Merge pull request OneOfEleven#147 from egzumer/battery_fix

Battery symbol fix of a fix
pdrbsts · Oct 9, 2023 · 6819aca · 6819aca
2 parents 79dae75 + 4607686
commit 6819aca
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 20 deletions.
diff --git a/ui/battery.c b/ui/battery.c
@@ -24,34 +24,35 @@
 
 void UI_DrawBattery(uint8_t *bitmap, const unsigned int level, const unsigned int blink)
 {
-	memmove(bitmap, BITMAP_BATTERY_LEVEL, sizeof(BITMAP_BATTERY_LEVEL));
-
-	if (level >= 1)
+	if (blink == 0) {
+		memset(bitmap, 0, sizeof(BITMAP_BATTERY_LEVEL));
+	}
+	else 
 	{
-		unsigned int i;
-		unsigned int bars = (level > 0) ? level - 1 : 0;
-		if (bars > 4)
-			bars = 4;
-		for (i = 0; i < bars; i++)
+		memmove(bitmap, BITMAP_BATTERY_LEVEL, sizeof(BITMAP_BATTERY_LEVEL));
+		if (level > 1)
 		{
-			#ifdef ENABLE_REVERSE_BAT_SYMBOL
-				bitmap[3 + (i * 3) + 0] = 0b01011101;
-				bitmap[3 + (i * 3) + 1] = 0b01011101;
-			#else
-				bitmap[sizeof(bitmap) - 3 - (i * 3) - 0] = 0b01011101;
-				bitmap[sizeof(bitmap) - 3 - (i * 3) - 1] = 0b01011101;
-			#endif
+			unsigned int i;
+			unsigned int bars = level - 1;
+			if (bars > 4)
+				bars = 4;
+			for (i = 0; i < bars; i++)
+			{
+				#ifdef ENABLE_REVERSE_BAT_SYMBOL
+					bitmap[3 + (i * 3) + 0] = 0b01011101;
+					bitmap[3 + (i * 3) + 1] = 0b01011101;
+				#else
+					bitmap[sizeof(BITMAP_BATTERY_LEVEL) - 3 - (i * 3) - 0] = 0b01011101;
+					bitmap[sizeof(BITMAP_BATTERY_LEVEL) - 3 - (i * 3) - 1] = 0b01011101;
+				#endif
+			}
 		}
 	}
-	else
-	if (blink == 0)
-		memset(bitmap, 0, sizeof(bitmap));
 }
 
 void UI_DisplayBattery(const unsigned int level, const unsigned int blink)
 {
 	uint8_t bitmap[sizeof(BITMAP_BATTERY_LEVEL)];
 	UI_DrawBattery(bitmap, level, blink);
-	memmove(bitmap, BITMAP_BATTERY_LEVEL, sizeof(BITMAP_BATTERY_LEVEL));
 	ST7565_DrawLine(LCD_WIDTH - sizeof(bitmap), 0, sizeof(bitmap), bitmap);
 }
diff --git a/ui/status.c b/ui/status.c
@@ -216,7 +216,7 @@ void UI_DisplayStatus(const bool test_display)
 	x += sizeof(BITMAP_USB_C);
 
 	// BATTERY LEVEL indicator
-	UI_DrawBattery(line + x, g_battery_display_level, g_low_battery);
+	UI_DrawBattery(line + x, g_battery_display_level, g_low_battery_blink);
 
 	// **************