Add config flags to display or not battery level and WiFi signal strenth texts (#201)

Co-authored-by: ble-dev <a2zugmhz4@mozmail.com>

Author: ble-dev

platformio/include/config.h

@@ -252,8 +252,10 @@
 // STATUS BAR EXTRAS
 //   Extra information that can be displayed on the status bar. Set to 1 to
 //   enable.
-#define STATUS_BAR_EXTRAS_BAT_VOLTAGE 0
-#define STATUS_BAR_EXTRAS_WIFI_RSSI   0
+#define STATUS_BAR_EXTRAS_BAT_PERCENTAGE 1
+#define STATUS_BAR_EXTRAS_BAT_VOLTAGE    0
+#define STATUS_BAR_EXTRAS_WIFI_STRENGTH  1
+#define STATUS_BAR_EXTRAS_WIFI_RSSI      0
 
 // BATTERY MONITORING
 //   You may choose to power your weather display with or without a battery.

platformio/src/renderer.cpp

@@ -1281,28 +1281,40 @@ void drawStatusBar(const String &statusStr, const String &refreshTimeStr,
     dataColor = ACCENT_COLOR;
   }
 #endif
-  dataStr = String(batPercent) + "%";
+#if STATUS_BAR_EXTRAS_BAT_PERCENTAGE || STATUS_BAR_EXTRAS_BAT_VOLTAGE
+  dataStr = "";
+#if STATUS_BAR_EXTRAS_BAT_PERCENTAGE
+  dataStr += String(batPercent) + "%";
+#endif
 #if STATUS_BAR_EXTRAS_BAT_VOLTAGE
   dataStr += " (" + String( std::round(batVoltage / 10.f) / 100.f, 2 ) + "v)";
 #endif
   drawString(pos, DISP_HEIGHT - 1 - 2, dataStr, RIGHT, dataColor);
-  pos -= getStringWidth(dataStr) + 25;
+  pos -= getStringWidth(dataStr) + 1;
+#endif
+  pos -= 24;
   display.drawInvertedBitmap(pos, DISP_HEIGHT - 1 - 17,
                              getBatBitmap24(batPercent), 24, 24, dataColor);
   pos -= sp + 9;
 #endif
 
   // WiFi
-  dataStr = String(getWiFidesc(rssi));
   dataColor = rssi >= -70 ? GxEPD_BLACK : ACCENT_COLOR;
+#if STATUS_BAR_EXTRAS_WIFI_STRENGTH || STATUS_BAR_EXTRAS_WIFI_RSSI
+  dataStr = "";
+#if STATUS_BAR_EXTRAS_WIFI_STRENGTH
+  dataStr += String(getWiFidesc(rssi));
+#endif
 #if STATUS_BAR_EXTRAS_WIFI_RSSI
   if (rssi != 0)
   {
     dataStr += " (" + String(rssi) + "dBm)";
   }
 #endif
   drawString(pos, DISP_HEIGHT - 1 - 2, dataStr, RIGHT, dataColor);
-  pos -= getStringWidth(dataStr) + 19;
+  pos -= getStringWidth(dataStr) + 1;
+#endif
+  pos -= 18;
   display.drawInvertedBitmap(pos, DISP_HEIGHT - 1 - 13, getWiFiBitmap16(rssi),
                              16, 16, dataColor);
   pos -= sp + 8;