Merge pull request #241 from wasatch-dev/satlist

Cosmetic Fixes Preparing for 4.27 Release

Author: komacke

ESPHamClock/HamClock.h

@@ -413,11 +413,11 @@ typedef enum {
     X(PLOT_CH_ADIF,         "ADIF")             \
     X(PLOT_CH_AURORA,       "Aurora")           \
     X(PLOT_CH_DXPEDS,       "DXPeditions")      \
-    X(PLOT_CH_DST,          "Disturbance")       \
+    X(PLOT_CH_DST,          "Disturbance")      \
     X(PLOT_CH_STORMS,       "Storms")           \
-    X(PLOT_CH_ACTIVENETS,   "Active_Nets")      \
-    X(PLOT_CH_LAUNCHES,     "Launches")          \
-    X(PLOT_CH_HFCOND,       "HF_Bands")           \
+    X(PLOT_CH_ACTIVENETS,   "Nets")             \
+    X(PLOT_CH_LAUNCHES,     "Launches")         \
+    X(PLOT_CH_HFCOND,       "HF_Bands")         \
     X(PLOT_CH_VHFCOND,      "VHF_Cond")
 
 #define X(a,b)  a,              // expands PLOTNAMES to each enum and comma

ESPHamClock/activenets.cpp

@@ -8,8 +8,8 @@
  *
  *     NetName,Frequency,Band,Mode,NetControl,Checkins,Logger,Started
  *
- * Each net is drawn as two lines: the net name in a large font with a smaller
- * supporting line beneath it (frequency, band, mode, net control, check-ins).
+ * Each net is drawn as two lines in a small font: the net name (bright white)
+ * with a dimmer supporting line beneath it (frequency, band, mode, check-ins).
  * The Logger column is intentionally not displayed.
  */
 
@@ -48,7 +48,7 @@ typedef struct {
 } ActiveNetEntry;
 
 static ActiveNetEntry *anets;                   // malloced list, count in an_ss.n_data
-static char subtitle[40];                       // count / freshness line under the title
+static char subtitle[40];                       // credit line under the title
 static ScrollState an_ss;                       // scrolling context
 
 /* free the anets[] list and reset count.
@@ -114,7 +114,7 @@ static void anGeometry (const SBox &box, int &block_dy, int &name_base_off,
 {
     int n_asc, n_h, i_asc, i_h;
 
-    selectFontStyle (LIGHT_FONT, SMALL_FONT);
+    selectFontStyle (LIGHT_FONT, FAST_FONT);
     fontVMetrics (n_asc, n_h);
     selectFontStyle (LIGHT_FONT, FAST_FONT);
     fontVMetrics (i_asc, i_h);
@@ -143,7 +143,7 @@ static void drawActiveNetsPane (const SBox &box)
     tft.setCursor (box.x + (box.w-tw)/2, box.y + PANETITLE_H);
     tft.print (title);
 
-    // subtitle (count / freshness)
+    // subtitle (credit line, like the Launches pane)
     selectFontStyle (LIGHT_FONT, FAST_FONT);
     tft.setTextColor (AN_COLOR);
     uint16_t sw = getTextWidth (subtitle);
@@ -174,8 +174,8 @@ static void drawActiveNetsPane (const SBox &box)
             int r = an_ss.getDisplayRow (i);
             uint16_t bt = y0 + r*block_dy;              // top of this net's block
 
-            // net name -- the largest text
-            selectFontStyle (LIGHT_FONT, SMALL_FONT);
+            // net name -- still the brighter (white) of the two lines, but same small font as info
+            selectFontStyle (LIGHT_FONT, FAST_FONT);
             tft.setTextColor (AN_NAME_COLOR);
             uint16_t w = getTextWidth (an.name);
             tft.setCursor (box.x + (box.w-w)/2, bt + name_base_off);
@@ -273,12 +273,17 @@ static void scrubToFit (char *line, const SBox &box)
 }
 
 /* build the supporting info line for one net from its CSV fields.
- * format: "<freq> <band> <mode> - <n> ckins", omitting empty pieces.
+ * format: "<freq> <band> <mode>", omitting empty pieces.
  * uses only ASCII so it renders correctly in the small CP437-based font.
+ * N.B. check-in count is intentionally NOT included here -- it's still recorded
+ * in ActiveNetEntry.chk and shown in the hover popup (see anFillInfo()).
  */
 static void buildInfoLine (char *out, size_t out_l, const char *freq, const char *band,
     const char *mode, const char *ncs, const char *chk)
 {
+    (void) ncs;                                 // not shown on the pane (kept for popup via caller)
+    (void) chk;                                 // not shown on the pane (kept for popup via caller)
+
     out[0] = '\0';
     size_t used = 0;
 
@@ -294,14 +299,6 @@ static void buildInfoLine (char *out, size_t out_l, const char *freq, const char
     AN_APP_SP (band);
     AN_APP_SP (mode);
 
-    // net control, set off with a dash
-    //if (ncs && ncs[0] && used < out_l)
-    //    used += snprintf (out+used, out_l-used, "%sNCS %s", used ? " - " : "", ncs);
-
-    // check-in count
-    if (chk && chk[0] && used < out_l)
-        used += snprintf (out+used, out_l-used, "%s%s ckins", used ? " - " : "", chk);
-
     #undef AN_APP_SP
 }
 
@@ -374,12 +371,11 @@ static bool retrieveActiveNets (const SBox &box)
         char info[200];
         buildInfoLine (info, sizeof(info), freq, band, mode, ncs, chk);
 
-        // scrub each to fit
+        // scrub each to fit (both now render in FAST_FONT)
         char nbuf[200];
         quietStrncpy (nbuf, name, sizeof(nbuf));
-        selectFontStyle (LIGHT_FONT, SMALL_FONT);
-        scrubToFit (nbuf, box);
         selectFontStyle (LIGHT_FONT, FAST_FONT);
+        scrubToFit (nbuf, box);
         scrubToFit (info, box);
 
         // append to anets[]
@@ -409,9 +405,8 @@ static bool retrieveActiveNets (const SBox &box)
 
     fclose (fp);
 
-    // build subtitle
-    snprintf (subtitle, sizeof(subtitle), "%d active net%s", an_ss.n_data,
-                                                an_ss.n_data == 1 ? "" : "s");
+    // build subtitle -- credit line, same spot/style as the Launches pane's credit
+    snprintf (subtitle, sizeof(subtitle), "Credit: NetLogger.org");
 
     an_ss.scrollToNewest();
 

ESPHamClock/earthsat.cpp

@@ -3401,10 +3401,20 @@ static void showSkyView (SatState &s)
         float daz = az - az_offset;
         while (daz >  180) daz -= 360;
         while (daz < -180) daz += 360;
-        return (int)(sky_x + sky_w/2 + daz * px_per_az + 0.5F);
+        int x = (int)(sky_x + sky_w/2 + daz * px_per_az + 0.5F);
+        // clamp -- callers may feed in extreme az (eg satellite trail) that would
+        // otherwise map to a pixel outside the frame buffer
+        if (x < 0) x = 0;
+        else if (x > (int)tft.width()-1) x = tft.width()-1;
+        return x;
     };
     auto el2y = [&](float el) -> int {
-        return (int)(hz_y - el * px_per_el + 0.5F);
+        int y = (int)(hz_y - el * px_per_el + 0.5F);
+        // clamp -- eg a satellite trail point well below the horizon (el near -90)
+        // would otherwise map to a pixel outside the frame buffer
+        if (y < 0) y = 0;
+        else if (y > (int)tft.height()-1) y = tft.height()-1;
+        return y;
     };
 
     // Trailing track — record last _SKY_TRAIL_MAX positions (az/el/sunlit)

ESPHamClock/hurricane.cpp

@@ -259,7 +259,7 @@ static void drawStormsPane (const SBox &box)
     // so if a full-width centered title would reach under it, shift the title left to clear it.
     selectFontStyle (LIGHT_FONT, SMALL_FONT);
     tft.setTextColor (STORM_COLOR_TITLE);
-    const char *title = "Tropical Wx";
+    const char *title = "Trop Wx";
     uint16_t tw = getTextWidth (title);
     uint16_t avail_r = box.w > STORM_TITLE_RSV ? box.w - STORM_TITLE_RSV : box.w;  // right limit
     uint16_t tx = box.w > tw ? (box.w - tw)/2 : 2;                                 // ideal centered x
@@ -783,7 +783,7 @@ static void runStormsPaneMenu (const SBox &box)
     };
 
     MenuItem mitems[STM_N];
-    mitems[STM_TITLE] = {MENU_LABEL,  false, 0, 2, "Tropical Wx", 0};
+    mitems[STM_TITLE] = {MENU_LABEL,  false, 0, 2, "Trop Wx", 0};
     mitems[STM_NHC]   = {MENU_TOGGLE, false, 1, 2, "Open NHC page", 0};
 
     uint16_t menu_x = BOX_IS_PANE_0(box) ? box.x + 3 : box.x + 10;

ESPHamClock/launches.cpp

@@ -57,6 +57,7 @@ static const char launches_fn[]   = "launches.txt";
 // ---------------------------------------------------------------------------
 
 #define LAUNCH_TITLE_DY   PANETITLE_H   // pane title baseline
+#define LAUNCH_TITLE_RSV  28            // reserve at right so title clears the scroll-arrow control
 #define LAUNCH_CREDITS_DY SUBTITLE_Y0   // source credit line
 #define LAUNCH_START_DY   LISTING_Y0    // first entry name baseline
 #define LAUNCH_ROW_H      24            // total height of one 2-line entry (px)
@@ -177,20 +178,29 @@ static void drawLaunchesPane (const SBox &box)
 
     prepPlotBox (box);
 
-    // ---- Title ----
+    // ---- Title -- centered, but kept clear of the scroll-arrow control in the top-right
+    // corner. That control always erases a band at the right edge (even when the arrows
+    // are inactive), so if a full-width centered title would reach under it, shift left.
     selectFontStyle (LIGHT_FONT, SMALL_FONT);
     tft.setTextColor (LAUNCH_TITLE_COLOR);
     static const char *title = "Launches";
     uint16_t tw = getTextWidth (title);
-    tft.setCursor (box.x + (box.w - tw) / 2, box.y + LAUNCH_TITLE_DY);
+    uint16_t avail_r = box.w > LAUNCH_TITLE_RSV ? box.w - LAUNCH_TITLE_RSV : box.w;  // right limit
+    uint16_t tx = box.w > tw ? (box.w - tw)/2 : 2;                                   // ideal centered x
+    if (tx + tw > avail_r)                                                          // would hit arrows
+        tx = avail_r > tw ? avail_r - tw : 2;                                       // shift left to clear
+    tft.setCursor (box.x + tx, box.y + LAUNCH_TITLE_DY);
     tft.print (title);
 
     // ---- Credit ----
     selectFontStyle (LIGHT_FONT, FAST_FONT);
     tft.setTextColor (LAUNCH_TITLE_COLOR);
-    uint16_t cw = getTextWidth (launch_credit);
+    char credit_copy[80];
+    quietStrncpy (credit_copy, launch_credit, sizeof(credit_copy));
+    maxStringW (credit_copy, box.w - 4);
+    uint16_t cw = getTextWidth (credit_copy);
     tft.setCursor (box.x + (box.w - cw) / 2, box.y + LAUNCH_CREDITS_DY);
-    tft.print (launch_credit);
+    tft.print (credit_copy);
 
     // ---- Entries ----
     selectFontStyle (LIGHT_FONT, FAST_FONT);
@@ -305,7 +315,7 @@ static bool runLaunchMenu (const SCoord &s, const SBox &box)
     MenuItem mitems[] = {
         {lname_mft,   false, 0, indent, lname,            0},
         {webpage_mft, false, 1, indent, "Open web page",  0},
-        {credit_mft,  false, 2, indent, "Launch Library 2 site", 0},
+        {credit_mft,  false, 2, indent, "Launch Lib 2", 0},
     };
     const int n_mi = NARRAY(mitems);
 
@@ -435,6 +445,17 @@ static bool retrieveLaunches (const SBox &box)
     }
     chompString (line1);
     launch_credit = strdup (line1);
+
+    // shorten "Library" -> "Lib" so eg "Credit: Launch Library 2" becomes
+    // "Credit: Launch Lib 2" -- fits the narrower panes without truncation
+    {
+        char *lib = strstr (launch_credit, "Library");
+        if (lib) {
+            memmove (lib+3, lib+7, strlen(lib+7)+1);    // shift tail (+ NUL) left over "rary"
+            memcpy (lib, "Lib", 3);
+        }
+    }
+
     ok = true;                          // at minimum we got the credit line
 
     // ---- Three lines per launch ----