Additional debug for pane choice; Sat Alerts instead of Sat Activations; Fix compiler warnings; for new installers or users of Sat Alerts and Flex Pane is displayed don't overflow

Author: wasatch-dev

ESPHamClock/ESPHamClock.cpp

@@ -1886,7 +1886,10 @@ void drawDEFormatMenu()
     // number of core menu items
     #define N_DEFMT_CORE        8
 
-    MenuItem mitems[N_DEFMT_CORE+N_PANE_0_CH] = {
+    // PLOT_CH_SATACT can't join PANE_0_CH_MASK -- that's a 32-bit bitmask constant and SATACT's
+    // ordinal (32) can never fit in one, by the same design as everywhere else PLOTBIT() is used.
+    // it's offered as one extra, separately-handled menu item instead.
+    MenuItem mitems[N_DEFMT_CORE+N_PANE_0_CH+1] = {
 
         // outer menu is whether to display the DE pane or use both DE+DX for a pane choice
         {MENU_1OFN, !SHOWING_PANE_0(), 1, mi, "DE format:", NULL},
@@ -1920,11 +1923,22 @@ void drawDEFormatMenu()
         PlotPane pp = findPaneForChoice ((PlotChoice)plot_n);
         bool available =  plotChoiceIsAvailable((PlotChoice)plot_n) && (pp == PANE_NONE || pp == PANE_0);
         MenuFieldType type = available ? MENU_AL1OFN : MENU_IGNORE;
-        mitems[N_DEFMT_CORE+i] = {type, !!(plot_rotset[PANE_0] & (1<<plot_n)), 3, Mi, plot_names[plot_n], 0};
+        mitems[N_DEFMT_CORE+i] = {type, !!(plot_rotset[PANE_0] & PLOTBIT(plot_n)), 3, Mi, plot_names[plot_n], 0};
     }
     if (pane_0_bits != 0)
         fatalError ("drawDEFormatMenu() %d %d 0x%x\n", pane_0_bits, N_PANE_0_CH, PANE_0_CH_MASK);
 
+    // extra SATACT item -- can't be represented in plot_rotset (see comment above), so its
+    // "currently set" state is determined the same way paneHasChoice() checks a solo choice
+    const int SATACT_MI = N_DEFMT_CORE + N_PANE_0_CH;
+    {
+        PlotPane pp = findPaneForChoice (PLOT_CH_SATACT);
+        bool available = plotChoiceIsAvailable (PLOT_CH_SATACT) && (pp == PANE_NONE || pp == PANE_0);
+        MenuFieldType type = available ? MENU_AL1OFN : MENU_IGNORE;
+        bool is_set = (plot_ch[PANE_0] == PLOT_CH_SATACT && plot_rotset[PANE_0] == 0);
+        mitems[SATACT_MI] = {type, is_set, 3, Mi, plot_names[PLOT_CH_SATACT], 0};
+    }
+
     // create a box for the menu
     SBox menu_b;
     menu_b.x = de_info_b.x + 4;
@@ -1966,18 +1980,26 @@ void drawDEFormatMenu()
             uint32_t new_rotset = 0;
             for (int i = 0; i < N_PANE_0_CH; i++) { 
                 if (mitems[N_DEFMT_CORE+i].set)
-                    new_rotset |= (1<<menu_ch[i]);
+                    new_rotset |= PLOTBIT(menu_ch[i]);
             }
 
-            // might not be any if user clicked this section but made no choice
-            if (new_rotset != 0) {
+            bool satact_set = mitems[SATACT_MI].set;
+
+            if (satact_set && new_rotset == 0) {
+
+                // SATACT alone: solo, non-rotating choice -- can't be represented in plot_rotset
+                plot_ch[PANE_0] = PLOT_CH_SATACT;
+                plot_rotset[PANE_0] = 0;
+
+            } else if (new_rotset != 0) {
 
-                // ok!
+                // one or more mask-based choices (SATACT, if also checked, can't join a
+                // multi-item rotation set the way these can, so it's dropped in that case)
                 plot_rotset[PANE_0] = new_rotset;
 
                 // pick any one as current
                 for (int i = 0; i < PLOT_CH_N; i++) {
-                    if (plot_rotset[PANE_0] & (1 << i)) {
+                    if (plot_rotset[PANE_0] & PLOTBIT(i)) {
                         plot_ch[PANE_0] = (PlotChoice) i;
                         break;
                     }

ESPHamClock/HamClock.h

@@ -419,7 +419,7 @@ typedef enum {
     X(PLOT_CH_LAUNCHES,     "Launches")         \
     X(PLOT_CH_HFCOND,       "HF_Bands")         \
     X(PLOT_CH_VHFCOND,      "VHF_Cond")         \
-    X(PLOT_CH_SATACT,       "Sat_Activations")
+    X(PLOT_CH_SATACT,       "Sat_Alerts")
 
 #define X(a,b)  a,              // expands PLOTNAMES to each enum and comma
 typedef enum {

ESPHamClock/clocks.cpp

@@ -1209,9 +1209,12 @@ bool checkClockTouch (SCoord &s)
         return (true);
     }
 
-    // ADS-B airplane icon: always present, opens adsb.lol
+    // ADS-B airplane icon: always present, opens adsb.lol centered on DE's location
     if (inBox (s, adsb_btn_b)) {
-        openURL ("https://adsb.lol");
+        char url[100];
+        snprintf (url, sizeof(url), "https://adsb.lol/?lat=%.3f&lon=%.3f&zoom=10",
+                    de_ll.lat_d, de_ll.lng_d);
+        openURL (url);
         return (true);
     }
 

ESPHamClock/hamsat.cpp

@@ -395,8 +395,11 @@ static void formatCountdown (time_t aos, time_t now, char *buf, size_t buflen)
     long dt = aos - now;
     int hr = dt / 3600;
     int mn = (dt % 3600) / 60;
+    // clamp so %d always fits buf regardless of dt's theoretical range; also satisfies GCC's
+    // value-range analysis to avoid -Wformat-truncation (same convention used in lightning.cpp)
+    #define CD_CLAMP(n) ((n) > 99 ? 99 : (n))
     if (hr > 0)
-        snprintf (buf, buflen, "%dh%02dm", hr, mn);
+        snprintf (buf, buflen, "%dh%02dm", CD_CLAMP(hr), mn);
     else
         snprintf (buf, buflen, "%dm", mn);
 }
@@ -430,8 +433,11 @@ static void drawHamsatVisAlerts (const SBox &box)
 
             // match% badge, fixed width
             char mbuf[6];
+            // clamp to satisfy GCC's -Wformat-truncation value-range analysis (same convention
+            // as lightning.cpp) -- also just correct, since this is logically always 0-100
+            #define MP_CLAMP(n) ((n) < 0 ? 0 : (n) > 999 ? 999 : (n))
             if (a.match_percent >= 0)
-                snprintf (mbuf, sizeof(mbuf), "%3d%%", a.match_percent);
+                snprintf (mbuf, sizeof(mbuf), "%3d%%", MP_CLAMP(a.match_percent));
             else
                 snprintf (mbuf, sizeof(mbuf), " -- ");
             uint16_t bg = matchColor (a.match_percent);
@@ -472,7 +478,7 @@ static void drawHamsatPane (const SBox &box)
 
     // subtitle: source + whether personalized
     selectFontStyle (LIGHT_FONT, FAST_FONT);
-    const char *sub = hamsat_key[0] ? "hams.at (has key)" : "hams.at (no key)";
+    const char *sub = hamsat_key[0] ? "https://hams.at (has key)" : "https://hams.at (no key)";
     uint16_t sw = maxStringW ((char*)sub, box.w-2);
     tft.setTextColor (hamsat_key[0] ? RA8875_WHITE : RGB565(180,140,60));
     tft.setCursor (box.x + (box.w-sw)/2, box.y + SUBTITLE_Y0);
@@ -515,7 +521,7 @@ bool updateHamsat (const SBox &box, bool fresh)
             hamsat_ss.scrollToNewest();
         drawHamsatPane (box);
     } else {
-        plotMessage (box, RA8875_RED, "hams.at download error");
+        plotMessage (box, RA8875_RED, "https://hams.at download error");
     }
 
     return (ok);
@@ -624,7 +630,7 @@ void drawHamsatOnMap (void)
             continue;
 
         DXSpot spot{};
-        strncpy (spot.tx_call, a.callsign, sizeof(spot.tx_call)-1);
+        quietStrncpy (spot.tx_call, a.callsign, sizeof(spot.tx_call));
         spot.tx_ll = ll;
         spot.kHz = a.mhz * 1000.0F;             // DXSpot wants kHz, we store MHz
 

ESPHamClock/plotmgmnt.cpp

@@ -26,8 +26,15 @@ static bool paneHasChoice (PlotPane pp, PlotChoice pc)
 {
     if (plot_rotset[pp] & PLOTBIT(pc))
         return (true);
-    if (PLOTBIT(pc) == 0 && plot_ch[pp] == pc && plot_rotset[pp] == 0)
+    if (PLOTBIT(pc) == 0 && plot_ch[pp] == pc && plot_rotset[pp] == 0) {
+        // PANE_0 is restricted to PANE_0_CH_MASK for its normal choices, but that mask can
+        // never include a solo/unrepresentable choice like this (PLOTBIT(pc)==0 means pc can't
+        // fit in any 32-bit bitmask, including PANE_0_CH_MASK) -- so it needs its own explicit
+        // whitelist here instead, or a stale/leftover value could silently reload forever.
+        if (pp == PANE_0)
+            return (pc == PLOT_CH_SATACT);
         return (true);
+    }
     return (false);
 }
 
@@ -89,8 +96,8 @@ static void setDefaultPaneChoice (PlotPane pp)
             plot_ch[pp] = PLOT_CH_NONE;
             Serial.println ("PANE: Setting pane 0 to default NONE");
         } else {
-            const PlotChoice ch_defaults[PANE_N] = {PLOT_CH_SSN, PLOT_CH_XRAY, PLOT_CH_SDO};
-            plot_ch[pp] = ch_defaults[pp];
+            const PlotChoice ch_defaults[PANE_N-1] = {PLOT_CH_SSN, PLOT_CH_XRAY, PLOT_CH_SDO};
+            plot_ch[pp] = ch_defaults[pp-1];
             plot_rotset[pp] = PLOTBIT(plot_ch[pp]);
             Serial.printf ("PANE: Setting pane %d to default %s\n", (int)pp, plot_names[plot_ch[pp]]);
         }
@@ -677,6 +684,15 @@ void initPlotPanes()
             plot_rotset[i] |= PLOTBIT(plot_ch[i]);
 
     // log and save final arrangement
+    // N.B. logPaneRotSet() only iterates plot_rotset[] bits, which can never reveal a solo choice
+    // like PLOT_CH_SATACT (PLOTBIT() is always 0 for it by design) -- print the raw plot_ch[]
+    // values directly too so a bug placing such a choice on the wrong pane is never invisible.
+    Serial.printf ("PANE: raw plot_ch[] = %d %d %d %d (%s %s %s %s)\n",
+                    (int)plot_ch[PANE_0], (int)plot_ch[PANE_1], (int)plot_ch[PANE_2], (int)plot_ch[PANE_3],
+                    plot_ch[PANE_0]==PLOT_CH_NONE ? "NONE" : plot_names[plot_ch[PANE_0]],
+                    plot_ch[PANE_1]==PLOT_CH_NONE ? "NONE" : plot_names[plot_ch[PANE_1]],
+                    plot_ch[PANE_2]==PLOT_CH_NONE ? "NONE" : plot_names[plot_ch[PANE_2]],
+                    plot_ch[PANE_3]==PLOT_CH_NONE ? "NONE" : plot_names[plot_ch[PANE_3]]);
     for (int i = PANE_0; i < PANE_N; i++)
         logPaneRotSet ((PlotPane)i, plot_ch[i]);
     savePlotOps();

ESPHamClock/wifi.cpp

@@ -2403,6 +2403,8 @@ void updateWiFi(void)
             break;
 
         case PLOT_CH_SATACT:
+            if (fresh_redraw[pc])
+                Serial.printf ("PANE: entering PLOT_CH_SATACT case for pp=%d (fresh)\n", (int)pp);
             if (t0 >= next_update[pp]) {
                 if (updateHamsat(box, fresh_redraw[pc])) {
                     next_update[pp] = nextPaneUpdate (pc, 90);     // secs, matches hamsat.cpp cache age