From 8b6abd95508a0150e250de937029bcf298dafecc Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Thu, 11 Apr 2024 03:01:40 +0200
Subject: [PATCH] Refactoring and save 4 bytes

---
 ui/welcome.c | 31 ++++++++++++-------------------
 1 file changed, 12 insertions(+), 19 deletions(-)

diff --git a/ui/welcome.c b/ui/welcome.c
index 3b98583..5e8d89b 100644
--- a/ui/welcome.c
+++ b/ui/welcome.c
@@ -68,35 +68,28 @@ void UI_DisplayWelcome(void)
 		memset(WelcomeString0, 0, sizeof(WelcomeString0));
 		memset(WelcomeString1, 0, sizeof(WelcomeString1));
 
-		if (gEeprom.POWER_ON_DISPLAY_MODE == POWER_ON_DISPLAY_MODE_VOLTAGE)
-		{
-			strcpy(WelcomeString0, "VOLTAGE");
-			sprintf(WelcomeString1, "%u.%02uV %u%%",
+		sprintf(WelcomeString1, "%u.%02uV %u%%",
 				gBatteryVoltageAverage / 100,
 				gBatteryVoltageAverage % 100,
 				BATTERY_VoltsToPercent(gBatteryVoltageAverage));
+
+		if (gEeprom.POWER_ON_DISPLAY_MODE == POWER_ON_DISPLAY_MODE_VOLTAGE)
+		{
+			strcpy(WelcomeString0, "VOLTAGE");
 		}
-#ifdef ENABLE_FEAT_F4HWN
-		else if (gEeprom.POWER_ON_DISPLAY_MODE == POWER_ON_DISPLAY_MODE_MESSAGE || gEeprom.POWER_ON_DISPLAY_MODE == POWER_ON_DISPLAY_MODE_ALL)
-#else
-		else
-#endif
+		else if(gEeprom.POWER_ON_DISPLAY_MODE == POWER_ON_DISPLAY_MODE_ALL)
+		{
+			EEPROM_ReadBuffer(0x0EB0, WelcomeString0, 16);
+		}
+		else if(gEeprom.POWER_ON_DISPLAY_MODE == POWER_ON_DISPLAY_MODE_MESSAGE)
 		{
 			EEPROM_ReadBuffer(0x0EB0, WelcomeString0, 16);
 			EEPROM_ReadBuffer(0x0EC0, WelcomeString1, 16);
 
-#ifdef ENABLE_FEAT_F4HWN
-			if(gEeprom.POWER_ON_DISPLAY_MODE == POWER_ON_DISPLAY_MODE_ALL)
+			if(strlen(WelcomeString1) == 0)
 			{
-				sprintf(WelcomeString1, "%u.%02uV %u%%",
-					gBatteryVoltageAverage / 100,
-					gBatteryVoltageAverage % 100,
-					BATTERY_VoltsToPercent(gBatteryVoltageAverage));
-			}	
-			else if(strlen(WelcomeString1) == 0) {
-				UI_PrintString("BIENVENUE", 0, 127, 2, 10);
+				strcpy(WelcomeString1, "BIENVENUE");
 			}
-#endif
 		}
 
 		UI_PrintString(WelcomeString0, 0, 127, 0, 10);