From bad53f90c44bc439b438419bc43a8c53c7a04fe0 Mon Sep 17 00:00:00 2001 From: srcejon Date: Thu, 7 Dec 2023 09:50:09 +0000 Subject: [PATCH 1/3] #1915. Remove space in CSV header. --- plugins/channelrx/demodradiosonde/radiosondedemod.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/channelrx/demodradiosonde/radiosondedemod.cpp b/plugins/channelrx/demodradiosonde/radiosondedemod.cpp index 5cd426a7a..4e07c4da2 100644 --- a/plugins/channelrx/demodradiosonde/radiosondedemod.cpp +++ b/plugins/channelrx/demodradiosonde/radiosondedemod.cpp @@ -383,7 +383,7 @@ void RadiosondeDemod::applySettings(const RadiosondeDemodSettings& settings, boo if (newFile) { // Write header - m_logStream << "Date,Time,Data,Serial,Frame,Lat,Lon,Alt (m),Speed (m/s),V/R (m/s),Heading,P (hPa),T (C), U (%)\n"; + m_logStream << "Date,Time,Data,Serial,Frame,Lat,Lon,Alt (m),Speed (m/s),V/R (m/s),Heading,P (hPa),T (C),U (%)\n"; } } else From ae04412e880af4194ae778f533c8d60e29c6059b Mon Sep 17 00:00:00 2001 From: srcejon Date: Thu, 7 Dec 2023 09:53:20 +0000 Subject: [PATCH 2/3] SDRPlayV3 on Mac: Update library path so is works with API 3.12.1. --- plugins/samplesource/sdrplayv3/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/samplesource/sdrplayv3/CMakeLists.txt b/plugins/samplesource/sdrplayv3/CMakeLists.txt index 94d05e0a1..4ef41ee40 100644 --- a/plugins/samplesource/sdrplayv3/CMakeLists.txt +++ b/plugins/samplesource/sdrplayv3/CMakeLists.txt @@ -56,11 +56,11 @@ target_link_libraries(${TARGET_NAME} ${SDRPLAY_LIBRARIES} ) -# Library name is wrong in 3.12 release +# /usr/local/lib doesn't seem to be searched by default if (APPLE AND (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL arm64)) add_custom_command(TARGET ${TARGET_NAME} POST_BUILD COMMAND - ${CMAKE_INSTALL_NAME_TOOL} -change libsdrplay_api_arm64.so.3.12 /Library/SDRplayAPI/3.12.0/lib/libsdrplay_api.so.3.12.0 $) + ${CMAKE_INSTALL_NAME_TOOL} -change libsdrplay_api.so.3.12 /usr/local/lib/libsdrplay_api.so.3.12 $) endif() install(TARGETS ${TARGET_NAME} DESTINATION ${INSTALL_FOLDER}) From ebb08720921765d365ab7b25443a280b4b849da3 Mon Sep 17 00:00:00 2001 From: srcejon Date: Thu, 7 Dec 2023 11:33:41 +0000 Subject: [PATCH 3/3] Don't bother trying to make an dmg. --- .github/workflows/sdrangel.yml | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/.github/workflows/sdrangel.yml b/.github/workflows/sdrangel.yml index 5fb05eada..c8d95ba4d 100644 --- a/.github/workflows/sdrangel.yml +++ b/.github/workflows/sdrangel.yml @@ -133,16 +133,3 @@ jobs: run: | cd build make -j3 - - name: Stop XProtectBehaviorService - run: | - echo "killing XProject as it can interfere with hdiutil"; sudo pkill -9 XProtect >/dev/null || true; - echo "waiting..."; while pgrep XProtect; do sleep 3; done; - - name: Build DMG - run: | - cd build - make package -j3 - - name: Upload artifact - uses: actions/upload-artifact@v3 - with: - name: ${{ steps.get_filename.outputs.filename }}.dmg - path: ${{ github.workspace }}/build/${{ steps.get_filename.outputs.filename }}.dmg