Fixed backlight countdowner

README.md

@@ -32,7 +32,7 @@ To enable the custom option just uncomment the line by removing the starting '#'
 * Slightly less intense menu style
 * AM RX now allowed everywhere, although the radio really doesn't do AM, the adverts are a con !
 * Finer RSSI bar steps
-* Nicer big font than original big font
+* Nicer/cleaner big numeric font than original QS big numeric font
 *
 * "MEM-CH" and "DEL-CH" menus now include channel name
 * "STEP" menu, added 1.25kHz option, removed 5kHz option

app/app.c

@@ -1280,6 +1280,11 @@ void APP_TimeSlice500ms(void)
 {
 	// Skipped authentic device check
 
+	if (gBacklightCountdown > 0)
+		if (--gBacklightCountdown == 0)
+			if (gEeprom.BACKLIGHT < 5)
+				GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);   // turn backlight off
+			
 	if (gKeypadLocked)
 		if (--gKeypadLocked == 0)
 			gUpdateDisplay = true;
@@ -1325,11 +1330,6 @@ void APP_TimeSlice500ms(void)
 		{
 			if ((gFM_ScanState == FM_SCAN_OFF || gAskToSave) && gScanState == SCAN_OFF && gCssScanMode == CSS_SCAN_MODE_OFF)
 			{
-				if (gBacklightCountdown)
-					if (--gBacklightCountdown == 0)
-						if (gEeprom.BACKLIGHT < 5)
-							GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);   // turn backlight off
-
 				#ifndef DISABLE_AIRCOPY
 					if (gScreenToDisplay != DISPLAY_AIRCOPY && (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND))
 				#else

driver/backlight.c

@@ -23,29 +23,30 @@ uint8_t gBacklightCountdown = 0;
 
 void BACKLIGHT_TurnOn(void)
 {
-	if (gEeprom.BACKLIGHT > 0)
+	if (gEeprom.BACKLIGHT == 0)
+		return;
+
+	// turn the backlight ON
+	GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);
+		
+	switch (gEeprom.BACKLIGHT)
 	{
-		GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);  // turn the backlight ON
+		default:
-		switch (gEeprom.BACKLIGHT)
+		case 1:	// 10 sec
-		{
+			gBacklightCountdown = 2 * 10;	// 1
-			case 1:	// 10 sec
+			break;
-				gBacklightCountdown = 1;
+		case 2:	// 20 sec
-				break;
+			gBacklightCountdown = 2 * 20;	// 21
-			case 2:	// 20 sec
+			break;
-				gBacklightCountdown = 21;
+		case 3:	// 40 sec
-				break;
+			gBacklightCountdown = 2 * 40;	// 61
-			case 3:	// 40 sec
+			break;
-				gBacklightCountdown = 61;
+		case 4:	// 80 sec
-				break;
+			gBacklightCountdown = 2 * 80;	// 141
-			case 4:	// 80 sec
+			break;
-				gBacklightCountdown = 141;
+		case 5:	// always on
-				break;
+			gBacklightCountdown = 0;
-			case 5:	// always on
+			break;
-			default:
-				gBacklightCountdown = 0;
-				break;
-		}
-//		gBacklightCountdown = (gEeprom.BACKLIGHT < 5) ? (gEeprom.BACKLIGHT * 20) - 19 : 0;
 	}
 }