Added second discharge curve for 2200mAh type battery and hidden BatTyp menu entry

Reverts:
fde690a74a: app.c
50a55e34ab: radio.c

Makefile

@@ -35,8 +35,7 @@ ENABLE_RSSI_BAR               := 1
 ENABLE_AUDIO_BAR              := 1
 ENABLE_COPY_CHAN_TO_VFO       := 1
 ENABLE_SPECTRUM               := 1
-#ENABLE_SINGLE_VFO_CHAN        := 1
-#ENABLE_BAND_SCOPE             := 1
+ENABLE_REDUCE_LOW_MID_TX_POWER:= 0
 
 #############################################################
 
@@ -211,6 +210,7 @@ endif
 
 # catch any and all warnings
 CFLAGS += -Wextra
+#CFLAGS += -Wpedantic
 
 CFLAGS += -DPRINTF_INCLUDE_CONFIG_H
 CFLAGS += -DGIT_HASH=\"$(GIT_HASH)\"
@@ -317,6 +317,9 @@ endif
 ifeq ($(ENABLE_BAND_SCOPE),1)
 	CFLAGS += -DENABLE_BAND_SCOPE
 endif
+ifeq ($(ENABLE_REDUCE_LOW_MID_TX_POWER),1)
+	CFLAGS  += -DENABLE_REDUCE_LOW_MID_TX_POWER
+endif
 
 LDFLAGS =
 ifeq ($(ENABLE_CLANG),0)

app/app.c

@@ -62,9 +62,10 @@
 #include "ui/status.h"
 #include "ui/ui.h"
 
-static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld);
+static void ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld);
+static void FlashlightTimeSlice();
 
-static void updateRSSI(const int vfo)
+static void UpdateRSSI(const int vfo)
 {
 	int16_t rssi = BK4819_GetRSSI();
 
@@ -82,7 +83,7 @@ static void updateRSSI(const int vfo)
 	UI_UpdateRSSI(rssi, vfo);
 }
 
-static void APP_CheckForIncoming(void)
+static void CheckForIncoming(void)
 {
 	if (!g_SquelchLost)
 		return;          // squelch is closed
@@ -116,7 +117,7 @@ static void APP_CheckForIncoming(void)
 				FUNCTION_Select(FUNCTION_INCOMING);
 				//gUpdateDisplay = true;
 
-				updateRSSI(gEeprom.RX_VFO);
+				UpdateRSSI(gEeprom.RX_VFO);
 				gUpdateRSSI = true;
 			}
 
@@ -132,7 +133,7 @@ static void APP_CheckForIncoming(void)
 				FUNCTION_Select(FUNCTION_INCOMING);
 				//gUpdateDisplay = true;
 
-				updateRSSI(gEeprom.RX_VFO);
+				UpdateRSSI(gEeprom.RX_VFO);
 				gUpdateRSSI = true;
 			}
 			return;
@@ -154,7 +155,7 @@ static void APP_CheckForIncoming(void)
 				FUNCTION_Select(FUNCTION_INCOMING);
 				//gUpdateDisplay = true;
 
-				updateRSSI(gEeprom.RX_VFO);
+				UpdateRSSI(gEeprom.RX_VFO);
 				gUpdateRSSI = true;
 			}
 			return;
@@ -171,12 +172,12 @@ static void APP_CheckForIncoming(void)
 		FUNCTION_Select(FUNCTION_INCOMING);
 		//gUpdateDisplay = true;
 
-		updateRSSI(gEeprom.RX_VFO);
+		UpdateRSSI(gEeprom.RX_VFO);
 		gUpdateRSSI = true;
 	}
 }
 
-static void APP_HandleIncoming(void)
+static void HandleIncoming(void)
 {
 	bool bFlag;
 
@@ -239,8 +240,8 @@ static void APP_HandleIncoming(void)
 					gUpdateStatus    = true;
 
 					gUpdateDisplay = true;
-					return;
 				}
+				return;
 			}
 		}
 	}
@@ -248,7 +249,7 @@ static void APP_HandleIncoming(void)
 	APP_StartListening(gMonitor ? FUNCTION_MONITOR : FUNCTION_RECEIVE, false);
 }
 
-static void APP_HandleReceive(void)
+static void HandleReceive(void)
 {
 	#define END_OF_RX_MODE_SKIP 0
 	#define END_OF_RX_MODE_END  1
@@ -263,7 +264,7 @@ static void APP_HandleReceive(void)
 	}
 
 	if (gScanStateDir != SCAN_OFF && IS_FREQ_CHANNEL(gNextMrChannel))
-	{
+	{ // we are scanning in the frequency mode
 		if (g_SquelchLost)
 			return;
 
@@ -370,7 +371,7 @@ static void APP_HandleReceive(void)
 	if (!gEndOfRxDetectedMaybe         &&
 	     Mode == END_OF_RX_MODE_SKIP   &&
 	     gNextTimeslice40ms            &&
-	     gEeprom.TAIL_NOTE_ELIMINATION &&
+	     gEeprom.TAIL_TONE_ELIMINATION &&
 	    (gCurrentCodeType == CODE_TYPE_DIGITAL || gCurrentCodeType == CODE_TYPE_REVERSE_DIGITAL) &&
 	     BK4819_GetCTCType() == 1)
 		Mode = END_OF_RX_MODE_TTE;
@@ -414,9 +415,9 @@ Skip:
 			break;
 
 		case END_OF_RX_MODE_TTE:
-			if (gEeprom.TAIL_NOTE_ELIMINATION)
+			if (gEeprom.TAIL_TONE_ELIMINATION)
 			{
-				GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+				AUDIO_AudioPathOff();
 
 				gTailNoteEliminationCountdown_10ms = 20;
 				gFlagTailNoteEliminationComplete   = false;
@@ -427,12 +428,12 @@ Skip:
 	}
 }
 
-static void APP_HandleFunction(void)
+static void HandleFunction(void)
 {
 	switch (gCurrentFunction)
 	{
 		case FUNCTION_FOREGROUND:
-			APP_CheckForIncoming();
+			CheckForIncoming();
 			break;
 
 		case FUNCTION_TRANSMIT:
@@ -442,16 +443,16 @@ static void APP_HandleFunction(void)
 			break;
 
 		case FUNCTION_INCOMING:
-			APP_HandleIncoming();
+			HandleIncoming();
 			break;
 
 		case FUNCTION_RECEIVE:
-			APP_HandleReceive();
+			HandleReceive();
 			break;
 
 		case FUNCTION_POWER_SAVE:
 			if (!gRxIdleMode)
-				APP_CheckForIncoming();
+				CheckForIncoming();
 			break;
 
 		case FUNCTION_BAND_SCOPE:
@@ -475,7 +476,7 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 	// clear the other vfo's rssi level (to hide the antenna symbol)
 	gVFO_RSSI_bar_level[(chan + 1) & 1u] = 0;
 
-	GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+	AUDIO_AudioPathOn();
 	gEnableSpeaker = true;
 
 	if (gSetting_backlight_on_tx_rx >= BACKLIGHT_ON_TR_RX)
@@ -540,7 +541,7 @@ void APP_StartListening(FUNCTION_Type_t Function, const bool reset_am_fix)
 
 	// AF gain - original QS values
 	if (gRxVfo->AM_mode){
-		BK4819_WriteRegister(0x48, 0xB3A8);
+		BK4819_WriteRegister(BK4819_REG_48, 0xB3A8);
 	}
 	else {
 	BK4819_WriteRegister(BK4819_REG_48,
@@ -592,7 +593,7 @@ uint32_t APP_SetFrequencyByStep(VFO_Info_t *pInfo, int8_t direction)
 	}
 #endif
 
-static void DUALWATCH_Alternate(void)
+static void DualwatchAlternate(void)
 {
 	#ifdef ENABLE_NOAA
 		if (gIsNoaaMode)
@@ -610,8 +611,8 @@ static void DUALWATCH_Alternate(void)
 		else
 	#endif
 	{	// toggle between VFO's
-		gEeprom.RX_VFO = (gEeprom.RX_VFO + 1) & 1;
-		gRxVfo             = &gEeprom.VfoInfo[gEeprom.RX_VFO];
+		gEeprom.RX_VFO = !gEeprom.RX_VFO;
+		gRxVfo         = &gEeprom.VfoInfo[gEeprom.RX_VFO];
 
 		if (!gDualWatchActive)
 		{	// let the user see DW is active
@@ -629,7 +630,7 @@ static void DUALWATCH_Alternate(void)
 	#endif
 }
 
-void APP_CheckRadioInterrupts(void)
+static void CheckRadioInterrupts(void)
 {
 	if (gScreenToDisplay == DISPLAY_SCANNER)
 		return;
@@ -772,32 +773,14 @@ void APP_CheckRadioInterrupts(void)
 
 void APP_EndTransmission(void)
 {	// back to RX mode
-
 	RADIO_SendEndOfTransmission();
-
-	if (gCurrentVfo->pTX->CodeType != CODE_TYPE_OFF)
-	{	// CTCSS/DCS is enabled
-
-		//if (gEeprom.TAIL_NOTE_ELIMINATION && gEeprom.REPEATER_TAIL_TONE_ELIMINATION > 0)
-		if (gEeprom.TAIL_NOTE_ELIMINATION)
-		{	// send the CTCSS/DCS tail tone - allows the receivers to mute the usual FM squelch tail/crash
-			RADIO_EnableCxCSS();
-		}
-		#if 0
-			else
-			{	// TX a short blank carrier
-				// this gives the receivers time to mute RX audio before we drop carrier
-				BK4819_ExitSubAu();
-				SYSTEM_DelayMs(200);
-			}
-		#endif
-	}
-
+	// send the CTCSS/DCS tail tone - allows the receivers to mute the usual FM squelch tail/crash
+	RADIO_EnableCxCSS();
 	RADIO_SetupRegisters(false);
 }
 
 #ifdef ENABLE_VOX
-	static void APP_HandleVox(void)
+	static void HandleVox(void)
 	{
 		if (gSetting_KILLED)
 			return;
@@ -878,13 +861,12 @@ void APP_EndTransmission(void)
 
 void APP_Update(void)
 {
-	#ifdef ENABLE_VOICE
-		if (gFlagPlayQueuedVoice)
-		{
+#ifdef ENABLE_VOICE
+	if (gFlagPlayQueuedVoice) {
 			AUDIO_PlayQueuedVoice();
 			gFlagPlayQueuedVoice = false;
-		}
-	#endif
+	}
+#endif
 
 	if (gCurrentFunction == FUNCTION_TRANSMIT && (gTxTimeoutReached || gSerialConfigCountDown_500ms > 0))
 	{	// transmitter timed out or must de-key
@@ -904,7 +886,7 @@ void APP_Update(void)
 		return;
 
 	if (gCurrentFunction != FUNCTION_TRANSMIT)
-		APP_HandleFunction();
+		HandleFunction();
 
 #ifdef ENABLE_FMRADIO
 //	if (gFmRadioCountdown_500ms > 0)
@@ -965,7 +947,7 @@ void APP_Update(void)
 				    gDTMF_CallState == DTMF_CALL_STATE_NONE &&
 				    gCurrentFunction != FUNCTION_POWER_SAVE)
 				{
-					DUALWATCH_Alternate();    // toggle between the two VFO's
+					DualwatchAlternate();    // toggle between the two VFO's
 
 					if (gRxVfoIsActive && gScreenToDisplay == DISPLAY_MAIN)
 						GUI_SelectNextDisplay(DISPLAY_MAIN);
@@ -993,7 +975,7 @@ void APP_Update(void)
 
 #ifdef ENABLE_VOX
 	if (gEeprom.VOX_SWITCH)
-		APP_HandleVox();
+		HandleVox();
 #endif
 
 	if (gSchedulePowerSave)
@@ -1067,7 +1049,7 @@ void APP_Update(void)
 			    gScanStateDir == SCAN_OFF &&
 			    gCssScanMode == CSS_SCAN_MODE_OFF)
 			{	// dual watch mode, toggle between the two VFO's
-				DUALWATCH_Alternate();
+				DualwatchAlternate();
 
 				gUpdateRSSI = false;
 			}
@@ -1079,9 +1061,9 @@ void APP_Update(void)
 		}
 		else
 		if (gEeprom.DUAL_WATCH == DUAL_WATCH_OFF || gScanStateDir != SCAN_OFF || gCssScanMode != CSS_SCAN_MODE_OFF || gUpdateRSSI)
-		{	// dual watch mode, go back to sleep
+		{	// dual watch mode off or scanning or rssi update request
 
-			updateRSSI(gEeprom.RX_VFO);
+			UpdateRSSI(gEeprom.RX_VFO);
 
 			// go back to sleep
 
@@ -1098,7 +1080,7 @@ void APP_Update(void)
 		else
 		{
 			// toggle between the two VFO's
-			DUALWATCH_Alternate();
+			DualwatchAlternate();
 
 			gUpdateRSSI       = true;
 			gPowerSave_10ms   = power_save1_10ms;
@@ -1109,7 +1091,7 @@ void APP_Update(void)
 }
 
 // called every 10ms
-void APP_CheckKeys(void)
+static void CheckKeys(void)
 {
 #ifdef ENABLE_AIRCOPY
 	if (gSetting_KILLED || (gScreenToDisplay == DISPLAY_AIRCOPY && gAircopyState != AIRCOPY_READY))
@@ -1126,7 +1108,7 @@ void APP_CheckKeys(void)
 		{	// PTT released or serial comms config in progress
 			if (++gPttDebounceCounter >= 3 || gSerialConfigCountDown_500ms > 0)	    // 30ms
 			{	// stop transmitting
-				APP_ProcessKey(KEY_PTT, false, false);
+				ProcessKey(KEY_PTT, false, false);
 				gPttIsPressed = false;
 				if (gKeyReading1 != KEY_INVALID)
 					gPttWasReleased = true;
@@ -1142,7 +1124,7 @@ void APP_CheckKeys(void)
 			boot_counter_10ms   = 0;
 			gPttDebounceCounter = 0;
 			gPttIsPressed       = true;
-			APP_ProcessKey(KEY_PTT, true, false);
+			ProcessKey(KEY_PTT, true, false);
 		}
 	}
 	else
@@ -1160,7 +1142,7 @@ void APP_CheckKeys(void)
 	{	
 
 		if (gKeyReading0 != KEY_INVALID && Key != KEY_INVALID)
-			APP_ProcessKey(gKeyReading1, false, gKeyBeingHeld);  // key pressed without releasing previous key
+			ProcessKey(gKeyReading1, false, gKeyBeingHeld);  // key pressed without releasing previous key
 
 		gKeyReading0     = Key;
 		gDebounceCounter = 0;
@@ -1175,14 +1157,14 @@ void APP_CheckKeys(void)
 		{
 			if (gKeyReading1 != KEY_INVALID) // some button was pressed before
 			{
-				APP_ProcessKey(gKeyReading1, false, gKeyBeingHeld); // process last button released event
+				ProcessKey(gKeyReading1, false, gKeyBeingHeld); // process last button released event
 				gKeyReading1 = KEY_INVALID;
 			}
 		}
 		else // process new key pressed
 		{
 			gKeyReading1 = Key;
-			APP_ProcessKey(Key, true, false);
+			ProcessKey(Key, true, false);
 		}
 
 		gKeyBeingHeld = false;
@@ -1197,7 +1179,7 @@ void APP_CheckKeys(void)
 		if (Key != KEY_PTT)
 		{
 			gKeyBeingHeld = true;
-			APP_ProcessKey(Key, true, true); // key held event
+			ProcessKey(Key, true, true); // key held event
 		}
 	}
 	else //subsequent fast key repeats
@@ -1206,7 +1188,7 @@ void APP_CheckKeys(void)
 		{
 			gKeyBeingHeld = true;
 			if ((gDebounceCounter % key_repeat_10ms) == 0)
-				APP_ProcessKey(Key, true, true); // key held event
+				ProcessKey(Key, true, true); // key held event
 		}
 
 		if (gDebounceCounter < 0xFFFF)
@@ -1243,7 +1225,7 @@ void APP_TimeSlice10ms(void)
 		return;
 
 	if (gCurrentFunction != FUNCTION_POWER_SAVE || !gRxIdleMode)
-		APP_CheckRadioInterrupts();
+		CheckRadioInterrupts();
 
 	if (gCurrentFunction == FUNCTION_TRANSMIT)
 	{	// transmitting
@@ -1260,7 +1242,7 @@ void APP_TimeSlice10ms(void)
 	}
 
 	if (gUpdateStatus)
-		UI_DisplayStatus(false);
+		UI_DisplayStatus();
 
 	// Skipping authentic device checks
 
@@ -1269,37 +1251,7 @@ void APP_TimeSlice10ms(void)
 			return;
 	#endif
 
-	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++;
-		}
-		
-	}
+	FlashlightTimeSlice();
 
 	#ifdef ENABLE_VOX
 		if (gVoxResumeCountdown > 0)
@@ -1354,7 +1306,7 @@ void APP_TimeSlice10ms(void)
 						RADIO_SetTxParameters();
 						BK4819_TransmitTone(true, 500);
 						SYSTEM_DelayMs(2);
-						GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+						AUDIO_AudioPathOn();
 
 						gEnableSpeaker    = true;
 						gAlarmToneCounter = 0;
@@ -1399,14 +1351,14 @@ void APP_TimeSlice10ms(void)
 		{
 			if (--gScanDelay_10ms > 0)
 			{
-				APP_CheckKeys();
+				CheckKeys();
 				return;
 			}
 		}
 
 		if (gScannerEditState != 0)
 		{
-			APP_CheckKeys();
+			CheckKeys();
 			return;
 		}
 
@@ -1525,7 +1477,7 @@ void APP_TimeSlice10ms(void)
 		}
 	#endif
 
-	APP_CheckKeys();
+	CheckKeys();
 }
 
 void cancelUserInputModes(void)
@@ -1750,7 +1702,7 @@ void APP_TimeSlice500ms(void)
 	}
 
 	if (gCurrentFunction != FUNCTION_POWER_SAVE && gCurrentFunction != FUNCTION_TRANSMIT)
-		updateRSSI(gEeprom.RX_VFO);
+		UpdateRSSI(gEeprom.RX_VFO);
 
 	if (!gPttIsPressed && gVFOStateResumeCountdown_500ms > 0)
 	{
@@ -1885,7 +1837,7 @@ void APP_TimeSlice500ms(void)
 	{
 		gAlarmState = ALARM_STATE_OFF;
 
-		GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+		AUDIO_AudioPathOff();
 		gEnableSpeaker = false;
 
 		if (gEeprom.ALARM_MODE == ALARM_MODE_TONE)
@@ -1909,7 +1861,7 @@ void APP_TimeSlice500ms(void)
 
 
 
-static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
+static void ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 {
 	if (Key == KEY_EXIT && !BACKLIGHT_IsOn() && gEeprom.BACKLIGHT_TIME > 0)
 	{	// just turn the light on for now so the user can see what's what
@@ -2113,7 +2065,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 				{
 					if (!bKeyPressed)
 					{
-						GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+						AUDIO_AudioPathOff();
 
 						gEnableSpeaker = false;
 
@@ -2129,7 +2081,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 				{
 					if (gEeprom.DTMF_SIDE_TONE)
 					{	// user will here the DTMF tones in speaker
-						GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+						AUDIO_AudioPathOn();
 						gEnableSpeaker = true;
 					}
 
@@ -2369,3 +2321,37 @@ Skip:
 
 	gUpdateDisplay = true;
 }
+
+static void FlashlightTimeSlice()
+{
+		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 = gFlashLightBlinkCounter + 7*u;
+				c = 0;
+			}
+			else if(c==7 || c==9 || c==11)
+			 	next = gFlashLightBlinkCounter + 3*u;
+			else
+				next = gFlashLightBlinkCounter + u;
+
+			c++;
+		}
+	}
+}

app/dtmf.c

@@ -434,7 +434,7 @@ void DTMF_Reply(void)
 
 	if (gEeprom.DTMF_SIDE_TONE)
 	{	// the user will also hear the transmitted tones
-		GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+		AUDIO_AudioPathOn();
 		gEnableSpeaker = true;
 	}
 
@@ -450,7 +450,7 @@ void DTMF_Reply(void)
 		gEeprom.DTMF_CODE_PERSIST_TIME,
 		gEeprom.DTMF_CODE_INTERVAL_TIME);
 
-	GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+	AUDIO_AudioPathOff();
 
 	gEnableSpeaker = false;
 

app/fm.c

@@ -96,7 +96,7 @@ void FM_TurnOff(void)
 	gFM_ScanState             = FM_SCAN_OFF;
 	gFM_RestoreCountdown_10ms = 0;
 
-	GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+	AUDIO_AudioPathOff();
 
 	gEnableSpeaker = false;
 
@@ -119,7 +119,7 @@ void FM_EraseChannels(void)
 
 void FM_Tune(uint16_t Frequency, int8_t Step, bool bFlag)
 {
-	GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+	AUDIO_AudioPathOff();
 
 	gEnableSpeaker = false;
 
@@ -166,7 +166,7 @@ void FM_PlayAndUpdate(void)
 	gScheduleFM           = false;
 	gAskToSave            = false;
 
-	GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+	AUDIO_AudioPathOn();
 
 	gEnableSpeaker   = true;
 }
@@ -625,7 +625,7 @@ void FM_Play(void)
 			if (!gEeprom.FM_IsMrMode)
 				gEeprom.FM_SelectedFrequency = gEeprom.FM_FrequencyPlaying;
 
-			GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+			AUDIO_AudioPathOn();
 			gEnableSpeaker = true;
 
 			GUI_SelectNextDisplay(DISPLAY_FM);
@@ -659,7 +659,7 @@ void FM_Start(void)
 
 	BK1080_Init(gEeprom.FM_FrequencyPlaying, true);
 
-	GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+	AUDIO_AudioPathOn();
 
 	gEnableSpeaker       = true;
 	gUpdateStatus        = true;

app/generic.c

@@ -212,21 +212,12 @@ void GENERIC_Key_PTT(bool bKeyPressed)
 		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
+		// 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;
 
 		// remember the DTMF string
 		gDTMF_PreviousIndex = gDTMF_InputBox_Index;

app/menu.c

@@ -331,8 +331,13 @@ int MENU_GetLimits(uint8_t menu_id, int32_t *pMin, int32_t *pMax)
 		#endif
 
 		case MENU_BATCAL:
-			*pMin = 1600;  // 0
-			*pMax = 2200;  // 2300
+			*pMin = 1600;
+			*pMax = 2200;
+			break;
+
+		case MENU_BATTYP:
+			*pMin = 0;
+			*pMax = 1;
 			break;
 
 		case MENU_F1SHRT:
@@ -594,7 +599,7 @@ void MENU_AcceptSetting(void)
 			return;
 
 		case MENU_STE:
-			gEeprom.TAIL_NOTE_ELIMINATION = gSubMenuSelection;
+			gEeprom.TAIL_TONE_ELIMINATION = gSubMenuSelection;
 			break;
 
 		case MENU_RP_STE:
@@ -772,17 +777,21 @@ void MENU_AcceptSetting(void)
 		#endif
 
 		case MENU_BATCAL:
-		{
+		{																 // voltages are averages between discharge curves of 1600 and 2200 mAh
 			gBatteryCalibration[0] = (520ul * gSubMenuSelection) / 760;  // 5.20V empty, blinking above this value, reduced functionality below
-			gBatteryCalibration[1] = (700ul * gSubMenuSelection) / 760;  // 7.00V,  ~5%, 1 bars above this value
-			gBatteryCalibration[2] = (745ul * gSubMenuSelection) / 760;  // 7.45V, ~17%, 2 bars above this value
+			gBatteryCalibration[1] = (689ul * gSubMenuSelection) / 760;  // 6.89V,  ~5%, 1 bars above this value
+			gBatteryCalibration[2] = (724ul * gSubMenuSelection) / 760;  // 7.24V, ~17%, 2 bars above this value
 			gBatteryCalibration[3] =          gSubMenuSelection;         // 7.6V,  ~29%, 3 bars above this value
-			gBatteryCalibration[4] = (788ul * gSubMenuSelection) / 760;  // 7.88V, ~65%, 4 bars above this value
+			gBatteryCalibration[4] = (771ul * gSubMenuSelection) / 760;  // 7.71V, ~65%, 4 bars above this value
 			gBatteryCalibration[5] = 2300;
 			SETTINGS_SaveBatteryCalibration(gBatteryCalibration);
 			return;
 		}
 
+		case MENU_BATTYP:
+			gEeprom.BATTERY_TYPE = gSubMenuSelection;
+			break;
+
 		case MENU_F1SHRT:
 		case MENU_F1LONG:
 		case MENU_F2SHRT:
@@ -1015,7 +1024,7 @@ void MENU_ShowCurrentSetting(void)
 			break;
 
 		case MENU_STE:
-			gSubMenuSelection = gEeprom.TAIL_NOTE_ELIMINATION;
+			gSubMenuSelection = gEeprom.TAIL_TONE_ELIMINATION;
 			break;
 
 		case MENU_RP_STE:
@@ -1170,6 +1179,10 @@ void MENU_ShowCurrentSetting(void)
 			gSubMenuSelection = gBatteryCalibration[3];
 			break;
 
+		case MENU_BATTYP:
+			gSubMenuSelection = gEeprom.BATTERY_TYPE;
+			break;			
+
 		case MENU_F1SHRT:
 		case MENU_F1LONG:
 		case MENU_F2SHRT:

app/scanner.h

@@ -52,6 +52,9 @@ extern volatile uint16_t gScanPauseDelayIn_10ms;
 extern uint8_t           gScanProgressIndicator;
 extern uint8_t           gScanHitCount;
 extern bool              gScanUseCssResult;
+
+// scan direction, if not equal SCAN_OFF indicates 
+// that we are in a process of scanning channels/frequencies
 extern int8_t            gScanStateDir;
 extern bool              gScanKeepResult;
 

app/spectrum.c

@@ -16,6 +16,7 @@
 
 #include "app/spectrum.h"
 #include "driver/backlight.h"
+#include "audio.h"
 
 struct FrequencyBandInfo {
     uint32_t lower;
@@ -78,10 +79,10 @@ uint16_t listenT = 0;
 
 RegisterSpec registerSpecs[] = {
     {},
-    {"LNAs", 0x13, 8, 0b11, 1},
-    {"LNA", 0x13, 5, 0b111, 1},
-    {"PGA", 0x13, 0, 0b111, 1},
-    {"IF", 0x3D, 0, 0xFFFF, 0x2aaa},
+    {"LNAs", BK4819_REG_13, 8, 0b11, 1},
+    {"LNA", BK4819_REG_13, 5, 0b111, 1},
+    {"PGA", BK4819_REG_13, 0, 0b111, 1},
+    {"IF", BK4819_REG_3D, 0, 0xFFFF, 0x2aaa},
     // {"MIX", 0x13, 3, 0b11, 1}, // TODO: hidden
 };
 
@@ -205,23 +206,23 @@ static void ToggleAFBit(bool on) {
 }
 
 static void BackupRegisters() {
-  R30 = BK4819_ReadRegister(0x30);
-  R37 = BK4819_ReadRegister(0x37);
-  R3D = BK4819_ReadRegister(0x3D);
-  R43 = BK4819_ReadRegister(0x43);
-  R47 = BK4819_ReadRegister(0x47);
-  R48 = BK4819_ReadRegister(0x48);
-  R7E = BK4819_ReadRegister(0x7E);
+  R30 = BK4819_ReadRegister(BK4819_REG_30);
+  R37 = BK4819_ReadRegister(BK4819_REG_37);
+  R3D = BK4819_ReadRegister(BK4819_REG_3D);
+  R43 = BK4819_ReadRegister(BK4819_REG_43);
+  R47 = BK4819_ReadRegister(BK4819_REG_47);
+  R48 = BK4819_ReadRegister(BK4819_REG_48);
+  R7E = BK4819_ReadRegister(BK4819_REG_7E);
 }
 
 static void RestoreRegisters() {
-  BK4819_WriteRegister(0x30, R30);
-  BK4819_WriteRegister(0x37, R37);
-  BK4819_WriteRegister(0x3D, R3D);
-  BK4819_WriteRegister(0x43, R43);
-  BK4819_WriteRegister(0x47, R47);
-  BK4819_WriteRegister(0x48, R48);
-  BK4819_WriteRegister(0x7E, R7E);
+  BK4819_WriteRegister(BK4819_REG_30, R30);
+  BK4819_WriteRegister(BK4819_REG_37, R37);
+  BK4819_WriteRegister(BK4819_REG_3D, R3D);
+  BK4819_WriteRegister(BK4819_REG_43, R43);
+  BK4819_WriteRegister(BK4819_REG_47, R47);
+  BK4819_WriteRegister(BK4819_REG_48, R48);
+  BK4819_WriteRegister(BK4819_REG_7E, R7E);
 }
 
 static void SetModulation(ModulationType type) {
@@ -230,9 +231,9 @@ static void SetModulation(ModulationType type) {
   reg &= ~(0b111 << 8);
   BK4819_WriteRegister(BK4819_REG_47, reg | (modTypeReg47Values[type] << 8));
   if (type == MOD_USB) {
-    BK4819_WriteRegister(0x3D, 0b0010101101000101);
+    BK4819_WriteRegister(BK4819_REG_3D, 0b0010101101000101);
     BK4819_WriteRegister(BK4819_REG_37, 0x160F);
-    BK4819_WriteRegister(0x48, 0b0000001110101000);
+    BK4819_WriteRegister(BK4819_REG_48, 0b0000001110101000);
   }
 }
 
@@ -304,9 +305,9 @@ static void ToggleAudio(bool on) {
   }
   audioState = on;
   if (on) {
-    GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+    AUDIO_AudioPathOn();
   } else {
-    GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+    AUDIO_AudioPathOff();
   }
 }
 

audio.c

@@ -97,7 +97,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 
 	ToneConfig = BK4819_ReadRegister(BK4819_REG_71);
 
-	GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+	AUDIO_AudioPathOff();
 
 	if (gCurrentFunction == FUNCTION_POWER_SAVE && gRxIdleMode)
 		BK4819_RX_TurnOn();
@@ -138,7 +138,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 
 	SYSTEM_DelayMs(2);
 
-	GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+	AUDIO_AudioPathOn();
 
 	SYSTEM_DelayMs(60);
 
@@ -185,7 +185,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 	BK4819_EnterTxMute();
 	SYSTEM_DelayMs(20);
 
-	GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+	AUDIO_AudioPathOff();
 
 	#ifdef ENABLE_VOX
 		gVoxResumeCountdown = 80;
@@ -197,7 +197,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 	BK4819_WriteRegister(BK4819_REG_71, ToneConfig);
 
 	if (gEnableSpeaker)
-		GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+		AUDIO_AudioPathOn();
 
 	#ifdef ENABLE_FMRADIO
 		if (gFmRadioMode)
@@ -270,7 +270,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 					BK1080_Mute(true);
 			#endif
 			
-			GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+			AUDIO_AudioPathOn();
 
 			#ifdef ENABLE_VOX
 				gVoxResumeCountdown = 2000;
@@ -297,7 +297,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 				#endif
 				
 				if (!gEnableSpeaker)
-					GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+					AUDIO_AudioPathOff();
 	
 				gVoiceWriteIndex    = 0;
 				gVoiceReadIndex     = 0;
@@ -438,7 +438,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 		#endif
 		
 		if (!gEnableSpeaker)
-			GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+			AUDIO_AudioPathOff();
 	
 		#ifdef ENABLE_VOX
 			gVoxResumeCountdown = 80;
@@ -449,3 +449,4 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 	}
 
 #endif
+

audio.h

@@ -20,6 +20,9 @@
 #include <stdbool.h>
 #include <stdint.h>
 
+#include "bsp/dp32g030/gpio.h"
+#include "driver/gpio.h"
+
 enum BEEP_Type_t
 {
 	BEEP_NONE = 0,
@@ -130,6 +133,14 @@ enum VOICE_ID_t
 
 typedef enum VOICE_ID_t  VOICE_ID_t;
 	
+static inline void AUDIO_AudioPathOn(void) {
+	GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+}
+
+static inline void AUDIO_AudioPathOff(void) {
+	GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+}
+
 #ifdef ENABLE_VOICE
 	extern VOICE_ID_t        gVoiceID[8];
 	extern uint8_t           gVoiceReadIndex;

bitmaps.c

@@ -270,48 +270,6 @@ const uint8_t BITMAP_Antenna[5] =
 	0b00000011
 };
 
-const uint8_t BITMAP_AntennaLevel1[3] =
-{
-	0b01100000,
-	0b01100000,
-	0b00000000
-};
-
-const uint8_t BITMAP_AntennaLevel2[3] =
-{
-	0b01110000,
-	0b01110000,
-	0b00000000
-};
-
-const uint8_t BITMAP_AntennaLevel3[3] =
-{
-	0b01111000,
-	0b01111000,
-	0b00000000
-};
-
-const uint8_t BITMAP_AntennaLevel4[3] =
-{
-	0b01111100,
-	0b01111100,
-	0b00000000
-};
-
-const uint8_t BITMAP_AntennaLevel5[3] =
-{
-	0b01111110,
-	0b01111110,
-	0b00000000
-};
-
-const uint8_t BITMAP_AntennaLevel6[3] =
-{
-	0b01111111,
-	0b01111111,
-	0b00000000
-};
-
 const uint8_t BITMAP_MARKER[8] =
 {
 	0b11111111,

bitmaps.h

@@ -39,12 +39,6 @@ extern const uint8_t BITMAP_TDR2[9];
 #endif
 
 extern const uint8_t BITMAP_Antenna[5];
-extern const uint8_t BITMAP_AntennaLevel1[3];
-extern const uint8_t BITMAP_AntennaLevel2[3];
-extern const uint8_t BITMAP_AntennaLevel3[3];
-extern const uint8_t BITMAP_AntennaLevel4[3];
-extern const uint8_t BITMAP_AntennaLevel5[3];
-extern const uint8_t BITMAP_AntennaLevel6[3];
 
 extern const uint8_t BITMAP_MARKER[8];
 

board.c

@@ -23,11 +23,10 @@
 #include "board.h"
 #include "bsp/dp32g030/gpio.h"
 #include "bsp/dp32g030/portcon.h"
-#include "bsp/dp32g030/pwmplus.h"
 #include "bsp/dp32g030/saradc.h"
 #include "bsp/dp32g030/syscon.h"
 #include "driver/adc.h"
-//#include "driver/backlight.h"
+#include "driver/backlight.h"
 #ifdef ENABLE_FMRADIO
 	#include "driver/bk1080.h"
 #endif
@@ -182,14 +181,10 @@ void BOARD_PORTCON_Init(void)
 	// PORT B pin selection
 
 	PORTCON_PORTB_SEL0 &= ~(0
-		// Back light
-		| PORTCON_PORTB_SEL0_B6_MASK
 		// SPI0 SSN
 		| PORTCON_PORTB_SEL0_B7_MASK
 		);
 	PORTCON_PORTB_SEL0 |= 0
-		// Back light PWM
-		| PORTCON_PORTB_SEL0_B6_BITS_PWMP0_CH0
 		// SPI0 SSN
 		| PORTCON_PORTB_SEL0_B7_BITS_SPI0_SSN
 		;
@@ -470,23 +465,6 @@ void BOARD_PORTCON_Init(void)
 		;
 }
 
-static void BacklightPWM_Init()
-{
-	// 48MHz / 94 / 1024 ~ 500Hz
-	PWM_PLUS0_CLKSRC |= ((94) << 16);
-	PWM_PLUS0_PERIOD = 1023;
-
-	PWM_PLUS0_GEN = 	
-		PWMPLUS_GEN_CH0_OE_BITS_ENABLE |
-		PWMPLUS_GEN_CH0_OUTINV_BITS_ENABLE |
-		0;
-
-	PWM_PLUS0_CFG =  	
-		PWMPLUS_CFG_CNT_REP_BITS_ENABLE |
-		PWMPLUS_CFG_COUNTER_EN_BITS_ENABLE |
-		0;
-}
-
 void BOARD_ADC_Init(void)
 {
 	ADC_Config_t Config;
@@ -524,7 +502,7 @@ void BOARD_Init(void)
 {
 	BOARD_PORTCON_Init();
 	BOARD_GPIO_Init();
-	BacklightPWM_Init();
+	BACKLIGHT_InitHardware();
 	BOARD_ADC_Init();
 	ST7565_Init(true);
 	#ifdef ENABLE_FMRADIO
@@ -564,7 +542,7 @@ void BOARD_EEPROM_Init(void)
 	gEeprom.BATTERY_SAVE          = (Data[3] < 5) ? Data[3] : 4;
 	gEeprom.DUAL_WATCH            = (Data[4] < 3) ? Data[4] : DUAL_WATCH_CHAN_A;
 	gEeprom.BACKLIGHT_TIME        = (Data[5] < ARRAY_SIZE(gSubMenu_BACKLIGHT)) ? Data[5] : 3;
-	gEeprom.TAIL_NOTE_ELIMINATION = (Data[6] < 2) ? Data[6] : false;
+	gEeprom.TAIL_TONE_ELIMINATION = (Data[6] < 2) ? Data[6] : false;
 	gEeprom.VFO_OPEN              = (Data[7] < 2) ? Data[7] : true;
 
 	// 0E80..0E87
@@ -636,7 +614,8 @@ void BOARD_EEPROM_Init(void)
 	#endif
 	gEeprom.ROGER                          = (Data[1] <  3) ? Data[1] : ROGER_MODE_OFF;
 	gEeprom.REPEATER_TAIL_TONE_ELIMINATION = (Data[2] < 11) ? Data[2] : 0;
-	gEeprom.TX_VFO                     = (Data[3] <  2) ? Data[3] : 0;
+	gEeprom.TX_VFO                         = (Data[3] <  2) ? Data[3] : 0;
+	gEeprom.BATTERY_TYPE                   = (Data[4] < BATTERY_TYPE_UNKNOWN) ? Data[4] : BATTERY_TYPE_1600_MAH;
 
 	// 0ED0..0ED7
 	EEPROM_ReadBuffer(0x0ED0, Data, 8);

debugging.h

@@ -0,0 +1,18 @@
+#ifndef DEBUGGING_H
+#define DEBUGGING_H
+
+#include "driver/uart.h"
+#include "string.h"
+#include "external/printf/printf.h"
+
+
+static inline void LogUart(char * str)
+{
+    UART_Send(str, strlen(str));
+}
+
+
+
+
+
+#endif

driver/backlight.c

@@ -17,6 +17,7 @@
 #include "backlight.h"
 #include "bsp/dp32g030/gpio.h"
 #include "bsp/dp32g030/pwmplus.h"
+#include "bsp/dp32g030/portcon.h"
 #include "driver/gpio.h"
 #include "settings.h"
 
@@ -24,6 +25,33 @@
 uint16_t gBacklightCountdown = 0;
 bool backlightOn;
 
+void BACKLIGHT_InitHardware()
+{
+	// 48MHz / 94 / 1024 ~ 500Hz
+	const uint32_t PWM_FREQUENCY_HZ =  1000;
+	PWM_PLUS0_CLKSRC |= ((48000000 / 1024 / PWM_FREQUENCY_HZ) << 16);
+	PWM_PLUS0_PERIOD = 1023;
+
+	PORTCON_PORTB_SEL0 &= ~(0
+		// Back light
+		| PORTCON_PORTB_SEL0_B6_MASK
+		);
+	PORTCON_PORTB_SEL0 |= 0
+		// Back light PWM
+		| PORTCON_PORTB_SEL0_B6_BITS_PWMP0_CH0
+		;
+
+	PWM_PLUS0_GEN = 	
+		PWMPLUS_GEN_CH0_OE_BITS_ENABLE |
+		PWMPLUS_GEN_CH0_OUTINV_BITS_ENABLE |
+		0;
+
+	PWM_PLUS0_CFG =  	
+		PWMPLUS_CFG_CNT_REP_BITS_ENABLE |
+		PWMPLUS_CFG_COUNTER_EN_BITS_ENABLE |
+		0;
+}
+
 void BACKLIGHT_TurnOn(void)
 {
 	if (gEeprom.BACKLIGHT_TIME != 0) {

driver/backlight.h

@@ -23,6 +23,7 @@
 extern uint16_t gBacklightCountdown;
 extern uint8_t gBacklightBrightness;
 
+void BACKLIGHT_InitHardware();
 void BACKLIGHT_TurnOn();
 void BACKLIGHT_TurnOff();
 bool BACKLIGHT_IsOn();

driver/bk4819-regs.h

@@ -52,6 +52,7 @@ enum BK4819_REGISTER_t {
 	BK4819_REG_3A = 0x3AU,
 	BK4819_REG_3B = 0x3BU,
 	BK4819_REG_3C = 0x3CU,
+	BK4819_REG_3D = 0x3DU,
 	BK4819_REG_3E = 0x3EU,
 	BK4819_REG_3F = 0x3FU,
 	BK4819_REG_43 = 0x43U,

driver/bk4819.c

@@ -16,6 +16,7 @@
 
 #include <stdio.h>   // NULL
 
+#include "audio.h"
 #include "bk4819.h"
 #include "bsp/dp32g030/gpio.h"
 #include "bsp/dp32g030/portcon.h"
@@ -1000,7 +1001,7 @@ void BK4819_PlaySingleTone(const unsigned int tone_Hz, const unsigned int delay,
 	
 	if (play_speaker)
 	{
-		GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+		AUDIO_AudioPathOn();
 		BK4819_SetAF(BK4819_AF_BEEP);
 	}
 	else
@@ -1022,7 +1023,7 @@ void BK4819_PlaySingleTone(const unsigned int tone_Hz, const unsigned int delay,
 
 	if (play_speaker)
 	{
-		GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+		AUDIO_AudioPathOff();
 		BK4819_SetAF(BK4819_AF_MUTE);
 	}
 	

driver/bk4819.h

@@ -62,6 +62,7 @@ enum BK4819_CssScanResult_t
 
 typedef enum BK4819_CssScanResult_t BK4819_CssScanResult_t;
 
+// radio is asleep, not listening
 extern bool gRxIdleMode;
 
 void     BK4819_Init(void);

driver/gpio.c

@@ -14,25 +14,5 @@
  *     limitations under the License.
  */
 
-#include "driver/gpio.h"
 
-void GPIO_ClearBit(volatile uint32_t *pReg, uint8_t Bit)
-{
-	*pReg &= ~(1U << Bit);
-}
-
-uint8_t GPIO_CheckBit(volatile uint32_t *pReg, uint8_t Bit)
-{
-	return (*pReg >> Bit) & 1U;
-}
-
-void GPIO_FlipBit(volatile uint32_t *pReg, uint8_t Bit)
-{
-	*pReg ^= 1U << Bit;
-}
-
-void GPIO_SetBit(volatile uint32_t *pReg, uint8_t Bit)
-{
-	*pReg |= 1U << Bit;
-}
 

driver/gpio.h

@@ -58,10 +58,21 @@ enum GPIOC_PINS {
 	GPIOC_PIN_PTT        = 5
 };
 
-void    GPIO_ClearBit(volatile uint32_t *pReg, uint8_t Bit);
-uint8_t GPIO_CheckBit(volatile uint32_t *pReg, uint8_t Bit);
-void    GPIO_FlipBit( volatile uint32_t *pReg, uint8_t Bit);
-void    GPIO_SetBit(  volatile uint32_t *pReg, uint8_t Bit);
+static inline void GPIO_ClearBit(volatile uint32_t *pReg, uint8_t Bit) {
+	*pReg &= ~(1U << Bit);
+}
+
+static inline uint8_t GPIO_CheckBit(volatile uint32_t *pReg, uint8_t Bit) {
+	return (*pReg >> Bit) & 1U;
+}
+
+static inline void GPIO_FlipBit(volatile uint32_t *pReg, uint8_t Bit) {
+	*pReg ^= 1U << Bit;
+}
+
+static inline void GPIO_SetBit(volatile uint32_t *pReg, uint8_t Bit) {
+	*pReg |= 1U << Bit;
+}
 
 #endif
 

functions.c

@@ -93,7 +93,7 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
 	{
 		BK4819_Conditional_RX_TurnOn_and_GPIO6_Enable();
 		gRxIdleMode = false;
-		UI_DisplayStatus(false);
+		UI_DisplayStatus();
 	}
 
 	switch (Function)
@@ -179,13 +179,13 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
 
 					GUI_DisplayScreen();
 
-					GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+					AUDIO_AudioPathOff();
 
 					SYSTEM_DelayMs(20);
 					BK4819_PlayTone(500, 0);
 					SYSTEM_DelayMs(2);
 
-					GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+					AUDIO_AudioPathOn();
 
 					gEnableSpeaker = true;
 
@@ -223,7 +223,7 @@ void FUNCTION_Select(FUNCTION_Type_t Function)
 							BK4819_TransmitTone(true, 500);
 					#endif
 					SYSTEM_DelayMs(2);
-					GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+					AUDIO_AudioPathOn();
 					#ifdef ENABLE_ALARM
 						gAlarmToneCounter = 0;
 					#endif

helper/battery.c

@@ -17,6 +17,7 @@
 #include "battery.h"
 #include "driver/backlight.h"
 #include "misc.h"
+#include "settings.h"
 #include "ui/battery.h"
 #include "ui/menu.h"
 #include "ui/ui.h"
@@ -34,48 +35,47 @@ uint16_t          gBatteryCheckCounter;
 
 volatile uint16_t gPowerSave_10ms;
 
-/*
-Based on real measurement
 
-Volts	Percent		Volts	Percent		Volts	Percent		Volts	Percent
-8.28	100			7.95099	73			7.7184	46			7.48116	19
-8.22	99          7.94188	72          7.71091	45          7.46364	18
-8.17	98          7.9338	71          7.70911	44          7.44789	17
-8.13632	97          7.92684	70          7.70098	43          7.43318	16
-8.12308	96          7.9178	69          7.69619	42          7.41864	15
-8.09688	95          7.90823	68          7.69018	41          7.40579	14
-8.08124	94          7.89858	67          7.68473	40          7.39289	13
-8.06912	93          7.88667	66          7.67911	39          7.37839	12
-8.05826	92          7.87673	65          7.67087	38          7.36017	11
-8.05008	91          7.86864	64          7.66601	37          7.33704	10
-8.04192	90          7.85802	63          7.6599	36          7.3079	9
-8.03866	89          7.84816	62          7.65418	35          7.26793	8
-8.03089	88          7.83744	61          7.64775	34          7.21291	7
-8.0284	87          7.82748	60          7.64065	33          7.13416	6
-8.02044	86          7.81983	59          7.63136	32          7.02785	5
-8.01832	85          7.80929	58          7.6244	31          6.89448	4
-8.01072	84          7.79955	57          7.61636	30          6.72912	3
-8.00965	83          7.79017	56          7.60738	29          6.5164	2
-8.00333	82          7.78107	55          7.597	28          6.19272	1
-7.99973	81          7.77167	54          7.5876	27          5.63138	0
-7.99218	80          7.76509	53          7.57732	26
-7.98999	79          7.75649	52          7.56563	25
-7.98234	78          7.74939	51          7.55356	24
-7.97892	77          7.7411	50          7.54088	23
-7.97043	76          7.73648	49          7.52683	22
-7.96478	75          7.72911	48          7.51285	21
-7.95983	74          7.72097	47          7.49832	20
-*/
 unsigned int BATTERY_VoltsToPercent(const unsigned int voltage_10mV)
 {
-	if (voltage_10mV > 814)
-		return 100;
-	if (voltage_10mV > 756)
-		return ((132ul * voltage_10mV) /  100) - 974u;
-	if (voltage_10mV > 729)
-		return  ((63ul * voltage_10mV) /  100) - 452u;
-	if (voltage_10mV > 600)
-		return  ((52ul * voltage_10mV) / 1000) - 31u;    	
+	const uint16_t crv1600[][2] = {
+		{814, 100},
+		{756, 24 },
+		{729, 7 },
+		{597, 0 },
+		{0,   0}
+	};
+
+	const uint16_t crv2200[][2] = {
+		{823, 100},
+		{740, 60},
+		{707, 21},
+		{680, 5},
+		{505, 0},
+		{0,   0}
+	};
+	
+	const BATTERY_Type_t type = gEeprom.BATTERY_TYPE;
+	const uint16_t(*crv)[2];
+	uint8_t size;
+	if (type == BATTERY_TYPE_2200_MAH) {
+		crv = crv2200;
+		size = ARRAY_SIZE(crv2200);
+	}	
+	else {
+		crv = crv1600;
+		size = ARRAY_SIZE(crv1600);
+	}
+
+	const int mulipl = 1000;
+	for (int i = 1; i < size; i++) {
+		if (voltage_10mV > crv[i][0]) {
+			int a = (crv[i - 1][1] - crv[i][1]) * mulipl / (crv[i - 1][0] - crv[i][0]);
+			int b = crv[i][1] - a * crv[i][0] / mulipl;
+			int p = a * voltage_10mV / mulipl + b;
+			return MIN(p, 100);
+		}
+	}
 	return 0;
 }
 

helper/battery.h

@@ -33,6 +33,12 @@ extern uint16_t          gBatteryCheckCounter;
 
 extern volatile uint16_t gPowerSave_10ms;
 
+typedef enum {
+    BATTERY_TYPE_1600_MAH,
+    BATTERY_TYPE_2200_MAH,
+    BATTERY_TYPE_UNKNOWN
+} BATTERY_Type_t;
+
 unsigned int BATTERY_VoltsToPercent(const unsigned int voltage_10mV);
 void BATTERY_GetReadings(const bool bDisplayBatteryLevel);
 

misc.h

@@ -225,8 +225,12 @@ extern bool                  gEndOfRxDetectedMaybe;
 extern int16_t               gVFO_RSSI[2];
 extern uint8_t               gVFO_RSSI_bar_level[2];
 
+// battery critical, limit functionality to minimum
 extern uint8_t               gReducedService;
 extern uint8_t               gBatteryVoltageIndex;
+
+// if not equal CSS_SCAN_MODE_OFF we are scanning CTCSS/DCS
+// this is a scanning inside RX ctcss/dcs menu
 extern CssScanMode_t         gCssScanMode;
 extern bool                  gUpdateRSSI;
 extern AlarmState_t          gAlarmState;
@@ -264,6 +268,8 @@ extern bool                  g_CxCSS_TAIL_Found;
 	extern uint16_t          gVoxResumeCountdown;
 	extern uint16_t          gVoxPauseCountdown;
 #endif
+
+// true means we are receiving signal
 extern bool                  g_SquelchLost;
 extern uint8_t               gFlashLightState;
 extern volatile uint16_t     gFlashLightBlinkCounter;

radio.c

@@ -513,6 +513,21 @@ void RADIO_ConfigureSquelchAndOutputPower(VFO_Info_t *pInfo)
 
 	EEPROM_ReadBuffer(0x1ED0 + (Band * 16) + (pInfo->OUTPUT_POWER * 3), Txp, 3);
 
+
+#ifdef ENABLE_REDUCE_LOW_MID_TX_POWER
+	// make low and mid even lower
+	if (pInfo->OUTPUT_POWER == OUTPUT_POWER_LOW) {
+		Txp[0] /= 5;
+		Txp[1] /= 5;
+		Txp[2] /= 5;
+	}
+	else if (pInfo->OUTPUT_POWER == OUTPUT_POWER_MID){
+		Txp[0] /= 3;
+		Txp[1] /= 3;
+		Txp[2] /= 3;
+	}
+#endif
+
 	pInfo->TXP_CalculatedSetting = FREQUENCY_CalculateOutputPower(
 		Txp[0],
 		Txp[1],
@@ -570,13 +585,13 @@ void RADIO_SelectVfos(void)
 	RADIO_SelectCurrentVfo();
 }
 
-void RADIO_SetupRegisters(bool bSwitchToFunction0)
+void RADIO_SetupRegisters(bool switchToForeground)
 {
 	BK4819_FilterBandwidth_t Bandwidth = gRxVfo->CHANNEL_BANDWIDTH;
 	uint16_t                 InterruptMask;
 	uint32_t                 Frequency;
 
-	GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+	AUDIO_AudioPathOff();
 
 	gEnableSpeaker = false;
 
@@ -773,7 +788,7 @@ void RADIO_SetupRegisters(bool bSwitchToFunction0)
 
 	FUNCTION_Init();
 
-	if (bSwitchToFunction0)
+	if (switchToForeground)
 		FUNCTION_Select(FUNCTION_FOREGROUND);
 }
 
@@ -826,7 +841,7 @@ void RADIO_SetTxParameters(void)
 {
 	BK4819_FilterBandwidth_t Bandwidth = gCurrentVfo->CHANNEL_BANDWIDTH;
 
-	GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+	AUDIO_AudioPathOff();
 
 	gEnableSpeaker = false;
 
@@ -1031,23 +1046,17 @@ void RADIO_PrepareTX(void)
 
 void RADIO_EnableCxCSS(void)
 {
-	switch (gCurrentVfo->pTX->CodeType)
-	{
-		default:
-		case CODE_TYPE_OFF:
-			break;
-
-		case CODE_TYPE_CONTINUOUS_TONE:
-			BK4819_EnableCTCSS();
-			SYSTEM_DelayMs(200);
-			break;
-
-		case CODE_TYPE_DIGITAL:
-		case CODE_TYPE_REVERSE_DIGITAL:
-			BK4819_EnableCDCSS();
-			SYSTEM_DelayMs(200);
-			break;
+	switch (gCurrentVfo->pTX->CodeType) {
+	case CODE_TYPE_DIGITAL:
+	case CODE_TYPE_REVERSE_DIGITAL:
+		BK4819_EnableCDCSS();
+		break;
+	default:
+		BK4819_EnableCTCSS();
+		break;
 	}
+
+	SYSTEM_DelayMs(200);
 }
 
 void RADIO_PrepareCssTX(void)
@@ -1077,7 +1086,7 @@ void RADIO_SendEndOfTransmission(void)
 	{	// end-of-tx
 		if (gEeprom.DTMF_SIDE_TONE)
 		{
-			GPIO_SetBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+			AUDIO_AudioPathOn();
 			gEnableSpeaker = true;
 			SYSTEM_DelayMs(60);
 		}
@@ -1092,7 +1101,7 @@ void RADIO_SendEndOfTransmission(void)
 				gEeprom.DTMF_CODE_PERSIST_TIME,
 				gEeprom.DTMF_CODE_INTERVAL_TIME);
 		
-		GPIO_ClearBit(&GPIOC->DATA, GPIOC_PIN_AUDIO_PATH);
+		AUDIO_AudioPathOff();
 		gEnableSpeaker = false;
 	}
 

settings.c

@@ -102,7 +102,7 @@ void SETTINGS_SaveSettings(void)
 	State[3] = gEeprom.BATTERY_SAVE;
 	State[4] = gEeprom.DUAL_WATCH;
 	State[5] = gEeprom.BACKLIGHT_TIME;
-	State[6] = gEeprom.TAIL_NOTE_ELIMINATION;
+	State[6] = gEeprom.TAIL_TONE_ELIMINATION;
 	State[7] = gEeprom.VFO_OPEN;
 	EEPROM_WriteBuffer(0x0E78, State);
 
@@ -137,6 +137,7 @@ void SETTINGS_SaveSettings(void)
 	State[1] = gEeprom.ROGER;
 	State[2] = gEeprom.REPEATER_TAIL_TONE_ELIMINATION;
 	State[3] = gEeprom.TX_VFO;
+	State[4] = gEeprom.BATTERY_TYPE;
 	EEPROM_WriteBuffer(0x0EA8, State);
 
 	State[0] = gEeprom.DTMF_SIDE_TONE;

settings.h

@@ -21,6 +21,7 @@
 #include <stdint.h>
 
 #include "frequencies.h"
+#include <helper/battery.h>
 #include "radio.h"
 
 enum POWER_OnDisplayMode_t {
@@ -155,7 +156,7 @@ typedef struct {
 	#endif
 	bool                  BEEP_CONTROL;
 	uint8_t               CHANNEL_DISPLAY_MODE;
-	bool                  TAIL_NOTE_ELIMINATION;
+	bool                  TAIL_TONE_ELIMINATION;
 	bool                  VFO_OPEN;
 	uint8_t               DUAL_WATCH;
 	uint8_t               CROSS_BAND_RX_TX;
@@ -230,6 +231,7 @@ typedef struct {
 	uint8_t 			  KEY_M_LONG_PRESS_ACTION;
 	uint8_t               BACKLIGHT_MIN;
 	uint8_t               BACKLIGHT_MAX;
+	BATTERY_Type_t		  BATTERY_TYPE;
 } EEPROM_Config_t;
 
 extern EEPROM_Config_t gEeprom;

ui/main.c

@@ -40,19 +40,16 @@ center_line_t center_line = CENTER_LINE_NONE;
 
 // ***************************************************************************
 
-void UI_drawBars(uint8_t *p, const unsigned int level)
+static void DrawSmallAntennaAndBars(uint8_t *p, unsigned int level)
 {
-	switch (level)
-	{
-		default:
-		case 7: memmove(p + 20, BITMAP_AntennaLevel6, sizeof(BITMAP_AntennaLevel6)); [[fallthrough]];
-		case 6: memmove(p + 17, BITMAP_AntennaLevel5, sizeof(BITMAP_AntennaLevel5)); [[fallthrough]];
-		case 5: memmove(p + 14, BITMAP_AntennaLevel4, sizeof(BITMAP_AntennaLevel4)); [[fallthrough]];
-		case 4: memmove(p + 11, BITMAP_AntennaLevel3, sizeof(BITMAP_AntennaLevel3)); [[fallthrough]];
-		case 3: memmove(p +  8, BITMAP_AntennaLevel2, sizeof(BITMAP_AntennaLevel2)); [[fallthrough]];
-		case 2: memmove(p +  5, BITMAP_AntennaLevel1, sizeof(BITMAP_AntennaLevel1)); [[fallthrough]];
-		case 1: memmove(p +  0, BITMAP_Antenna,       sizeof(BITMAP_Antenna)); break;
-		case 0: memset( p +  0, 0,                    sizeof(BITMAP_Antenna)); break;
+	if(level>6)
+		level = 6;
+
+	memcpy(p, BITMAP_Antenna, ARRAY_SIZE(BITMAP_Antenna));
+
+	for(uint8_t i = 1; i <= level; i++) {
+		char bar = (0xff << (6-i)) & 0x7F;
+		memset(p + 2 + i*3, bar, 2);
 	}
 }
 
@@ -115,154 +112,112 @@ void UI_DisplayAudioBar(void)
 }
 #endif
 
-#if defined(ENABLE_RSSI_BAR)
-void UI_DisplayRSSIBar(const int16_t rssi, const bool now)
+static void DisplayRSSIBar(const int16_t rssi, const bool now)
 {
-	const int16_t      s0_dBm       = -147;                  // S0 .. base level
-	const unsigned int txt_width    = 7 * 8;                 // 8 text chars
-	const unsigned int bar_x        = 2 + txt_width + 4;     // X coord of bar graph
-	const int16_t      rssi_dBm     = (rssi / 2) - 160;
+#if defined(ENABLE_RSSI_BAR)
 
-	const unsigned int line         = 3;
-	uint8_t           *p_line        = gFrameBuffer[line];
-	char               str[16];
+	if (center_line == CENTER_LINE_RSSI) {
+		const unsigned int txt_width    = 7 * 8;                 // 8 text chars
+		const unsigned int bar_x        = 2 + txt_width + 4;     // X coord of bar graph
 
-	const char plus[] = {
-		0b00011000,
-		0b00011000,
-		0b01111110,
-		0b01111110,
-		0b01111110,
-		0b00011000,
-		0b00011000,
-	};
+		const unsigned int line         = 3;
+		uint8_t           *p_line        = gFrameBuffer[line];
+		char               str[16];
 
-	const char hollowBar[] = {
-		0b01111111, 
-		0b01000001, 
-		0b01000001, 
-		0b01111111
-	};
+		const char plus[] = {
+			0b00011000,
+			0b00011000,
+			0b01111110,
+			0b01111110,
+			0b01111110,
+			0b00011000,
+			0b00011000,
+		};
 
-	if (gEeprom.KEY_LOCK && gKeypadLocked > 0)
-		return;     // display is in use
+		const char hollowBar[] = {
+			0b01111111, 
+			0b01000001, 
+			0b01000001, 
+			0b01111111
+		};
 
-	if (gCurrentFunction == FUNCTION_TRANSMIT ||
-		gScreenToDisplay != DISPLAY_MAIN ||
-		gDTMF_CallState != DTMF_CALL_STATE_NONE)
-		return;     // display is in use
+		if (gEeprom.KEY_LOCK && gKeypadLocked > 0)
+			return;     // display is in use
 
+		if (gCurrentFunction == FUNCTION_TRANSMIT ||
+			gScreenToDisplay != DISPLAY_MAIN ||
+			gDTMF_CallState != DTMF_CALL_STATE_NONE)
+			return;     // display is in use
+
+		if (now)
+			memset(p_line, 0, LCD_WIDTH);
+			
+		const int16_t      s0_dBm       = -147;                  // S0 .. base level
+		const int16_t      rssi_dBm     = (rssi / 2) - 160;
+
+		const uint8_t s_level = MIN(MAX((rssi_dBm - s0_dBm) / 6, 0), 9); // S0 - S9
+		uint8_t overS9dBm = MIN(MAX(73 + rssi_dBm, 0), 99);
+		uint8_t overS9Bars = MIN(overS9dBm/10, 4);
+		
+		if(overS9Bars == 0) {
+			sprintf(str, "% 4d S%d", rssi_dBm, s_level);
+		}
+		else {
+			sprintf(str, "% 4d  %2d", rssi_dBm, overS9dBm);
+			memcpy(p_line + 2 + 7*5, &plus, ARRAY_SIZE(plus));
+		}
+
+		UI_PrintStringSmall(str, 2, 0, line);
+
+		for(uint8_t i = 0; i < s_level; i++) { // S bars
+			for(uint8_t j = 0; j < 4; j++)
+				p_line[bar_x + i * 5 + j] = (~(0x7F >> (i+1))) & 0x7F;
+		}
+		for(uint8_t i = 0; i < overS9Bars; i++) { // +10 hollow bars
+			memcpy(p_line + (bar_x + (i + 9) * 5), &hollowBar, ARRAY_SIZE(hollowBar));
+		}
+	}
+#else
+
+	uint8_t Level;
+
+	if (rssi >= gEEPROM_RSSI_CALIB[gRxVfo->Band][3]) {
+		Level = 6;
+	} else if (rssi >= gEEPROM_RSSI_CALIB[gRxVfo->Band][2]) {
+		Level = 4;
+	} else if (rssi >= gEEPROM_RSSI_CALIB[gRxVfo->Band][1]) {
+		Level = 2;
+	} else if (rssi >= gEEPROM_RSSI_CALIB[gRxVfo->Band][0]) {
+		Level = 1;
+	} else {
+		Level = 0;
+	}
+
+	uint8_t *pLine = (gEeprom.RX_VFO == 0)? gFrameBuffer[2] : gFrameBuffer[6];
 	if (now)
-		memset(p_line, 0, LCD_WIDTH);
-
-	const uint8_t s_level = MIN(MAX((rssi_dBm - s0_dBm) / 6, 0), 9);
-	uint8_t overS9Bars = MAX(0, 73 + rssi_dBm)/10;
-	
-	if(overS9Bars == 0) {
-		sprintf(str, "% 4d S%d", rssi_dBm, s_level);
-	}
-	else {
-		sprintf(str, "% 4d  %d0", rssi_dBm, overS9Bars);
-		memcpy(p_line + 2 + 7*5, &plus, ARRAY_SIZE(plus));
-	}
-
-	UI_PrintStringSmall(str, 2, 0, line);
-
-	for(uint8_t i = 0; i < s_level; i++) { // S bars
-		for(uint8_t j = 0; j < 4; j++)
-			p_line[bar_x + i * 5 + j] = (~(0x7F >> (i+1))) & 0x7F;
-	}
-	overS9Bars = MIN(overS9Bars, 4);
-	for(uint8_t i = 0; i < overS9Bars; i++) { // +10 hollow bars
-		memcpy(p_line + (bar_x + (i + 9) * 5), &hollowBar, ARRAY_SIZE(hollowBar));
-	}
+		memset(pLine, 0, 23);
+	DrawSmallAntennaAndBars(pLine, Level);
+#endif
 
 	if (now)
 		ST7565_BlitFullScreen();
 }
-#endif
+
 
 void UI_UpdateRSSI(const int16_t rssi, const int vfo)
 {
-#ifdef ENABLE_RSSI_BAR
-
 	(void)vfo;  // unused
 	
 	// optional larger RSSI dBm, S-point and bar level
 
-	if (center_line != CENTER_LINE_RSSI)
-		return;
-
 	if (gCurrentFunction == FUNCTION_RECEIVE ||
 		gCurrentFunction == FUNCTION_MONITOR ||
 		gCurrentFunction == FUNCTION_INCOMING)
 	{
-		UI_DisplayRSSIBar(rssi, true);
+		
+		DisplayRSSIBar(rssi, true);
 	}
 
-#else
-
-	// original little RS bars
-
-//		const int16_t dBm   = (rssi / 2) - 160;
-	const uint8_t Line  = (vfo == 0) ? 3 : 7;
-	uint8_t      *p_line = gFrameBuffer[Line - 1];
-
-
-	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;
-
-	gVFO_RSSI[vfo] = rssi;
-
-	uint8_t rssi_level = 0;
-
-	if (rssi >= level3)  rssi_level = 7;
-	else
-	if (rssi >= level23) rssi_level = 6;
-	else
-	if (rssi >= level2)  rssi_level = 5;
-	else
-	if (rssi >= level12) rssi_level = 4;
-	else
-	if (rssi >= level1)  rssi_level = 3;
-	else
-	if (rssi >= level01) rssi_level = 2;
-	else
-	if (rssi >= level0)  rssi_level = 1;
-
-	if (gVFO_RSSI_bar_level[vfo] == rssi_level)
-		return;
-
-	gVFO_RSSI_bar_level[vfo] = rssi_level;
-
-	// **********************************************************
-
-	if (gEeprom.KEY_LOCK && gKeypadLocked > 0)
-		return;    // display is in use
-
-	if (gCurrentFunction == FUNCTION_TRANSMIT || gScreenToDisplay != DISPLAY_MAIN)
-		return;    // display is in use
-
-	p_line = gFrameBuffer[Line - 1];
-
-	memset(p_line, 0, 23);
-
-	// untested !!!
-
-	if (rssi_level == 0)
-		p_line = NULL;
-	else
-		UI_drawBars(p_line, rssi_level);
-
-	ST7565_DrawLine(0, Line, 23, p_line);
-#endif
 }
 
 // ***************************************************************************
@@ -594,8 +549,8 @@ void UI_DisplayMain(void)
 						Level = gVFO_RSSI_bar_level[vfo_num];
 				#endif
 			}
-
-			UI_drawBars(p_line1 + LCD_WIDTH, Level);
+			if(Level)
+				DrawSmallAntennaAndBars(p_line1 + LCD_WIDTH, Level);
 		}
 
 		// ************
@@ -688,7 +643,7 @@ void UI_DisplayMain(void)
 #ifdef ENABLE_RSSI_BAR
 		if (rx) {
 			center_line = CENTER_LINE_RSSI;
-			UI_DisplayRSSIBar(gCurrentRSSI[gEeprom.RX_VFO], false);
+			DisplayRSSIBar(gCurrentRSSI[gEeprom.RX_VFO], false);
 		}
 		else
 #endif

ui/menu.c

@@ -134,6 +134,7 @@ const t_menu_item MenuList[] =
 	{"FrCali", VOICE_ID_INVALID,                       MENU_F_CALI        }, // reference xtal calibration
 #endif
 	{"BatCal", VOICE_ID_INVALID,                       MENU_BATCAL        }, // battery voltage calibration
+	{"BatTyp", VOICE_ID_INVALID,                       MENU_BATTYP        }, // battery type 1600/2200mAh
 	{"Reset",  VOICE_ID_INITIALISATION,                MENU_RESET         }, // might be better to move this to the hidden menu items ?
 
 	{"",       VOICE_ID_INVALID,                       0xff               }  // end of list - DO NOT delete or move this this
@@ -316,6 +317,12 @@ const char gSubMenu_BAT_TXT[3][8] =
 	"PERCENT"
 };
 
+const char gSubMenu_BATTYP[2][9] =
+{
+	"1600mAh",
+	"2200mAh"
+};
+
 const char gSubMenu_SCRAMBLER[11][7] =
 {
 	"OFF",
@@ -835,7 +842,11 @@ void UI_DisplayMenu(void)
 			sprintf(String, "%u.%02uV\n%u", vol / 100, vol % 100, gSubMenuSelection);
 			break;
 		}
-		
+
+		case MENU_BATTYP:
+			strcpy(String, gSubMenu_BATTYP[gSubMenuSelection]);
+			break;	
+
 		case MENU_F1SHRT:
 		case MENU_F1LONG:
 		case MENU_F2SHRT:

ui/menu.h

@@ -120,7 +120,8 @@ enum
 	MENU_F1LONG,
 	MENU_F2SHRT,
 	MENU_F2LONG,
-	MENU_MLONG
+	MENU_MLONG,
+	MENU_BATTYP
 };
 
 extern const uint8_t FIRST_HIDDEN_MENU_ITEM;
@@ -154,7 +155,7 @@ extern const char        gSubMenu_RX_TX[4][6];
 	extern const char    gSubMenu_AM_fix_test1[4][8];
 #endif
 extern const char        gSubMenu_BAT_TXT[3][8];
-
+extern const char 		 gSubMenu_BATTYP[2][9];
 extern const char        gSubMenu_SCRAMBLER[11][7];
 
 typedef struct {char* name; uint8_t id;} t_sidefunction;

ui/status.c

@@ -33,7 +33,7 @@
 #include "ui/ui.h"
 #include "ui/status.h"
 
-void UI_DisplayStatus(const bool test_display)
+void UI_DisplayStatus()
 {
 	uint8_t     *line = gStatusLine;
 	unsigned int x    = 0;
@@ -60,7 +60,7 @@ void UI_DisplayStatus(const bool test_display)
 		x1 = x + sizeof(BITMAP_RX);
 	}
 	else
-	if (gCurrentFunction == FUNCTION_POWER_SAVE || test_display)
+	if (gCurrentFunction == FUNCTION_POWER_SAVE)
 	{
 		memmove(line + x, BITMAP_POWERSAVE, sizeof(BITMAP_POWERSAVE));
 		x1 = x + sizeof(BITMAP_POWERSAVE);
@@ -69,7 +69,7 @@ void UI_DisplayStatus(const bool test_display)
 
 	#ifdef ENABLE_NOAA
 		// NOASS SCAN indicator
-		if (gIsNoaaMode || test_display)
+		if (gIsNoaaMode)
 		{
 			memmove(line + x, BITMAP_NOAA, sizeof(BITMAP_NOAA));
 			x1 = x + sizeof(BITMAP_NOAA);
@@ -86,30 +86,29 @@ void UI_DisplayStatus(const bool test_display)
 	}
 	else
 		// SCAN indicator
-		if (gScanStateDir != SCAN_OFF || gScreenToDisplay == DISPLAY_SCANNER || test_display)
+		if (gScanStateDir != SCAN_OFF || gScreenToDisplay == DISPLAY_SCANNER)
 		{
+			char * s = "";
 			if (IS_MR_CHANNEL(gNextMrChannel) && gScreenToDisplay != DISPLAY_SCANNER)
 			{	// channel mode
-				if (gEeprom.SCAN_LIST_DEFAULT == 0)
-					UI_PrintStringSmallBuffer("1", line + x);
-				else
-				if (gEeprom.SCAN_LIST_DEFAULT == 1)
-					UI_PrintStringSmallBuffer("2", line + x);
-				else
-				if (gEeprom.SCAN_LIST_DEFAULT == 2)
-					UI_PrintStringSmallBuffer("*", line + x);
+				switch(gEeprom.SCAN_LIST_DEFAULT) {
+					case 0: s = "1"; break;
+					case 1: s = "2"; break;
+					case 2: s = "*"; break;
+				}
 			}
 			else
 			{	// frequency mode
-				UI_PrintStringSmallBuffer("S", line + x);
+				s = "S";
 			}
+			UI_PrintStringSmallBuffer(s, line + x);
 			x1 = x + 7;
 		}
 	x += 7;  // font character width
 
 	#ifdef ENABLE_VOICE
 		// VOICE indicator
-		if (gEeprom.VOICE_PROMPT != VOICE_PROMPT_OFF || test_display)
+		if (gEeprom.VOICE_PROMPT != VOICE_PROMPT_OFF)
 		{
 			memmove(line + x, BITMAP_VoicePrompt, sizeof(BITMAP_VoicePrompt));
 			x1 = x + sizeof(BITMAP_VoicePrompt);
@@ -122,8 +121,8 @@ void UI_DisplayStatus(const bool test_display)
 	x++;
 	if(gScreenToDisplay != DISPLAY_SCANNER) {
 		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) 
+		if(dw == 1 || dw == 3) { // DWR - dual watch + respond
+			if(gDualWatchActive) 
 				memmove(line + x, BITMAP_TDR1, sizeof(BITMAP_TDR1) - (dw==1?0:5));
 			else 
 				memmove(line + x + 3, BITMAP_TDR2, sizeof(BITMAP_TDR2));
@@ -136,7 +135,7 @@ void UI_DisplayStatus(const bool test_display)
 	
 	#ifdef ENABLE_VOX
 		// VOX indicator
-		if (gEeprom.VOX_SWITCH || test_display)
+		if (gEeprom.VOX_SWITCH)
 		{
 			memmove(line + x, BITMAP_VOX, sizeof(BITMAP_VOX));
 			x1 = x + sizeof(BITMAP_VOX);
@@ -148,7 +147,7 @@ void UI_DisplayStatus(const bool test_display)
 	x1 = x;
 
 	// KEY-LOCK indicator
-	if (gEeprom.KEY_LOCK || test_display)
+	if (gEeprom.KEY_LOCK)
 	{
 		memmove(line + x, BITMAP_KeyLock, sizeof(BITMAP_KeyLock));
 		x += sizeof(BITMAP_KeyLock);
@@ -204,7 +203,7 @@ void UI_DisplayStatus(const bool test_display)
 	x = LCD_WIDTH - sizeof(BITMAP_BatteryLevel1) - sizeof(BITMAP_USB_C);
 	
 	// USB-C charge indicator
-	if (gChargingWithTypeC || test_display)
+	if (gChargingWithTypeC)
 		memmove(line + x, BITMAP_USB_C, sizeof(BITMAP_USB_C));
 	x += sizeof(BITMAP_USB_C);
 

ui/status.h

@@ -17,7 +17,7 @@
 #ifndef UI_STATUS_H
 #define UI_STATUS_H
 
-void UI_DisplayStatus(const bool test_display);
+void UI_DisplayStatus();
 
 #endif
 

ui/welcome.c

@@ -43,7 +43,6 @@ void UI_DisplayWelcome(void)
 {
 	char WelcomeString0[16];
 	char WelcomeString1[16];
-	char WelcomeString2[16];
 	
 	memset(gStatusLine,  0, sizeof(gStatusLine));
 	memset(gFrameBuffer, 0, sizeof(gFrameBuffer));
@@ -61,7 +60,6 @@ void UI_DisplayWelcome(void)
 	{
 		memset(WelcomeString0, 0, sizeof(WelcomeString0));
 		memset(WelcomeString1, 0, sizeof(WelcomeString1));
-		memset(WelcomeString2, 0, sizeof(WelcomeString2));
 
 		if (gEeprom.POWER_ON_DISPLAY_MODE == POWER_ON_DISPLAY_MODE_VOLTAGE)
 		{
@@ -70,10 +68,6 @@ void UI_DisplayWelcome(void)
 				gBatteryVoltageAverage / 100,
 				gBatteryVoltageAverage % 100,
 				BATTERY_VoltsToPercent(gBatteryVoltageAverage));
-
-			#if 0
-				sprintf(WelcomeString2, "Current %u", gBatteryCurrent);  // needs scaling into mA
-			#endif
 		}
 		else
 		{
@@ -83,17 +77,9 @@ void UI_DisplayWelcome(void)
 
 		UI_PrintString(WelcomeString0, 0, 127, 0, 10);
 		UI_PrintString(WelcomeString1, 0, 127, 2, 10);
-		#if 0
-			UI_PrintStringSmall(WelcomeString2, 0, 127, 4);
-		#endif
-			UI_PrintStringSmall(Version, 0, 0, 6);
+		UI_PrintStringSmall(Version, 0, 0, 6);
 
-		#if 1
-			ST7565_BlitStatusLine();  // blank status line
-		#else
-			UI_DisplayStatus(true);   // show all status line symbols (test)
-		#endif
-		
+		ST7565_BlitStatusLine();  // blank status line
 		ST7565_BlitFullScreen();
 	}
 }