actual fix for RadarBox UAT stage 2 issue

Thanks to @wiedehopf for explaining this to me. We need to point the stage2 radarbox container directly at the dum978 of the micro feeder (and we need to make sure that port is actually available from that docker container). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
dirkhh · May 18, 2024 · 529b444 · 529b444
1 parent 3499404
commit 529b444
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/release-notes.md b/release-notes.md
@@ -1,4 +1,5 @@
 Changes since v2.0.2 include:
+- actual working fix for the stage2 Radarbox UAT issue
 - add button to update the base OS
 - stage2: create multi-heywhatsthat-outline to show the theoretical combined coverage of all micro feeders (assuming they all have HeyWhatsThat IDs)
 - stage2: dynamically update the micro feeder information on the stage2 page

diff --git a/src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/app.py b/src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/app.py
@@ -1458,10 +1458,14 @@ def handle_implied_settings(self):
                     self._d.env_by_tags("978host").list_set(
                         sitenum, f"ultrafeeder_{sitenum}"
                     )
+                    self._d.env_by_tags("rb978host").list_set(
+                        sitenum, self._d.env_by_tags("mf_ip").list_get(sitenum)
+                    )
                     self._d.env_by_tags("978piaware").list_set(sitenum, "relay")
                 else:
                     self._d.env_by_tags("replay978").list_set(sitenum, "")
                     self._d.env_by_tags("978host").list_set(sitenum, "")
+                    self._d.env_by_tags("rb978host").list_set(sitenum, "")
                     self._d.env_by_tags("978piaware").list_set(sitenum, "")
 
         else:

diff --git a/src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/utils/data.py b/src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/utils/data.py
@@ -218,6 +218,7 @@ def proxy_routes(self):
         ),
         # hostname ultrafeeder uses to get 978 data
         Env("FEEDER_UAT978_HOST", default=[""], tags=["978host"]),
+        Env("FEEDER_RB_UAT978_HOST", default=[""], tags=["rb978host"]),
         # add the URL to the dump978 map
         Env("FEEDER_URL_978", default=[""], tags=["978url"]),
         # URL to get Airspy stats (used in stage2)

diff --git a/src/modules/adsb-feeder/filesystem/root/opt/adsb/rb_stage2_template.yml b/src/modules/adsb-feeder/filesystem/root/opt/adsb/rb_stage2_template.yml
@@ -18,7 +18,7 @@ services:
     cpu_quota: 7500
     environment:
       - BEASTHOST=ultrafeeder_STAGE2NUM
-      - UAT_RECEIVER_HOST=${FEEDER_UAT978_HOST_STAGE2NUM:-ultrafeeder_STAGE2NUM}
+      - UAT_RECEIVER_HOST=${FEEDER_RB_UAT978_HOST_STAGE2NUM:-}
       - LAT=${FEEDER_LAT_STAGE2NUM}
       - LONG=${FEEDER_LONG_STAGE2NUM}
       - ALT=${FEEDER_ALT_M_STAGE2NUM}

diff --git a/src/modules/adsb-feeder/filesystem/root/opt/adsb/uat978.yml b/src/modules/adsb-feeder/filesystem/root/opt/adsb/uat978.yml
@@ -15,7 +15,7 @@ services:
       - LON=${FEEDER_LONG}
       - DUMP978_RTLSDR_DEVICE=${FEEDER_SERIAL_978}
       - DUMP978_SDR_GAIN=${UAT_SDR_GAIN}
-      - DUMP978_SDR_PPM=${UAT_SDR_PPM}
+      - DUMP978_SDR_PPM=${UAT_SDR_PPM:-}
       - DUMP978_DEVICE_TYPE=rtlsdr
       - DUMP978_ENABLE_BIASTEE=${FEEDER_ENABLE_UATBIASTEE}
       - AUTOGAIN_INITIAL_PERIOD=7200
@@ -28,6 +28,7 @@ services:
     ports:
       - ${AF_UAT978_PORT:-9780}:80
       - 30978:30978
+      - 30979:30979
     tmpfs:
       - /run:exec,size=64M
       - /run/stats:size=32M