Fixed RSSI calibration

Flashlight SOS function
Change menu items names
2023-10-16 13:01:24 +02:00 · 2023-10-16 00:15:04 +02:00 · 2023-10-15 22:07:55 +02:00 · 2023-10-15 21:52:42 +02:00 · 2023-10-15 21:12:06 +02:00 · 2023-10-14 20:26:29 +02:00
33 changed files with 814 additions and 974 deletions
--- a/2
+++ b/2
@@ -25,7 +25,7 @@ ENABLE_F_CAL_MENU             := 0
 ENABLE_CTCSS_TAIL_PHASE_SHIFT := 1
 ENABLE_BOOT_BEEPS             := 0
 ENABLE_SHOW_CHARGE_LEVEL      := 1
-ENABLE_REVERSE_BAT_SYMBOL     := 1
+ENABLE_REVERSE_BAT_SYMBOL     := 0
 ENABLE_CODE_SCAN_TIMEOUT      := 0
 ENABLE_AM_FIX                 := 1
 ENABLE_AM_FIX_SHOW_DATA       := 0
--- a/app/action.c
+++ b/app/action.c
@@ -45,6 +45,7 @@ static void ACTION_FlashLight(void)
 			GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT);
 			break;
 		case 1:
+		case 2:
 			gFlashLightState++;
 			break;
 		default:
@@ -334,10 +335,10 @@ void ACTION_Handle(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 		{
 			gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;

-			if (gDTMF_InputIndex > 0)
+			if (gDTMF_InputBox_Index > 0)
 			{
-				gDTMF_InputBox[--gDTMF_InputIndex] = '-';
-				if (gDTMF_InputIndex > 0)
+				gDTMF_InputBox[--gDTMF_InputBox_Index] = '-';
+				if (gDTMF_InputBox_Index > 0)
 				{
 					gPttWasReleased       = true;
 					gRequestDisplayScreen = DISPLAY_MAIN;
--- a/app/app.c
+++ b/app/app.c
@@ -1189,8 +1189,7 @@ void APP_Update(void)
 			{
 				gBatterySaveCountdown_10ms   = battery_save_count_10ms;
 			}
-			else
-			if ((IS_NOT_NOAA_CHANNEL(gEeprom.ScreenChannel[0]) && IS_NOT_NOAA_CHANNEL(gEeprom.ScreenChannel[1])) || !gIsNoaaMode)
+			else if ((IS_NOT_NOAA_CHANNEL(gEeprom.ScreenChannel[0]) && IS_NOT_NOAA_CHANNEL(gEeprom.ScreenChannel[1])) || !gIsNoaaMode)
 			{
 				//if (gCurrentFunction != FUNCTION_POWER_SAVE)
 					FUNCTION_Select(FUNCTION_POWER_SAVE);
@@ -1288,16 +1287,15 @@ void APP_Update(void)
 // called every 10ms
 void APP_CheckKeys(void)
 {
-	KEY_Code_t Key;
-
-	#ifdef ENABLE_AIRCOPY
-		if (gSetting_KILLED || (gScreenToDisplay == DISPLAY_AIRCOPY && gAircopyState != AIRCOPY_READY))
-			return;
-	#else
-		if (gSetting_KILLED)
-			return;
-	#endif
+#ifdef ENABLE_AIRCOPY
+	if (gSetting_KILLED || (gScreenToDisplay == DISPLAY_AIRCOPY && gAircopyState != AIRCOPY_READY))
+		return;
+#else
+	if (gSetting_KILLED)
+		return;
+#endif

+// -------------------- PTT ------------------------
 	if (gPttIsPressed)
 	{
 		if (GPIO_CheckBit(&GPIOC->DATA, GPIOC_PIN_PTT) || gSerialConfigCountDown_500ms > 0)
@@ -1313,8 +1311,7 @@ void APP_CheckKeys(void)
 		else
 			gPttDebounceCounter = 0;
 	}
-	else
-	if (!GPIO_CheckBit(&GPIOC->DATA, GPIOC_PIN_PTT) && gSerialConfigCountDown_500ms == 0)
+	else if (!GPIO_CheckBit(&GPIOC->DATA, GPIOC_PIN_PTT) && gSerialConfigCountDown_500ms == 0)
 	{	// PTT pressed
 		if (++gPttDebounceCounter >= 3)	    // 30ms
 		{	// start transmitting
@@ -1327,16 +1324,16 @@ void APP_CheckKeys(void)
 	else
 		gPttDebounceCounter = 0;

-	// *****************
+// --------------------- OTHER KEYS ----------------------------

 	// scan the hardware keys
-	Key = KEYBOARD_Poll();
+	KEY_Code_t Key = KEYBOARD_Poll();

-	if (Key != KEY_INVALID)
+	if (Key != KEY_INVALID) // any key pressed
 		boot_counter_10ms = 0;   // cancel boot screen/beeps if any key pressed

-	if (gKeyReading0 != Key)
-	{	// new key pressed
+	if (gKeyReading0 != Key) // new key pressed
+	{	

 		if (gKeyReading0 != KEY_INVALID && Key != KEY_INVALID)
 			APP_ProcessKey(gKeyReading1, false, gKeyBeingHeld);  // key pressed without releasing previous key
@@ -1346,18 +1343,19 @@ void APP_CheckKeys(void)
 		return;
 	}

-	if (++gDebounceCounter == key_debounce_10ms)
-	{	// debounced new key pressed
+	gDebounceCounter++;

-		if (Key == KEY_INVALID)
+	if (gDebounceCounter == key_debounce_10ms) // debounced new key pressed
+	{	
+		if (Key == KEY_INVALID) //all PTT keys released
 		{
-			if (gKeyReading1 != KEY_INVALID)
+			if (gKeyReading1 != KEY_INVALID) // some button was pressed before
 			{
-				APP_ProcessKey(gKeyReading1, false, gKeyBeingHeld);
+				APP_ProcessKey(gKeyReading1, false, gKeyBeingHeld); // process last button released event
 				gKeyReading1 = KEY_INVALID;
 			}
 		}
-		else
+		else // process new key pressed
 		{
 			gKeyReading1 = Key;
 			APP_ProcessKey(Key, true, false);
@@ -1367,28 +1365,19 @@ void APP_CheckKeys(void)
 		return;
 	}

-	// key is being held pressed
+	if (gDebounceCounter < key_repeat_delay_10ms || Key == KEY_INVALID) // the button is not held long enough for repeat yet, or not really pressed
+		return;

-	if (gDebounceCounter == key_repeat_delay_10ms)
-	{	// initial delay after pressed
-		if (Key == KEY_STAR  ||
-		    Key == KEY_F     ||
-		    Key == KEY_SIDE2 ||
-		    Key == KEY_SIDE1 ||
-		    Key == KEY_UP    ||
-		    Key == KEY_DOWN  ||
-		    Key == KEY_EXIT  ||
-		    Key == KEY_MENU  ||
-			(Key >= KEY_0 && Key <= KEY_9))       // keys 0-9 can be held down to bypass pressing the F-Key
+	if (gDebounceCounter == key_repeat_delay_10ms) //initial key repeat with longer delay
+	{	
+		if (Key != KEY_PTT)
 		{
 			gKeyBeingHeld = true;
 			APP_ProcessKey(Key, true, true);
 		}
-		return;
 	}
-
-	if (gDebounceCounter > key_repeat_delay_10ms)
-	{	// key repeat
+	else //subsequent fast key repeats
+	{	
 		if (Key == KEY_UP || Key == KEY_DOWN)
 		{
 			gKeyBeingHeld = true;
@@ -1399,8 +1388,7 @@ void APP_CheckKeys(void)
 		if (gDebounceCounter < 0xFFFF)
 			return;

-		gDebounceCounter = key_repeat_delay_10ms;
-		return;
+		gDebounceCounter = key_repeat_delay_10ms+1;
 	}
 }

@@ -1433,34 +1421,23 @@ void APP_TimeSlice10ms(void)
 	if (gCurrentFunction != FUNCTION_POWER_SAVE || !gRxIdleMode)
 		APP_CheckRadioInterrupts();

-	if (gCurrentFunction != FUNCTION_TRANSMIT)
-	{	// receiving
-		if (gUpdateStatus)
-			UI_DisplayStatus(false);
-
-		if (gUpdateDisplay)
-		{
-			gUpdateDisplay = false;
-			GUI_DisplayScreen();
-		}
-	}
-	else
+	if (gCurrentFunction == FUNCTION_TRANSMIT)
 	{	// transmitting
 		#ifdef ENABLE_AUDIO_BAR
 			if (gSetting_mic_bar && (gFlashLightBlinkCounter % (150 / 10)) == 0) // once every 150ms
 				UI_DisplayAudioBar();
 		#endif
-
-		if (gUpdateDisplay)
-		{
-			gUpdateDisplay = false;
-			GUI_DisplayScreen();
-		}
-
-		if (gUpdateStatus)
-			UI_DisplayStatus(false);
 	}

+	if (gUpdateDisplay)
+	{
+		gUpdateDisplay = false;
+		GUI_DisplayScreen();
+	}
+
+	if (gUpdateStatus)
+		UI_DisplayStatus(false);
+
 	// Skipping authentic device checks

 	#ifdef ENABLE_FMRADIO
@@ -1470,11 +1447,40 @@ void APP_TimeSlice10ms(void)

 	if (gFlashLightState == FLASHLIGHT_BLINK && (gFlashLightBlinkCounter & 15u) == 0)
 		GPIO_FlipBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT);
+	else if(gFlashLightState == FLASHLIGHT_SOS) {
+		const uint16_t u = 15;
+		static uint8_t c;
+		static uint16_t next;
+
+		if(gFlashLightBlinkCounter - next > 7*u) {
+			c = 0;
+			next = gFlashLightBlinkCounter+1;
+		}
+		else if(gFlashLightBlinkCounter == next) {
+			if(c==0) {
+				GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT);
+			}
+			else
+				GPIO_FlipBit(&GPIOC->DATA, GPIOC_PIN_FLASHLIGHT);
+
+			if(c == 18) {
+				next += 7*u;
+				c = 0;
+			}
+			else if(c==7 || c==9 || c==11)
+			 	next += 3*u;
+			else
+				next += u;
+
+			c++;
+		}
+		
+	}

 	#ifdef ENABLE_VOX
 		if (gVoxResumeCountdown > 0)
 			gVoxResumeCountdown--;
-	
+
 		if (gVoxPauseCountdown > 0)
 			gVoxPauseCountdown--;
 	#endif
@@ -1567,9 +1573,11 @@ void APP_TimeSlice10ms(void)

 		if (gScanDelay_10ms > 0)
 		{
-			gScanDelay_10ms--;
-			APP_CheckKeys();
-			return;
+			if (--gScanDelay_10ms > 0)
+			{
+				APP_CheckKeys();
+				return;
+			}
 		}

 		if (gScannerEditState != 0)
@@ -1698,23 +1706,30 @@ void APP_TimeSlice10ms(void)

 void cancelUserInputModes(void)
 {
-	gKeyInputCountdown = 0;
-	if (gDTMF_InputMode || gInputBoxIndex > 0)
+	if (gDTMF_InputMode || gDTMF_InputBox_Index > 0)
 	{
-		memset(gDTMF_String, 0, sizeof(gDTMF_String));
-		gDTMF_InputMode       = false;
-		gDTMF_InputIndex      = 0;
-		gInputBoxIndex        = 0;
-
+		DTMF_clear_input_box();
+		gBeepToPlay           = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
 		gRequestDisplayScreen = DISPLAY_MAIN;
+		gUpdateDisplay        = true;
+	}

-		gBeepToPlay           = BEEP_1KHZ_60MS_OPTIONAL;
+	if (gWasFKeyPressed || gKeyInputCountdown > 0 || gInputBoxIndex > 0)
+	{
+		gWasFKeyPressed     = false;
+		gInputBoxIndex      = 0;
+		gKeyInputCountdown  = 0;
+		gBeepToPlay         = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
+		gUpdateStatus       = true;
+		gUpdateDisplay      = true;
 	}
 }

 // this is called once every 500ms
 void APP_TimeSlice500ms(void)
 {
+	bool exit_menu = false;
+
 	// Skipped authentic device check

 	if (gKeypadLocked > 0)
@@ -1722,9 +1737,19 @@ void APP_TimeSlice500ms(void)
 			gUpdateDisplay = true;

 	if (gKeyInputCountdown > 0)
+	{
 		if (--gKeyInputCountdown == 0)
+		{
 			cancelUserInputModes();

+			if (gBeepToPlay != BEEP_NONE)
+			{
+				AUDIO_PlayBeep(gBeepToPlay);
+				gBeepToPlay = BEEP_NONE;
+			}
+		}
+	}
+
 	if (gDTMF_RX_live_timeout > 0)
 	{
 		#ifdef ENABLE_RSSI_BAR
@@ -1742,16 +1767,15 @@ void APP_TimeSlice500ms(void)
 			}
 		}
 	}
-	
+
+	if (gMenuCountdown > 0)
+		if (--gMenuCountdown == 0)
+			exit_menu = (gScreenToDisplay == DISPLAY_MENU);	// exit menu mode
+
 	if (gDTMF_RX_timeout > 0)
 		if (--gDTMF_RX_timeout == 0)
 			DTMF_clear_RX();

-	if (gSerialConfigCountDown_500ms > 0)
-	{
-//		gReducedService = true;            // a serial config upload/download is in progress
-	}
-
 	// Skipped authentic device check

 	#ifdef ENABLE_FMRADIO
@@ -1763,6 +1787,16 @@ void APP_TimeSlice500ms(void)
 		}
 	#endif

+	if (gBacklightCountdown > 0 && !gAskToSave && gCssScanMode == CSS_SCAN_MODE_OFF)
+		if (gScreenToDisplay != DISPLAY_MENU || gMenuCursor != MENU_ABR) // don't turn off backlight if user is in backlight menu option
+			if (--gBacklightCountdown == 0)
+				if (gEeprom.BACKLIGHT < (ARRAY_SIZE(gSubMenu_BACKLIGHT) - 1))
+					GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);   // turn backlight off
+
+	if (gSerialConfigCountDown_500ms > 0)
+	{
+	}
+
 	if (gReducedService)
 	{
 		BOARD_ADC_GetBatteryInfo(&gBatteryCurrentVoltage, &gBatteryCurrent);
@@ -1783,14 +1817,18 @@ void APP_TimeSlice500ms(void)

 	// Skipped authentic device check

-	if ((gBatteryCheckCounter & 1) == 0)
+	if (gCurrentFunction != FUNCTION_TRANSMIT)
 	{
-		BOARD_ADC_GetBatteryInfo(&gBatteryVoltages[gBatteryVoltageIndex++], &gBatteryCurrent);
-		if (gBatteryVoltageIndex > 3)
-			gBatteryVoltageIndex = 0;
-		BATTERY_GetReadings(true);
-	}

+		if ((gBatteryCheckCounter & 1) == 0)
+		{
+			BOARD_ADC_GetBatteryInfo(&gBatteryVoltages[gBatteryVoltageIndex++], &gBatteryCurrent);
+			if (gBatteryVoltageIndex > 3)
+				gBatteryVoltageIndex = 0;
+			BATTERY_GetReadings(true);
+		}
+	}
+	
 	// regular display updates (once every 2 sec) - if need be
 	if ((gBatteryCheckCounter & 3) == 0)
 	{
@@ -1802,112 +1840,108 @@ void APP_TimeSlice500ms(void)
 		#endif
 	}

-	if (gCurrentFunction != FUNCTION_TRANSMIT)
+	#ifdef ENABLE_FMRADIO
+		if ((gFM_ScanState == FM_SCAN_OFF || gAskToSave) && gCssScanMode == CSS_SCAN_MODE_OFF)
+	#else
+		if (gCssScanMode == CSS_SCAN_MODE_OFF)
+	#endif
 	{
-		if (gCurrentFunction != FUNCTION_POWER_SAVE)
-			updateRSSI(gEeprom.RX_VFO);
-
-		#ifdef ENABLE_FMRADIO
-			if ((gFM_ScanState == FM_SCAN_OFF || gAskToSave) && gCssScanMode == CSS_SCAN_MODE_OFF)
+		#ifdef ENABLE_AIRCOPY
+			if (gScanStateDir == SCAN_OFF && gScreenToDisplay != DISPLAY_AIRCOPY && (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND))
 		#else
-			if (gCssScanMode == CSS_SCAN_MODE_OFF)
+			if (gScanStateDir == SCAN_OFF && (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND))
 		#endif
 		{
-			if (gBacklightCountdown > 0)
-				if (gScreenToDisplay != DISPLAY_MENU || gMenuCursor != MENU_ABR) // don't turn off backlight if user is in backlight menu option
-					if (--gBacklightCountdown == 0)
-						if (gEeprom.BACKLIGHT < (ARRAY_SIZE(gSubMenu_BACKLIGHT) - 1))
-							GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);   // turn backlight off
-
-			#ifdef ENABLE_AIRCOPY
-				if (gScanStateDir == SCAN_OFF && gScreenToDisplay != DISPLAY_AIRCOPY && (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND))
-			#else
-				if (gScanStateDir == SCAN_OFF && (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND))
-			#endif
+			if (gEeprom.AUTO_KEYPAD_LOCK && gKeyLockCountdown > 0 && !gDTMF_InputMode && gScreenToDisplay != DISPLAY_MENU)
 			{
-				bool exit_menu = false;
+				if (--gKeyLockCountdown == 0)
+					gEeprom.KEY_LOCK = true;     // lock the keyboard
+				gUpdateStatus = true;            // lock symbol needs showing
+			}

-				if (gEeprom.AUTO_KEYPAD_LOCK && gKeyLockCountdown > 0 && !gDTMF_InputMode)
+			if (exit_menu)
+			{
+				gMenuCountdown = 0;
+
+				if (gEeprom.BACKLIGHT == 0)
 				{
-					if (--gKeyLockCountdown == 0)
-						gEeprom.KEY_LOCK = true;     // lock the keyboard
-
-					gUpdateStatus = true;            // lock symbol needs showing
+					gBacklightCountdown = 0;
+					GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);	// turn the backlight OFF
 				}

-				if (gMenuCountdown > 0)
-					if (--gMenuCountdown == 0)
-						exit_menu = true;	// exit menu mode
-
-				if (exit_menu)
+				if (gInputBoxIndex > 0 || gDTMF_InputMode)
+					AUDIO_PlayBeep(BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL);
+/*
+				if (gScreenToDisplay == DISPLAY_SCANNER)
 				{
-					gMenuCountdown = 0;
+					BK4819_StopScan();

-					if (gEeprom.BACKLIGHT == 0 && gScreenToDisplay == DISPLAY_MENU)
-					{
-						gBacklightCountdown = 0;
-						GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);	// turn the backlight OFF
-					}
+					RADIO_ConfigureChannel(0, VFO_CONFIGURE_RELOAD);
+					RADIO_ConfigureChannel(1, VFO_CONFIGURE_RELOAD);

-					if (gInputBoxIndex > 0 || gDTMF_InputMode || gScreenToDisplay == DISPLAY_MENU)
-						AUDIO_PlayBeep(BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL);
+					RADIO_SetupRegisters(true);
+				}
+*/
+				DTMF_clear_input_box();

-					if (gScreenToDisplay == DISPLAY_SCANNER)
-					{
-						BK4819_StopScan();
+				gWasFKeyPressed  = false;
+				gInputBoxIndex   = 0;

-						RADIO_ConfigureChannel(0, VFO_CONFIGURE_RELOAD);
-						RADIO_ConfigureChannel(1, VFO_CONFIGURE_RELOAD);
+				gAskToSave       = false;
+				gAskToDelete     = false;

-						RADIO_SetupRegisters(true);
-					}
+				gUpdateStatus    = true;
+				gUpdateDisplay   = true;

-					gWasFKeyPressed  = false;
-					gUpdateStatus    = true;
-					gInputBoxIndex   = 0;
-					gDTMF_InputMode  = false;
-					gDTMF_InputIndex = 0;
-					gAskToSave       = false;
-					gAskToDelete     = false;
+				{
+					GUI_DisplayType_t disp = DISPLAY_INVALID;

 					#ifdef ENABLE_FMRADIO
 						if (gFmRadioMode &&
-						    gCurrentFunction != FUNCTION_RECEIVE &&
+							gCurrentFunction != FUNCTION_RECEIVE &&
 							gCurrentFunction != FUNCTION_MONITOR &&
 							gCurrentFunction != FUNCTION_TRANSMIT)
 						{
-							GUI_SelectNextDisplay(DISPLAY_FM);
+							disp = DISPLAY_FM;
 						}
-						else
 					#endif
-					#ifndef ENABLE_CODE_SCAN_TIMEOUT
-						if (gScreenToDisplay != DISPLAY_SCANNER)
-					#endif
-							GUI_SelectNextDisplay(DISPLAY_MAIN);
+
+					if (disp == DISPLAY_INVALID)
+					{
+						#ifndef ENABLE_CODE_SCAN_TIMEOUT
+							if (gScreenToDisplay != DISPLAY_SCANNER)
+						#endif
+								disp = DISPLAY_MAIN;
+					}
+
+					if (disp != DISPLAY_INVALID)
+						GUI_SelectNextDisplay(disp);
 				}
 			}
 		}
-
 	}

-	#ifdef ENABLE_FMRADIO
-		if (!gPttIsPressed && gFM_ResumeCountdown_500ms > 0)
-		{
-			if (--gFM_ResumeCountdown_500ms == 0)
-			{
-				RADIO_SetVfoState(VFO_STATE_NORMAL);
+	if (gCurrentFunction != FUNCTION_POWER_SAVE && gCurrentFunction != FUNCTION_TRANSMIT)
+		updateRSSI(gEeprom.RX_VFO);

-				if (gCurrentFunction != FUNCTION_RECEIVE  &&
-				    gCurrentFunction != FUNCTION_TRANSMIT &&
-				    gCurrentFunction != FUNCTION_MONITOR  &&
-					gFmRadioMode)
-				{	// switch back to FM radio mode
-					FM_Start();
-					GUI_SelectNextDisplay(DISPLAY_FM);
-				}
+	if (!gPttIsPressed && gVFOStateResumeCountdown_500ms > 0)
+	{
+		if (--gVFOStateResumeCountdown_500ms == 0)
+		{
+			RADIO_SetVfoState(VFO_STATE_NORMAL);
+#ifdef ENABLE_FMRADIO
+			if (gCurrentFunction != FUNCTION_RECEIVE  &&
+			    gCurrentFunction != FUNCTION_TRANSMIT &&
+			    gCurrentFunction != FUNCTION_MONITOR  &&
+				gFmRadioMode)
+			{	// switch back to FM radio mode
+				FM_Start();
+				GUI_SelectNextDisplay(DISPLAY_FM);
 			}
+#endif				
 		}
-	#endif
+	}
+

 	if (gLowBattery)
 	{
@@ -1947,7 +1981,7 @@ void APP_TimeSlice500ms(void)
 						//if (gCurrentFunction != FUNCTION_POWER_SAVE)
 							FUNCTION_Select(FUNCTION_POWER_SAVE);

-						ST7565_Configure_GPIO_B11();
+						ST7565_HardwareReset();

 						if (gEeprom.BACKLIGHT < (ARRAY_SIZE(gSubMenu_BACKLIGHT) - 1))
 							GPIO_ClearBit(&GPIOB->DATA, GPIOB_PIN_BACKLIGHT);  // turn the backlight off
@@ -1999,7 +2033,10 @@ void APP_TimeSlice500ms(void)
 		{
 			if (--gDTMF_auto_reset_time_500ms == 0)
 			{
-				gDTMF_CallState = DTMF_CALL_STATE_NONE;
+				if (gDTMF_CallState == DTMF_CALL_STATE_RECEIVED && gEeprom.DTMF_auto_reset_time >= DTMF_HOLD_MAX)
+					gDTMF_CallState = DTMF_CALL_STATE_RECEIVED_STAY;     // keep message on-screen till a key is pressed
+				else
+					gDTMF_CallState = DTMF_CALL_STATE_NONE;
 				gUpdateDisplay  = true;
 			}
 		}
@@ -2126,7 +2163,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 	}
 	else
 	{
-		if (Key != KEY_PTT)
+		if (Key != KEY_PTT || gSetting_backlight_on_tx_rx == 1 || gSetting_backlight_on_tx_rx == 3)
 			BACKLIGHT_TurnOn();

 		if (Key == KEY_EXIT && bKeyHeld)
@@ -2139,6 +2176,9 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 				gDTMF_RX_live_timeout = 0;
 				gUpdateDisplay        = true;
 			}
+
+			// cancel user input
+			cancelUserInputModes();
 		}

 		if (gScreenToDisplay == DISPLAY_MENU)       // 1of11
@@ -2189,14 +2229,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 		}
 	}

-	if (Key != KEY_PTT   &&
-	    Key != KEY_UP    &&
-	    Key != KEY_DOWN  &&
-	    Key != KEY_EXIT  &&
-	    Key != KEY_SIDE1 &&
-	    Key != KEY_SIDE2 &&
-	    Key != KEY_STAR  &&
-		Key != KEY_MENU)
+	if ((Key >= KEY_0 && Key <= KEY_9) || Key == KEY_F)
 	{
 		if (gScanStateDir != SCAN_OFF || gCssScanMode != CSS_SCAN_MODE_OFF)
 		{	// FREQ/CTCSS/DCS scanning
@@ -2218,12 +2251,10 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 			}
 		}
 	}
-	else
-	if (gPttWasReleased)
+	else if (gPttWasReleased)
 	{
 		if (bKeyHeld)
 			bFlag = true;
-
 		if (!bKeyPressed)
 		{
 			bFlag           = true;
@@ -2231,9 +2262,8 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 		}
 	}

-	if (gWasFKeyPressed && Key > KEY_9 && Key != KEY_F && Key != KEY_STAR)
-//	if (gWasFKeyPressed && Key > KEY_9 && Key != KEY_F && Key != KEY_STAR && Key != KEY_MENU)
-	{
+	if (gWasFKeyPressed && (Key == KEY_PTT || Key == KEY_EXIT || Key == KEY_SIDE1 || Key == KEY_SIDE2))
+	{	// cancel the F-key
 		gWasFKeyPressed = false;
 		gUpdateStatus   = true;
 	}
@@ -2243,77 +2273,71 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 		if (gCurrentFunction == FUNCTION_TRANSMIT)
 		{	// transmitting

-			#if defined(ENABLE_ALARM) || defined(ENABLE_TX1750)
-				if (gAlarmState == ALARM_STATE_OFF)
-			#endif
+#if defined(ENABLE_ALARM) || defined(ENABLE_TX1750)
+			if (gAlarmState == ALARM_STATE_OFF)
+#endif
 			{
+				char Code;
+
 				if (Key == KEY_PTT)
 				{
 					GENERIC_Key_PTT(bKeyPressed);
+					goto Skip;
+				}
+
+				if (Key == KEY_SIDE2)
+				{	// transmit 1750Hz tone
+					Code = 0xFE;
 				}
 				else
 				{
-					char Code;
+					Code = DTMF_GetCharacter(Key - KEY_0);
+					if (Code == 0xFF)
+						goto Skip;

-					if (Key == KEY_SIDE2)
-					{	// transmit 1750Hz tone
-						Code = 0xFE;
-					}
-					else
+					// transmit DTMF keys
+				}
+
+				if (!bKeyPressed || bKeyHeld)
+				{
+					if (!bKeyPressed)
 					{
-						Code = DTMF_GetCharacter(Key - KEY_0);
-						if (Code == 0xFF)
-							goto Skip;
-						
-						// transmit DTMF keys
-					}
+						GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);

-					if (!bKeyPressed || bKeyHeld)
-					{
-						if (!bKeyPressed)
-						{
-							GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+						gEnableSpeaker = false;

-							gEnableSpeaker = false;
+						BK4819_ExitDTMF_TX(false);

-							BK4819_ExitDTMF_TX(false);
-
-							if (gCurrentVfo->SCRAMBLING_TYPE == 0 || !gSetting_ScrambleEnable)
-								BK4819_DisableScramble();
-							else
-								BK4819_EnableScramble(gCurrentVfo->SCRAMBLING_TYPE - 1);
-						}
-					}
-					else
-					{
-						if (gEeprom.DTMF_SIDE_TONE)
-						{	// user will here the DTMF tones in speaker
-							GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
-							gEnableSpeaker = true;
-						}
-
-						BK4819_DisableScramble();
-
-						if (Code == 0xFE)
-							BK4819_TransmitTone(gEeprom.DTMF_SIDE_TONE, 1750);
+						if (gCurrentVfo->SCRAMBLING_TYPE == 0 || !gSetting_ScrambleEnable)
+							BK4819_DisableScramble();
 						else
-							BK4819_PlayDTMFEx(gEeprom.DTMF_SIDE_TONE, Code);
+							BK4819_EnableScramble(gCurrentVfo->SCRAMBLING_TYPE - 1);
 					}
 				}
+				else
+				{
+					if (gEeprom.DTMF_SIDE_TONE)
+					{	// user will here the DTMF tones in speaker
+						GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+						gEnableSpeaker = true;
+					}
+
+					BK4819_DisableScramble();
+
+					if (Code == 0xFE)
+						BK4819_TransmitTone(gEeprom.DTMF_SIDE_TONE, 1750);
+					else
+						BK4819_PlayDTMFEx(gEeprom.DTMF_SIDE_TONE, Code);
+				}
 			}
-			#if defined(ENABLE_ALARM) || defined(ENABLE_TX1750)
+#if defined(ENABLE_ALARM) || defined(ENABLE_TX1750)
 				else
 				if ((!bKeyHeld && bKeyPressed) || (gAlarmState == ALARM_STATE_TX1750 && bKeyHeld && !bKeyPressed))
 				{
 					ALARM_Off();

-					// TODO:  fix side key 1750, you have to press it twice to restart the tone :(
-
 					if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0)
-					{
-						//if (gCurrentFunction != FUNCTION_FOREGROUND)
-							FUNCTION_Select(FUNCTION_FOREGROUND);
-					}
+						FUNCTION_Select(FUNCTION_FOREGROUND);
 					else
 						gRTTECountdown = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10;

@@ -2323,7 +2347,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 					if (!bKeyHeld)
 						gPttWasReleased = true;
 				}
-			#endif
+#endif
 		}
 		else
 		if (Key != KEY_SIDE1 && Key != KEY_SIDE2)
@@ -2331,10 +2355,9 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 			switch (gScreenToDisplay)
 			{
 				case DISPLAY_MAIN:
+				
 					MAIN_ProcessKeys(Key, bKeyPressed, bKeyHeld);
-
-					bKeyHeld = false;	// allow the channel setting to be saved
-
+//					bKeyHeld = false;	// allow the channel setting to be saved
 					break;

 				#ifdef ENABLE_FMRADIO
@@ -2363,23 +2386,17 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 			}
 		}
 		else
-		#ifdef ENABLE_AIRCOPY
-			if (gScreenToDisplay != DISPLAY_SCANNER && gScreenToDisplay != DISPLAY_AIRCOPY)
-		#else
-			if (gScreenToDisplay != DISPLAY_SCANNER)
-		#endif
+#ifdef ENABLE_AIRCOPY
+		if (gScreenToDisplay != DISPLAY_SCANNER && gScreenToDisplay != DISPLAY_AIRCOPY)
+#else
+		if (gScreenToDisplay != DISPLAY_SCANNER)
+#endif
 		{
 			ACTION_Handle(Key, bKeyPressed, bKeyHeld);
 		}
-		else
-		if (!bKeyHeld && bKeyPressed)
+		else if (!bKeyHeld && bKeyPressed)
 			gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
 	}
-	else
-	{
-		if (Key == KEY_EXIT && bKeyHeld)
-			cancelUserInputModes();
-	}

 Skip:
 	if (gBeepToPlay != BEEP_NONE)
@@ -2401,7 +2418,6 @@ Skip:
 	if (gFlagStopScan)
 	{
 		BK4819_StopScan();
-
 		gFlagStopScan = false;
 	}

@@ -2508,6 +2524,8 @@ Skip:

 	if (gFlagStartScan)
 	{
+		gFlagStartScan = false;
+
 		gMonitor = false;

 		#ifdef ENABLE_VOICE
@@ -2518,7 +2536,6 @@ Skip:
 		SCANNER_Start();

 		gRequestDisplayScreen = DISPLAY_SCANNER;
-		gFlagStartScan        = false;
 	}

 	if (gFlagPrepareTX)
@@ -2538,6 +2555,7 @@ Skip:
 	#endif

 	GUI_SelectNextDisplay(gRequestDisplayScreen);
-
 	gRequestDisplayScreen = DISPLAY_INVALID;
+
+	gUpdateDisplay = true;
 }
--- a/app/dtmf.c
+++ b/app/dtmf.c
@@ -36,9 +36,9 @@
 char              gDTMF_String[15];

 char              gDTMF_InputBox[15];
-uint8_t           gDTMF_InputIndex    = 0;
-bool              gDTMF_InputMode     = false;
-uint8_t           gDTMF_PreviousIndex = 0;
+uint8_t           gDTMF_InputBox_Index = 0;
+bool              gDTMF_InputMode      = false;
+uint8_t           gDTMF_PreviousIndex  = 0;

 char              gDTMF_RX[17];
 uint8_t           gDTMF_RX_index   = 0;
@@ -133,8 +133,26 @@ bool DTMF_FindContact(const char *pContact, char *pResult)

 char DTMF_GetCharacter(const unsigned int code)
 {
-	const char list[] = "0123456789ABCD*#";
-	return (code < ARRAY_SIZE(list)) ? list[code] : 0xFF;
+	switch (code)
+	{
+		case KEY_0:    return '0';
+		case KEY_1:    return '1';
+		case KEY_2:    return '2';
+		case KEY_3:    return '3';
+		case KEY_4:    return '4';
+		case KEY_5:    return '5';
+		case KEY_6:    return '6';
+		case KEY_7:    return '7';
+		case KEY_8:    return '8';
+		case KEY_9:    return '9';
+		case KEY_MENU: return 'A';
+		case KEY_UP:   return 'B';
+		case KEY_DOWN: return 'C';
+		case KEY_EXIT: return 'D';
+		case KEY_STAR: return '*';
+		case KEY_F:    return '#';
+		default:       return 0xff;
+	}
 }

 bool DTMF_CompareMessage(const char *pMsg, const char *pTemplate, const unsigned int size, const bool bCheckGroup)
@@ -163,16 +181,23 @@ DTMF_CallMode_t DTMF_CheckGroupCall(const char *pMsg, const unsigned int size)
 	return (i < size) ? DTMF_CALL_MODE_GROUP : DTMF_CALL_MODE_NOT_GROUP;
 }

+void DTMF_clear_input_box(void)
+{
+	memset(gDTMF_InputBox, 0, sizeof(gDTMF_InputBox));
+	gDTMF_InputBox_Index = 0;
+	gDTMF_InputMode      = false;
+}
+
 void DTMF_Append(const char code)
 {
-	if (gDTMF_InputIndex == 0)
+	if (gDTMF_InputBox_Index == 0)
 	{
-		memset(gDTMF_InputBox, '-', sizeof(gDTMF_InputBox));
+		memset(gDTMF_InputBox, '-', sizeof(gDTMF_InputBox) - 1);
 		gDTMF_InputBox[sizeof(gDTMF_InputBox) - 1] = 0;
 	}

-	if (gDTMF_InputIndex < sizeof(gDTMF_InputBox))
-		gDTMF_InputBox[gDTMF_InputIndex++] = code;
+	if (gDTMF_InputBox_Index < (sizeof(gDTMF_InputBox) - 1))
+		gDTMF_InputBox[gDTMF_InputBox_Index++] = code;
 }

 void DTMF_HandleRequest(void)
--- a/app/dtmf.h
+++ b/app/dtmf.h
@@ -33,7 +33,8 @@ typedef enum DTMF_State_t DTMF_State_t;
 enum DTMF_CallState_t {
 	DTMF_CALL_STATE_NONE = 0,
 	DTMF_CALL_STATE_CALL_OUT,
-	DTMF_CALL_STATE_RECEIVED
+	DTMF_CALL_STATE_RECEIVED,
+	DTMF_CALL_STATE_RECEIVED_STAY
 };

 enum DTMF_DecodeResponse_t {
@@ -60,12 +61,17 @@ enum DTMF_CallMode_t {
 	DTMF_CALL_MODE_DTMF
 };

+enum {  // seconds
+	DTMF_HOLD_MIN =  5,
+	DTMF_HOLD_MAX = 60
+};
+
 typedef enum DTMF_CallMode_t DTMF_CallMode_t;

 extern char              gDTMF_String[15];

 extern char              gDTMF_InputBox[15];
-extern uint8_t           gDTMF_InputIndex;
+extern uint8_t           gDTMF_InputBox_Index;
 extern bool              gDTMF_InputMode;
 extern uint8_t           gDTMF_PreviousIndex;

@@ -98,6 +104,7 @@ bool DTMF_FindContact(const char *pContact, char *pResult);
 char DTMF_GetCharacter(const unsigned int code);
 bool DTMF_CompareMessage(const char *pDTMF, const char *pTemplate, const unsigned int size, const bool bFlag);
 DTMF_CallMode_t DTMF_CheckGroupCall(const char *pDTMF, const unsigned int size);
+void DTMF_clear_input_box(void);
 void DTMF_Append(const char vode);
 void DTMF_HandleRequest(void);
 void DTMF_Reply(void);
--- a/app/fm.c
+++ b/app/fm.c
@@ -45,7 +45,6 @@ bool              gFM_AutoScan;
 uint8_t           gFM_ChannelPosition;
 bool              gFM_FoundFrequency;
 bool              gFM_AutoScan;
-uint8_t           gFM_ResumeCountdown_500ms;
 uint16_t          gFM_RestoreCountdown_10ms;

 bool FM_CheckValidChannel(uint8_t Channel)
--- a/app/fm.h
+++ b/app/fm.h
@@ -39,7 +39,6 @@ extern uint8_t           gFM_ChannelPosition;
 extern uint16_t          gFM_FrequencyDeviation;
 extern bool              gFM_FoundFrequency;
 extern bool              gFM_AutoScan;
-extern uint8_t           gFM_ResumeCountdown_500ms;
 extern uint16_t          gFM_RestoreCountdown_10ms;

 bool    FM_CheckValidChannel(uint8_t Channel);
--- a/app/generic.c
+++ b/app/generic.c
@@ -37,39 +37,35 @@ void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld)
 {
 	if (gInputBoxIndex > 0)
 	{
-		if (!bKeyHeld && bKeyPressed)
+		if (!bKeyHeld && bKeyPressed) // short pressed
 			gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
 		return;
 	}

-	if (bKeyHeld || !bKeyPressed)
+	if (bKeyHeld || !bKeyPressed) // held or released
 	{
-		if (bKeyHeld || bKeyPressed)
+		if (bKeyHeld || bKeyPressed) // held or pressed (cannot be held and not pressed I guess, so it checks only if HELD?)
 		{
-			if (!bKeyHeld)
+			if (!bKeyHeld) // won't ever pass
 				return;

-			if (!bKeyPressed)
+			if (!bKeyPressed) // won't ever pass
 				return;

 			if (gScreenToDisplay != DISPLAY_MENU &&
-			    gScreenToDisplay != DISPLAY_FM &&
-			    #ifdef ENABLE_FMRADIO
-					!gFmRadioMode &&
-			    #endif
 			    gCurrentFunction != FUNCTION_TRANSMIT)
 			{	// toggle the keyboad lock
-	
+
 				#ifdef ENABLE_VOICE
 					gAnotherVoiceID = gEeprom.KEY_LOCK ? VOICE_ID_UNLOCK : VOICE_ID_LOCK;
 				#endif
-	
+
 				gEeprom.KEY_LOCK = !gEeprom.KEY_LOCK;
-	
+
 				gRequestSaveSettings = true;
 			}
 		}
-		else
+		else // released
 		{
 			#ifdef ENABLE_FMRADIO
 				if ((gFmRadioMode || gScreenToDisplay != DISPLAY_MAIN) && gScreenToDisplay != DISPLAY_FM)
@@ -79,7 +75,10 @@ void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld)
 					return;
 			#endif

-			gWasFKeyPressed = !gWasFKeyPressed;
+			gWasFKeyPressed = !gWasFKeyPressed; // toggle F function
+
+			if (gWasFKeyPressed)
+				gKeyInputCountdown = key_input_timeout_500ms;

 			#ifdef ENABLE_VOICE
 				if (!gWasFKeyPressed)
@@ -89,7 +88,7 @@ void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld)
 			gUpdateStatus = true;
 		}
 	}
-	else
+	else // short pressed
 	{
 		if (gScreenToDisplay != DISPLAY_FM)
 		{
@@ -98,7 +97,7 @@ void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld)
 		}

 		#ifdef ENABLE_FMRADIO
-			if (gFM_ScanState == FM_SCAN_OFF)
+			if (gFM_ScanState == FM_SCAN_OFF) // not scanning
 			{
 				gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
 				return;
@@ -106,6 +105,7 @@ void GENERIC_Key_F(bool bKeyPressed, bool bKeyHeld)
 		#endif

 		gBeepToPlay     = BEEP_440HZ_500MS;
+
 		gPttWasReleased = true;
 	}
 }
@@ -115,161 +115,152 @@ void GENERIC_Key_PTT(bool bKeyPressed)
 	gInputBoxIndex = 0;

 	if (!bKeyPressed || gSerialConfigCountDown_500ms > 0)
-	{
-		//if (gScreenToDisplay == DISPLAY_MAIN)
-		{
-			if (gCurrentFunction == FUNCTION_TRANSMIT)
+	{	// PTT released
+		if (gCurrentFunction == FUNCTION_TRANSMIT)
+		{	// we are transmitting .. stop
+
+			if (gFlagEndTransmission)
 			{
-				if (gFlagEndTransmission)
-				{
-					FUNCTION_Select(FUNCTION_FOREGROUND);
-				}
-				else
-				{
-					APP_EndTransmission();
-
-					if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0)
-					{
-						FUNCTION_Select(FUNCTION_FOREGROUND);
-					}
-					else
-						gRTTECountdown = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10;
-				}
-
-				gFlagEndTransmission = false;
-				#ifdef ENABLE_VOX
-					gVOX_NoiseDetected = false;
-				#endif
+				FUNCTION_Select(FUNCTION_FOREGROUND);
 			}
+			else
+			{
+				APP_EndTransmission();
+
+				if (gEeprom.REPEATER_TAIL_TONE_ELIMINATION == 0)
+					FUNCTION_Select(FUNCTION_FOREGROUND);
+				else
+					gRTTECountdown = gEeprom.REPEATER_TAIL_TONE_ELIMINATION * 10;
+			}
+
+			gFlagEndTransmission = false;
+
+			#ifdef ENABLE_VOX
+				gVOX_NoiseDetected = false;
+			#endif

 			RADIO_SetVfoState(VFO_STATE_NORMAL);

 			if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
 				gRequestDisplayScreen = DISPLAY_MAIN;
-
-			return;
 		}

-		gInputBoxIndex = 0;
 		return;
 	}

-	if (gScanStateDir != SCAN_OFF)
-	{
-		SCANNER_Stop();
+	// PTT pressed

-		gPttDebounceCounter   = 0;
-		gPttIsPressed         = false;
+	if (gScanStateDir != SCAN_OFF ||             // frequency/channel scanning
+	    gScreenToDisplay == DISPLAY_SCANNER ||   // CTCSS/CDCSS scanning
+	    gCssScanMode != CSS_SCAN_MODE_OFF)       //   "     "
+	{	// we're scanning .. stop

-		if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
-			gRequestDisplayScreen = DISPLAY_MAIN;
-
-		return;
-	}
-
-	#ifdef ENABLE_FMRADIO
-		if (gFM_ScanState == FM_SCAN_OFF)
-	#endif
-	{
-		if (gCssScanMode == CSS_SCAN_MODE_OFF)
-		{
-			#ifdef ENABLE_FMRADIO
-				if (gScreenToDisplay == DISPLAY_FM)
-				{
-					gRequestDisplayScreen = DISPLAY_MAIN;
-					gInputBoxIndex        = 0;
-					gPttIsPressed         = false;
-					gPttDebounceCounter   = 0;
-					return;
-				}
-			#endif
-
-			if (gScreenToDisplay != DISPLAY_SCANNER)
-			{
-				if (gCurrentFunction == FUNCTION_TRANSMIT && gRTTECountdown == 0)
-				{
-					gInputBoxIndex = 0;
-					return;
-				}
-
-				gFlagPrepareTX = true;
-
-				if (gDTMF_InputMode)
-				{
-					if (gDTMF_InputIndex > 0 || gDTMF_PreviousIndex > 0)
-					{
-						if (gDTMF_InputIndex == 0)
-							gDTMF_InputIndex = gDTMF_PreviousIndex;
-
-						gDTMF_InputBox[gDTMF_InputIndex] = 0;
-
-						#if 0
-							// append our DTMF ID to the inputted DTMF code -
-							//  IF the user inputted code is exactly 3 digits long
-							if (gDTMF_InputIndex == 3)
-								gDTMF_CallMode = DTMF_CheckGroupCall(gDTMF_InputBox, 3);
-							else
-						#else
-							// append our DTMF ID to the inputted DTMF code -
-							//  IF the user inputted code is exactly 3 digits long and D-DCD is enabled
-							if (gDTMF_InputIndex == 3 && gTxVfo->DTMF_DECODING_ENABLE > 0)
-								gDTMF_CallMode = DTMF_CheckGroupCall(gDTMF_InputBox, 3);
-							else
-						#endif
-							gDTMF_CallMode = DTMF_CALL_MODE_DTMF;
-
-						strcpy(gDTMF_String, gDTMF_InputBox);
-
-						gDTMF_PreviousIndex = gDTMF_InputIndex;
-						gDTMF_ReplyState    = DTMF_REPLY_ANI;
-						gDTMF_State         = DTMF_STATE_0;
-					}
-
-					if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
-						gRequestDisplayScreen = DISPLAY_MAIN;
-
-					gDTMF_InputMode = false;
-					gDTMF_InputIndex = 0;
-					return;
-				}
-
-				if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
-					gRequestDisplayScreen = DISPLAY_MAIN;
-
-				gFlagPrepareTX        = true;
-				gInputBoxIndex        = 0;
-
-				return;
-			}
-
-			if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
-				gRequestDisplayScreen    = DISPLAY_MAIN;
-
-			gEeprom.CROSS_BAND_RX_TX = gBackupCROSS_BAND_RX_TX;
-			gUpdateStatus            = true;
+		if (gScreenToDisplay == DISPLAY_SCANNER)
+		{	// CTCSS/CDCSS scanning .. stop
+			gEeprom.CROSS_BAND_RX_TX = gBackup_CROSS_BAND_RX_TX;
 			gFlagStopScan            = true;
 			gVfoConfigureMode        = VFO_CONFIGURE_RELOAD;
 			gFlagResetVfos           = true;
 		}
 		else
-		{
+		if (gScanStateDir != SCAN_OFF)
+		{	// frequency/channel scanning . .stop
+			SCANNER_Stop();
+		}
+		else
+		if (gCssScanMode != CSS_SCAN_MODE_OFF)
+		{	// CTCSS/CDCSS scanning .. stop
 			MENU_StopCssScan();

-			if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
-				gRequestDisplayScreen = DISPLAY_MENU;
+			#ifdef ENABLE_VOICE
+				gAnotherVoiceID = VOICE_ID_SCANNING_STOP;
+			#endif
 		}
+
+		goto cancel_tx;
 	}
-	#ifdef ENABLE_FMRADIO
-		else
-		{
-			FM_PlayAndUpdate();
-			gRequestDisplayScreen = DISPLAY_FM;
-		}
-	#endif

-	#ifdef ENABLE_VOICE
-		gAnotherVoiceID = VOICE_ID_SCANNING_STOP;
-	#endif
+#ifdef ENABLE_FMRADIO
+	if (gFM_ScanState != FM_SCAN_OFF)
+	{	// FM radio is scanning .. stop
+		FM_PlayAndUpdate();
+		#ifdef ENABLE_VOICE
+			gAnotherVoiceID = VOICE_ID_SCANNING_STOP;
+		#endif
+		gRequestDisplayScreen = DISPLAY_FM;
+		goto cancel_tx;
+	}
+#endif

-	gPttWasPressed  = true;
+#ifdef ENABLE_FMRADIO
+	if (gScreenToDisplay == DISPLAY_FM)
+		goto start_tx;	// listening to the FM radio .. start TX'ing
+#endif
+
+	if (gCurrentFunction == FUNCTION_TRANSMIT && gRTTECountdown == 0)
+	{	// already transmitting
+		gInputBoxIndex = 0;
+		return;
+	}
+
+	if (gScreenToDisplay != DISPLAY_MENU)     // 1of11 .. don't close the menu
+		gRequestDisplayScreen = DISPLAY_MAIN;
+
+	if (!gDTMF_InputMode && gDTMF_InputBox_Index == 0)
+		goto start_tx;	// wasn't entering a DTMF code .. start TX'ing (maybe)
+
+	// was entering a DTMF string
+
+	if (gDTMF_InputBox_Index > 0 || gDTMF_PreviousIndex > 0)
+	{	// going to transmit a DTMF string
+
+		if (gDTMF_InputBox_Index == 0 && gDTMF_PreviousIndex > 0)
+			gDTMF_InputBox_Index = gDTMF_PreviousIndex;           // use the previous DTMF string
+
+		if (gDTMF_InputBox_Index < sizeof(gDTMF_InputBox))
+			gDTMF_InputBox[gDTMF_InputBox_Index] = 0;             // NULL term the string
+
+		#if 0
+			// append our DTMF ID to the inputted DTMF code -
+			//  IF the user inputted code is exactly 3 digits long
+			if (gDTMF_InputBox_Index == 3)
+				gDTMF_CallMode = DTMF_CheckGroupCall(gDTMF_InputBox, 3);
+			else
+				gDTMF_CallMode = DTMF_CALL_MODE_DTMF;
+		#else
+			// append our DTMF ID to the inputted DTMF code -
+			//  IF the user inputted code is exactly 3 digits long and D-DCD is enabled
+			if (gDTMF_InputBox_Index == 3 && gTxVfo->DTMF_DECODING_ENABLE > 0)
+				gDTMF_CallMode = DTMF_CheckGroupCall(gDTMF_InputBox, 3);
+			else
+				gDTMF_CallMode = DTMF_CALL_MODE_DTMF;
+		#endif
+
+		// remember the DTMF string
+		gDTMF_PreviousIndex = gDTMF_InputBox_Index;
+		strcpy(gDTMF_String, gDTMF_InputBox);
+
+		gDTMF_ReplyState = DTMF_REPLY_ANI;
+		gDTMF_State      = DTMF_STATE_0;
+	}
+
+	DTMF_clear_input_box();
+
+start_tx:
+	// request start TX
+	gFlagPrepareTX = true;
+	goto done;
+	
+cancel_tx:
+	if (gPttIsPressed)
+	{
+		gPttWasPressed = true;
+	}
+
+done:	
+	gPttDebounceCounter = 0;
+	if (gScreenToDisplay != DISPLAY_MENU && gRequestDisplayScreen != DISPLAY_FM)     // 1of11 .. don't close the menu
+		gRequestDisplayScreen = DISPLAY_MAIN;
+	gUpdateStatus  = true;
+	gUpdateDisplay = true;
 }
--- a/app/main.c
+++ b/app/main.c
@@ -198,7 +198,7 @@ static void processFKeyFunction(const KEY_Code_t Key, const bool beep)
 			gWasFKeyPressed          = false;
 			gFlagStartScan           = true;
 			gScanSingleFrequency     = false;
-			gBackupCROSS_BAND_RX_TX  = gEeprom.CROSS_BAND_RX_TX;
+			gBackup_CROSS_BAND_RX_TX  = gEeprom.CROSS_BAND_RX_TX;
 			gEeprom.CROSS_BAND_RX_TX = CROSS_BAND_OFF;
 			gUpdateStatus            = true;

@@ -534,10 +534,10 @@ static void MAIN_Key_EXIT(bool bKeyPressed, bool bKeyHeld)
 	if (bKeyHeld && bKeyPressed)
 	{	// exit key held down

-		if (gInputBoxIndex > 0)
+		if (gInputBoxIndex > 0 || gDTMF_InputBox_Index > 0 || gDTMF_InputMode)
 		{	// cancel key input mode (channel/frequency entry)
 			gDTMF_InputMode       = false;
-			gDTMF_InputIndex      = 0;
+			gDTMF_InputBox_Index  = 0;
 			memset(gDTMF_String, 0, sizeof(gDTMF_String));
 			gInputBoxIndex        = 0;
 			gRequestDisplayScreen = DISPLAY_MAIN;
@@ -558,6 +558,8 @@ static void MAIN_Key_MENU(const bool bKeyPressed, const bool bKeyHeld)
 		if (bKeyPressed)
 		{	// long press MENU key

+			gWasFKeyPressed = false;
+
 			if (gScreenToDisplay == DISPLAY_MAIN)
 			{
 				if (gInputBoxIndex > 0)
@@ -642,6 +644,9 @@ static void MAIN_Key_MENU(const bool bKeyPressed, const bool bKeyHeld)

 static void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld)
 {
+	if (gCurrentFunction == FUNCTION_TRANSMIT)
+		return;
+	
 	if (gInputBoxIndex)
 	{
 		if (!bKeyHeld && bKeyPressed)
@@ -649,70 +654,67 @@ static void MAIN_Key_STAR(bool bKeyPressed, bool bKeyHeld)
 		return;
 	}

-	if (bKeyHeld || !bKeyPressed)
-	{	// long press
+	if (bKeyHeld && !gWasFKeyPressed)
+	{	// long press .. toggle scanning
+		if (!bKeyPressed)
+			return; // released

-		if (bKeyHeld || bKeyPressed)
-		{
-			if (!bKeyHeld)
-				return;
+		ACTION_Scan(false);

-			if (!bKeyPressed)
-				return;
+		gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
+		return;
+	}

-			ACTION_Scan(false);
-
-			return;
-		}
+	if (bKeyPressed)
+	{	// just pressed
+//		gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
+		gBeepToPlay = BEEP_880HZ_40MS_OPTIONAL;
+		return;
+	}
+	
+	// just released
+	
+	if (!gWasFKeyPressed)
+	{	// pressed without the F-key

 		#ifdef ENABLE_NOAA
 			if (gScanStateDir == SCAN_OFF && IS_NOT_NOAA_CHANNEL(gTxVfo->CHANNEL_SAVE))
 		#else
 			if (gScanStateDir == SCAN_OFF)
 		#endif
-		{
-			gKeyInputCountdown    = key_input_timeout_500ms;
+		{	// start entering a DTMF string
+
+			memmove(gDTMF_InputBox, gDTMF_String, MIN(sizeof(gDTMF_InputBox), sizeof(gDTMF_String) - 1));
+			gDTMF_InputBox_Index  = 0;
 			gDTMF_InputMode       = true;
-			memmove(gDTMF_InputBox, gDTMF_String, sizeof(gDTMF_InputBox));
-			gDTMF_InputIndex      = 0;
+
+			gKeyInputCountdown    = key_input_timeout_500ms;

 			gRequestDisplayScreen = DISPLAY_MAIN;
-			return;
 		}
 	}
 	else
-	{
-		gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
-		if (!gWasFKeyPressed)
-		{
-			gBeepToPlay = BEEP_1KHZ_60MS_OPTIONAL;
-			return;
-		}
-
+	{	// with the F-key
 		gWasFKeyPressed = false;
-		gUpdateStatus   = true;

 		#ifdef ENABLE_NOAA
-			if (IS_NOT_NOAA_CHANNEL(gTxVfo->CHANNEL_SAVE))
-			{
-				gFlagStartScan           = true;
-				gScanSingleFrequency     = true;
-				gBackupCROSS_BAND_RX_TX  = gEeprom.CROSS_BAND_RX_TX;
-				gEeprom.CROSS_BAND_RX_TX = CROSS_BAND_OFF;
-			}
-			else
+			if (IS_NOAA_CHANNEL(gTxVfo->CHANNEL_SAVE))
 			{
 				gBeepToPlay = BEEP_500HZ_60MS_DOUBLE_BEEP_OPTIONAL;
-			}
-		#else
-			gFlagStartScan           = true;
-			gScanSingleFrequency     = true;
-			gBackupCROSS_BAND_RX_TX  = gEeprom.CROSS_BAND_RX_TX;
-			gEeprom.CROSS_BAND_RX_TX = CROSS_BAND_OFF;
+				return;
+			}				
 		#endif

-		gPttWasReleased = true;
+		// scan the CTCSS/DCS code
+		gFlagStartScan           = true;
+		gScanSingleFrequency     = true;
+		gBackup_CROSS_BAND_RX_TX  = gEeprom.CROSS_BAND_RX_TX;
+		gEeprom.CROSS_BAND_RX_TX = CROSS_BAND_OFF;
 	}
+	
+	gPttWasReleased = true;
+
+	gUpdateStatus   = true;
 }

 static void MAIN_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction)
@@ -826,31 +828,25 @@ void MAIN_ProcessKeys(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 		}
 	#endif

-	if (gDTMF_InputMode && bKeyPressed)
+	if (gDTMF_InputMode && bKeyPressed && !bKeyHeld)
 	{
-		if (!bKeyHeld)
-		{
-			const char Character = DTMF_GetCharacter(Key - KEY_0);
-			if (Character != 0xFF)
-			{	// add key to DTMF string
-				DTMF_Append(Character);
-
-				gKeyInputCountdown    = key_input_timeout_500ms;
-
-				gRequestDisplayScreen = DISPLAY_MAIN;
-
-				gPttWasReleased       = true;
-				gBeepToPlay           = BEEP_1KHZ_60MS_OPTIONAL;
-				return;
-			}
+		const char Character = DTMF_GetCharacter(Key);
+		if (Character != 0xFF)
+		{	// add key to DTMF string
+			DTMF_Append(Character);
+			gKeyInputCountdown    = key_input_timeout_500ms;
+			gRequestDisplayScreen = DISPLAY_MAIN;
+			gPttWasReleased       = true;
+			gBeepToPlay           = BEEP_1KHZ_60MS_OPTIONAL;
+			return;
 		}
 	}

 	// TODO: ???
-	if (Key > KEY_PTT)
-	{
-		Key = KEY_SIDE2;      // what's this doing ???
-	}
+//	if (Key > KEY_PTT)
+//	{
+//		Key = KEY_SIDE2;      // what's this doing ???
+//	}

 	switch (Key)
 	{
--- a/app/menu.c
+++ b/app/menu.c
@@ -139,12 +139,7 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)

 		case MENU_TDR:
 			*pMin = 0;
-			*pMax = ARRAY_SIZE(gSubMenu_CHAN) - 1;
-			break;
-
-		case MENU_XB:
-			*pMin = 0;
-			*pMax = ARRAY_SIZE(gSubMenu_XB) - 1;
+			*pMax = ARRAY_SIZE(gSubMenu_RXMode) - 1;
 			break;

 		#ifdef ENABLE_VOICE
@@ -510,7 +505,7 @@ void MENU_AcceptSetting(void)
 				gEeprom.VOX_SWITCH = gSubMenuSelection != 0;
 				if (gEeprom.VOX_SWITCH)
 					gEeprom.VOX_LEVEL = gSubMenuSelection - 1;
-				BOARD_EEPROM_LoadMoreSettings();
+				BOARD_EEPROM_LoadCalibration();
 				gFlagReconfigureVfos = true;
 				gUpdateStatus        = true;
 				break;
@@ -525,24 +520,13 @@ void MENU_AcceptSetting(void)
 			break;

 		case MENU_TDR:
-			gEeprom.DUAL_WATCH   = gSubMenuSelection;
+			gEeprom.DUAL_WATCH = (gEeprom.TX_VFO + 1) * (gSubMenuSelection & 1);
+			gEeprom.CROSS_BAND_RX_TX = (gEeprom.TX_VFO + 1) * ((gSubMenuSelection & 2) > 0);
+
 			gFlagReconfigureVfos = true;
 			gUpdateStatus        = true;
 			break;

-		case MENU_XB:
-			#ifdef ENABLE_NOAA
-				if (IS_NOAA_CHANNEL(gEeprom.ScreenChannel[0]))
-					return;
-				if (IS_NOAA_CHANNEL(gEeprom.ScreenChannel[1]))
-					return;
-			#endif
-
-			gEeprom.CROSS_BAND_RX_TX = gSubMenuSelection;
-			gFlagReconfigureVfos     = true;
-			gUpdateStatus            = true;
-			break;
-
 		case MENU_BEEP:
 			gEeprom.BEEP_CONTROL = gSubMenuSelection;
 			break;
@@ -595,7 +579,7 @@ void MENU_AcceptSetting(void)

 		case MENU_MIC:
 			gEeprom.MIC_SENSITIVITY = gSubMenuSelection;
-			BOARD_EEPROM_LoadMoreSettings();
+			BOARD_EEPROM_LoadCalibration();
 			gFlagReconfigureVfos = true;
 			break;

@@ -674,7 +658,7 @@ void MENU_AcceptSetting(void)
 			{
 				GUI_SelectNextDisplay(DISPLAY_MAIN);
 				gDTMF_InputMode       = true;
-				gDTMF_InputIndex      = 3;
+				gDTMF_InputBox_Index  = 3;
 				memmove(gDTMF_InputBox, gDTMF_ID, 4);
 				gRequestDisplayScreen = DISPLAY_INVALID;
 			}
@@ -956,11 +940,7 @@ void MENU_ShowCurrentSetting(void)
 			break;

 		case MENU_TDR:
-			gSubMenuSelection = gEeprom.DUAL_WATCH;
-			break;
-
-		case MENU_XB:
-			gSubMenuSelection = gEeprom.CROSS_BAND_RX_TX;
+			gSubMenuSelection = (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF) + (gEeprom.CROSS_BAND_RX_TX != CROSS_BAND_OFF) * 2;
 			break;

 		case MENU_BEEP:
--- a/app/scanner.c
+++ b/app/scanner.c
@@ -95,7 +95,7 @@ static void SCANNER_Key_EXIT(bool bKeyPressed, bool bKeyHeld)
 			case 0:
 				gRequestDisplayScreen    = DISPLAY_MAIN;
 				
-				gEeprom.CROSS_BAND_RX_TX = gBackupCROSS_BAND_RX_TX;
+				gEeprom.CROSS_BAND_RX_TX = gBackup_CROSS_BAND_RX_TX;
 				gUpdateStatus            = true;
 				gFlagStopScan            = true;
 				gVfoConfigureMode        = VFO_CONFIGURE_RELOAD;
--- a/bitmaps.c
+++ b/bitmaps.c
@@ -197,26 +197,27 @@ const uint8_t BITMAP_F_Key[6] =
 	};
 #endif

-const uint8_t BITMAP_TDR1[12] =
-{	// "DW"
-	0b00000000,
+const uint8_t BITMAP_TDR1[15] =
+{	// "DWR"
 	0b01111111,
 	0b01000001,
 	0b01000001,
-	0b01000001,
 	0b00111110,
 	0b00000000,
 	0b01111111,
 	0b00100000,
 	0b00011000,
 	0b00100000,
-	0b01111111
+	0b01111111,
+	0b00000000,
+	0b01111111,
+	0b00011001,
+	0b00101001,
+	0b01000110
 };

-const uint8_t BITMAP_TDR2[12] =
+const uint8_t BITMAP_TDR2[9] =
 {	// "><" .. DW on hold
-	0b00000000,
-	0b00000000,
 	0b00100010,
 	0b00110110,
 	0b00011100,
@@ -226,7 +227,6 @@ const uint8_t BITMAP_TDR2[12] =
 	0b00011100,
 	0b00110110,
 	0b00100010,
-	0b00000000
 };

 #ifdef ENABLE_VOICE
@@ -244,27 +244,8 @@ const uint8_t BITMAP_TDR2[12] =
 	};
 #endif

-#ifdef ENABLE_FMRADIO
-	const uint8_t BITMAP_FM[12] =
-	{	// "FM"
-		0b00000000,
-		0b01111111,
-		0b00001001,
-		0b00001001,
-		0b00001001,
-		0b00000001,
-
-		0b00000000,
-		0b01111111,
-		0b00000010,
-		0b00001100,
-		0b00000010,
-		0b01111111
-	};
-#endif
-
 #ifdef ENABLE_NOAA
-	const uint8_t BITMAP_NOAA[12] =
+	const uint8_t BITMAP_NOAA[11] =
 	{	// "NS"
 		0b00000000,
 		0b01111111,
@@ -272,12 +253,10 @@ const uint8_t BITMAP_TDR2[12] =
 		0b00001000,
 		0b00010000,
 		0b01111111,
-
 		0b00000000,
 		0b01000110,
 		0b01001001,
 		0b01001001,
-		0b01001001,
 		0b00110001
 	};
 #endif
--- a/bitmaps.h
+++ b/bitmaps.h
@@ -25,25 +25,17 @@ extern const uint8_t BITMAP_F_Key[6];
 	extern const uint8_t BITMAP_VOX[18];
 #endif

-#if 0
-	extern const uint8_t BITMAP_WX[12];
-#else
-	extern const uint8_t BITMAP_XB[12];
-#endif
+extern const uint8_t BITMAP_XB[12];

-extern const uint8_t BITMAP_TDR1[12];
-extern const uint8_t BITMAP_TDR2[12];
+extern const uint8_t BITMAP_TDR1[15];
+extern const uint8_t BITMAP_TDR2[9];

 #ifdef ENABLE_VOICE
 	extern const uint8_t BITMAP_VoicePrompt[9];
 #endif

-#ifdef ENABLE_FMRADIO
-	extern const uint8_t BITMAP_FM[12];
-#endif
-
 #ifdef ENABLE_NOAA
-	extern const uint8_t BITMAP_NOAA[12];
+	extern const uint8_t BITMAP_NOAA[11];
 #endif

 extern const uint8_t BITMAP_Antenna[5];
--- a/board.c
+++ b/board.c
@@ -739,14 +739,14 @@ void BOARD_EEPROM_Init(void)
 	}
 }

-void BOARD_EEPROM_LoadMoreSettings(void)
+void BOARD_EEPROM_LoadCalibration(void)
 {
 //	uint8_t Mic;

-	EEPROM_ReadBuffer(0x1EC0, gEEPROM_1EC0_0, 8);
-	memmove(gEEPROM_1EC0_1, gEEPROM_1EC0_0, 8);
-	memmove(gEEPROM_1EC0_2, gEEPROM_1EC0_0, 8);
-	memmove(gEEPROM_1EC0_3, gEEPROM_1EC0_0, 8);
+	EEPROM_ReadBuffer(0x1EC0, gEEPROM_RSSI_CALIB[3], 8);
+	memcpy(gEEPROM_RSSI_CALIB[4], gEEPROM_RSSI_CALIB[3], 8);
+	memcpy(gEEPROM_RSSI_CALIB[5], gEEPROM_RSSI_CALIB[3], 8);
+	memcpy(gEEPROM_RSSI_CALIB[6], gEEPROM_RSSI_CALIB[3], 8);

 	// 8 * 16-bit values
 	EEPROM_ReadBuffer(0x1EC0, gEEPROM_RSSI_CALIB[0], 8);
--- a/board.h
+++ b/board.h
@@ -27,7 +27,7 @@ void     BOARD_ADC_Init(void);
 void     BOARD_ADC_GetBatteryInfo(uint16_t *pVoltage, uint16_t *pCurrent);
 void     BOARD_Init(void);
 void     BOARD_EEPROM_Init(void);
-void     BOARD_EEPROM_LoadMoreSettings(void);
+void     BOARD_EEPROM_LoadCalibration(void);
 uint32_t BOARD_fetchChannelFrequency(const int channel);
 void     BOARD_fetchChannelName(char *s, const int channel);
 void     BOARD_FactoryReset(bool bIsAll);
--- a/compile-with-docker.sh
+++ b/compile-with-docker.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 docker build -t uvk5 .
-docker run -v $(PWD)/compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app && make && cp firmware* compiled-firmware/"
+docker run -v ${PWD}/compiled-firmware:/app/compiled-firmware uvk5 /bin/bash -c "cd /app && make && cp firmware* compiled-firmware/"
--- a/driver/keyboard.c
+++ b/driver/keyboard.c
@@ -36,8 +36,8 @@ static const struct {
 	// We are very fortunate.
 	// The key and pin defines fit together in a single u8, making this very efficient
 	struct {
-		uint8_t key : 5; // Key 23 is highest
-		uint8_t pin : 3; // Pin 6 is highest
+		KEY_Code_t key : 5;
+		uint8_t    pin : 3; // Pin 6 is highest
 	} pins[4];

 } keyboard[] = {
@@ -104,6 +104,8 @@ KEY_Code_t KEYBOARD_Poll(void)
 	for (unsigned int j = 0; j < ARRAY_SIZE(keyboard); j++)
 	{
 		uint16_t reg;
+		unsigned int i;
+		unsigned int k;

 		// Set all high
 		GPIOA->DATA |=  1u << GPIOA_PIN_KEYBOARD_4 |
@@ -114,11 +116,22 @@ KEY_Code_t KEYBOARD_Poll(void)
 		// Clear the pin we are selecting
 		GPIOA->DATA &= keyboard[j].set_to_zero_mask;

-		// Wait for the pins to stabilize
-		SYSTICK_DelayUs(1);
+		// Read all 4 GPIO pins at once .. with de-noise, max of 8 sample loops
+		for (i = 0, k = 0, reg = 0; i < 3 && k < 8; i++, k++)
+		{
+			uint16_t reg2;

-		// Read all 4 GPIO pins at once
-		reg = GPIOA->DATA;
+			SYSTICK_DelayUs(1);
+
+			reg2 = GPIOA->DATA;
+			if (reg != reg2)
+			{	// noise
+				reg = reg2;
+				i   = 0;
+			}
+		}
+		if (i < 3)
+			break;	// noise is too bad

 		for (unsigned int i = 0; i < ARRAY_SIZE(keyboard[j].pins); i++)
 		{
--- a/driver/keyboard.h
+++ b/driver/keyboard.h
@@ -21,28 +21,29 @@
 #include <stdbool.h>
 #include <stdint.h>

-typedef enum {
-	KEY_INVALID = 0,
-	KEY_0,
-	KEY_1,
-	KEY_2,
-	KEY_3,
-	KEY_4,
-	KEY_5,
-	KEY_6,
-	KEY_7,
-	KEY_8,
-	KEY_9,
-	KEY_MENU,
-	KEY_UP,
-	KEY_DOWN,
-	KEY_EXIT,
-	KEY_STAR,
-	KEY_F,
-	KEY_PTT,
-	KEY_SIDE2,
-	KEY_SIDE1
-} KEY_Code_t;
+enum KEY_Code_e {
+	KEY_0 = 0,  // 0
+	KEY_1,      // 1
+	KEY_2,      // 2
+	KEY_3,      // 3
+	KEY_4,      // 4
+	KEY_5,      // 5
+	KEY_6,      // 6
+	KEY_7,      // 7
+	KEY_8,      // 8
+	KEY_9,      // 9
+	KEY_MENU,   // A
+	KEY_UP,     // B
+	KEY_DOWN,   // C
+	KEY_EXIT,   // D
+	KEY_STAR,   // *
+	KEY_F,      // #
+	KEY_PTT,    //
+	KEY_SIDE2,  //
+	KEY_SIDE1,  //
+	KEY_INVALID //
+};
+typedef enum KEY_Code_e KEY_Code_t;

 extern KEY_Code_t gKeyReading0;
 extern KEY_Code_t gKeyReading1;
--- a/driver/st7565.c
+++ b/driver/st7565.c
@@ -146,7 +146,7 @@ void ST7565_Init(const bool full)
 	{
 		SPI0_Init();
 	
-		ST7565_Configure_GPIO_B11();
+		ST7565_HardwareReset();
 	
 		SPI_ToggleMasterMode(&SPI0->CR, false);
 	
@@ -199,7 +199,7 @@ void ST7565_Init(const bool full)
 		ST7565_FillScreen(0x00);
 }

-void ST7565_Configure_GPIO_B11(void)
+void ST7565_HardwareReset(void)
 {
 	GPIO_SetBit(&GPIOB->DATA, GPIOB_PIN_ST7565_RES);
 	SYSTEM_DelayMs(1);
--- a/driver/st7565.h
+++ b/driver/st7565.h
@@ -31,7 +31,7 @@ void ST7565_BlitFullScreen(void);
 void ST7565_BlitStatusLine(void);
 void ST7565_FillScreen(uint8_t Value);
 void ST7565_Init(const bool full);
-void ST7565_Configure_GPIO_B11(void);
+void ST7565_HardwareReset(void);
 void ST7565_SelectColumnAndLine(uint8_t Column, uint8_t Line);
 void ST7565_WriteByte(uint8_t Value);

--- a/driver/systick.c
+++ b/driver/systick.c
@@ -29,26 +29,17 @@ void SYSTICK_Init(void)

 void SYSTICK_DelayUs(uint32_t Delay)
 {
-	uint32_t i;
-	uint32_t Start;
-	uint32_t Previous;
-	uint32_t Current;
-	uint32_t Delta;
-
-	i = 0;
-	Start = SysTick->LOAD;
-	Previous = SysTick->VAL;
+	const uint32_t ticks    = Delay * gTickMultiplier;
+	uint32_t       i        = 0;
+	uint32_t       Start    = SysTick->LOAD;
+	uint32_t       Previous = SysTick->VAL;
 	do {
-		do {
-			Current = SysTick->VAL;
-		} while (Current == Previous);
-		if (Current < Previous) {
-			Delta = -Current;
-		} else {
-			Delta = Start - Current;
-		}
-		i += Delta + Previous;
+		uint32_t Current;
+		uint32_t Delta;
+		while ((Current = SysTick->VAL) == Previous) {}
+		Delta    = (Current < Previous) ? -Current : Start - Current;
+		i       += Delta + Previous;
 		Previous = Current;
-	} while (i < Delay * gTickMultiplier);
+	} while (i < ticks);
 }

--- a/functions.c
+++ b/functions.c
@@ -116,8 +116,12 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
 					gFM_RestoreCountdown_10ms = fm_restore_countdown_10ms;
 			#endif

-			if (gDTMF_CallState == DTMF_CALL_STATE_CALL_OUT || gDTMF_CallState == DTMF_CALL_STATE_RECEIVED)
-				gDTMF_auto_reset_time_500ms = 1 + (gEeprom.DTMF_auto_reset_time * 2);
+			if (gDTMF_CallState == DTMF_CALL_STATE_CALL_OUT ||
+			    gDTMF_CallState == DTMF_CALL_STATE_RECEIVED ||
+				gDTMF_CallState == DTMF_CALL_STATE_RECEIVED_STAY)
+			{
+				gDTMF_auto_reset_time_500ms = gEeprom.DTMF_auto_reset_time * 2;
+			}

 			gUpdateStatus = true;
 			return;
--- a/main.c
+++ b/main.c
@@ -84,7 +84,7 @@ void Main(void)

 	BOARD_EEPROM_Init();

-	BOARD_EEPROM_LoadMoreSettings();
+	BOARD_EEPROM_LoadCalibration();

 	RADIO_ConfigureChannel(0, VFO_CONFIGURE_RELOAD);
 	RADIO_ConfigureChannel(1, VFO_CONFIGURE_RELOAD);
--- a/misc.c
+++ b/misc.c
@@ -19,12 +19,13 @@
 #include "misc.h"
 #include "settings.h"

-const uint8_t     fm_resume_countdown_500ms        =  2500 / 500;  // 2.5 seconds
 const uint8_t     fm_radio_countdown_500ms         =  2000 / 500;  // 2 seconds
 const uint16_t    fm_play_countdown_scan_10ms      =   100 / 10;   // 100ms
 const uint16_t    fm_play_countdown_noscan_10ms    =  1200 / 10;   // 1.2 seconds
 const uint16_t    fm_restore_countdown_10ms        =  5000 / 10;   // 5 seconds

+const uint8_t     vfo_state_resume_countdown_500ms =  2500 / 500;  // 2.5 seconds
+
 const uint8_t     menu_timeout_500ms               =  20000 / 500;  // 20 seconds
 const uint16_t    menu_timeout_long_500ms          = 120000 / 500;  // 2 minutes

@@ -109,12 +110,7 @@ bool              bHasCustomAesKey;
 uint32_t          gChallenge[4];
 uint8_t           gTryCount;

-uint8_t           gEEPROM_1EC0_0[8];
-uint8_t           gEEPROM_1EC0_1[8];
-uint8_t           gEEPROM_1EC0_2[8];
-uint8_t           gEEPROM_1EC0_3[8];
-
-uint16_t          gEEPROM_RSSI_CALIB[2][4];
+uint16_t          gEEPROM_RSSI_CALIB[7][4];

 uint16_t          gEEPROM_1F8A;
 uint16_t          gEEPROM_1F8C;
@@ -141,6 +137,8 @@ volatile bool     gTxTimeoutReached;

 volatile uint16_t gTailNoteEliminationCountdown_10ms;

+volatile uint8_t    gVFOStateResumeCountdown_500ms;
+
 #ifdef ENABLE_NOAA
 	volatile uint16_t gNOAA_Countdown_10ms;
 #endif
@@ -220,7 +218,7 @@ bool              gKeyBeingHeld;
 bool              gPttIsPressed;
 uint8_t           gPttDebounceCounter;
 uint8_t           gMenuListCount;
-uint8_t           gBackupCROSS_BAND_RX_TX;
+uint8_t           gBackup_CROSS_BAND_RX_TX;
 uint8_t           gScanDelay_10ms;
 #ifdef ENABLE_AIRCOPY
 	uint8_t       gAircopySendCountdown;
--- a/misc.h
+++ b/misc.h
@@ -24,6 +24,14 @@
 	#define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0]))
 #endif

+#ifndef MAX
+	#define MAX(a, b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a > _b ? _a : _b; })
+#endif
+
+#ifndef MIN
+	#define MIN(a, b) ({ __typeof__ (a) _a = (a); __typeof__ (b) _b = (b); _a < _b ? _a : _b; })
+#endif
+
 #define IS_MR_CHANNEL(x)       ((x) >= MR_CHANNEL_FIRST   && (x) <= MR_CHANNEL_LAST)
 #define IS_FREQ_CHANNEL(x)     ((x) >= FREQ_CHANNEL_FIRST && (x) <= FREQ_CHANNEL_LAST)
 #define IS_VALID_CHANNEL(x)    ((x) < LAST_CHANNEL)
@@ -44,7 +52,8 @@ enum {
 enum {
 	FLASHLIGHT_OFF = 0,
 	FLASHLIGHT_ON,
-	FLASHLIGHT_BLINK
+	FLASHLIGHT_BLINK,
+	FLASHLIGHT_SOS
 };

 enum {
@@ -85,12 +94,13 @@ enum scan_next_chan_t {
 };
 typedef enum scan_next_chan_t scan_next_chan_t;

-extern const uint8_t         fm_resume_countdown_500ms;
 extern const uint8_t         fm_radio_countdown_500ms;
 extern const uint16_t        fm_play_countdown_scan_10ms;
 extern const uint16_t        fm_play_countdown_noscan_10ms;
 extern const uint16_t        fm_restore_countdown_10ms;

+extern const uint8_t        vfo_state_resume_countdown_500ms;
+
 extern const uint8_t         menu_timeout_500ms;
 extern const uint16_t        menu_timeout_long_500ms;

@@ -174,12 +184,7 @@ extern bool                  bHasCustomAesKey;
 extern uint32_t              gChallenge[4];
 extern uint8_t               gTryCount;

-extern uint8_t               gEEPROM_1EC0_0[8];
-extern uint8_t               gEEPROM_1EC0_1[8];
-extern uint8_t               gEEPROM_1EC0_2[8];
-extern uint8_t               gEEPROM_1EC0_3[8];
-
-extern uint16_t              gEEPROM_RSSI_CALIB[2][4];
+extern uint16_t              gEEPROM_RSSI_CALIB[7][4];

 extern uint16_t              gEEPROM_1F8A;
 extern uint16_t              gEEPROM_1F8C;
@@ -283,7 +288,7 @@ extern bool                  gKeyBeingHeld;
 extern bool                  gPttIsPressed;
 extern uint8_t               gPttDebounceCounter;
 extern uint8_t               gMenuListCount;
-extern uint8_t               gBackupCROSS_BAND_RX_TX;
+extern uint8_t               gBackup_CROSS_BAND_RX_TX;
 extern uint8_t               gScanDelay_10ms;
 #ifdef ENABLE_AIRCOPY
 	extern uint8_t           gAircopySendCountdown;
@@ -311,6 +316,7 @@ extern volatile bool         gNextTimeslice40ms;
 	extern volatile bool     gScheduleNOAA;
 #endif
 extern volatile bool         gFlagTailNoteEliminationComplete;
+extern volatile uint8_t      gVFOStateResumeCountdown_500ms;
 #ifdef ENABLE_FMRADIO
 	extern volatile bool     gScheduleFM;
 #endif
--- a/radio.c
+++ b/radio.c
@@ -494,13 +494,13 @@ void RADIO_ConfigureSquelchAndOutputPower(VFO_Info_t *pInfo)
 		glitch_close = (glitch_open * 10) / 9;

 		// ensure the 'close' threshold is lower than the 'open' threshold
-		if (rssi_close   == rssi_open   && rssi_close   > 0)
-			rssi_close--;
-		if (noise_close  == noise_open  && noise_close  < 127)
-			noise_close++;
-		if (glitch_close == glitch_open && glitch_close < 255)
-			glitch_close++;
-		
+		if (rssi_close   == rssi_open   && rssi_close   >= 2)
+			rssi_close -= 2;
+		if (noise_close  == noise_open  && noise_close  <= 125)
+			noise_close += 2;
+		if (glitch_close == glitch_open && glitch_close <= 253)
+			glitch_close += 2;
+
 		pInfo->SquelchOpenRSSIThresh    = (rssi_open    > 255) ? 255 : rssi_open;
 		pInfo->SquelchCloseRSSIThresh   = (rssi_close   > 255) ? 255 : rssi_close;
 		pInfo->SquelchOpenNoiseThresh   = (noise_open   > 127) ? 127 : noise_open;
@@ -898,10 +898,7 @@ void RADIO_SetVfoState(VfoState_t State)
 	{
 		VfoState[0] = VFO_STATE_NORMAL;
 		VfoState[1] = VFO_STATE_NORMAL;
-
-		#ifdef ENABLE_FMRADIO
-			gFM_ResumeCountdown_500ms = 0;
-		#endif
+		gVFOStateResumeCountdown_500ms = 0;
 	}
 	else
 	{
@@ -916,9 +913,7 @@ void RADIO_SetVfoState(VfoState_t State)
 			VfoState[vfo] = State;
 		}

-		#ifdef ENABLE_FMRADIO
-			gFM_ResumeCountdown_500ms = fm_resume_countdown_500ms;
-		#endif
+		gVFOStateResumeCountdown_500ms = vfo_state_resume_countdown_500ms;
 	}

 	gUpdateDisplay = true;
@@ -934,12 +929,13 @@ void RADIO_PrepareTX(void)
 		gDualWatchCountdown_10ms = dual_watch_count_after_tx_10ms;
 		gScheduleDualWatch       = false;

-		if (gRxVfoIsActive)
-		{	// use the TX vfo
+		if (!gRxVfoIsActive)
+		{	// use the current RX vfo
 			gEeprom.RX_VFO = gEeprom.TX_VFO;
 			gRxVfo         = &gEeprom.VfoInfo[gEeprom.TX_VFO];
-//			gRxVfoIsActive = true;
+			gRxVfoIsActive = true;
 		}
+		gCurrentVfo = gRxVfo;

 		// let the user see that DW is not active
 		gDualWatchActive = false;
--- a/ui/battery.c
+++ b/ui/battery.c
@@ -22,66 +22,35 @@
 #include "functions.h"
 #include "ui/battery.h"

-void UI_DisplayBattery(const uint8_t level, const uint8_t blink)
+void UI_DrawBattery(uint8_t* bitmap, uint8_t level, uint8_t blink)
 {
-//	if (gCurrentFunction != FUNCTION_TRANSMIT)
+	if (level < 2 && blink == 1) {
+		memset(bitmap, 0, sizeof(BITMAP_BatteryLevel1));
+	}
+	else 
 	{
-		uint8_t bitmap[sizeof(BITMAP_BatteryLevel1)];
-		
-#if 1
-
-		if (level >= 2)
+		memmove(bitmap, BITMAP_BatteryLevel1, sizeof(BITMAP_BatteryLevel1));
+		if (level > 1)
 		{
-			memmove(bitmap, BITMAP_BatteryLevel1, sizeof(BITMAP_BatteryLevel1));
-			#ifndef ENABLE_REVERSE_BAT_SYMBOL
-				uint8_t *pb = bitmap + sizeof(BITMAP_BatteryLevel1);
-				if (level >= 2)
-					memmove(pb -  4, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-				if (level >= 5)
-					memmove(pb -  7, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-				if (level >= 7)
-					memmove(pb - 10, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-				if (level >= 9)
-					memmove(pb - 13, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-			#else
-				if (level >= 2)
-					memmove(bitmap +  3, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-				if (level >= 5)
-					memmove(bitmap +  6, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-				if (level >= 7)
-					memmove(bitmap +  9, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-				if (level >= 9)
-					memmove(bitmap + 12, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-			#endif
+			unsigned int i;
+			uint8_t bars = level - 1;
+			if (bars > 4)
+				bars = 4;
+			for (i = 0; i < bars; i++)
+			{
+				#ifndef ENABLE_REVERSE_BAT_SYMBOL
+					memcpy(bitmap + sizeof(BITMAP_BatteryLevel1) - 4 - (i * 3), BITMAP_BatteryLevel, 2);
+				#else
+					memcpy(bitmap + 3 + (i * 3) + 0, BITMAP_BatteryLevel, 2);
+				#endif
+			}
 		}
-		else
-		if (blink == 1)
-			memmove(bitmap, BITMAP_BatteryLevel1, sizeof(BITMAP_BatteryLevel1));
-		else
-			memset(bitmap, 0, sizeof(bitmap));
-
-#else
-
-		if (level > 0)
-		{
-			const uint8_t lev = (level <= 11) ? level : 11;
-
-			memmove(bitmap, BITMAP_BatteryLevel1, sizeof(BITMAP_BatteryLevel1));
-
-			#ifdef ENABLE_REVERSE_BAT_SYMBOL
-				for (uint8_t i = 0; i < lev; i++)
-					bitmap[3 + i] = (i & 1u) ? 0b01011101 : 0b01011101;
-			#else
-				for (uint8_t i = 0; i < lev; i++)
-					bitmap[sizeof(bitmap) - 3 - i] = (i & 1u) ? 0b01011101 : 0b01011101;
-			#endif
-		}
-		else
-			memset(bitmap, 0, sizeof(bitmap));
-		
-#endif
-
-		//              col lne, siz, bm
-		ST7565_DrawLine(LCD_WIDTH - sizeof(bitmap), 0, sizeof(bitmap), bitmap);
 	}
 }
+
+void UI_DisplayBattery(uint8_t level, uint8_t blink)
+{
+	uint8_t bitmap[sizeof(BITMAP_BatteryLevel1)];
+	UI_DrawBattery(bitmap, level, blink);
+	ST7565_DrawLine(LCD_WIDTH - sizeof(bitmap), 0, sizeof(bitmap), bitmap);
+}
--- a/ui/battery.h
+++ b/ui/battery.h
@@ -18,8 +18,8 @@
 #define UI_BATTERY_H

 #include <stdint.h>
-
-void UI_DisplayBattery(const uint8_t Level, const uint8_t blink);
+void UI_DrawBattery(uint8_t* bitmap, uint8_t level, uint8_t blink);
+void UI_DisplayBattery(uint8_t Level, uint8_t blink);

 #endif

--- a/ui/main.c
+++ b/ui/main.c
@@ -58,8 +58,8 @@ void UI_drawBars(uint8_t *p, const unsigned int level)
 		case 4: memmove(p + 11, BITMAP_AntennaLevel3, sizeof(BITMAP_AntennaLevel3));
 		case 3: memmove(p +  8, BITMAP_AntennaLevel2, sizeof(BITMAP_AntennaLevel2));
 		case 2: memmove(p +  5, BITMAP_AntennaLevel1, sizeof(BITMAP_AntennaLevel1));
-		case 1: memmove(p +  0, BITMAP_Antenna,       sizeof(BITMAP_Antenna));
-		case 0: break;
+		case 1: memmove(p +  0, BITMAP_Antenna,       sizeof(BITMAP_Antenna)); break;
+		case 0: memset( p +  0, 0,                    sizeof(BITMAP_Antenna)); break;
 	}

 	#pragma GCC diagnostic pop
@@ -101,53 +101,26 @@ void UI_drawBars(uint8_t *p, const unsigned int level)
 				return;  // screen is in use
 			}
 				
-			#if defined(ENABLE_ALARM) || defined(ENABLE_TX1750)
-				if (gAlarmState != ALARM_STATE_OFF)
-					return;
-			#endif
+#if defined(ENABLE_ALARM) || defined(ENABLE_TX1750)
+			if (gAlarmState != ALARM_STATE_OFF)
+				return;
+#endif
+			const unsigned int voice_amp  = BK4819_GetVoiceAmplitudeOut();  // 15:0
+	
+			// make non-linear to make more sensitive at low values
+			const unsigned int level      = voice_amp * 8;
+			const unsigned int sqrt_level = sqrt16((level < 65535) ? level : 65535);
+			const unsigned int len        = (sqrt_level <= bar_width) ? sqrt_level : bar_width;

-			{
-				#if 1
-					// TX audio level
+			uint8_t *p_line = gFrameBuffer[line];
 	
-					const unsigned int voice_amp  = BK4819_GetVoiceAmplitudeOut();  // 15:0
+			memset(p_line, 0, LCD_WIDTH);
 	
-//					const unsigned int max        = 65535;
-//					const unsigned int level      = ((voice_amp * bar_width) + (max / 2)) / max;            // with rounding
-//					const unsigned int len        = (level <= bar_width) ? level : bar_width;
-	
-					// make non-linear to make more sensitive at low values
-					const unsigned int level      = voice_amp * 8;
-					const unsigned int sqrt_level = sqrt16((level < 65535) ? level : 65535);
-					const unsigned int len        = (sqrt_level <= bar_width) ? sqrt_level : bar_width;
-	
-				#else
-					// TX/RX AF input level (dB)
-	
-					const uint8_t      af_tx_rx   = BK4819_GetAfTxRx();             //  6:0
-					const unsigned int max        = 63;
-					const unsigned int level      = (((uint16_t)af_tx_rx * bar_width) + (max / 2)) / max;   // with rounding
-					const unsigned int len        = (level <= bar_width) ? level : bar_width;
-	
-				#endif
-	
-				uint8_t *p_line = gFrameBuffer[line];
-	
-				memset(p_line, 0, LCD_WIDTH);
-	
-				#if 1
-					// solid bar
-					for (i = 0; i < bar_width; i++)
-						p_line[bar_x + i] = (i > len) ? ((i & 1) == 0) ? 0x41 : 0x00 : ((i & 1) == 0) ? 0x7f : 0x3e;
-				#else
-					// knuled bar
-					for (i = 0; i < bar_width; i += 2)
-						p_line[bar_x + i] = (i <= len) ? 0x7f : 0x41;
-				#endif
-	
-				if (gCurrentFunction == FUNCTION_TRANSMIT)
-					ST7565_BlitFullScreen();
-			}
+			for (i = 0; i < bar_width; i++)
+				p_line[bar_x + i] = (i > len) ? ((i & 1) == 0) ? 0x41 : 0x00 : ((i & 1) == 0) ? 0x7f : 0x3e;
+
+			if (gCurrentFunction == FUNCTION_TRANSMIT)
+				ST7565_BlitFullScreen();
 		}
 	}
 #endif
@@ -245,24 +218,13 @@ void UI_UpdateRSSI(const int16_t rssi, const int vfo)
 		const uint8_t Line  = (vfo == 0) ? 3 : 7;
 		uint8_t      *p_line = gFrameBuffer[Line - 1];

-		// TODO: sort out all 8 values from the eeprom

-		#if 0
-			// dBm     -105  -100  -95   -90      -70   -65   -60   -55
-			// RSSI     110   120   130   140      180   190   200   210
-			// 0000C0   6E 00 78 00 82 00 8C 00    B4 00 BE 00 C8 00 D2 00
-			//
-			const unsigned int band = 1;
-			const int16_t level0  = gEEPROM_RSSI_CALIB[band][0];
-			const int16_t level1  = gEEPROM_RSSI_CALIB[band][1];
-			const int16_t level2  = gEEPROM_RSSI_CALIB[band][2];
-			const int16_t level3  = gEEPROM_RSSI_CALIB[band][3];
-		#else
-			const int16_t level0  = (-115 + 160) * 2;   // dB
-			const int16_t level1  = ( -89 + 160) * 2;   // dB
-			const int16_t level2  = ( -64 + 160) * 2;   // dB
-			const int16_t level3  = ( -39 + 160) * 2;   // dB
-		#endif
+		const unsigned int band = gRxVfo->Band;
+		const int16_t level0  = gEEPROM_RSSI_CALIB[band][0];
+		const int16_t level1  = gEEPROM_RSSI_CALIB[band][1];
+		const int16_t level2  = gEEPROM_RSSI_CALIB[band][2];
+		const int16_t level3  = gEEPROM_RSSI_CALIB[band][3];
+
 		const int16_t level01 = (level0 + level1) / 2;
 		const int16_t level12 = (level1 + level2) / 2;
 		const int16_t level23 = (level2 + level3) / 2;
@@ -341,30 +303,23 @@ void UI_DisplayMain(void)
 		return;
 	}

+	unsigned int activeTxVFO = (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF && gRxVfoIsActive) ? gEeprom.RX_VFO : gEeprom.TX_VFO;
+
 	for (vfo_num = 0; vfo_num < 2; vfo_num++)
 	{
 		const unsigned int line       = (vfo_num == 0) ? line0 : line1;
-		unsigned int       channel    = gEeprom.TX_VFO;
-//		unsigned int       tx_channel = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_VFO : gEeprom.TX_VFO;
-		const bool         same_vfo   = (channel == vfo_num) ? true : false;
+		const bool         isTxVFO   = (vfo_num == gEeprom.TX_VFO);
 		uint8_t           *p_line0    = gFrameBuffer[line + 0];
 		uint8_t           *p_line1    = gFrameBuffer[line + 1];
 		unsigned int       mode       = 0;
-		unsigned int       state;

 		if (single_vfo)
 		{	// we're in single VFO mode - screen is dedicated to just one VFO
-
-			if (!same_vfo)
+			if (!isTxVFO)
 				continue;  // skip the unused vfo
-
-
 		}

-		if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF && gRxVfoIsActive)
-			channel = gEeprom.RX_VFO;    // we're currently monitoring the other VFO
-
-		if (channel != vfo_num)
+		if (activeTxVFO != vfo_num)
 		{
 			if (gDTMF_CallState != DTMF_CALL_STATE_NONE || gDTMF_IsTx || gDTMF_InputMode)
 			{	// show DTMF stuff
@@ -377,7 +332,7 @@ void UI_DisplayMain(void)
 					if (gDTMF_CallState == DTMF_CALL_STATE_CALL_OUT)
 						strcpy(String, (gDTMF_State == DTMF_STATE_CALL_OUT_RSP) ? "CALL OUT(RSP)" : "CALL OUT");
 					else
-					if (gDTMF_CallState == DTMF_CALL_STATE_RECEIVED)
+					if (gDTMF_CallState == DTMF_CALL_STATE_RECEIVED || gDTMF_CallState == DTMF_CALL_STATE_RECEIVED_STAY)
 						sprintf(String, "CALL FRM:%s", (DTMF_FindContact(gDTMF_Caller, Contact)) ? Contact : gDTMF_Caller);
 					else
 					if (gDTMF_IsTx)
@@ -386,10 +341,8 @@ void UI_DisplayMain(void)
 				else
 				{
 					sprintf(String, ">%s", gDTMF_InputBox);
-
-					center_line = CENTER_LINE_IN_USE;
 				}
-				UI_PrintString(String, 2, 0, vfo_num * 3, 8);
+				UI_PrintString(String, 2, 0, 0 + (vfo_num * 3), 8);

 				memset(String,  0, sizeof(String));
 				if (!gDTMF_InputMode)
@@ -398,16 +351,12 @@ void UI_DisplayMain(void)
 					if (gDTMF_CallState == DTMF_CALL_STATE_CALL_OUT)
 						sprintf(String, ">%s", (DTMF_FindContact(gDTMF_String, Contact)) ? Contact : gDTMF_String);
 					else
-					if (gDTMF_CallState == DTMF_CALL_STATE_RECEIVED)
+					if (gDTMF_CallState == DTMF_CALL_STATE_RECEIVED || gDTMF_CallState == DTMF_CALL_STATE_RECEIVED_STAY)
 						sprintf(String, ">%s", (DTMF_FindContact(gDTMF_Callee, Contact)) ? Contact : gDTMF_Callee);
 					else
 					if (gDTMF_IsTx)
 						sprintf(String, ">%s", gDTMF_String);
 				}
-				else
-				{
-					center_line = CENTER_LINE_IN_USE;
-				}
 				UI_PrintString(String, 2, 0, 2 + (vfo_num * 3), 8);

 				center_line = CENTER_LINE_IN_USE;
@@ -415,19 +364,14 @@ void UI_DisplayMain(void)
 			}

 			// highlight the selected/used VFO with a marker
-			if (!single_vfo && same_vfo)
+			if (!single_vfo && isTxVFO)
 				memmove(p_line0 + 0, BITMAP_VFO_Default, sizeof(BITMAP_VFO_Default));
-			else
-			if (gEeprom.CROSS_BAND_RX_TX != CROSS_BAND_OFF)
-				memmove(p_line0 + 0, BITMAP_VFO_NotDefault, sizeof(BITMAP_VFO_NotDefault));
 		}
-		else
-		if (!single_vfo)
+		else if (!single_vfo)
 		{	// highlight the selected/used VFO with a marker
-			if (same_vfo)
+			if (isTxVFO)
 				memmove(p_line0 + 0, BITMAP_VFO_Default, sizeof(BITMAP_VFO_Default));
 			else
-			//if (gEeprom.CROSS_BAND_RX_TX != CROSS_BAND_OFF)
 				memmove(p_line0 + 0, BITMAP_VFO_NotDefault, sizeof(BITMAP_VFO_NotDefault));
 		}

@@ -440,8 +384,8 @@ void UI_DisplayMain(void)
 				else
 			#endif
 			{
-				channel = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_VFO : gEeprom.TX_VFO;
-				if (channel == vfo_num)
+				activeTxVFO = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_VFO : gEeprom.TX_VFO;
+				if (activeTxVFO == vfo_num)
 				{	// show the TX symbol
 					mode = 1;
 					#ifdef ENABLE_SMALL_BOLD
@@ -505,7 +449,7 @@ void UI_DisplayMain(void)

 		// ************

-		state = VfoState[vfo_num];
+		unsigned int state = VfoState[vfo_num];

 		#ifdef ENABLE_ALARM
 			if (gCurrentFunction == FUNCTION_TRANSMIT && gAlarmState == ALARM_STATE_ALARM)
@@ -534,8 +478,8 @@ void UI_DisplayMain(void)
 			uint32_t frequency = gEeprom.VfoInfo[vfo_num].pRX->Frequency;
 			if (gCurrentFunction == FUNCTION_TRANSMIT)
 			{	// transmitting
-				channel = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_VFO : gEeprom.TX_VFO;
-				if (channel == vfo_num)
+				activeTxVFO = (gEeprom.CROSS_BAND_RX_TX == CROSS_BAND_OFF) ? gEeprom.RX_VFO : gEeprom.TX_VFO;
+				if (activeTxVFO == vfo_num)
 					frequency = gEeprom.VfoInfo[vfo_num].pTX->Frequency;
 			}

--- a/ui/menu.c
+++ b/ui/menu.c
@@ -43,71 +43,70 @@ const t_menu_item MenuList[] =
 {
 //   text,     voice ID,                               menu ID

-	{"SQL",    VOICE_ID_SQUELCH,                       MENU_SQL           },
-	{"STEP",   VOICE_ID_FREQUENCY_STEP,                MENU_STEP          },
-	{"T PWR",  VOICE_ID_POWER,                         MENU_TXP           }, // was "TXP"
-	{"R DCS",  VOICE_ID_DCS,                           MENU_R_DCS         }, // was "R_DCS"
-	{"R CTCS", VOICE_ID_CTCSS,                         MENU_R_CTCS        }, // was "R_CTCS"
-	{"T DCS",  VOICE_ID_DCS,                           MENU_T_DCS         }, // was "T_DCS"
-	{"T CTCS", VOICE_ID_CTCSS,                         MENU_T_CTCS        }, // was "T_CTCS"
-	{"T DIR",  VOICE_ID_TX_OFFSET_FREQUENCY_DIRECTION, MENU_SFT_D         }, // was "SFT_D"
-	{"T OFFS", VOICE_ID_TX_OFFSET_FREQUENCY,           MENU_OFFSET        }, // was "OFFSET"
-	{"T VFO",  VOICE_ID_INVALID,                       MENU_XB            }, // was "WX"
-	{"T TOUT", VOICE_ID_TRANSMIT_OVER_TIME,            MENU_TOT           }, // was "TOT"
+	{"Sql",    VOICE_ID_SQUELCH,                       MENU_SQL           },
+	{"Step",   VOICE_ID_FREQUENCY_STEP,                MENU_STEP          },
+	{"TxPwr",  VOICE_ID_POWER,                         MENU_TXP           }, // was "TXP"
+	{"RxDCS",  VOICE_ID_DCS,                           MENU_R_DCS         }, // was "R_DCS"
+	{"RxCTCS", VOICE_ID_CTCSS,                         MENU_R_CTCS        }, // was "R_CTCS"
+	{"TxDCS",  VOICE_ID_DCS,                           MENU_T_DCS         }, // was "T_DCS"
+	{"TxCTCS", VOICE_ID_CTCSS,                         MENU_T_CTCS        }, // was "T_CTCS"
+	{"TxODir",  VOICE_ID_TX_OFFSET_FREQUENCY_DIRECTION, MENU_SFT_D         }, // was "SFT_D"
+	{"TxOffs", VOICE_ID_TX_OFFSET_FREQUENCY,           MENU_OFFSET        }, // was "OFFSET"
+	{"TxTOut", VOICE_ID_TRANSMIT_OVER_TIME,            MENU_TOT           }, // was "TOT"
 	{"W/N",    VOICE_ID_CHANNEL_BANDWIDTH,             MENU_W_N           },
-	{"SCRAM",  VOICE_ID_SCRAMBLER_ON,                  MENU_SCR           }, // was "SCR"
-	{"BUSYCL", VOICE_ID_BUSY_LOCKOUT,                  MENU_BCL           }, // was "BCL"
-	{"CH SAV", VOICE_ID_MEMORY_CHANNEL,                MENU_MEM_CH        }, // was "MEM-CH"
-	{"CH DEL", VOICE_ID_DELETE_CHANNEL,                MENU_DEL_CH        }, // was "DEL-CH"
-	{"CH NAM", VOICE_ID_INVALID,                       MENU_MEM_NAME      },
-	{"CH DIS", VOICE_ID_INVALID,                       MENU_MDF           }, // was "MDF"
-	{"BATSAV", VOICE_ID_SAVE_MODE,                     MENU_SAVE          }, // was "SAVE"
+	{"Scramb", VOICE_ID_SCRAMBLER_ON,                  MENU_SCR           }, // was "SCR"
+	{"BusyCL", VOICE_ID_BUSY_LOCKOUT,                  MENU_BCL           }, // was "BCL"
+	{"ChSave", VOICE_ID_MEMORY_CHANNEL,                MENU_MEM_CH        }, // was "MEM-CH"
+	{"ChDele",  VOICE_ID_DELETE_CHANNEL,                MENU_DEL_CH        }, // was "DEL-CH"
+	{"ChName", VOICE_ID_INVALID,                       MENU_MEM_NAME      },
+	{"ChDisp", VOICE_ID_INVALID,                       MENU_MDF           }, // was "MDF"
+	{"BatSav", VOICE_ID_SAVE_MODE,                     MENU_SAVE          }, // was "SAVE"
 #ifdef ENABLE_VOX
 	{"VOX",    VOICE_ID_VOX,                           MENU_VOX           },
 #endif
-	{"BLT",    VOICE_ID_INVALID,                       MENU_ABR           }, // was "ABR"
-	{"BLTTRX", VOICE_ID_INVALID,                       MENU_ABR_ON_TX_RX  },
-	{"DUALRX", VOICE_ID_DUAL_STANDBY,                  MENU_TDR           }, // was "TDR"
-	{"BEEP",   VOICE_ID_BEEP_PROMPT,                   MENU_BEEP          },
+	{"BackLt",    VOICE_ID_INVALID,                       MENU_ABR           }, // was "ABR"
+	{"BltTRX", VOICE_ID_INVALID,                       MENU_ABR_ON_TX_RX  },
+	{"RxMode", VOICE_ID_DUAL_STANDBY,                  MENU_TDR           },
+	{"Beep",   VOICE_ID_BEEP_PROMPT,                   MENU_BEEP          },
 #ifdef ENABLE_VOICE
-	{"VOICE",  VOICE_ID_VOICE_PROMPT,                  MENU_VOICE         },
+	{"Voice",  VOICE_ID_VOICE_PROMPT,                  MENU_VOICE         },
 #endif
-	{"SC REV", VOICE_ID_INVALID,                       MENU_SC_REV        },
-	{"KEYLOC", VOICE_ID_INVALID,                       MENU_AUTOLK        }, // was "AUTOLk"
-	{"S ADD1", VOICE_ID_INVALID,                       MENU_S_ADD1        },
-	{"S ADD2", VOICE_ID_INVALID,                       MENU_S_ADD2        },
+	{"ScnRev", VOICE_ID_INVALID,                       MENU_SC_REV        },
+	{"KeyLck", VOICE_ID_INVALID,                       MENU_AUTOLK        }, // was "AUTOLk"
+	{"ScAdd1", VOICE_ID_INVALID,                       MENU_S_ADD1        },
+	{"ScAdd2", VOICE_ID_INVALID,                       MENU_S_ADD2        },
 	{"STE",    VOICE_ID_INVALID,                       MENU_STE           },
 	{"RP STE", VOICE_ID_INVALID,                       MENU_RP_STE        },
-	{"MIC",    VOICE_ID_INVALID,                       MENU_MIC           },
+	{"Mic",    VOICE_ID_INVALID,                       MENU_MIC           },
 #ifdef ENABLE_AUDIO_BAR
-	{"MICBAR", VOICE_ID_INVALID,                       MENU_MIC_BAR       },
+	{"MicBar", VOICE_ID_INVALID,                       MENU_MIC_BAR       },
 #endif
-	{"COMPND", VOICE_ID_INVALID,                       MENU_COMPAND       },
-	{"1 CALL", VOICE_ID_INVALID,                       MENU_1_CALL        },
-	{"SLIST",  VOICE_ID_INVALID,                       MENU_S_LIST        },
-	{"SLIST1", VOICE_ID_INVALID,                       MENU_SLIST1        },
-	{"SLIST2", VOICE_ID_INVALID,                       MENU_SLIST2        },
+	{"Compnd", VOICE_ID_INVALID,                       MENU_COMPAND       },
+	{"1 Call", VOICE_ID_INVALID,                       MENU_1_CALL        },
+	{"SList",  VOICE_ID_INVALID,                       MENU_S_LIST        },
+	{"SList1", VOICE_ID_INVALID,                       MENU_SLIST1        },
+	{"SList2", VOICE_ID_INVALID,                       MENU_SLIST2        },
 #ifdef ENABLE_ALARM
-	{"AL-MOD", VOICE_ID_INVALID,                       MENU_AL_MOD        },
+	{"AlarmT", VOICE_ID_INVALID,                       MENU_AL_MOD        },
 #endif
 	{"ANI ID", VOICE_ID_ANI_CODE,                      MENU_ANI_ID        },
-	{"UPCODE", VOICE_ID_INVALID,                       MENU_UPCODE        },
-	{"DWCODE", VOICE_ID_INVALID,                       MENU_DWCODE        },
+	{"UPCode", VOICE_ID_INVALID,                       MENU_UPCODE        },
+	{"DWCode", VOICE_ID_INVALID,                       MENU_DWCODE        },
 	{"PTT ID", VOICE_ID_INVALID,                       MENU_PTT_ID        },
 	{"D ST",   VOICE_ID_INVALID,                       MENU_D_ST          },
-    {"D RSP",  VOICE_ID_INVALID,                       MENU_D_RSP         },
-	{"D HOLD", VOICE_ID_INVALID,                       MENU_D_HOLD        },
-	{"D PRE",  VOICE_ID_INVALID,                       MENU_D_PRE         },
-	{"D DCD",  VOICE_ID_INVALID,                       MENU_D_DCD         },
-	{"D LIST", VOICE_ID_INVALID,                       MENU_D_LIST        },
-	{"D LIVE", VOICE_ID_INVALID,                       MENU_D_LIVE_DEC    }, // live DTMF decoder
-	{"PONMSG", VOICE_ID_INVALID,                       MENU_PONMSG        },
-	{"ROGER",  VOICE_ID_INVALID,                       MENU_ROGER         },
-	{"BATVOL", VOICE_ID_INVALID,                       MENU_VOL           }, // was "VOL"
-	{"BATTXT", VOICE_ID_INVALID,                       MENU_BAT_TXT       },
-	{"MODE",   VOICE_ID_INVALID,                       MENU_AM            }, // was "AM"
+    {"D Resp", VOICE_ID_INVALID,                      MENU_D_RSP         },
+	{"D Hold", VOICE_ID_INVALID,                       MENU_D_HOLD        },
+	{"D Prel", VOICE_ID_INVALID,                      MENU_D_PRE         },
+	{"D Decd", VOICE_ID_INVALID,                       MENU_D_DCD         },
+	{"D List", VOICE_ID_INVALID,                       MENU_D_LIST        },
+	{"D Live", VOICE_ID_INVALID,                       MENU_D_LIVE_DEC    }, // live DTMF decoder
+	{"POnMsg", VOICE_ID_INVALID,                       MENU_PONMSG        },
+	{"Roger",  VOICE_ID_INVALID,                       MENU_ROGER         },
+	{"BatVol", VOICE_ID_INVALID,                       MENU_VOL           }, // was "VOL"
+	{"BatTxt", VOICE_ID_INVALID,                       MENU_BAT_TXT       },
+	{"Demodu", VOICE_ID_INVALID,                       MENU_AM          }, // was "AM"
 #ifdef ENABLE_AM_FIX
-	{"AM FIX", VOICE_ID_INVALID,                       MENU_AM_FIX        },
+	{"AM Fix", VOICE_ID_INVALID,                       MENU_AM_FIX        },
 #endif
 #ifdef ENABLE_AM_FIX_TEST1
 	{"AM FT1", VOICE_ID_INVALID,                       MENU_AM_FIX_TEST1  },
@@ -115,23 +114,23 @@ const t_menu_item MenuList[] =
 #ifdef ENABLE_NOAA
 	{"NOAA-S", VOICE_ID_INVALID,                       MENU_NOAA_S        },
 #endif
-	{"RESET",  VOICE_ID_INITIALISATION,                MENU_RESET         }, // might be better to move this to the hidden menu items ?
+	{"Reset",  VOICE_ID_INITIALISATION,                MENU_RESET         }, // might be better to move this to the hidden menu items ?

 	// hidden menu items from here on
 	// enabled if pressing both the PTT and upper side button at power-on

-	{"F LOCK", VOICE_ID_INVALID,                       MENU_F_LOCK        },
-	{"TX 200", VOICE_ID_INVALID,                       MENU_200TX         }, // was "200TX"
-	{"TX 350", VOICE_ID_INVALID,                       MENU_350TX         }, // was "350TX"
-	{"TX 500", VOICE_ID_INVALID,                       MENU_500TX         }, // was "500TX"
-	{"350 EN", VOICE_ID_INVALID,                       MENU_350EN         }, // was "350EN"
-	{"SCR EN", VOICE_ID_INVALID,                       MENU_SCREN         }, // was "SCREN"
+	{"F Lock", VOICE_ID_INVALID,                       MENU_F_LOCK        },
+	{"Tx 200", VOICE_ID_INVALID,                       MENU_200TX         }, // was "200TX"
+	{"Tx 350", VOICE_ID_INVALID,                       MENU_350TX         }, // was "350TX"
+	{"Tx 500", VOICE_ID_INVALID,                       MENU_500TX         }, // was "500TX"
+	{"350 En", VOICE_ID_INVALID,                       MENU_350EN         }, // was "350EN"
+	{"ScraEn", VOICE_ID_INVALID,                       MENU_SCREN         }, // was "SCREN"

-	{"TX EN",  VOICE_ID_INVALID,                       MENU_TX_EN         }, // enable TX
+	{"TxEnab",  VOICE_ID_INVALID,                       MENU_TX_EN         }, // enable TX
 #ifdef ENABLE_F_CAL_MENU
-	{"F CALI", VOICE_ID_INVALID,                       MENU_F_CALI        }, // reference xtal calibration
+	{"FrCali", VOICE_ID_INVALID,                       MENU_F_CALI        }, // reference xtal calibration
 #endif
-	{"BATCAL", VOICE_ID_INVALID,                       MENU_BATCAL        }, // battery voltage calibration
+	{"BatCal", VOICE_ID_INVALID,                       MENU_BATCAL        }, // battery voltage calibration

 	{"",       VOICE_ID_INVALID,                       0xff               }  // end of list - DO NOT delete or move this this
 };
@@ -186,18 +185,12 @@ const char gSubMenu_TOT[11][7] =
 	"15 min"
 };

-const char gSubMenu_CHAN[3][10] =
+const char* gSubMenu_RXMode[4] =
 {
-	"OFF",
-	"UPPER\nVFO",
-	"LOWER\nVFO"
-};
-
-const char gSubMenu_XB[3][10] =
-{
-	"MAIN\nVFO",
-	"UPPER\nVFO",
-	"LOWER\nVFO"
+	"MAIN\nONLY", // TX and RX on main only
+	"DUAL RX\nRESPOND", // Watch both and respond
+	"CROSS\nBAND", // TX on main, RX on secondary
+	"MAIN TX\nDUAL RX" // always TX on main, but RX on both
 };

 #ifdef ENABLE_VOICE
@@ -209,14 +202,14 @@ const char gSubMenu_XB[3][10] =
 	};
 #endif

-const char gSubMenu_SC_REV[3][13] =
+const char gSubMenu_SC_REV[3][8] =
 {
 	"TIME",
 	"CARRIER",
 	"SEARCH"
 };

-const char gSubMenu_MDF[4][15] =
+const char* gSubMenu_MDF[4] =
 {
 	"FREQ",
 	"CHANNEL\nNUMBER",
@@ -240,7 +233,7 @@ const char gSubMenu_D_RSP[4][11] =
 	"BOTH"
 };

-const char gSubMenu_PTT_ID[5][15] =
+const char* gSubMenu_PTT_ID[5] =
 {
 	"OFF",
 	"KEY\nUP",
@@ -680,11 +673,7 @@ void UI_DisplayMenu(void)
 			break;

 		case MENU_TDR:
-			strcpy(String, gSubMenu_CHAN[gSubMenuSelection]);
-			break;
-
-		case MENU_XB:
-			strcpy(String, gSubMenu_XB[gSubMenuSelection]);
+			strcpy(String, gSubMenu_RXMode[gSubMenuSelection]);
 			break;

 		case MENU_TOT:
--- a/ui/menu.h
+++ b/ui/menu.h
@@ -39,7 +39,6 @@ enum
 	MENU_T_CTCS,
 	MENU_SFT_D,
 	MENU_OFFSET,
-	MENU_XB,
 	MENU_TOT,
 	MENU_W_N,
 	MENU_SCR,
@@ -128,18 +127,18 @@ extern const char        gSubMenu_W_N[2][7];
 extern const char        gSubMenu_OFF_ON[2][4];
 extern const char        gSubMenu_SAVE[5][4];
 extern const char        gSubMenu_TOT[11][7];
-extern const char        gSubMenu_CHAN[3][10];
-extern const char        gSubMenu_XB[3][10];
+extern const char*        gSubMenu_RXMode[4];
+
 #ifdef ENABLE_VOICE
 	extern const char    gSubMenu_VOICE[3][4];
 #endif
-extern const char        gSubMenu_SC_REV[3][13];
-extern const char        gSubMenu_MDF[4][15];
+extern const char        gSubMenu_SC_REV[3][8];
+extern const char*       gSubMenu_MDF[4];
 #ifdef ENABLE_ALARM
 	extern const char    gSubMenu_AL_MOD[2][5];
 #endif
 extern const char        gSubMenu_D_RSP[4][11];
-extern const char        gSubMenu_PTT_ID[5][15];
+extern const char*       gSubMenu_PTT_ID[5];
 extern const char        gSubMenu_PONMSG[4][8];
 extern const char        gSubMenu_ROGER[3][9];
 extern const char        gSubMenu_RESET[2][4];
--- a/ui/status.c
+++ b/ui/status.c
@@ -28,6 +28,7 @@
 #include "helper/battery.h"
 #include "misc.h"
 #include "settings.h"
+#include "ui/battery.h"
 #include "ui/helper.h"
 #include "ui/ui.h"
 #include "ui/status.h"
@@ -84,15 +85,6 @@ void UI_DisplayStatus(const bool test_display)
 		x1 = x + 10;
 	}
 	else
-	#ifdef ENABLE_FMRADIO
-		// FM indicator
-		if (gFmRadioMode || test_display)
-		{
-			memmove(line + x, BITMAP_FM, sizeof(BITMAP_FM));
-			x1 = x + sizeof(BITMAP_FM);
-		}
-		else
-	#endif
 		// SCAN indicator
 		if (gScanStateDir != SCAN_OFF || gScreenToDisplay == DISPLAY_SCANNER || test_display)
 		{
@@ -122,28 +114,23 @@ void UI_DisplayStatus(const bool test_display)
 			memmove(line + x, BITMAP_VoicePrompt, sizeof(BITMAP_VoicePrompt));
 			x1 = x + sizeof(BITMAP_VoicePrompt);
 		}
-		x += sizeof(BITMAP_VoicePrompt);
+		x += sizeof(BITMAP_VoicePrompt) + 2;
 	#else
 		// hmmm, what to put in it's place
 	#endif

-	// DUAL-WATCH indicator
-	if (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF || test_display)
-	{
-		if (gDualWatchActive || test_display)
-			memmove(line + x, BITMAP_TDR1, sizeof(BITMAP_TDR1));
-		else
-			memmove(line + x, BITMAP_TDR2, sizeof(BITMAP_TDR2));
+	uint8_t dw = (gEeprom.DUAL_WATCH != DUAL_WATCH_OFF) + (gEeprom.CROSS_BAND_RX_TX != CROSS_BAND_OFF) * 2;
+	if(dw == 1 || dw == 3 || test_display) { // DWR - dual watch + respond
+		if(gDualWatchActive || test_display) 
+			memmove(line + x, BITMAP_TDR1, sizeof(BITMAP_TDR1) - (dw==1?0:5));
+		else 
+			memmove(line + x + 3, BITMAP_TDR2, sizeof(BITMAP_TDR2));
 	}
-	x += sizeof(BITMAP_TDR1);
-
-	// CROSS-VFO indicator
-	if (gEeprom.CROSS_BAND_RX_TX != CROSS_BAND_OFF || test_display)
-	{
+	else if(dw == 2) { // XB - crossband
 		memmove(line + x, BITMAP_XB, sizeof(BITMAP_XB));
-		x1 = x + sizeof(BITMAP_XB);
 	}
-	x += sizeof(BITMAP_XB);
+
+	x += sizeof(BITMAP_TDR1) + 2;
 	
 	#ifdef ENABLE_VOX
 		// VOX indicator
@@ -152,9 +139,12 @@ void UI_DisplayStatus(const bool test_display)
 			memmove(line + x, BITMAP_VOX, sizeof(BITMAP_VOX));
 			x1 = x + sizeof(BITMAP_VOX);
 		}
-		x += sizeof(BITMAP_VOX);
+		x += sizeof(BITMAP_VOX) + 2;
 	#endif

+	x = MAX(x, 61);
+	x1 = x;
+
 	// KEY-LOCK indicator
 	if (gEeprom.KEY_LOCK || test_display)
 	{
@@ -217,50 +207,8 @@ void UI_DisplayStatus(const bool test_display)
 	x += sizeof(BITMAP_USB_C);

 	// BATTERY LEVEL indicator
-	if (gBatteryDisplayLevel >= 2 && !gLowBattery)
-	{
-		line += x;
-		memmove(line, BITMAP_BatteryLevel1, sizeof(BITMAP_BatteryLevel1));
-
-		#ifndef ENABLE_REVERSE_BAT_SYMBOL
-			line += sizeof(BITMAP_BatteryLevel1);
-			{
-				const int8_t pos[] = {-4, -7, -10, 13};
-				for (unsigned int i = 0; i < ARRAY_SIZE(pos); i++)
-					if (gBatteryDisplayLevel >= (2 + i))
-						memmove(line + pos[i], BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
+	UI_DrawBattery(line + x, gBatteryDisplayLevel, gLowBatteryBlink);
 	
-/*				switch (gBatteryDisplayLevel)
-				{
-					default:
-					case 5: memmove(line - 13, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-					case 4: memmove(line - 10, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-					case 3: memmove(line -  7, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-					case 2: memmove(line -  4, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-				}
-*/			}
-		#else
-		{
-			const int8_t pos[] = {3, 6, 9, 12};
-			for (unsigned int i = 0; i < ARRAY_SIZE(pos); i++)
-				if (gBatteryDisplayLevel >= (2 + i))
-					memmove(line + pos[i], BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-/*
-			switch (gBatteryDisplayLevel)
-			{
-				default:
-				case 5: memmove(line + 12, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-				case 4: memmove(line +  9, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-				case 3: memmove(line +  6, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-				case 2: memmove(line +  3, BITMAP_BatteryLevel, sizeof(BITMAP_BatteryLevel));
-			}
-*/		}
-		#endif
-	}
-	else
-	if (gLowBatteryBlink == 1)
-		memmove(line + x, BITMAP_BatteryLevel1, sizeof(BITMAP_BatteryLevel1));
-
 	// **************

 	ST7565_BlitStatusLine();
--- a/ui/ui.c
+++ b/ui/ui.c
@@ -77,33 +77,28 @@ void GUI_DisplayScreen(void)

 void GUI_SelectNextDisplay(GUI_DisplayType_t Display)
 {
-	if (Display != DISPLAY_INVALID)
+	if (Display == DISPLAY_INVALID)
+		return;
+
+	if (gScreenToDisplay != Display)
 	{
-		if (gScreenToDisplay != Display)
-		{
-			gInputBoxIndex      = 0;
-			gIsInSubMenu        = false;
-			gCssScanMode        = CSS_SCAN_MODE_OFF;
-			gScanStateDir       = SCAN_OFF;
-			#ifdef ENABLE_FMRADIO
-				gFM_ScanState   = FM_SCAN_OFF;
-			#endif
-			gAskForConfirmation = 0;
-			gDTMF_InputMode     = false;
-			gDTMF_InputIndex    = 0;
-			gAskToSave          = false;
-			gAskToDelete        = false;
+		DTMF_clear_input_box();

-			if (gWasFKeyPressed)
-			{
-				gWasFKeyPressed = false;
-				gUpdateStatus   = true;
-			}
+		gInputBoxIndex       = 0;
+		gIsInSubMenu         = false;
+		gCssScanMode         = CSS_SCAN_MODE_OFF;
+		gScanStateDir        = SCAN_OFF;
+		#ifdef ENABLE_FMRADIO
+			gFM_ScanState    = FM_SCAN_OFF;
+		#endif
+		gAskForConfirmation  = 0;
+		gAskToSave           = false;
+		gAskToDelete         = false;
+		gWasFKeyPressed      = false;

-			gUpdateStatus       = true;
-		}
-
-		gUpdateDisplay   = true;
-		gScreenToDisplay = Display;
+		gUpdateStatus        = true;
 	}
+
+	gScreenToDisplay = Display;
+	gUpdateDisplay   = true;
 }
Author	SHA1	Message	Date
Krzysiek Egzmont	d817ff7e6a	Fixed RSSI calibration	2023-10-16 13:01:24 +02:00
Krzysiek Egzmont	ec4bec5b1f	Flashlight SOS function	2023-10-16 00:15:04 +02:00
Krzysiek Egzmont	d7c458839c	Change menu items names	2023-10-15 22:07:55 +02:00
Krzysiek Egzmont	cff2f25e56	Consolidate "T VFO" and "DUALRX" into one "RXMODE"	2023-10-15 21:52:42 +02:00
Krzysiek Egzmont	63ac84883e	add execute rights to compile-with-docker.sh	2023-10-15 21:12:06 +02:00
wrobepio	f8252df281	fixed: "compiled-firmware" folder missing under linux - fixed shell variable $PWD	2023-10-14 20:26:29 +02:00
Krzysiek Egzmont	be00bb99ad	FIX #28 : After entering item 51（BATVOL） of the menu, the automatic lock screen cannot be unlocked	2023-10-12 20:45:26 +02:00
Krzysiek Egzmont	7e6a78ab6c	FIX #26 : vfo state (TX DISABLE label) update issue when FM radio disabled in Makefile	2023-10-12 00:44:52 +02:00
Krzysiek Egzmont	06c2ddf543	BUG FIX: power save never activated	2023-10-10 19:36:12 +02:00
Krzysiek Egzmont	47f1e80252	Fix #25 : When you stop the scan with the PTT the Walkie stays in permanent TX	2023-10-10 17:32:58 +02:00
Krzysiek Egzmont	64bc29d362	FIX #24 : lock/unlock doesn't work when FM radio active	2023-10-10 14:29:51 +02:00
Krzysiek Egzmont	8d17f5922c	FIX #21 : Battery symbol fix of a fix	2023-10-10 02:39:02 +02:00
Krzysiek Egzmont	063dc61e65	Part of the recent changes form 1o11, including DTMF input box error #19	2023-10-09 21:47:06 +02:00
Krzysiek Egzmont	60ccd3372f	FIX #8 : This should fix compiler errors	2023-10-09 17:17:45 +02:00
Krzysiek Egzmont	149a0f5bdc	Revert do not update battery level when TX	2023-10-09 16:57:52 +02:00
Krzysiek Egzmont	c7da7cf725	Battery symbol fix	2023-10-09 16:30:20 +02:00
Krzysiek Egzmont	4b9147327a	Fix random upper/lower for TX, bring back TX on last RX	2023-10-09 16:02:57 +02:00