Fixed RSSI calibration

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:

app/app.c

@@ -1447,6 +1447,35 @@ 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)
@@ -1823,7 +1852,7 @@ void APP_TimeSlice500ms(void)
 			if (gScanStateDir == SCAN_OFF && (gScreenToDisplay != DISPLAY_SCANNER || gScanCssState >= SCAN_CSS_STATE_FOUND))
 		#endif
 		{
-			if (gEeprom.AUTO_KEYPAD_LOCK && gKeyLockCountdown > 0 && !gDTMF_InputMode)
+			if (gEeprom.AUTO_KEYPAD_LOCK && gKeyLockCountdown > 0 && !gDTMF_InputMode && gScreenToDisplay != DISPLAY_MENU)
 			{
 				if (--gKeyLockCountdown == 0)
 					gEeprom.KEY_LOCK = true;     // lock the keyboard
@@ -1895,24 +1924,24 @@ void APP_TimeSlice500ms(void)
 	if (gCurrentFunction != FUNCTION_POWER_SAVE && gCurrentFunction != FUNCTION_TRANSMIT)
 		updateRSSI(gEeprom.RX_VFO);
 
-	#ifdef ENABLE_FMRADIO
-		if (!gPttIsPressed && gFM_ResumeCountdown_500ms > 0)
+	if (!gPttIsPressed && gVFOStateResumeCountdown_500ms > 0)
+	{
+		if (--gVFOStateResumeCountdown_500ms == 0)
 		{
-			if (--gFM_ResumeCountdown_500ms == 0)
-			{
-				RADIO_SetVfoState(VFO_STATE_NORMAL);
-
-				if (gCurrentFunction != FUNCTION_RECEIVE  &&
-				    gCurrentFunction != FUNCTION_TRANSMIT &&
-				    gCurrentFunction != FUNCTION_MONITOR  &&
-					gFmRadioMode)
-				{	// switch back to FM radio mode
-					FM_Start();
-					GUI_SelectNextDisplay(DISPLAY_FM);
-				}
+			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)
 	{

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)

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);

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;
 
@@ -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:

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

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];

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);

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);

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/"

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);

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

misc.h

@@ -52,7 +52,8 @@ enum {
 enum {
 	FLASHLIGHT_OFF = 0,
 	FLASHLIGHT_ON,
-	FLASHLIGHT_BLINK
+	FLASHLIGHT_BLINK,
+	FLASHLIGHT_SOS
 };
 
 enum {
@@ -93,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;
 
@@ -182,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;
@@ -319,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

radio.c

@@ -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;

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
@@ -218,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;
@@ -314,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
@@ -382,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));
 		}
 
@@ -407,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
@@ -472,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)
@@ -501,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;
 			}
 

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] =
-{
-	"RX\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:

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];

ui/status.c

@@ -85,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)
 		{
@@ -123,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
@@ -153,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)
 	{