Revert BackLight Action and add 2 new buttons shortcuts

app/action.c

@@ -491,7 +491,24 @@ void ACTION_Wn(void)
 
 void ACTION_BackLight(void)
 {
+	if(gBackLight)
+	{
+		gEeprom.BACKLIGHT_TIME = gBacklightTimeOriginal;
+	}
+	gBackLight = false;
+	BACKLIGHT_TurnOn();
+}
+
+void ACTION_BackLightOnDemand(void)
+{
+	if(gBackLight == false)
+	{
+		gBacklightTimeOriginal = gEeprom.BACKLIGHT_TIME;
+		gEeprom.BACKLIGHT_TIME = 7;
 		gBackLight = true;
+	}
+	else
+	{
 		if(gBacklightBrightnessOld == gEeprom.BACKLIGHT_MAX)
 		{
 			gEeprom.BACKLIGHT_TIME = 0;
@@ -500,6 +517,8 @@ void ACTION_BackLight(void)
 		{
 			gEeprom.BACKLIGHT_TIME = 7;
 		}
+	}
+	
 	BACKLIGHT_TurnOn();
 }
 #endif

app/action.h

@@ -39,6 +39,7 @@ void ACTION_SwitchDemodul(void);
 	void ACTION_RxMode(void);
 	void ACTION_Ptt(void);
 	void ACTION_Wn(void);
+	void ACTION_BackLightOnDemand(void);
 	void ACTION_BackLight(void);
 #endif
 

app/main.c

@@ -456,6 +456,17 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 	gWasFKeyPressed = false;
 	gUpdateStatus   = true;
 
+	if(Key == 8)
+	{
+		ACTION_BackLightOnDemand();
+		return;
+	}
+	else if(Key == 9)
+	{
+		ACTION_BackLight();
+		return;
+	}
+
 	processFKeyFunction(Key, true);
 }
 

app/menu.c

@@ -1010,7 +1010,18 @@ void MENU_ShowCurrentSetting(void)
 #endif
 
 		case MENU_ABR:
+			#ifdef ENABLE_FEAT_F4HWN
+				if(gBackLight)
+				{
+					gSubMenuSelection = gBacklightTimeOriginal;
+				}
+				else
+				{
 					gSubMenuSelection = gEeprom.BACKLIGHT_TIME;
+				}
+			#else
+				gSubMenuSelection = gEeprom.BACKLIGHT_TIME;
+			#endif
 			break;
 
 		case MENU_ABR_MIN:

misc.c

@@ -277,6 +277,7 @@ uint8_t           gIsLocked = 0xFF;
 
 #ifdef ENABLE_FEAT_F4HWN
 	bool          gBackLight = false;
+	uint8_t       gBacklightTimeOriginal;
 	uint8_t       gPttOnePushCounter = 0;
 	uint32_t      gBlinkCounter = 0;
 #endif

misc.h

@@ -344,6 +344,7 @@ extern volatile uint8_t      boot_counter_10ms;
 
 #ifdef ENABLE_FEAT_F4HWN
 	extern bool                  gBackLight;
+	extern uint8_t               gBacklightTimeOriginal;
 	extern uint8_t               gPttOnePushCounter;
 	extern uint32_t              gBlinkCounter;
 #endif

ui/menu.c

@@ -424,7 +424,6 @@ const t_sidefunction gSubMenu_SIDEFUNCTIONS[] =
 	{"SWITCH\nRX MODE",   ACTION_OPT_RXMODE},
 	{"SWITCH\nPTT",  	    ACTION_OPT_PTT},
 	{"SWITCH\nWIDE\nNARROW", ACTION_OPT_WN},
-	{"SWITCH\nBACKLIGHT", ACTION_OPT_BACKLIGHT},
 #endif
 };