Merge pull request #4116 from DanNixon/osd_power_formatting

OSD power formatting

src/main/io/osd.c

@@ -572,7 +572,7 @@ static void osdDrawSingleElement(uint8_t item)
         }
 
     case OSD_POWER:
-        tfp_sprintf(buff, "%dW", getAmperage() * getBatteryVoltage() / 1000);
+        tfp_sprintf(buff, "%4dW", getAmperage() * getBatteryVoltage() / 1000);
         break;
 
     case OSD_PIDRATE_PROFILE:

src/test/unit/osd_unittest.cc

@@ -604,6 +604,68 @@ TEST(OsdTest, TestElementMahDrawn)
     displayPortTestBufferSubstring(1, 11, "1042%c", SYM_MAH);
 }
 
+/*
+ * Tests the instantaneous electrical power OSD element.
+ */
+TEST(OsdTest, TestElementPower)
+{
+    // given
+    osdConfigMutable()->item_pos[OSD_POWER] = OSD_POS(1, 10)  | VISIBLE_FLAG;
+
+    // and
+    simulationBatteryVoltage = 100; // 10V
+
+    // and
+    simulationBatteryAmperage = 0; // 0A
+
+    // when
+    displayClearScreen(&testDisplayPort);
+    osdRefresh(simulationTime);
+
+    // then
+    displayPortTestBufferSubstring(1, 10, "   0W");
+
+    // given
+    simulationBatteryAmperage = 10; // 0.1A
+
+    // when
+    displayClearScreen(&testDisplayPort);
+    osdRefresh(simulationTime);
+
+    // then
+    displayPortTestBufferSubstring(1, 10, "   1W");
+
+    // given
+    simulationBatteryAmperage = 120; // 1.2A
+
+    // when
+    displayClearScreen(&testDisplayPort);
+    osdRefresh(simulationTime);
+
+    // then
+    displayPortTestBufferSubstring(1, 10, "  12W");
+
+    // given
+    simulationBatteryAmperage = 1230; // 12.3A
+
+    // when
+    displayClearScreen(&testDisplayPort);
+    osdRefresh(simulationTime);
+
+    // then
+    displayPortTestBufferSubstring(1, 10, " 123W");
+
+    // given
+    simulationBatteryAmperage = 12340; // 123.4A
+
+    // when
+    displayClearScreen(&testDisplayPort);
+    osdRefresh(simulationTime);
+
+    // then
+    displayPortTestBufferSubstring(1, 10, "1234W");
+}
+
 /*
  * Tests the altitude OSD element.
  */