random fixes

2022-10-23 17:41:10 +02:00 · 2022-10-23 17:41:10 +02:00 · d16c08c8b2
commit d16c08c8b2
--- a/make_macos_bundle.sh
+++ b/make_macos_bundle.sh
@ -36,6 +36,7 @@ bundle_install_binary $BUNDLE $BUNDLE/Contents/Plugins $BUILD_DIR/source_modules
 bundle_install_binary $BUNDLE $BUNDLE/Contents/Plugins $BUILD_DIR/source_modules/bladerf_source/bladerf_source.dylib
 bundle_install_binary $BUNDLE $BUNDLE/Contents/Plugins $BUILD_DIR/source_modules/file_source/file_source.dylib
 bundle_install_binary $BUNDLE $BUNDLE/Contents/Plugins $BUILD_DIR/source_modules/hackrf_source/hackrf_source.dylib
+bundle_install_binary $BUNDLE $BUNDLE/Contents/Plugins $BUILD_DIR/source_modules/hermes_source/hermes_source.dylib
 bundle_install_binary $BUNDLE $BUNDLE/Contents/Plugins $BUILD_DIR/source_modules/limesdr_source/limesdr_source.dylib
 bundle_install_binary $BUNDLE $BUNDLE/Contents/Plugins $BUILD_DIR/source_modules/plutosdr_source/plutosdr_source.dylib
 bundle_install_binary $BUNDLE $BUNDLE/Contents/Plugins $BUILD_DIR/source_modules/rfspace_source/rfspace_source.dylib
@ -45,6 +46,7 @@ bundle_install_binary $BUNDLE $BUNDLE/Contents/Plugins $BUILD_DIR/source_modules
 bundle_install_binary $BUNDLE $BUNDLE/Contents/Plugins $BUILD_DIR/source_modules/sdrpp_server_source/sdrpp_server_source.dylib
 bundle_install_binary $BUNDLE $BUNDLE/Contents/Plugins $BUILD_DIR/source_modules/soapy_source/soapy_source.dylib
 bundle_install_binary $BUNDLE $BUNDLE/Contents/Plugins $BUILD_DIR/source_modules/spyserver_source/spyserver_source.dylib
+bundle_install_binary $BUNDLE $BUNDLE/Contents/Plugins $BUILD_DIR/source_modules/usrp_source/usrp_source.dylib

 # Sink modules
 bundle_install_binary $BUNDLE $BUNDLE/Contents/Plugins $BUILD_DIR/sink_modules/portaudio_sink/audio_sink.dylib
--- a/make_macos_package.sh
+++ b/make_macos_package.sh
@ -1,15 +0,0 @@
-#!/bin/sh
-
-mkdir sdrpp
-
-# Copy files
-ORIG_DIR=$PWD
-cd $1
-make install DESTDIR=$ORIG_DIR/sdrpp
-cd $ORIG_DIR
-
-# Create archive
-productbuild --root sdrpp / sdrpp_macos_amd64.pkg
-
-# Cleanup
-rm -rf sdrpp/
--- a/make_windows_package.ps1
+++ b/make_windows_package.ps1
@ -25,14 +25,20 @@ cp $build_dir/source_modules/file_source/Release/file_source.dll sdrpp_windows_x
 cp $build_dir/source_modules/hackrf_source/Release/hackrf_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/PothosSDR/bin/hackrf.dll' sdrpp_windows_x64/

-cp $build_dir/source_modules/rtl_sdr_source/Release/rtl_sdr_source.dll sdrpp_windows_x64/modules/
-cp 'C:/Program Files/PothosSDR/bin/rtlsdr.dll' sdrpp_windows_x64/
+cp $build_dir/source_modules/hermes_source/Release/hermes_source.dll sdrpp_windows_x64/modules/

 cp $build_dir/source_modules/limesdr_source/Release/limesdr_source.dll sdrpp_windows_x64/modules/
 cp 'C:/Program Files/PothosSDR/bin/LimeSuite.dll' sdrpp_windows_x64/

+cp $build_dir/source_modules/plutosdr_source/Release/plutosdr_source.dll sdrpp_windows_x64/modules/
+cp 'C:/Program Files/PothosSDR/bin/libiio.dll' sdrpp_windows_x64/
+cp 'C:/Program Files/PothosSDR/bin/libad9361.dll' sdrpp_windows_x64/
+
 cp $build_dir/source_modules/rfspace_source/Release/rfspace_source.dll sdrpp_windows_x64/modules/

+cp $build_dir/source_modules/rtl_sdr_source/Release/rtl_sdr_source.dll sdrpp_windows_x64/modules/
+cp 'C:/Program Files/PothosSDR/bin/rtlsdr.dll' sdrpp_windows_x64/
+
 cp $build_dir/source_modules/rtl_tcp_source/Release/rtl_tcp_source.dll sdrpp_windows_x64/modules/

 cp $build_dir/source_modules/sdrplay_source/Release/sdrplay_source.dll sdrpp_windows_x64/modules/ -ErrorAction SilentlyContinue
@ -42,16 +48,15 @@ cp $build_dir/source_modules/sdrpp_server_source/Release/sdrpp_server_source.dll

 cp $build_dir/source_modules/soapy_source/Release/soapy_source.dll sdrpp_windows_x64/modules/

-cp $build_dir/source_modules/plutosdr_source/Release/plutosdr_source.dll sdrpp_windows_x64/modules/
-cp 'C:/Program Files/PothosSDR/bin/libiio.dll' sdrpp_windows_x64/
-cp 'C:/Program Files/PothosSDR/bin/libad9361.dll' sdrpp_windows_x64/
-
 cp $build_dir/source_modules/spyserver_source/Release/spyserver_source.dll sdrpp_windows_x64/modules/

+cp $build_dir/source_modules/usrp_source/Release/usrp_source.dll sdrpp_windows_x64/modules/
+

 # Copy sink modules
 cp $build_dir/sink_modules/audio_sink/Release/audio_sink.dll sdrpp_windows_x64/modules/
 cp "C:/Program Files (x86)/RtAudio/bin/rtaudio.dll" sdrpp_windows_x64/
+
 cp $build_dir/sink_modules/network_sink/Release/network_sink.dll sdrpp_windows_x64/modules/


@ -60,14 +65,19 @@ cp $build_dir/decoder_modules/m17_decoder/Release/m17_decoder.dll sdrpp_windows_
 cp "C:/Program Files/codec2/lib/libcodec2.dll" sdrpp_windows_x64/

 cp $build_dir/decoder_modules/meteor_demodulator/Release/meteor_demodulator.dll sdrpp_windows_x64/modules/
+
 cp $build_dir/decoder_modules/radio/Release/radio.dll sdrpp_windows_x64/modules/


 # Copy misc modules
 cp $build_dir/misc_modules/discord_integration/Release/discord_integration.dll sdrpp_windows_x64/modules/
+
 cp $build_dir/misc_modules/frequency_manager/Release/frequency_manager.dll sdrpp_windows_x64/modules/
+
 cp $build_dir/misc_modules/recorder/Release/recorder.dll sdrpp_windows_x64/modules/
+
 cp $build_dir/misc_modules/rigctl_server/Release/rigctl_server.dll sdrpp_windows_x64/modules/
+
 cp $build_dir/misc_modules/scanner/Release/scanner.dll sdrpp_windows_x64/modules/


--- a/readme.md
+++ b/readme.md
@ -314,23 +314,24 @@ Modules in beta are still included in releases for the most part but not enabled

 ## Sources

-| Name                | Stage      | Dependencies      | Option                     | Built by default| Built in Release        | Enabled in SDR++ by default |
-|---------------------|------------|-------------------|----------------------------|:---------------:|:-----------------------:|:---------------------------:|
-| airspy_source       | Working    | libairspy         | OPT_BUILD_AIRSPY_SOURCE    | ✅              | ✅                     | ✅                         |
-| airspyhf_source     | Working    | libairspyhf       | OPT_BUILD_AIRSPYHF_SOURCE  | ✅              | ✅                     | ✅                         |
-| bladerf_source      | Working    | libbladeRF        | OPT_BUILD_BLADERF_SOURCE   | ⛔              | ⚠️ (not Debian Buster) | ✅                         |
-| file_source         | Working    | -                 | OPT_BUILD_FILE_SOURCE      | ✅              | ✅                     | ✅                         |
-| hackrf_source       | Working    | libhackrf         | OPT_BUILD_HACKRF_SOURCE    | ✅              | ✅                     | ✅                         |
-| hermes_source       | Unfinished | -                 | OPT_BUILD_HERMES_SOURCE    | ✅              | ✅                     | ✅                         |
-| limesdr_source      | Working    | liblimesuite      | OPT_BUILD_LIMESDR_SOURCE   | ⛔              | ✅                     | ✅                         |
-| plutosdr_source     | Working    | libiio, libad9361 | OPT_BUILD_PLUTOSDR_SOURCE  | ✅              | ✅                     | ✅                         |
-| rfspace_source      | Working    | -                 | OPT_BUILD_RFSPACE_SOURCE   | ✅              | ✅                     | ✅                         |
-| rtl_sdr_source      | Working    | librtlsdr         | OPT_BUILD_RTL_SDR_SOURCE   | ✅              | ✅                     | ✅                         |
-| rtl_tcp_source      | Working    | -                 | OPT_BUILD_RTL_TCP_SOURCE   | ✅              | ✅                     | ✅                         |
-| sdrplay_source      | Working    | SDRplay API       | OPT_BUILD_SDRPLAY_SOURCE   | ⛔              | ✅                     | ✅                         |
-| sdrpp_server_source | Working    | -                 | OPT_BUILD_SPYSERVER_SOURCE | ✅              | ✅                     | ✅                         |
-| soapy_source        | Working    | soapysdr          | OPT_BUILD_SOAPY_SOURCE     | ✅              | ✅                     | ✅                         |
-| spyserver_source    | Working    | -                 | OPT_BUILD_SPYSERVER_SOURCE | ✅              | ✅                     | ✅                         |
+| Name                | Stage      | Dependencies      | Option                        | Built by default| Built in Release        | Enabled in SDR++ by default |
+|---------------------|------------|-------------------|-------------------------------|:---------------:|:-----------------------:|:---------------------------:|
+| airspy_source       | Working    | libairspy         | OPT_BUILD_AIRSPY_SOURCE       | ✅              | ✅                     | ✅                         |
+| airspyhf_source     | Working    | libairspyhf       | OPT_BUILD_AIRSPYHF_SOURCE     | ✅              | ✅                     | ✅                         |
+| bladerf_source      | Working    | libbladeRF        | OPT_BUILD_BLADERF_SOURCE      | ⛔              | ⚠️ (not Debian Buster) | ✅                         |
+| file_source         | Working    | -                 | OPT_BUILD_FILE_SOURCE         | ✅              | ✅                     | ✅                         |
+| hackrf_source       | Working    | libhackrf         | OPT_BUILD_HACKRF_SOURCE       | ✅              | ✅                     | ✅                         |
+| hermes_source       | Unfinished | -                 | OPT_BUILD_HERMES_SOURCE       | ✅              | ✅                     | ⛔                         |
+| limesdr_source      | Working    | liblimesuite      | OPT_BUILD_LIMESDR_SOURCE      | ⛔              | ✅                     | ✅                         |
+| plutosdr_source     | Working    | libiio, libad9361 | OPT_BUILD_PLUTOSDR_SOURCE     | ✅              | ✅                     | ✅                         |
+| rfspace_source      | Working    | -                 | OPT_BUILD_RFSPACE_SOURCE      | ✅              | ✅                     | ✅                         |
+| rtl_sdr_source      | Working    | librtlsdr         | OPT_BUILD_RTL_SDR_SOURCE      | ✅              | ✅                     | ✅                         |
+| rtl_tcp_source      | Working    | -                 | OPT_BUILD_RTL_TCP_SOURCE      | ✅              | ✅                     | ✅                         |
+| sdrplay_source      | Working    | SDRplay API       | OPT_BUILD_SDRPLAY_SOURCE      | ⛔              | ✅                     | ✅                         |
+| sdrpp_server_source | Working    | -                 | OPT_BUILD_SDRPP_SERVER_SOURCE | ✅              | ✅                     | ✅                         |
+| soapy_source        | Working    | soapysdr          | OPT_BUILD_SOAPY_SOURCE        | ✅              | ✅                     | ✅                         |
+| spyserver_source    | Working    | -                 | OPT_BUILD_SPYSERVER_SOURCE    | ✅              | ✅                     | ✅                         |
+| usrp_source         | Beta       | libuhd            | OPT_BUILD_USRP_SOURCE         | ⛔              | ✅                     | ⛔                         |

 ## Sinks

--- a/source_modules/usrp_source/src/main.cpp
+++ b/source_modules/usrp_source/src/main.cpp
@ -310,6 +310,7 @@ private:
            _this->select(ser);
        }

+        // TODO: Hide if only one channel
        SmGui::LeftLabel("Channel");
        SmGui::FillWidth();
        SmGui::ForceSync();
@ -324,6 +325,7 @@ private:

        if (_this->running) { SmGui::EndDisabled(); }

+        // TODO: Hide if only one antenna
        SmGui::LeftLabel("Antenna");
        SmGui::FillWidth();
        if (SmGui::Combo(CONCAT("##_usrp_ant_sel_", _this->name), &_this->antId, _this->antennas.txt)) {