OTA CI loop

src/adsb_client.cpp

@@ -108,8 +108,10 @@ FetchResult fetch(double homeLat, double homeLon, float radiusKm,
 
 if (ac["alt_baro"].is<const char*>()) {
             a.altBaroFt = 0;
+            a.onGround = (strcmp(ac["alt_baro"], "ground") == 0);
         } else {
             a.altBaroFt = ac["alt_baro"] | 0;
+            a.onGround = false;
         }
 
         a.vertRateFtMin = ac["baro_rate"] | 0;

src/aircraft.h

@@ -23,6 +23,7 @@ struct Aircraft {
     uint32_t alertedAtMs    = 0;
 
     bool     valid          = false;
+    bool     onGround       = false;
 
     char     airlineName[24] = {0};
     uint16_t estSeats         = 0;

src/aircraft_list_screen.cpp

@@ -90,7 +90,7 @@ bool run(TFT_eSPI& tft) {
         for (uint8_t i = 0; i < AircraftTable::capacity(); i++) {
             if (!table[i].valid) continue;
             if (table[i].distanceKm > rangeKm * 1.05f) continue;
-            if (SettingsStore::hideGroundVehicles() && table[i].category[0] == 'C') continue;
+            if (SettingsStore::hideGroundVehicles() && (table[i].category[0] == 'C' || table[i].onGround)) continue;
             if (AirlineFilter::isHidden(table[i].callsign)) continue;
             snapshot[count++] = table[i];
         }

src/i18n_en.h

@@ -248,7 +248,7 @@ static const char* const I18N_EN[] = {
     "Already up to date: v",
     "Update available: v",
     "A new firmware update will be downloaded and installed. Please don't interrupt the WiFi connection or power supply during this process. You'll be asked to restart once installation is complete. If the WebUI page (logbook/radar) is open in a browser, please close it first - it regularly polls the device for data and can interfere with the download otherwise.",
-    "Installing update ",
+    "Install update ",
     "Update failed",
     "Update installed",
     "The new firmware was installed successfully. Please restart now to start using it.",

src/main.cpp

@@ -34,6 +34,7 @@
 #include "first_run_language_screen.h"
 #include "first_run_location_screen.h"
 #include "first_run_complete_screen.h"
+#include "ota_update.h"
 #include "menu_stars.h"
 #include "ui_font.h"
 #include <math.h>
@@ -48,6 +49,9 @@ constexpr uint32_t SWEEP_TICK_MS = 80;
 constexpr uint32_t STATUS_LINE_UPDATE_MS = 1000;
 uint32_t lastPollMs = 0;
 uint32_t lastSweepMs = 0;
+bool gOtaUpdateAvailable = false;
+char gOtaLatestVersion[16] = {0};
+char gOtaDownloadUrl[192] = {0};
 uint32_t lastStatusLineMs = 0;
 uint32_t lastRenderedVersion = 0xFFFFFFFF;
 Weather::Condition lastRenderedWeather = Weather::Condition::Unknown;
@@ -634,6 +638,24 @@ void setup() {
     setenv("TZ", "CET-1CEST-2,M3.5.0/2,M10.5.0/3", 1);
 tzset();
 
+    // Quick OTA version check during splash screen
+    SplashScreen::setStatusLine(tft, 1, I18n::t(StringId::OTA_CHECKING));
+    uint32_t otaStart = millis();
+    while (WifiMgr::getState() != WifiMgr::State::Connected &&
+           millis() - otaStart < 4000) {
+        MenuStars::update(tft);
+        delay(100);
+    }
+    if (WifiMgr::getState() == WifiMgr::State::Connected) {
+        auto otaInfo = OtaUpdate::checkForUpdate();
+if (otaInfo.result == OtaUpdate::CheckResult::UpdateAvailable) {
+            gOtaUpdateAvailable = true;
+            strncpy(gOtaLatestVersion, otaInfo.latestVersion, sizeof(gOtaLatestVersion) - 1);
+            strncpy(gOtaDownloadUrl, otaInfo.downloadUrl, sizeof(gOtaDownloadUrl) - 1);
+        }
+    }
+    SplashScreen::setStatusLine(tft, 1, "");
+
     AircraftTable::init();
     AirlineLookup::init();
     FlightLogbook::init();
@@ -642,6 +664,96 @@ void setup() {
 
 SplashScreen::waitRemaining(tft);
 
+if (gOtaUpdateAvailable) {
+        struct Rect { int16_t x, y, w, h;
+            bool contains(int16_t px, int16_t py) const {
+                return px >= x && px < x + w && py >= y && py < y + h;
+            }
+        };
+        auto drawBtn = [](Rect r, const String& label, uint16_t color) {
+            tft.fillRoundRect(r.x, r.y, r.w, r.h, 4, TFT_BLACK);
+            tft.drawRoundRect(r.x, r.y, r.w, r.h, 4, color);
+            tft.setTextDatum(MC_DATUM);
+            tft.setTextColor(color, TFT_BLACK);
+            tft.drawString(label, r.x + r.w / 2, r.y + r.h / 2);
+            tft.setTextDatum(TL_DATUM);
+        };
+
+        tft.fillScreen(TFT_BLACK);
+        tft.setTextDatum(MC_DATUM);
+        tft.setTextColor(TFT_YELLOW, TFT_BLACK);
+        tft.setTextSize(1);
+        tft.drawString(String(I18n::t(StringId::OTA_UPDATE_AVAILABLE_PREFIX)) + gOtaLatestVersion,
+                       Config::SCREEN_WIDTH / 2, Config::SCREEN_HEIGHT / 2 - 30);
+        tft.setTextSize(1);
+
+        int16_t btnW = 100, btnH = 40, btnY = Config::SCREEN_HEIGHT / 2 + 10;
+        int16_t gap = 16;
+        int16_t totalW = btnW * 2 + gap;
+        int16_t startX = (Config::SCREEN_WIDTH - totalW) / 2;
+        Rect installBtn = {startX, btnY, btnW, btnH};
+        Rect dismissBtn = {startX + btnW + gap, btnY, btnW, btnH};
+        drawBtn(installBtn, I18n::t(StringId::OTA_INSTALLING_PREFIX), TFT_GREEN);
+        drawBtn(dismissBtn, "Dismiss", TFT_RED);
+
+        tft.setTextDatum(TL_DATUM);
+        MenuStars::reset();
+        TouchInput::Point tap;
+        bool installChosen = false;
+        while (true) {
+            if (TouchInput::wasTapped(tap)) {
+                if (installBtn.contains(tap.x, tap.y)) { installChosen = true; break; }
+                if (dismissBtn.contains(tap.x, tap.y)) break;
+            }
+            MenuStars::update(tft);
+            delay(20);
+        }
+
+        if (installChosen) {
+            tft.fillScreen(TFT_BLACK);
+            tft.setTextDatum(MC_DATUM);
+            tft.setTextSize(1);
+            constexpr int16_t PROG_Y = Config::SCREEN_HEIGHT / 2 + 10;
+            auto progressFn = [](uint8_t pct) {
+                tft.fillRect(0, PROG_Y, Config::SCREEN_WIDTH, 20, TFT_BLACK);
+                char buf[8]; snprintf(buf, sizeof(buf), "%d%%", pct);
+                tft.setTextDatum(MC_DATUM);
+                tft.setTextColor(TFT_GREEN, TFT_BLACK);
+                tft.drawString(buf, Config::SCREEN_WIDTH / 2, PROG_Y + 2);
+                tft.setTextDatum(TL_DATUM);
+            };
+            tft.setTextColor(TFT_GREEN, TFT_BLACK);
+            tft.drawString(String(I18n::t(StringId::OTA_INSTALLING_PREFIX)) + gOtaLatestVersion + "...",
+                           Config::SCREEN_WIDTH / 2, Config::SCREEN_HEIGHT / 2 - 20);
+            bool ok = OtaUpdate::performUpdate(gOtaDownloadUrl, progressFn);
+            tft.fillScreen(TFT_BLACK);
+            tft.setTextDatum(MC_DATUM);
+            if (ok) {
+                tft.setTextColor(TFT_GREEN, TFT_BLACK);
+                tft.drawString(I18n::t(StringId::OTA_UPDATE_SUCCESS),
+                               Config::SCREEN_WIDTH / 2, Config::SCREEN_HEIGHT / 2 - 20);
+                Rect restartBtn = {startX, btnY, btnW, btnH};
+                drawBtn(restartBtn, I18n::t(StringId::OTA_RESTART_BUTTON), TFT_GREEN);
+                while (true) {
+                    if (TouchInput::wasTapped(tap) && restartBtn.contains(tap.x, tap.y)) {
+                        ESP.restart();
+                    }
+                    delay(20);
+                }
+            } else {
+                tft.setTextColor(TFT_RED, TFT_BLACK);
+                tft.drawString(I18n::t(StringId::OTA_UPDATE_FAILED),
+                               Config::SCREEN_WIDTH / 2, Config::SCREEN_HEIGHT / 2 - 20);
+                tft.drawString("Dismiss",
+                               Config::SCREEN_WIDTH / 2, Config::SCREEN_HEIGHT / 2 + 10);
+                while (true) {
+                    if (TouchInput::wasTapped(tap)) break;
+                    delay(20);
+                }
+            }
+        }
+    }
+
     drawHeader();
     updateStatusLine();
     RadarScreen::render(tft, CONTENT_TOP);

src/menu_screen.cpp

@@ -540,7 +540,7 @@ namespace {
         NetTask::resume();
 
         if (info.result == OtaUpdate::CheckResult::Error) {
-            infoScreen(tft, I18n::t(StringId::OTA_CHECK_FAILED), "", TFT_RED, I18n::t(StringId::OK));
+            infoScreen(tft, I18n::t(StringId::OTA_CHECK_FAILED), info.errorMsg, TFT_RED, I18n::t(StringId::OK));
             return;
         }
         if (info.result == OtaUpdate::CheckResult::UpToDate) {

src/ota_update.cpp

@@ -27,7 +27,11 @@ namespace {
     // Numeric version comparison (not string-based, so e.g. "3.10.0" > "3.9.0").
     int compareVersions(const char* a, const char* b) {
         int aMaj, aMin, aPat, bMaj, bMin, bPat;
-        if (!parseVersion(a, aMaj, aMin, aPat) || !parseVersion(b, bMaj, bMin, bPat)) return 0;
+        bool aOk = parseVersion(a, aMaj, aMin, aPat);
+        bool bOk = parseVersion(b, bMaj, bMin, bPat);
+        if (!aOk && !bOk) return 0;
+        if (!aOk) return -1; // non-numeric version (e.g. "custom") = older than any real version
+        if (!bOk) return 1;
         if (aMaj != bMaj) return aMaj - bMaj;
         if (aMin != bMin) return aMin - bMin;
         return aPat - bPat;
@@ -58,6 +62,7 @@ CheckInfo checkForUpdate() {
     http.setTimeout(8000);
     if (!http.begin(client, url)) {
         Serial.println("[OTA] Check failed: http.begin() returned false.");
+        strncpy(info.errorMsg, "Could not start HTTPS connection (low memory?)", sizeof(info.errorMsg) - 1);
         return info;
     }
     addAuthHeader(http);
@@ -65,10 +70,12 @@ CheckInfo checkForUpdate() {
     int code = http.GET();
     if (code != HTTP_CODE_OK) {
         if (code < 0) {
-            Serial.printf("[OTA] Check failed: HTTP error=%d (%s)\n", code,
-                          HTTPClient::errorToString(code).c_str());
+            String errStr = HTTPClient::errorToString(code);
+            Serial.printf("[OTA] Check failed: HTTP error=%d (%s)\n", code, errStr.c_str());
+            snprintf(info.errorMsg, sizeof(info.errorMsg), "HTTPS connection error: %s", errStr.c_str());
         } else {
             Serial.printf("[OTA] Check failed: HTTP status=%d\n", code);
+            snprintf(info.errorMsg, sizeof(info.errorMsg), "Server returned HTTP %d", code);
         }
         http.end();
         return info;
@@ -80,12 +87,14 @@ CheckInfo checkForUpdate() {
     DeserializationError jsonErr = deserializeJson(doc, body);
     if (jsonErr) {
         Serial.printf("[OTA] Check failed: JSON error (%s)\n", jsonErr.c_str());
+        snprintf(info.errorMsg, sizeof(info.errorMsg), "Invalid response from server");
         return info;
     }
 
     const char* tag = doc["tag_name"] | "";
     if (!tag[0]) {
         Serial.println("[OTA] Check failed: no tag_name in release JSON.");
+        snprintf(info.errorMsg, sizeof(info.errorMsg), "No release found on git.rasmusbendtsen.dk");
         return info;
     }
 
@@ -104,7 +113,7 @@ CheckInfo checkForUpdate() {
 
     int cmp = compareVersions(info.latestVersion, Config::APP_VERSION);
     info.result = (cmp > 0) ? CheckResult::UpdateAvailable : CheckResult::UpToDate;
-    Serial.printf("[OTA] Check successful: installed=v%s latest=v%s -> %s\n", Config::APP_VERSION,
+    Serial.printf("[OTA] Check successful: installed=%s latest=%s -> %s\n", Config::APP_VERSION,
                   info.latestVersion,
                   info.result == CheckResult::UpdateAvailable ? "Update available" : "already up-to-date");
     return info;

src/ota_update.h

@@ -21,6 +21,9 @@ namespace OtaUpdate {
 // Direct download link to the firmware.bin of the release - only
         // set when result == UpdateAvailable.
 char downloadUrl[192] = {0};
+// Human-readable error explanation (set when result == Error).
+        // e.g. "TLS handshake failed (low memory)" or "HTTP 401".
+        char errorMsg[64] = {0};
     };
 
 // Queries the Gitea Releases API for the latest release, compares

src/radar_screen.cpp

@@ -864,7 +864,7 @@ void render(TFT_eSPI& tft, int16_t top) {
         Aircraft& a = snapshot[i];
         if (a.distanceKm > rangeKm * 1.05f) continue;
 
-        if (SettingsStore::hideGroundVehicles() && a.category[0] == 'C') continue;
+        if (SettingsStore::hideGroundVehicles() && (a.category[0] == 'C' || a.onGround)) continue;
 
 if (AirlineFilter::isHidden(a.callsign)) continue;
 
@@ -1188,7 +1188,7 @@ bool runTable(TFT_eSPI& tft, int16_t top) {
         for (uint8_t i = 0; i < AircraftTable::capacity(); i++) {
             if (!table[i].valid) continue;
             if (table[i].distanceKm > rangeKm * 1.05f) continue;
-            if (SettingsStore::hideGroundVehicles() && table[i].category[0] == 'C') continue;
+            if (SettingsStore::hideGroundVehicles() && (table[i].category[0] == 'C' || table[i].onGround)) continue;
 if (AirlineFilter::isHidden(table[i].callsign)) continue;
 
             uint8_t altMode = SettingsStore::altFilterIndex();

src/route_filter_screen.cpp

@@ -185,7 +185,7 @@ bool run(TFT_eSPI& tft) {
             for (uint8_t i = 0; i < AircraftTable::capacity(); i++) {
                 if (!table[i].valid) continue;
                 if (table[i].distanceKm > rangeKm * 1.05f) continue;
-                if (SettingsStore::hideGroundVehicles() && table[i].category[0] == 'C') continue;
+                if (SettingsStore::hideGroundVehicles() && (table[i].category[0] == 'C' || table[i].onGround)) continue;
                 if (AirlineFilter::isHidden(table[i].callsign)) continue;
                 total++;
             }
@@ -199,7 +199,7 @@ bool run(TFT_eSPI& tft) {
             for (uint8_t i = 0; i < AircraftTable::capacity() && doneCount < total; i++) {
                 if (!table2[i].valid) continue;
                 if (table2[i].distanceKm > rangeKm * 1.05f) continue;
-                if (SettingsStore::hideGroundVehicles() && table2[i].category[0] == 'C') continue;
+                if (SettingsStore::hideGroundVehicles() && (table2[i].category[0] == 'C' || table2[i].onGround)) continue;
                 if (AirlineFilter::isHidden(table2[i].callsign)) continue;
                 doneCount++;
 

src/web_export_server.cpp

@@ -484,7 +484,7 @@ namespace {
             if (!a.valid) continue;
             if (a.distanceKm > rangeKm * 1.05f) continue;
 
-            bool isGroundVehicle = a.category[0] == 'C';
+            bool isGroundVehicle = a.category[0] == 'C' || a.onGround;
             if (hideGround && isGroundVehicle) continue;
             if (AirlineFilter::isHidden(a.callsign)) continue;