Added menu option for the RSSI S-meter bar

app/menu.c

@@ -239,6 +239,9 @@ int MENU_GetLimits(uint8_t Cursor, int32_t *pMin, int32_t *pMax)
 		#ifdef ENABLE_AUDIO_BAR
 			case MENU_MIC_BAR:
 		#endif
+		#ifdef ENABLE_RSSI_BAR
+			case MENU_RSSI_BAR:
+		#endif
 		case MENU_BCL:
 		case MENU_BEEP:
 		case MENU_AUTOLK:
@@ -639,6 +642,12 @@ void MENU_AcceptSetting(void)
 				break;
 		#endif
 
+		#ifdef ENABLE_RSSI_BAR
+			case MENU_RSSI_BAR:
+				g_setting_rssi_bar = g_sub_menu_selection;
+				break;
+		#endif
+
 		case MENU_COMPAND:
 			g_tx_vfo->compander = g_sub_menu_selection;
 			SETTINGS_UpdateChannel(g_tx_vfo->channel_save, g_tx_vfo, true);
@@ -1091,6 +1100,12 @@ void MENU_ShowCurrentSetting(void)
 				break;
 		#endif
 
+		#ifdef ENABLE_RSSI_BAR
+			case MENU_RSSI_BAR:
+				g_sub_menu_selection = g_setting_rssi_bar;
+				break;
+		#endif
+
 		case MENU_COMPAND:
 			g_sub_menu_selection = g_tx_vfo->compander;
 			return;

board.c

@@ -735,7 +735,10 @@ void BOARD_EEPROM_load(void)
 	g_setting_174_tx_enable      = (Data[3] < 2) ? Data[3] : false;
 	g_setting_470_tx_enable      = (Data[4] < 2) ? Data[4] : false;
 	g_setting_350_enable         = (Data[5] < 2) ? Data[5] : true;
-	g_setting_scramble_enable    = (Data[6] < 2) ? Data[6] : true;
+	g_setting_scramble_enable    = (Data[6] & (1u << 0)) ? true : false;
+	#ifdef ENABLE_RSSI_BAR
+		g_setting_rssi_bar       = (Data[6] & (1u << 1)) ? true : false;
+	#endif
 	g_setting_tx_enable          = (Data[7] & (1u << 0)) ? true : false;
 	g_setting_live_dtmf_decoder  = (Data[7] & (1u << 1)) ? true : false;
 	g_setting_battery_text       = (((Data[7] >> 2) & 3u) <= 2) ? (Data[7] >> 2) & 3 : 2;

functions.c

@@ -177,7 +177,8 @@ void FUNCTION_Select(function_type_t Function)
 				UART_SendText("func transmit\r\n");
 			#endif
 
-			// if DTMF is enabled when TX'ing, it changes the TX audio filtering !! .. 1of11
+			// if DTMF is enabled when TX'ing, it changes the TX audio filtering ! .. 1of11
+			// so MAKE SURE that DTMF is disabled - until needed
 			BK4819_DisableDTMF();
 
 			// clear the DTMF RX buffer

misc.c

@@ -109,6 +109,9 @@ uint8_t               g_setting_backlight_on_tx_rx;
 #ifdef ENABLE_AUDIO_BAR
 	bool              g_setting_mic_bar;
 #endif
+#ifdef ENABLE_RSSI_BAR
+	bool              g_setting_rssi_bar;
+#endif
 bool                  g_setting_live_dtmf_decoder;
 uint8_t               g_setting_battery_text;
 

misc.h

@@ -190,6 +190,9 @@ extern uint8_t               g_setting_backlight_on_tx_rx;
 #ifdef ENABLE_AUDIO_BAR
 	extern bool              g_setting_mic_bar;
 #endif
+#ifdef ENABLE_RSSI_BAR
+	extern bool              g_setting_rssi_bar;
+#endif
 extern bool                  g_setting_live_dtmf_decoder;
 extern uint8_t               g_setting_battery_text;
 

settings.c

@@ -318,7 +318,10 @@ void SETTINGS_SaveSettings(void)
 	State[3]  = g_setting_174_tx_enable;
 	State[4]  = g_setting_470_tx_enable;
 	State[5]  = g_setting_350_enable;
-	State[6]  = g_setting_scramble_enable;
+	if (!g_setting_scramble_enable)       State[6] &= ~(1u << 0);
+	#ifdef ENABLE_RSSI_BAR
+		if (!g_setting_rssi_bar)          State[6] &= ~(1u << 1);
+	#endif
 	if (!g_setting_tx_enable)             State[7] &= ~(1u << 0);
 	if (!g_setting_live_dtmf_decoder)     State[7] &= ~(1u << 1);
 	State[7] = (State[7] & ~(3u << 2)) | ((g_setting_battery_text & 3u) << 2);

settings.h

@@ -386,12 +386,19 @@ typedef struct {
 
 	// 0x0F40
 	uint8_t        freq_lock;                       //
-	uint8_t        enable_tx_350;                   // 350MHz ~ 400MHz
+	uint8_t        enable_tx_350:1;                 // 350MHz ~ 400MHz
-	uint8_t        radio_disabled;                  // 0 = not radio is not disabled
+	uint8_t        unused11a:7;                     //
-	uint8_t        enable_tx_200;                   // 174MHz ~ 350MHz
+	uint8_t        radio_disabled:1;                // 0 = not radio is not disabled
-	uint8_t        enable_tx_470;                   // >= 470MHz disabled
+	uint8_t        unused11b:7;                     //
-	uint8_t        enable_350;                      // 0 = 350HMz ~ 400MHz RX/TX disabled
+	uint8_t        enable_tx_200:1;                 // 174MHz ~ 350MHz
-	uint8_t        enable_scrambler;                // 0 = scrambler disabled, 1 = enabled
+	uint8_t        unused11c:7;                     //
+	uint8_t        enable_tx_470:1;                 // >= 470MHz disabled
+	uint8_t        unused11d:7;                     //
+	uint8_t        enable_350:1;                    // 0 = 350HMz ~ 400MHz RX/TX disabled
+	uint8_t        unused11e:7;                     //
+	uint8_t        enable_scrambler:1;              // 0 = scrambler disabled, 1 = enabled
+	uint8_t        enable_rssi_bar:1;               // 0 = disabled .. 1of11
+	uint8_t        unused11f:6;                     //
 	#if 0
 		// QS
 		uint8_t    unused12[9];                     // 0xff's

ui/main.c

@@ -236,6 +236,8 @@ void UI_drawBars(uint8_t *p, const unsigned int level)
 #ifdef ENABLE_RSSI_BAR
 	void UI_DisplayRSSIBar(const int16_t rssi, const bool now)
 	{
+		if (g_setting_rssi_bar)
+		{
 //			const int16_t      s0_dBm       = -127;                  // S0 .. base level
 			const int16_t      s0_dBm       = -147;                  // S0 .. base level
 	
@@ -289,6 +291,7 @@ void UI_drawBars(uint8_t *p, const unsigned int level)
 			if (now)
 				ST7565_BlitFullScreen();
 		}
+	}
 #endif
 
 void UI_update_rssi(const int16_t rssi, const int vfo)

ui/menu.c

@@ -70,8 +70,8 @@ const t_menu_item g_menu_list[] =
 #ifdef ENABLE_VOX
 	{"VOX",    VOICE_ID_VOX,                           MENU_VOX           },
 #endif
-	{"BLT",    VOICE_ID_INVALID,                       MENU_ABR           }, // was "ABR"
+	{"BL ",    VOICE_ID_INVALID,                       MENU_ABR           }, // was "ABR"
-	{"BLTTRX", VOICE_ID_INVALID,                       MENU_ABR_ON_TX_RX  },
+	{"BL TRX", VOICE_ID_INVALID,                       MENU_ABR_ON_TX_RX  },
 	{"CTRAST", VOICE_ID_INVALID,                       MENU_CONTRAST      },
 	{"BEEP",   VOICE_ID_BEEP_PROMPT,                   MENU_BEEP          },
 #ifdef ENABLE_VOICE
@@ -84,10 +84,13 @@ const t_menu_item g_menu_list[] =
 	{"STE",    VOICE_ID_INVALID,                       MENU_STE           },
 	{"RP STE", VOICE_ID_INVALID,                       MENU_RP_STE        },
 	{"MIC",    VOICE_ID_INVALID,                       MENU_MIC           },
-#ifdef ENABLE_AUDIO_BAR
-	{"MICBAR", VOICE_ID_INVALID,                       MENU_MIC_BAR       },
-#endif
 	{"COMPND", VOICE_ID_INVALID,                       MENU_COMPAND       },
+#ifdef ENABLE_AUDIO_BAR
+	{"Tx BAR", VOICE_ID_INVALID,                       MENU_MIC_BAR       },
+#endif
+#ifdef ENABLE_RSSI_BAR
+	{"Rx BAR", VOICE_ID_INVALID,                       MENU_RSSI_BAR      },
+#endif
 	{"1 CALL", VOICE_ID_INVALID,                       MENU_1_CALL        },
 	{"SLIST",  VOICE_ID_INVALID,                       MENU_S_LIST        },
 	{"SLIST1", VOICE_ID_INVALID,                       MENU_SLIST1        },
@@ -549,12 +552,6 @@ void UI_DisplayMenu(void)
 			}
 			break;
 
-		#ifdef ENABLE_AUDIO_BAR
-			case MENU_MIC_BAR:
-				strcpy(String, g_sub_menu_off_on[g_sub_menu_selection]);
-				break;
-		#endif
-
 		case MENU_STEP:
 			sprintf(String, "%d.%02ukHz", STEP_FREQ_TABLE[g_sub_menu_selection] / 100, STEP_FREQ_TABLE[g_sub_menu_selection] % 100);
 			break;
@@ -704,13 +701,19 @@ void UI_DisplayMenu(void)
 			break;
 
 		case MENU_CONTRAST:
-			strcpy(String, "DISPLAY\nCONTRAST\n");
+			strcpy(String, "CONTRAST\n");
-			sprintf(String, "%d", g_sub_menu_selection);
+			sprintf(String + strlen(String), "%d", g_sub_menu_selection);
 			//g_setting_contrast = g_sub_menu_selection
 			ST7565_SetContrast(g_sub_menu_selection);
 			g_update_display = true;
 			break;
 			
+		#ifdef ENABLE_AUDIO_BAR
+			case MENU_MIC_BAR:
+		#endif
+		#ifdef ENABLE_RSSI_BAR
+			case MENU_RSSI_BAR:
+		#endif
 		#ifdef ENABLE_AM_FIX
 			case MENU_AM_FIX:
 		#endif

ui/menu.h

@@ -82,6 +82,9 @@ enum
 	MENU_MIC_BAR,
 #endif
 	MENU_COMPAND,
+#ifdef ENABLE_RSSI_BAR
+	MENU_RSSI_BAR,
+#endif
 	MENU_1_CALL,
 	MENU_S_LIST,
 	MENU_SLIST1,

version.c

@@ -1,9 +1,5 @@
 
-#ifdef GIT_HASH
 #define __VER__          GIT_HASH
-#else
-	#define __VER__     "231012"
-#endif
 
 //#define __VER_PREFIX__  "OEFW-"
 #define __VER_PREFIX__   "1o11-"