Skip to content

Commit 239a198

Browse files
Mr-PreciseMr-Precise
committed
Merge remote-tracking branch 'upstream/master'
2 parents f7ad0b2 + 3fc8935 commit 239a198

File tree

51 files changed

+3256
-717
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+3256
-717
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ assignees: ''
77

88
---
99

10+
# WARNING: Filling out the template below is NOT optional. Issues not filling out this template will be closed without review.
11+
1012
FIRST: Before reporting any bug, make sure that the bug you are reporting has not been reported before. Also, try to use the [nightly version](https://www.sdrpp.org/nightly) if possible in case I've already fixed the bug.
1113

1214
**Hardware**

‎.github/workflows/build_all.yml‎

Lines changed: 48 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: windows-latest
1919

2020
steps:
21-
- uses: actions/checkout@v3
21+
- uses: actions/checkout@v4
2222

2323
- name: Create Build Environment
2424
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -79,7 +79,7 @@ jobs:
7979
run: '&($Env:GITHUB_WORKSPACE + "/make_windows_package.ps1") ./build ($Env:GITHUB_WORKSPACE + "/root")'
8080

8181
- name: Save Archive
82-
uses: actions/upload-artifact@v3
82+
uses: actions/upload-artifact@v4
8383
with:
8484
name: sdrpp_windows_x64
8585
path: ${{runner.workspace}}/sdrpp_windows_x64.zip
@@ -88,7 +88,7 @@ jobs:
8888
runs-on: macos-latest
8989

9090
steps:
91-
- uses: actions/checkout@v3
91+
- uses: actions/checkout@v4
9292

9393
- name: Create Build Environment
9494
run: cmake -E make_directory ${{runner.workspace}}/build
@@ -103,7 +103,7 @@ jobs:
103103
run: git clone --recursive https://github.com/gnuradio/volk && cd volk && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../
104104

105105
- name: Install SDRplay API
106-
run: wget https://www.sdrplay.com/software/SDRplay_RSP_API-MacOSX-3.07.3.pkg && sudo installer -pkg SDRplay_RSP_API-MacOSX-3.07.3.pkg -target /
106+
run: wget https://www.sdrplay.com/software/SDRplayAPI-macos-installer-universal-3.12.1.pkg && sudo installer -pkg SDRplayAPI-macos-installer-universal-3.12.1.pkg -target /
107107

108108
- name: Install libiio
109109
run: wget https://github.com/analogdevicesinc/libiio/archive/refs/tags/v0.25.zip && 7z x v0.25.zip && cd libiio-0.25 && mkdir build && cd build && cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.15 -DCMAKE_BUILD_TYPE=Release .. && make -j3 && sudo make install && cd ../../
@@ -133,7 +133,7 @@ jobs:
133133
run: cd $GITHUB_WORKSPACE && sh make_macos_bundle.sh ${{runner.workspace}}/build ./SDR++.app && zip -r ${{runner.workspace}}/sdrpp_macos_intel.zip SDR++.app
134134

135135
- name: Save Archive
136-
uses: actions/upload-artifact@v3
136+
uses: actions/upload-artifact@v4
137137
with:
138138
name: sdrpp_macos_intel
139139
path: ${{runner.workspace}}/sdrpp_macos_intel.zip
@@ -142,7 +142,7 @@ jobs:
142142
runs-on: ubuntu-latest
143143

144144
steps:
145-
- uses: actions/checkout@v3
145+
- uses: actions/checkout@v4
146146

147147
- name: Create Docker Image
148148
run: cd $GITHUB_WORKSPACE/docker_builds/debian_buster && docker build . --tag sdrpp_build
@@ -155,7 +155,7 @@ jobs:
155155
run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
156156

157157
- name: Save Deb Archive
158-
uses: actions/upload-artifact@v3
158+
uses: actions/upload-artifact@v4
159159
with:
160160
name: sdrpp_debian_buster_amd64
161161
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
@@ -164,7 +164,7 @@ jobs:
164164
runs-on: ubuntu-latest
165165

166166
steps:
167-
- uses: actions/checkout@v3
167+
- uses: actions/checkout@v4
168168

169169
- name: Create Docker Image
170170
run: cd $GITHUB_WORKSPACE/docker_builds/debian_bullseye && docker build . --tag sdrpp_build
@@ -177,7 +177,7 @@ jobs:
177177
run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
178178

179179
- name: Save Deb Archive
180-
uses: actions/upload-artifact@v3
180+
uses: actions/upload-artifact@v4
181181
with:
182182
name: sdrpp_debian_bullseye_amd64
183183
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
@@ -186,7 +186,7 @@ jobs:
186186
runs-on: ubuntu-latest
187187

188188
steps:
189-
- uses: actions/checkout@v3
189+
- uses: actions/checkout@v4
190190

191191
- name: Create Docker Image
192192
run: cd $GITHUB_WORKSPACE/docker_builds/debian_bookworm && docker build . --tag sdrpp_build
@@ -199,7 +199,7 @@ jobs:
199199
run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
200200

201201
- name: Save Deb Archive
202-
uses: actions/upload-artifact@v3
202+
uses: actions/upload-artifact@v4
203203
with:
204204
name: sdrpp_debian_bookworm_amd64
205205
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
@@ -208,7 +208,7 @@ jobs:
208208
runs-on: ubuntu-latest
209209

210210
steps:
211-
- uses: actions/checkout@v3
211+
- uses: actions/checkout@v4
212212

213213
- name: Create Docker Image
214214
run: cd $GITHUB_WORKSPACE/docker_builds/debian_sid && docker build . --tag sdrpp_build
@@ -221,7 +221,7 @@ jobs:
221221
run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
222222

223223
- name: Save Deb Archive
224-
uses: actions/upload-artifact@v3
224+
uses: actions/upload-artifact@v4
225225
with:
226226
name: sdrpp_debian_sid_amd64
227227
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
@@ -230,7 +230,7 @@ jobs:
230230
runs-on: ubuntu-latest
231231

232232
steps:
233-
- uses: actions/checkout@v3
233+
- uses: actions/checkout@v4
234234

235235
- name: Create Docker Image
236236
run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_focal && docker build . --tag sdrpp_build
@@ -243,7 +243,7 @@ jobs:
243243
run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
244244

245245
- name: Save Deb Archive
246-
uses: actions/upload-artifact@v3
246+
uses: actions/upload-artifact@v4
247247
with:
248248
name: sdrpp_ubuntu_focal_amd64
249249
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
@@ -252,7 +252,7 @@ jobs:
252252
runs-on: ubuntu-latest
253253

254254
steps:
255-
- uses: actions/checkout@v3
255+
- uses: actions/checkout@v4
256256

257257
- name: Create Docker Image
258258
run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_jammy && docker build . --tag sdrpp_build
@@ -265,16 +265,38 @@ jobs:
265265
run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
266266

267267
- name: Save Deb Archive
268-
uses: actions/upload-artifact@v3
268+
uses: actions/upload-artifact@v4
269269
with:
270270
name: sdrpp_ubuntu_jammy_amd64
271271
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
272+
273+
build_ubuntu_mantic:
274+
runs-on: ubuntu-latest
275+
276+
steps:
277+
- uses: actions/checkout@v4
278+
279+
- name: Create Docker Image
280+
run: cd $GITHUB_WORKSPACE/docker_builds/ubuntu_mantic && docker build . --tag sdrpp_build
281+
282+
- name: Run Container
283+
run: docker run --name build -v $GITHUB_WORKSPACE:/root/SDRPlusPlus --env BUILD_NO="-$GITHUB_RUN_NUMBER" sdrpp_build /root/do_build.sh
284+
285+
- name: Recover Deb Archive
286+
working-directory: ${{runner.workspace}}
287+
run: docker cp build:/root/SDRPlusPlus/sdrpp_debian_amd64.deb ./
288+
289+
- name: Save Deb Archive
290+
uses: actions/upload-artifact@v4
291+
with:
292+
name: sdrpp_ubuntu_mantic_amd64
293+
path: ${{runner.workspace}}/sdrpp_debian_amd64.deb
272294

273295
build_android:
274296
runs-on: ubuntu-latest
275297

276298
steps:
277-
- uses: actions/checkout@v3
299+
- uses: actions/checkout@v4
278300

279301
- name: Fetch container
280302
working-directory: ${{runner.workspace}}
@@ -292,18 +314,18 @@ jobs:
292314
run: docker cp build:/root/SDRPlusPlus/android/app/build/outputs/apk/debug/app-debug.apk ./ && mv app-debug.apk sdrpp.apk
293315

294316
- name: Save APK
295-
uses: actions/upload-artifact@v3
317+
uses: actions/upload-artifact@v4
296318
with:
297319
name: sdrpp_android
298320
path: ${{runner.workspace}}/sdrpp.apk
299321

300322
create_full_archive:
301-
needs: ['build_windows', 'build_macos', 'build_debian_buster', 'build_debian_bullseye', 'build_debian_bookworm', 'build_debian_sid', 'build_ubuntu_focal', 'build_ubuntu_jammy', 'build_android']
323+
needs: ['build_windows', 'build_macos', 'build_debian_buster', 'build_debian_bullseye', 'build_debian_bookworm', 'build_debian_sid', 'build_ubuntu_focal', 'build_ubuntu_jammy', 'build_ubuntu_mantic', 'build_android']
302324
runs-on: ubuntu-latest
303325

304326
steps:
305327
- name: Download All Builds
306-
uses: actions/download-artifact@v3
328+
uses: actions/download-artifact@v4
307329

308330
- name: Create Archive
309331
run: >
@@ -316,9 +338,10 @@ jobs:
316338
mv sdrpp_debian_sid_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_debian_sid_amd64.deb &&
317339
mv sdrpp_ubuntu_focal_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_focal_amd64.deb &&
318340
mv sdrpp_ubuntu_jammy_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_jammy_amd64.deb &&
341+
mv sdrpp_ubuntu_mantic_amd64/sdrpp_debian_amd64.deb sdrpp_all/sdrpp_ubuntu_mantic_amd64.deb &&
319342
mv sdrpp_android/sdrpp.apk sdrpp_all/sdrpp.apk
320343
321-
- uses: actions/upload-artifact@v3
344+
- uses: actions/upload-artifact@v4
322345
with:
323346
name: sdrpp_all
324347
path: sdrpp_all/
@@ -330,7 +353,7 @@ jobs:
330353

331354
steps:
332355
- name: Download All Builds
333-
uses: actions/download-artifact@v3
356+
uses: actions/download-artifact@v4
334357

335358
- name: Update Nightly
336359
run: gh release upload nightly sdrpp_all/* -R ${{github.repository}} --clobber
@@ -339,7 +362,7 @@ jobs:
339362
runs-on: ubuntu-latest
340363

341364
steps:
342-
- uses: actions/checkout@v3
365+
- uses: actions/checkout@v4
343366

344367
- name: Install codespell
345368
run: sudo apt update -y && sudo apt install -y codespell
@@ -351,7 +374,7 @@ jobs:
351374
runs-on: ubuntu-latest
352375

353376
steps:
354-
- uses: actions/checkout@v3
377+
- uses: actions/checkout@v4
355378

356379
- name: Run check_clang_format
357380
run: cd $GITHUB_WORKSPACE && chmod +x ./check_clang_format.sh && ./check_clang_format.sh || true

‎CMakeLists.txt‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ option(OPT_BUILD_FALCON9_DECODER "Build the falcon9 live decoder (Dependencies:
4343
option(OPT_BUILD_KG_SSTV_DECODER "Build the KG SSTV (KG-STV) decoder module (no dependencies required)" OFF)
4444
option(OPT_BUILD_M17_DECODER "Build the M17 decoder module (Dependencies: codec2)" OFF)
4545
option(OPT_BUILD_METEOR_DEMODULATOR "Build the meteor demodulator module (no dependencies required)" ON)
46+
option(OPT_BUILD_PAGER_DECODER "Build the pager decoder module (no dependencies required)" OFF)
4647
option(OPT_BUILD_RADIO "Main audio modulation decoder (AM, FM, SSB, etc...)" ON)
4748
option(OPT_BUILD_WEATHER_SAT_DECODER "Build the HRPT decoder module (no dependencies required)" OFF)
4849

@@ -234,6 +235,10 @@ if (OPT_BUILD_METEOR_DEMODULATOR)
234235
add_subdirectory("decoder_modules/meteor_demodulator")
235236
endif (OPT_BUILD_METEOR_DEMODULATOR)
236237

238+
if (OPT_BUILD_PAGER_DECODER)
239+
add_subdirectory("decoder_modules/pager_decoder")
240+
endif (OPT_BUILD_PAGER_DECODER)
241+
237242
if (OPT_BUILD_RADIO)
238243
add_subdirectory("decoder_modules/radio")
239244
endif (OPT_BUILD_RADIO)
@@ -242,6 +247,7 @@ if (OPT_BUILD_WEATHER_SAT_DECODER)
242247
add_subdirectory("decoder_modules/weather_sat_decoder")
243248
endif (OPT_BUILD_WEATHER_SAT_DECODER)
244249

250+
add_subdirectory("decoder_modules/pager_decoder")
245251

246252
# Misc
247253
if (OPT_BUILD_DISCORD_PRESENCE)
@@ -302,7 +308,7 @@ if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
302308
add_custom_target(do_always ALL cp \"$<TARGET_FILE_DIR:sdrpp_core>/libsdrpp_core.dylib\" \"$<TARGET_FILE_DIR:sdrpp>\")
303309
endif ()
304310

305-
# cmake .. "-DCMAKE_TOOLCHAIN_FILE=C:/dev/vcpkg/scripts/buildsystems/vcpkg.cmake" -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD_SDRPLAY_SOURCE=ON -DOPT_BUILD_M17_DECODER=ON -DOPT_BUILD_SCANNER=ON -DOPT_BUILD_SCHEDULER=ON -DOPT_BUILD_USRP_SOURCE=ON
311+
# cmake .. "-DCMAKE_TOOLCHAIN_FILE=C:/dev/vcpkg/scripts/buildsystems/vcpkg.cmake" -DOPT_BUILD_BLADERF_SOURCE=ON -DOPT_BUILD_LIMESDR_SOURCE=ON -DOPT_BUILD_SDRPLAY_SOURCE=ON -DOPT_BUILD_M17_DECODER=ON -DOPT_BUILD_SCANNER=ON -DOPT_BUILD_SCHEDULER=ON -DOPT_BUILD_USRP_SOURCE=ON -DOPT_BUILD_PAGER_DECODER=ON
306312

307313
# Create module cmake file
308314
configure_file(${CMAKE_SOURCE_DIR}/sdrpp_module.cmake ${CMAKE_CURRENT_BINARY_DIR}/sdrpp_module.cmake @ONLY)

‎core/libcorrect/src/convolutional/history_buffer.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ uint8_t *history_buffer_get_slice(history_buffer *buf) { return buf->history[buf
4545

4646
shift_register_t history_buffer_search(history_buffer *buf, const distance_t *distances,
4747
unsigned int search_every) {
48-
shift_register_t bestpath;
48+
shift_register_t bestpath = 0;
4949
distance_t leasterror = USHRT_MAX;
5050
// search for a state with the least error
5151
for (shift_register_t state = 0; state < buf->num_states; state += search_every) {

0 commit comments

Comments
 (0)