From 39012dcb76bbfefb9dfe2fc46233f4b8f169b783 Mon Sep 17 00:00:00 2001 From: Aang23 Date: Sun, 21 Jan 2024 19:52:50 +0100 Subject: [PATCH 1/6] Update all_build.yml --- .github/workflows/all_build.yml | 62 ++++++++++++++++----------------- 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/all_build.yml b/.github/workflows/all_build.yml index ad20d512b..a154abe88 100644 --- a/.github/workflows/all_build.yml +++ b/.github/workflows/all_build.yml @@ -192,57 +192,57 @@ jobs: name: SatDump-Ubuntu-Latest path: ${{runner.workspace}}/build/*.deb -# build_linux_arm64: + build_linux_arm64: # The CMake configure and build commands are platform agnostic and should work equally # well on Windows or Mac. You can convert this to a matrix build if you need # cross-platform coverage. # See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix -# runs-on: ARM64 + runs-on: ARM64 -# steps: -# - uses: actions/checkout@v4 + steps: + - uses: actions/checkout@v4 -# - name: Update repositories -# run: sudo apt update + - name: Update repositories + run: sudo apt update -# - name: Install dependencies -# run: sudo apt install -y libglfw3-dev libfftw3-dev libvolk2-dev build-essential cmake pkgconf libjpeg-dev libpng-dev libairspy-dev libairspyhf-dev libhackrf-dev librtlsdr-dev libomp-dev libnng-dev libiio-dev libzstd-dev libad9361-dev libbladerf-dev libuhd-dev liblimesuite-dev ocl-icd-opencl-dev + - name: Install dependencies + run: sudo apt install -y libglfw3-dev libfftw3-dev libvolk2-dev build-essential cmake pkgconf libjpeg-dev libpng-dev libairspy-dev libairspyhf-dev libhackrf-dev librtlsdr-dev libomp-dev libnng-dev libiio-dev libzstd-dev libad9361-dev libbladerf-dev libuhd-dev liblimesuite-dev ocl-icd-opencl-dev -# - name: Delete build dir -# run: rm -rf ${{runner.workspace}}/build + - name: Delete build dir + run: rm -rf ${{runner.workspace}}/build -# - name: Create Build Environment + - name: Create Build Environment # Some projects don't allow in-source building, so create a separate build directory # We'll use this as our working directory for all subsequent commands -# run: cmake -E make_directory ${{runner.workspace}}/build + run: cmake -E make_directory ${{runner.workspace}}/build -# - name: Configure CMake + - name: Configure CMake # Use a bash shell so we can use the same syntax for environment variable # access regardless of the host operating system -# shell: bash -# working-directory: ${{runner.workspace}}/build + shell: bash + working-directory: ${{runner.workspace}}/build # Note the current convention is to use the -S and -B options here to specify source # and build directories, but this is only available with CMake 3.13 and higher. # The CMake binaries on the Github Actions machines are (as of this writing) 3.12 -# run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_LIVE=ON + run: cmake $GITHUB_WORKSPACE -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DBUILD_LIVE=ON -# - name: Build -# working-directory: ${{runner.workspace}}/build -# shell: bash + - name: Build + working-directory: ${{runner.workspace}}/build + shell: bash # Execute the build. You can specify a specific target with "--target " -# run: make -j4 + run: make -j4 - # - name: Package - # working-directory: ${{runner.workspace}}/build - # shell: bash + - name: Package + working-directory: ${{runner.workspace}}/build + shell: bash # Execute the build. You can specify a specific target with "--target " - # run: make package + run: make package - # - name: Upload ZIP - # uses: actions/upload-artifact@v3 - # with: - # name: SatDump-Pi64-Latest - # path: ${{runner.workspace}}/build/*.deb + - name: Upload ZIP + uses: actions/upload-artifact@v3 + with: + name: SatDump-Pi64-Latest + path: ${{runner.workspace}}/build/*.deb build_macos: runs-on: macos-latest @@ -300,7 +300,7 @@ jobs: # Yes, since I was asked to do like SDR++ for this I did look at how Ryzerth has done it :-) update_nightly_release: - needs: ["build_windows", "build_linux", "build_macos"] #, "build_linux_arm64", "build_android"] + needs: ["build_windows", "build_linux", "build_macos", "build_linux_arm64"] #, "build_android"] runs-on: ubuntu-latest if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }} @@ -312,7 +312,7 @@ jobs: run: sudo apt install -y unzip - name: Copy files - run: mkdir satdump_out && cp SatDump-Ubuntu-Latest/satdump*.deb satdump_out/satdump_ubuntu_latest_amd64.deb && cp SatDump-macOS/SatDump-macOS.dmg satdump_out/SatDump-macOS.dmg && (cd SatDump-Windows_x64_Portable && zip -r ../satdump_out/SatDump-Windows_x64_Portable.zip *) && cp SatDump-Windows_x64_Installer/SatDump-*.exe satdump_out/SatDump-Windows_x64_Installer.exe # && cp SatDump-Pi64-Latest/satdump*.deb satdump_out/satdump_rpi64_latest_arm64.deb && cp SatDump-debug.apk/app-debug.apk satdump_out/SatDump-debug.apk + run: mkdir satdump_out && cp SatDump-Ubuntu-Latest/satdump*.deb satdump_out/satdump_ubuntu_latest_amd64.deb && cp SatDump-macOS/SatDump-macOS.dmg satdump_out/SatDump-macOS.dmg && (cd SatDump-Windows_x64_Portable && zip -r ../satdump_out/SatDump-Windows_x64_Portable.zip *) && cp SatDump-Windows_x64_Installer/SatDump-*.exe satdump_out/SatDump-Windows_x64_Installer.exe && cp SatDump-Pi64-Latest/satdump*.deb satdump_out/satdump_rpi64_latest_arm64.deb # && cp SatDump-debug.apk/app-debug.apk satdump_out/SatDump-debug.apk - name: Update Nightly run: gh release upload nightly satdump_out/* -R ${{github.repository}} --clobber From ce9bbb4746c7d70d6f9899a5d3cc52602e435f6e Mon Sep 17 00:00:00 2001 From: OK9UWU Date: Mon, 22 Jan 2024 08:43:27 +0100 Subject: [PATCH 2/6] Add audio muting but needs to be checked --- .../cluster/module_cluster_instruments.cpp | 35 ++++++++++++++++++- .../cluster/module_cluster_instruments.h | 3 ++ 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/plugins/cluster_support/cluster/module_cluster_instruments.cpp b/plugins/cluster_support/cluster/module_cluster_instruments.cpp index 10ad362e8..ff0f5d2f1 100644 --- a/plugins/cluster_support/cluster/module_cluster_instruments.cpp +++ b/plugins/cluster_support/cluster/module_cluster_instruments.cpp @@ -12,6 +12,8 @@ #include "instruments/wbd_decoder.h" #include "common/audio/audio_sink.h" #include "common/dsp/io/wav_writer.h" +#include "core/config.h" + namespace cluster { @@ -32,6 +34,8 @@ namespace cluster logger->info("Using input frames " + d_input_file); + play_audio = satdump::config::main_cfg["user_interface"]["play_audio"]["value"].get(); + time_t lastTime = 0; uint8_t cadu[1279]; @@ -105,7 +109,7 @@ namespace cluster for (int i = 0; i < 4352; i++) audio_buffer[i] = (int(majorframe.payload[i]) - 127) * 255; - if (enable_audio) + if (enable_audio && play_audio) audio_sink->push_samples(audio_buffer, 4352); if (majorframe.VCXO == 0) @@ -152,6 +156,9 @@ namespace cluster } } + if (enable_audio) + audio_sink->stop(); + wave_writer_Ez.finish_header(final_data_size_ant_Ez); wave_writer_Bx.finish_header(final_data_size_ant_Bx); wave_writer_By.finish_header(final_data_size_ant_By); @@ -207,6 +214,32 @@ namespace cluster ImGui::SameLine(); ImGui::Text("%d", param_commands); + if (enable_audio) //Does this work?! + { + ImGui::Spacing(); + const char* btn_icon, * label; + ImU32 color; + if (play_audio) + { + color = IM_COL32(0, 255, 0, 255); + btn_icon = u8"\uF028##wbdaudio"; + label = "Audio Playing"; + } + else + { + color = IM_COL32(255, 0, 0, 255); + btn_icon = u8"\uF026##wbdaudio"; + label = "Audio Muted"; + } + + ImGui::PushStyleColor(ImGuiCol_Text, color); + if (ImGui::Button(btn_icon)) + play_audio = !play_audio; + ImGui::PopStyleColor(); + ImGui::SameLine(); + ImGui::TextUnformatted(label); + } + if (input_data_type == DATA_FILE) ImGui::ProgressBar((double)progress / (double)filesize, ImVec2(ImGui::GetWindowWidth() - 10, 20 * ui_scale)); diff --git a/plugins/cluster_support/cluster/module_cluster_instruments.h b/plugins/cluster_support/cluster/module_cluster_instruments.h index 401353e88..d23eed5ef 100644 --- a/plugins/cluster_support/cluster/module_cluster_instruments.h +++ b/plugins/cluster_support/cluster/module_cluster_instruments.h @@ -14,6 +14,9 @@ namespace cluster std::atomic filesize; std::atomic progress; + bool enable_audio = false; + bool play_audio; + // Readers // cips::CIPSReader cips_readers[4]; // totally not stolen AIM decoder..... From 3d170fb0e8afc75f46406507795fe712b6dd44e4 Mon Sep 17 00:00:00 2001 From: RAD750 Date: Mon, 22 Jan 2024 11:19:28 +0100 Subject: [PATCH 3/6] Fixed minor mistakes on the compos --- satdump_cfg.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/satdump_cfg.json b/satdump_cfg.json index a110a7746..c6af0ae1a 100644 --- a/satdump_cfg.json +++ b/satdump_cfg.json @@ -1148,7 +1148,7 @@ } }, "124": { - "equation": "ch1, ch2, ch4", + "equation": "ch1, ch2, 1-ch4", "description": "descriptions/124.md", "geo_correct": true, "white_balance": true, @@ -1219,6 +1219,7 @@ "channels": "ch4", "lua": "scripted_compos/underlay_with_clouds.lua", "description": "descriptions/MCIR.md", + "equalize": true, "lua_vars": { "minoffset": 0.45, "scalar": 2.6, From e42b179255b7f7f3a6e3954a3b5110140e3760d7 Mon Sep 17 00:00:00 2001 From: RAD750 Date: Mon, 22 Jan 2024 11:19:35 +0100 Subject: [PATCH 4/6] Fixed minor mistakes on the compos --- satdump_cfg.json | 1 + 1 file changed, 1 insertion(+) diff --git a/satdump_cfg.json b/satdump_cfg.json index c6af0ae1a..bae81449a 100644 --- a/satdump_cfg.json +++ b/satdump_cfg.json @@ -584,6 +584,7 @@ "channels": "cch4", "lua": "scripted_compos/underlay_with_clouds.lua", "description": "descriptions/MCIR.md", + "equalize": true, "lua_vars": { "minoffset": 0.05, "scalar": 1.1, From 7647d963a09e81ac77472a6f96b7464d0bf9e4fe Mon Sep 17 00:00:00 2001 From: Jamie Vital Date: Mon, 22 Jan 2024 08:58:06 -0500 Subject: [PATCH 5/6] Remove extra var and fix setting play_audio --- .../cluster_support/cluster/module_cluster_instruments.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/plugins/cluster_support/cluster/module_cluster_instruments.cpp b/plugins/cluster_support/cluster/module_cluster_instruments.cpp index ff0f5d2f1..b3b003ce2 100644 --- a/plugins/cluster_support/cluster/module_cluster_instruments.cpp +++ b/plugins/cluster_support/cluster/module_cluster_instruments.cpp @@ -22,6 +22,7 @@ namespace cluster CLUSTERInstrumentsDecoderModule::CLUSTERInstrumentsDecoderModule(std::string input_file, std::string output_file_hint, nlohmann::json parameters) : ProcessingModule(input_file, output_file_hint, parameters) { + play_audio = satdump::config::main_cfg["user_interface"]["play_audio"]["value"].get(); } void CLUSTERInstrumentsDecoderModule::process() @@ -34,8 +35,6 @@ namespace cluster logger->info("Using input frames " + d_input_file); - play_audio = satdump::config::main_cfg["user_interface"]["play_audio"]["value"].get(); - time_t lastTime = 0; uint8_t cadu[1279]; @@ -50,7 +49,6 @@ namespace cluster // Audio stuff int16_t audio_buffer[4352]; - bool enable_audio = false; std::shared_ptr audio_sink; if (input_data_type != DATA_FILE && audio::has_sink()) { @@ -214,7 +212,7 @@ namespace cluster ImGui::SameLine(); ImGui::Text("%d", param_commands); - if (enable_audio) //Does this work?! + if (enable_audio) { ImGui::Spacing(); const char* btn_icon, * label; From f25726ca67452dcdf6c164554e9fb42cf79c6038 Mon Sep 17 00:00:00 2001 From: Jamie Vital Date: Tue, 23 Jan 2024 00:06:13 -0500 Subject: [PATCH 6/6] Enable Noise Reduction on APT by default --- pipelines/NOAA.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pipelines/NOAA.json b/pipelines/NOAA.json index cfb2f6147..8a2891e1c 100644 --- a/pipelines/NOAA.json +++ b/pipelines/NOAA.json @@ -238,7 +238,7 @@ }, "sdrpp_noise_reduction": { "type": "bool", - "value": false, + "value": true, "name": "SDR++ Noise Reduction", "description": "APT Noise Reduction originally from Ryzerth in SDR++. Performs quite well on APT!" } @@ -257,4 +257,4 @@ } } } -} \ No newline at end of file +}