From 064aaddbf2ea83fabaca734a0066b8180ce81a7d Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sat, 28 Dec 2024 09:10:28 -0800 Subject: [PATCH] deal with RadarBox -> AirNav Radar rebranding Signed-off-by: Dirk Hohndel --- README.md | 4 ++-- release-notes.md | 1 + .../filesystem/root/opt/adsb/adsb-setup/app.py | 11 +++++------ .../opt/adsb/adsb-setup/templates/aggregators.html | 12 ++++++------ .../opt/adsb/adsb-setup/utils/other_aggregators.py | 6 ++++-- 5 files changed, 18 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index bd5842b7..3054c463 100644 --- a/README.md +++ b/README.md @@ -39,7 +39,7 @@ These aggregators are also supported: - [Plane.watch](https://plane.watch) - [Plane Finder](https://planefinder.net) - [Planespotters.net](http://planespotters.net) -- [RadarBox](https://www.radarbox.com) +- [AirNav Radar](https://www.airnavradar.com) - [RadarPlane](https://radarplane.com/) - [Radar Virtuel](https://www.radarvirtuel.com) @@ -53,7 +53,7 @@ These aggregators are also supported: - buy one of the supported boards (at least the Le Potato seems to be easily and cheaply available in most places) - invest in a decent power supply - while many of these can be driven from a powered hub or a cheap 'charger' plug, not having a stable 5V power source tends to be the biggest cause of issues with these SBC -- get an SDR and antenna. There are many many choices. Availability may differ depending on where you are. But often the 'green' RadarBox SDR and +- get an SDR and antenna. There are many many choices. Availability may differ depending on where you are. But often a generic SDR and an indoor or (much better) outdoor antenna is all you need. More detail on the [ADSB.im website](https://adsb.im/supported). - download the current release from the [Release section](https://github.com/dirkhh/adsb-feeder-image/releases/latest) - use a tool like the [Raspberry Pi Imager](https://github.com/raspberrypi/rpi-imager/releases) to write the image to a µSD card on your computer diff --git a/release-notes.md b/release-notes.md index 4689ed6c..2c6dc194 100644 --- a/release-notes.md +++ b/release-notes.md @@ -1,4 +1,5 @@ Changes since v2.2.4 include: +- deal with the RadarBox -> AirNav Radar rebranding - small wording changes to several pages that hopefully improve the user experience - system management page: don't offer an incorrect / non-existent 'origin/' channel for updates - feeder homepage: small changes to declutter the 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 index 27280052..dd27970b 100644 --- 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 @@ -188,7 +188,7 @@ def list_value_by_tags(tags, idx): self.lastSetGainWrite = 0 - # no one should share a CPU serial with RadarBox, so always create fake cpuinfo; + # no one should share a CPU serial with AirNav, so always create fake cpuinfo; # also identify if we would use the thermal hack for RB and Ultrafeeder self._d.env_by_tags("rbthermalhack").value = "/sys/class/thermal" if create_fake_info() else "" @@ -223,7 +223,7 @@ def list_value_by_tags(tags, idx): ["flightradar", "flightradar24", "https://www.flightradar24.com/", ["/fr24STG2IDX/"], 1], ["planewatch", "Plane.watch", "https:/plane.watch/desktop.html", [""], 1], ["flightaware", "FlightAware", "https://www.flightaware.com/live/map", ["/fa-statusSTG2IDX/"], 1], - ["radarbox", "RadarBox", "https://www.radarbox.com/coverage-map", ["https://www.radarbox.com/stations/"], 1], + ["radarbox", "AirNav Radar", "https://www.airnavradar.com/coverage-map", ["https://www.airnavradar.com/stations/"], 1], ["planefinder", "PlaneFinder", "https://planefinder.net/", ["/planefinder-statSTG2IDX/"], 1], ["adsbhub", "ADSBHub", "https://www.adsbhub.org/coverage.php", [""], 1], ["opensky", "OpenSky", "https://opensky-network.org/network/explorer", ["https://opensky-network.org/receiver-profile?s="], 1], @@ -385,7 +385,6 @@ def update_version(self): print_err("no version found on disk or in memory, using v0.0.0") self._d.env_by_tags("base_version").value = "v0.0.0" - def get_previous_version(self): previous_version = "" pv_file = "/opt/adsb/adsb.im.previous-version" @@ -396,7 +395,6 @@ def get_previous_version(self): return previous_version - def update_meminfo(self): self._memtotal = 0 try: @@ -1795,7 +1793,9 @@ def handle_implied_settings(self): # make all the smart choices for plugged in SDRs - unless we are a stage2 that hasn't explicitly requested SDR support # only run this for initial setup or when the SDR setup is requested via the interface - if (not self._d.is_enabled("stage2") or self._d.is_enabled("stage2_nano")) and not self._d.env_by_tags("sdrs_locked").value: + if (not self._d.is_enabled("stage2") or self._d.is_enabled("stage2_nano")) and not self._d.env_by_tags( + "sdrs_locked" + ).value: # first grab the SDRs plugged in and check if we have one identified for UAT self._sdrdevices._ensure_populated() env978 = self._d.env_by_tags("978serial") @@ -2656,7 +2656,6 @@ def every_minute(self): print_err(f"sending previous version: {self._d.previous_version}") self._im_status.check() - @check_restart_lock def index(self): # if we get to show the feeder homepage, the user should have everything figured out diff --git a/src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/templates/aggregators.html b/src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/templates/aggregators.html index d1c9dffa..d327e9bf 100644 --- a/src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/templates/aggregators.html +++ b/src/modules/adsb-feeder/filesystem/root/opt/adsb/adsb-setup/templates/aggregators.html @@ -189,17 +189,17 @@