diff --git a/app/app.c b/app/app.c index 9659bd3..0269301 100644 --- a/app/app.c +++ b/app/app.c @@ -660,7 +660,7 @@ static void MR_NextChannel(void) gEeprom.MrChannel[gEeprom.RX_CHANNEL] = gNextMrChannel; gEeprom.ScreenChannel[gEeprom.RX_CHANNEL] = gNextMrChannel; - RADIO_ConfigureChannel(gEeprom.RX_CHANNEL, 2); + RADIO_ConfigureChannel(gEeprom.RX_CHANNEL, VFO_CONFIGURE_RELOAD); RADIO_SetupRegisters(true); gUpdateDisplay = true; @@ -1731,8 +1731,8 @@ void APP_TimeSlice500ms(void) { BK4819_StopScan(); - RADIO_ConfigureChannel(0, 2); - RADIO_ConfigureChannel(1, 2); + RADIO_ConfigureChannel(0, VFO_CONFIGURE_RELOAD); + RADIO_ConfigureChannel(1, VFO_CONFIGURE_RELOAD); RADIO_SetupRegisters(true); } @@ -2009,7 +2009,7 @@ static void APP_ProcessKey(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) { SETTINGS_SaveChannel(gTxVfo->CHANNEL_SAVE, gEeprom.TX_CHANNEL, gTxVfo, gFlagSaveChannel); gFlagSaveChannel = false; - RADIO_ConfigureChannel(gEeprom.TX_CHANNEL, 1); + RADIO_ConfigureChannel(gEeprom.TX_CHANNEL, VFO_CONFIGURE); RADIO_SetupRegisters(true); GUI_SelectNextDisplay(DISPLAY_MAIN); } diff --git a/app/main.c b/app/main.c index ae182c7..11ab6e3 100644 --- a/app/main.c +++ b/app/main.c @@ -370,7 +370,7 @@ static void MAIN_Key_DIGITS(KEY_Code_t Key, bool bKeyPressed, bool bKeyHeld) SETTINGS_SaveVfoIndices(); - RADIO_ConfigureChannel(Vfo, 2); + RADIO_ConfigureChannel(Vfo, VFO_CONFIGURE_RELOAD); } // Frequency += 75; // is this meant to be rounding ? diff --git a/app/scanner.c b/app/scanner.c index bd27698..cc52d65 100644 --- a/app/scanner.c +++ b/app/scanner.c @@ -236,8 +236,8 @@ static void SCANNER_Key_MENU(bool bKeyPressed, bool bKeyHeld) } else { - RADIO_ConfigureChannel(0, 2); - RADIO_ConfigureChannel(1, 2); + RADIO_ConfigureChannel(0, VFO_CONFIGURE_RELOAD); + RADIO_ConfigureChannel(1, VFO_CONFIGURE_RELOAD); gTxVfo->freq_config_RX.CodeType = gScanCssResultType; gTxVfo->freq_config_RX.Code = gScanCssResultCode; @@ -427,7 +427,8 @@ void SCANNER_Stop(void) { gEeprom.MrChannel[gEeprom.RX_CHANNEL] = gRestoreMrChannel; gEeprom.ScreenChannel[gEeprom.RX_CHANNEL] = Previous; - RADIO_ConfigureChannel(gEeprom.RX_CHANNEL, 2); + + RADIO_ConfigureChannel(gEeprom.RX_CHANNEL, VFO_CONFIGURE_RELOAD); } else { diff --git a/firmware.bin b/firmware.bin index cf8dd2c..1106721 100644 Binary files a/firmware.bin and b/firmware.bin differ diff --git a/firmware.packed.bin b/firmware.packed.bin index 4f0834a..9be5749 100644 Binary files a/firmware.packed.bin and b/firmware.packed.bin differ diff --git a/main.c b/main.c index 059c631..c1dc33e 100644 --- a/main.c +++ b/main.c @@ -85,8 +85,8 @@ void Main(void) BOARD_EEPROM_LoadMoreSettings(); - RADIO_ConfigureChannel(0, 2); - RADIO_ConfigureChannel(1, 2); + RADIO_ConfigureChannel(0, VFO_CONFIGURE_RELOAD); + RADIO_ConfigureChannel(1, VFO_CONFIGURE_RELOAD); RADIO_SelectVfos(); diff --git a/radio.c b/radio.c index 4155240..c8ec9f8 100644 --- a/radio.c +++ b/radio.c @@ -143,7 +143,7 @@ void RADIO_InitInfo(VFO_Info_t *pInfo, uint8_t ChannelSave, uint8_t Band, uint32 RADIO_ConfigureSquelchAndOutputPower(pInfo); } -void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Arg) +void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure) { uint8_t Channel; uint8_t Attributes; @@ -246,7 +246,7 @@ void RADIO_ConfigureChannel(uint8_t VFO, uint32_t Arg) else Base = 0x0C80 + ((Channel - FREQ_CHANNEL_FIRST) * 32) + (VFO * 16); - if (Arg == VFO_CONFIGURE_RELOAD || Channel >= FREQ_CHANNEL_FIRST) + if (configure == VFO_CONFIGURE_RELOAD || Channel >= FREQ_CHANNEL_FIRST) { uint8_t Tmp; uint8_t Data[8]; diff --git a/radio.h b/radio.h index 99246fa..70b39a6 100644 --- a/radio.h +++ b/radio.h @@ -161,7 +161,7 @@ extern VfoState_t VfoState[2]; bool RADIO_CheckValidChannel(uint16_t ChNum, bool bCheckScanList, uint8_t RadioNum); uint8_t RADIO_FindNextChannel(uint8_t ChNum, int8_t Direction, bool bCheckScanList, uint8_t RadioNum); void RADIO_InitInfo(VFO_Info_t *pInfo, uint8_t ChannelSave, uint8_t ChIndex, uint32_t Frequency); -void RADIO_ConfigureChannel(uint8_t RadioNum, uint32_t Arg); +void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure); void RADIO_ConfigureSquelchAndOutputPower(VFO_Info_t *pInfo); void RADIO_ApplyOffset(VFO_Info_t *pInfo); void RADIO_SelectVfos(void);