Merge with latest 2.3

radio/src/gui/128x64/view_main.cpp

@@ -44,7 +44,6 @@ struct {
 #define PHASE_FLAGS   0
 #define VBATT_X       (6*FW-1)
 #define VBATT_Y       (2*FH)
-#define VBATTUNIT_X   (VBATT_X-1)
 #define VBATTUNIT_Y   (3*FH)
 #define REBOOT_X      (20*FW-3)
 #define BAR_HEIGHT    (BOX_WIDTH-1l) // don't remove the l here to force 16bits maths on 9X
@@ -260,8 +259,13 @@ void displayBattVoltage()
     count = (get_tmr10ms() & 127u) * count / 128;
   }
 #endif
-  for (uint8_t i = 0; i < count; i += 2)
+  for (uint8_t i = 0; i < count; i += 2) {
+#if defined(USB_CHARGER)
+    if ((i >= count - 2) && usbChargerLed() && BLINK_ON_PHASE)  // Blink last segment on charge
+      continue;
+#endif
     lcdDrawSolidVerticalLine(VBATT_X - 24 + i, VBATT_Y + 10, 3);
+  }
   if (!IS_TXBATT_WARNING() || BLINK_ON_PHASE)
     lcdDrawSolidFilledRect(VBATT_X - 26, VBATT_Y, 24, 15);
 #else