Merge branch 'gqrx-sdr:master' into remote_snr_map

gqrx-sdr · Oct 16, 2024 · be99be5 · be99be5
2 parents fa57405 + ea40e55
commit be99be5
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 22 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -67,7 +67,7 @@ jobs:
           path: Gqrx-*.AppImage
   macos:
     name: MacOS
-    runs-on: macos-12
+    runs-on: macos-13
     steps:
       - name: Check for Secret availability
         id: secret-check
@@ -79,6 +79,8 @@ jobs:
           fi
       - name: Install dependencies
         run: |
+          # for https://github.com/actions/runner-images/issues/9272
+          sudo chown -R runner:admin /usr/local/
           brew update
           brew install --HEAD librtlsdr
           brew install airspy airspyhf boost dylibbundler gnuradio hackrf libbladerf libserialport portaudio pybind11 six uhd qt@6 || true
@@ -111,7 +113,7 @@ jobs:
           cd build
           cmake ..
           make -j4
-          make install
+          sudo make install
 
           cd /tmp
           cp /Library/Frameworks/iio.framework/iio /usr/local/lib/libiio.dylib
@@ -131,7 +133,7 @@ jobs:
           cd build
           cmake ..
           make -j4
-          make install
+          sudo make install
 
           cd /tmp
           git clone https://gitea.osmocom.org/sdr/gr-osmosdr.git
@@ -140,7 +142,7 @@ jobs:
           cd build
           cmake -DCMAKE_CXX_FLAGS=-Wno-register ..
           LIBRARY_PATH=/usr/local/opt/icu4c/lib make -j4
-          make install
+          sudo make install
       - name: Install Apple certificate
         if: ${{ steps.secret-check.outputs.available == 'true' }}
         env:
@@ -151,7 +153,7 @@ jobs:
           CERTIFICATE_PATH=$RUNNER_TEMP/build_certificate.p12
           KEYCHAIN_PATH=$RUNNER_TEMP/app-signing.keychain-db
 
-          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 --decode --output $CERTIFICATE_PATH
+          echo -n "$BUILD_CERTIFICATE_BASE64" | base64 -d -o $CERTIFICATE_PATH
 
           security create-keychain -p "$KEYCHAIN_PASSWORD" $KEYCHAIN_PATH
           security set-keychain-settings -lut 21600 $KEYCHAIN_PATH
@@ -237,7 +239,7 @@ jobs:
     - name: Clone and build GNU Radio
       working-directory: ${{ runner.temp }}
       run: |
-        git clone --branch v3.10.9.2 --depth 1 https://github.com/gnuradio/gnuradio.git
+        git clone --branch v3.10.11.0 --depth 1 https://github.com/gnuradio/gnuradio.git
         cd gnuradio
         cmake -S . -B build \
           -DCMAKE_INSTALL_PREFIX=${RUNNER_TEMP}/msys64/mingw64 \
@@ -337,7 +339,7 @@ jobs:
           libfftw3f-3.dll \
           libfftw3f_threads-3.dll \
           libFLAC.dll \
-          libfmt.dll \
+          libfmt-11.dll \
           libfreetype-6.dll \
           libgcc_s_seh-1.dll \
           libglib-2.0-0.dll \
@@ -346,9 +348,9 @@ jobs:
           libgraphite2.dll \
           libharfbuzz-0.dll \
           libiconv-2.dll \
-          libicudt74.dll \
-          libicuin74.dll \
-          libicuuc74.dll \
+          libicudt75.dll \
+          libicuin75.dll \
+          libicuuc75.dll \
           libintl-8.dll \
           libmd4c.dll \
           libmp3lame-0.dll \

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -68,12 +68,14 @@ jobs:
     name: MacOS CI
     strategy:
       matrix:
-        os: [macos-12, macos-13]
+        os: [macos-13, macos-14]
         backend: [Portaudio, Gr-audio]
     runs-on: ${{ matrix.os }}
     steps:
       - name: Install dependencies
         run: |
+          # for https://github.com/actions/runner-images/issues/9272
+          sudo chown -R runner:admin /usr/local/
           brew update
           brew install airspy boost gnuradio hackrf libbladerf librtlsdr pybind11 six uhd qt@6 || true
 
@@ -84,7 +86,7 @@ jobs:
           cd build
           cmake -DCMAKE_CXX_FLAGS=-Wno-register ..
           LIBRARY_PATH=/usr/local/opt/icu4c/lib make -j4
-          make install
+          sudo make install
       - name: Checkout code
         uses: actions/checkout@v4
       - name: Configure

diff --git a/src/dsp/rds/parser_impl.cc b/src/dsp/rds/parser_impl.cc
@@ -66,7 +66,7 @@ void parser_impl::reset() {
 	mono_stereo                    = false;
 	artificial_head                = false;
 	compressed                     = false;
-	static_pty                     = false;
+	dynamic_pty                    = false;
 }
 
 /* type 0 = PI
@@ -103,16 +103,16 @@ void parser_impl::decode_type0(unsigned int *group, bool B) {
 	/* see page 41, table 9 of the standard */
 	switch (segment_address) {
 		case 0:
-			mono_stereo=decoder_control_bit;
+			dynamic_pty=decoder_control_bit;
 		break;
 		case 1:
-			artificial_head=decoder_control_bit;
+			compressed=decoder_control_bit;
 		break;
 		case 2:
-			compressed=decoder_control_bit;
+			artificial_head=decoder_control_bit;
 		break;
 		case 3:
-			static_pty=decoder_control_bit;
+			mono_stereo=decoder_control_bit;
 		break;
 		default:
 		break;
@@ -123,7 +123,7 @@ void parser_impl::decode_type0(unsigned int *group, bool B) {
 	flagstring[3] = mono_stereo            ? '1' : '0';
 	flagstring[4] = artificial_head        ? '1' : '0';
 	flagstring[5] = compressed             ? '1' : '0';
-	flagstring[6] = static_pty             ? '1' : '0';
+	flagstring[6] = dynamic_pty            ? '1' : '0';
 	static std::string af_string;
 
 	if(!B) { // type 0A

diff --git a/src/dsp/rds/parser_impl.h b/src/dsp/rds/parser_impl.h
@@ -68,7 +68,7 @@ class parser_impl : public parser
 	bool           mono_stereo;
 	bool           artificial_head;
 	bool           compressed;
-	bool           static_pty;
+	bool           dynamic_pty;
 	bool           log;
 	bool           debug;
 	unsigned char  pty_locale;

diff --git a/src/qtgui/dockrds.cpp b/src/qtgui/dockrds.cpp
@@ -70,11 +70,11 @@ void DockRDS::updateRDS(QString text, int type)
         if (str.at(1) == '1') out.append("TA ");
         if (str.at(2) == '0') out.append("Speech ");
         if (str.at(2) == '1') out.append("Music ");
-        if (str.at(3) == '0') out.append("Stereo ");
-        if (str.at(3) == '1') out.append("Mono ");
+        if (str.at(3) == '1') out.append("Stereo ");
+        if (str.at(3) == '0') out.append("Mono ");
         if (str.at(4) == '1') out.append("AH ");
         if (str.at(5) == '1') out.append("CMP ");
-        if (str.at(6) == '1') out.append("stPTY ");
+        if (str.at(6) == '0') out.append("stPTY ");
         ui->flags->setText(QString::fromStdString(out));
         break;
     case 4: