20260704 merge upstream 30hours - #47
Open
Purple10101 wants to merge 19 commits into
Open
Conversation
another uhd update.. I have tried without the: =4.9.0.0-0ubuntu1~jammy2 and that compiled fine.. I think apt install can work out a suitable version without our help of being specific?
Sdn ninja uhd patch
* Wraps sockets in pointers for try/catch * Moves socket init up to fail early if web app isn't running
Graceful close if web server isn't running
Update UHD package versions in Dockerfile
Uhd version update
Thanks to Jehan from Discord for sharing this
Add Dockerfile for Raspberry Pi environment setup
…ream-30hours # Conflicts: # CMakeLists.txt # Dockerfile # config/config.yml # html/controller/index.html # html/index.html # html/lib/blah2.css # src/blah2.cpp # src/capture/Capture.cpp # src/capture/rspduo/RspDuo.cpp # src/capture/rspduo/RspDuo.h # web/html/display/detection/delay-doppler/index.html # web/html/display/detection/delay/index.html # web/html/display/detection/doppler/index.html # web/html/display/map/index.html # web/html/display/maxhold/index.html # web/html/display/spectrum/index.html # web/html/display/timing/index.html
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges upstream
30hours/blah2(upstream/main) into blah2-arm, reconciling ~19 upstream commits against this fork's ARM-specific divergence (dropped USRP/HackRF/Kraken support, NEON-optimized FFTW build, per-tuner RSPduo gain reduction, retina web UI rebrand). Despite the commit count, the net file diff is small: 3 files changed, 81 insertions, 53 deletions.Changes
src/capture/rspduo/RspDuo.cpp(+6 lines)Adds an explicit re-assignment of
deviceParams->rxChannelA/B->tunerParams.gain.gRdBand.LNAstateimmediately before thesdrplay_api_Update()calls inRspDuo::process(), ported from upstream. This guards againstsdrplay_api_Init()having reset/overwritten those struct fields before the explicit hardware gain-push call — closes a previously-unverified gap in blah2-arm's per-tuner gain reduction feature (added 2026-06-16), which was itself ported from this same upstream code without this re-assignment.src/blah2.cpp(127 lines touched, 3 changes bundled)31d527e): sockets becomestd::unique_ptr<Socket>, wrapped intry/catch. Socket + FFTW-thread setup moved before SDR device creation. If the downstream API/web server isn't reachable, blah2 now fails fast with a clear stderr message andexit(1)instead of crashing uncaught or hanging after already spinning up the SDR hardware.sleep(5)→sleep(2)before the connection attempt.a3928a2): addsdetection->save(...), gated by asaveDetectionflag read fromconfig.yml'ssave.detectionkey (mirrors existing map-saving). blah2-arm'sconfig.ymlalready hadsave.detection: truesitting dormant/unread — this merge wires it up, so detections will now actually write to disk. Follow-up ticket filed to add UI/config support for this inretina-gui, which currently has no way to view or toggle this setting.std::endl→"\n", a couple of "setup" → "set up" typo fixes.Dockerfile(-1 line)Stray blank line removed, left over from resolving the USRP-vs-ARM-native-build conflict. No functional change.
Conflict resolution notes
CMakeLists.txt,Dockerfile,Capture.cpp) when going ARM/SDRplay-only. Resolved by keeping blah2-arm's RSPduo-only scope throughout.config/config.yml: reverted to be byte-identical tomain— no config default changes are part of this PR.html/vsweb/html/: upstream's changes to the oldhtml/path (a cosmetic orange-background tweak) were dropped; blah2-arm'sweb/html/retina rebrand already supersedes it.contrib/raspberrypi/Dockerfilefrom upstream (a community-contributed generic RPi build) was not carried in — it reintroduces UHD/RTL-SDR support and has no ARM/NEON optimization, and isn't referenced by any compose file.