Removed floating point stuff

Author: OneOfEleven

README.md

@@ -34,19 +34,7 @@ To enable the custom option just uncomment the line by removing the starting '#'
 * AM RX now allowed everywhere, although the radio really doesn't do AM, the adverts are a con !
 * Finer RSSI bar steps
 * Nicer/cleaner big numeric font than original QS big numeric font
-*
-* "MEM-CH" and "DEL-CH" menus now include channel name
-* "STEP" menu, added 1.25kHz option, removed 5kHz option
-* "TXP" menu, renamed to "TX-PWR"
-* "SAVE" menu, renamed to "B-SAVE"
-* "WX" menu, renamed to "CROS-B" ('WX' means weather here in the UK)
-* "ABR" menu, renamed to "BAK-LT", extended times, includes always ON option
-* "SCR" menu, renamed to "SCRAM"
-* "MIC" menu, shows mic gain in dB's, includes max mic gain possible (+15.5dB)
-* "VOL" menu, renamed to "BATVOL", added percentage level
-* "AM" menu, renamed to "MODE", shows RX modulation mode
-
-Menu renames are to try and reduce 'WTF does that mean ?'
+* Various menu re-wordings - to try and reduce 'WTH does that mean ?'
 
 # Compiler
 

app/aircopy.c

@@ -136,7 +136,7 @@ static void AIRCOPY_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 
 		for (i = 0; i < 7; i++)
 		{
-			if (Frequency >= gLowerLimitFrequencyBandTable[i] && Frequency <= gUpperLimitFrequencyBandTable[i])
+			if (Frequency >= LowerLimitFrequencyBandTable[i] && Frequency <= UpperLimitFrequencyBandTable[i])
 			{
 				#ifndef DISABLE_VOICE
 					gAnotherVoiceID        = (VOICE_ID_t)Key;

app/app.c

@@ -440,11 +440,11 @@ void APP_SetFrequencyByStep(VFO_Info_t *pInfo, int8_t Step)
 {
 	uint32_t Frequency = pInfo->ConfigRX.Frequency + (Step * pInfo->StepFrequency);
 
-	if (Frequency < gLowerLimitFrequencyBandTable[pInfo->Band])
-		Frequency = FREQUENCY_FloorToStep(gUpperLimitFrequencyBandTable[pInfo->Band], pInfo->StepFrequency, gLowerLimitFrequencyBandTable[pInfo->Band]);
+	if (Frequency < LowerLimitFrequencyBandTable[pInfo->Band])
+		Frequency = FREQUENCY_FloorToStep(UpperLimitFrequencyBandTable[pInfo->Band], pInfo->StepFrequency, LowerLimitFrequencyBandTable[pInfo->Band]);
 	else
-	if (Frequency > gUpperLimitFrequencyBandTable[pInfo->Band])
-		Frequency = gLowerLimitFrequencyBandTable[pInfo->Band];
+	if (Frequency > UpperLimitFrequencyBandTable[pInfo->Band])
+		Frequency = LowerLimitFrequencyBandTable[pInfo->Band];
 
 	pInfo->ConfigRX.Frequency = Frequency;
 }

app/generic.c

@@ -14,6 +14,8 @@
  *     limitations under the License.
  */
 
+#include <string.h>
+
 #include "app/app.h"
 #include "app/fm.h"
 #include "app/generic.h"
@@ -174,7 +176,7 @@ void GENERIC_Key_PTT(bool bKeyPressed)
 						else
 							gDTMF_CallMode = DTMF_CALL_MODE_DTMF;
 
-						sprintf(gDTMF_String, "%s", gDTMF_InputBox);
+						strcpy(gDTMF_String, gDTMF_InputBox);
 
 						gDTMF_PreviousIndex = gDTMF_InputIndex;
 						gDTMF_ReplyState    = DTMF_REPLY_ANI;

app/main.c

@@ -104,7 +104,7 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 				unsigned int i;
 				for (i = 0; i < 7; i++)
 				{
-					if (Frequency >= gLowerLimitFrequencyBandTable[i] && Frequency <= gUpperLimitFrequencyBandTable[i])
+					if (Frequency >= LowerLimitFrequencyBandTable[i] && Frequency <= UpperLimitFrequencyBandTable[i])
 					{
 						#ifndef DISABLE_VOICE
 							gAnotherVoiceID = (VOICE_ID_t)Key;
@@ -123,7 +123,7 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld)
 
 						Frequency += 75;
 
-						gTxVfo->ConfigRX.Frequency = FREQUENCY_FloorToStep(Frequency, gTxVfo->StepFrequency, gLowerLimitFrequencyBandTable[gTxVfo->Band]);
+						gTxVfo->ConfigRX.Frequency = FREQUENCY_FloorToStep(Frequency, gTxVfo->StepFrequency, LowerLimitFrequencyBandTable[gTxVfo->Band]);
 
 						gRequestSaveChannel = 1;
 						return;

audio.c

@@ -169,7 +169,7 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 		unsigned int i;
 
 		GPIO_SetBit(&GPIOA->DATA, GPIOA_PIN_VOICE_0);
-		SYSTEM_DelayMs(7);
+		SYSTEM_DelayMs(20);
 		GPIO_ClearBit(&GPIOA->DATA, GPIOA_PIN_VOICE_0);
 
 		for (i = 0; i < 8; i++)
@@ -179,11 +179,12 @@ void AUDIO_PlayBeep(BEEP_Type_t Beep)
 			else
 				GPIO_SetBit(&GPIOA->DATA, GPIOA_PIN_VOICE_1);
 
-			SYSTICK_DelayUs(1200);
+			SYSTICK_DelayUs(1000);
 			GPIO_SetBit(&GPIOA->DATA, GPIOA_PIN_VOICE_0);
 			SYSTICK_DelayUs(1200);
 			GPIO_ClearBit(&GPIOA->DATA, GPIOA_PIN_VOICE_0);
 			VoiceID <<= 1;
+			SYSTICK_DelayUs(200);
 		}
 	}
 

board.c

@@ -39,6 +39,15 @@
 #include "settings.h"
 #include "sram-overlay.h"
 
+static const uint32_t gDefaultFrequencyTable[] =
+{
+	14502500,
+	14552500,
+	43477500,
+	43502500,
+	43697500
+};
+
 void BOARD_FLASH_Init(void)
 {
 	FLASH_Init(FLASH_READ_MODE_1_CYCLE);
@@ -389,7 +398,7 @@ void BOARD_EEPROM_Init(void)
 	gEeprom.KEY_2_LONG_PRESS_ACTION  = (Data[4] < ACTION_OPT_LEN) ? Data[4] : ACTION_OPT_FM;
 	gEeprom.SCAN_RESUME_MODE         = (Data[5] < 3)              ? Data[5] : SCAN_RESUME_CO;
 	gEeprom.AUTO_KEYPAD_LOCK         = (Data[6] < 2)              ? Data[6] : false;
-	gEeprom.POWER_ON_DISPLAY_MODE    = (Data[7] < 3)              ? Data[7] : POWER_ON_DISPLAY_MODE_MESSAGE;
+	gEeprom.POWER_ON_DISPLAY_MODE    = (Data[7] < 3)              ? Data[7] : POWER_ON_DISPLAY_MODE_VOLTAGE;
 
 	// 0E98..0E9F
 	EEPROM_ReadBuffer(0x0E98, Data, 8);
@@ -478,9 +487,6 @@ void BOARD_EEPROM_Init(void)
 	EEPROM_ReadBuffer(0x0F40, Data, 8);
 	gSetting_F_LOCK         = (Data[0] < 6) ? Data[0] : F_LOCK_OFF;
 
-	gUpperLimitFrequencyBandTable = UpperLimitFrequencyBandTable;
-	gLowerLimitFrequencyBandTable = LowerLimitFrequencyBandTable;
-
 	gSetting_350TX          = (Data[1] < 2) ? Data[1] : false;  // was true
 	gSetting_KILLED         = (Data[2] < 2) ? Data[2] : false;
 	gSetting_200TX          = (Data[3] < 2) ? Data[3] : false;
@@ -587,4 +593,17 @@ void BOARD_FactoryReset(bool bIsAll)
 			EEPROM_WriteBuffer(i, Template);
 		}
 	}
+
+	if (bIsAll)
+	{
+		RADIO_InitInfo(gRxVfo, FREQ_CHANNEL_FIRST + 5, 5, 43300000);
+		for (i = 0; i < 5; i++)
+		{
+			const uint32_t Frequency   = gDefaultFrequencyTable[i];
+			gRxVfo->ConfigRX.Frequency = Frequency;
+			gRxVfo->ConfigTX.Frequency = Frequency;
+			gRxVfo->Band               = FREQUENCY_GetBand(Frequency);
+			SETTINGS_SaveChannel(MR_CHANNEL_FIRST + i, 0, gRxVfo, 2);
+		}
+	}
 }