New design Dual Watch

ui/main.c

@@ -371,14 +371,14 @@ void DisplayRSSIBar(const bool now)
 #endif
 
 #ifdef ENABLE_FEAT_F4HWN
-	if (isMainOnly())
+	if (isMainOnly() || gSetting_set_gui)
 	{
 		sprintf(str, "%3d", -rssi_dBm);
 		UI_PrintStringSmallNormal(str, LCD_WIDTH + 8, 0, line - 1);
 	}
 	else
 	{
-		sprintf(str, "%04d %s", -rssi_dBm, "dBm");
+		sprintf(str, "% 4d %s", -rssi_dBm, "dBm");
 		GUI_DisplaySmallest(str, 2, 25, false, true);
 	}
 
@@ -1008,7 +1008,7 @@ void UI_DisplayMain(void)
 		}
 
 #if ENABLE_FEAT_F4HWN
-		if (isMainOnly())
+		if (isMainOnly() || gSetting_set_gui)
 		{
 			UI_PrintStringSmallNormal(s, LCD_WIDTH + 24, 0, line + 1);
 		}
@@ -1024,7 +1024,7 @@ void UI_DisplayMain(void)
 		{	// show the TX power
 			int i = vfoInfo->OUTPUT_POWER % 3;
 #if ENABLE_FEAT_F4HWN
-		if (isMainOnly())
+		if (isMainOnly() || gSetting_set_gui)
 		{
 			const char pwr_list[][2] = {"L","M","H"};
 			UI_PrintStringSmallNormal(pwr_list[i], LCD_WIDTH + 46, 0, line + 1);			
@@ -1045,7 +1045,7 @@ void UI_DisplayMain(void)
 			const char dir_list[][2] = {"", "+", "-"};
 			int i = vfoInfo->TX_OFFSET_FREQUENCY_DIRECTION % 3;
 #if ENABLE_FEAT_F4HWN
-		if (isMainOnly())
+		if (isMainOnly() || gSetting_set_gui)
 		{
 			UI_PrintStringSmallNormal(dir_list[i], LCD_WIDTH + 54, 0, line + 1);
 		}
@@ -1062,7 +1062,7 @@ void UI_DisplayMain(void)
 		if (vfoInfo->FrequencyReverse)
 #if ENABLE_FEAT_F4HWN
 		{
-			if (isMainOnly())
+			if (isMainOnly() || gSetting_set_gui)
 			{
 				UI_PrintStringSmallNormal("R", LCD_WIDTH + 62, 0, line + 1);
 			}
@@ -1076,7 +1076,7 @@ void UI_DisplayMain(void)
 #endif
 
 #if ENABLE_FEAT_F4HWN
-		if (isMainOnly())
+		if (isMainOnly() || gSetting_set_gui)
 		{
 			if (vfoInfo->CHANNEL_BANDWIDTH == BANDWIDTH_NARROW)
 				UI_PrintStringSmallNormal("N", LCD_WIDTH + 70, 0, line + 1);	
@@ -1111,7 +1111,7 @@ void UI_DisplayMain(void)
 				sprintf(String, "%s", "MONIT");
  			}
  			
-			if (isMainOnly())
+			if (isMainOnly() || gSetting_set_gui)
  			{
 				if(!gMonitor)
 	 		 	{

ui/menu.c

@@ -134,6 +134,7 @@ const t_menu_item MenuList[] =
 	{"SetInv", VOICE_ID_INVALID,                       MENU_SET_INV       },
 	{"SetLck", VOICE_ID_INVALID,                       MENU_SET_LCK       },
 	{"SetMet", VOICE_ID_INVALID,                       MENU_SET_MET       },
+	{"SetGui", VOICE_ID_INVALID,                       MENU_SET_GUI       },
 #endif
 	// hidden menu items from here on
 	// enabled if pressing both the PTT and upper side button at power-on
@@ -919,9 +920,6 @@ void UI_DisplayMenu(void)
 			break;
 
 		case MENU_SET_TOT:
-			strcpy(String, gSubMenu_SET_TOT[gSubMenuSelection]);
-			break;
-
 		case MENU_SET_EOT:
 			strcpy(String, gSubMenu_SET_TOT[gSubMenuSelection]); // Same as SET_TOT
 			break;
@@ -942,8 +940,10 @@ void UI_DisplayMenu(void)
 			break;
 
 		case MENU_SET_MET:
-			strcpy(String, gSubMenu_SET_MET[gSubMenuSelection]);
+		case MENU_SET_GUI:
+			strcpy(String, gSubMenu_SET_MET[gSubMenuSelection]); // Same as SET_MET
 			break;
+
 #endif
 
 	}

ui/menu.h

@@ -130,6 +130,7 @@ enum
 	MENU_SET_INV,
 	MENU_SET_LCK,
 	MENU_SET_MET,
+	MENU_SET_GUI,
 #endif
 	MENU_BATCAL,  // battery voltage calibration
 	MENU_F1SHRT,