Fix Issue #326
This commit is contained in:
10
app/main.c
10
app/main.c
@@ -349,6 +349,11 @@ void channelMove(uint16_t Channel)
|
|||||||
//gRequestSaveVFO = true;
|
//gRequestSaveVFO = true;
|
||||||
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
|
gVfoConfigureMode = VFO_CONFIGURE_RELOAD;
|
||||||
|
|
||||||
|
#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
|
||||||
|
gRemoveOffset = false;
|
||||||
|
gPowerHigh = false;
|
||||||
|
#endif
|
||||||
|
|
||||||
RADIO_ConfigureChannel(gEeprom.TX_VFO, gVfoConfigureMode);
|
RADIO_ConfigureChannel(gEeprom.TX_VFO, gVfoConfigureMode);
|
||||||
|
|
||||||
return;
|
return;
|
||||||
@@ -823,6 +828,11 @@ static void MAIN_Key_UP_DOWN(bool bKeyPressed, bool bKeyHeld, int8_t Direction)
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
|
||||||
|
gRemoveOffset = false;
|
||||||
|
gPowerHigh = false;
|
||||||
|
#endif
|
||||||
|
|
||||||
uint8_t Channel = gEeprom.ScreenChannel[gEeprom.TX_VFO];
|
uint8_t Channel = gEeprom.ScreenChannel[gEeprom.TX_VFO];
|
||||||
|
|
||||||
if (bKeyHeld || !bKeyPressed) { // key held or released
|
if (bKeyHeld || !bKeyPressed) { // key held or released
|
||||||
|
6
radio.c
6
radio.c
@@ -427,21 +427,19 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
|
|||||||
|
|
||||||
pVfo->Compander = att.compander;
|
pVfo->Compander = att.compander;
|
||||||
|
|
||||||
RADIO_ConfigureSquelchAndOutputPower(pVfo);
|
|
||||||
|
|
||||||
#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
|
#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
|
||||||
if(gRemoveOffset)
|
if(gRemoveOffset)
|
||||||
{
|
{
|
||||||
pVfo->pTX = &pVfo->freq_config_RX;
|
pVfo->pTX = &pVfo->freq_config_RX;
|
||||||
gRequestSaveChannel = 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if(gPowerHigh)
|
if(gPowerHigh)
|
||||||
{
|
{
|
||||||
pVfo->OUTPUT_POWER = OUTPUT_POWER_HIGH;
|
pVfo->OUTPUT_POWER = OUTPUT_POWER_HIGH;
|
||||||
gRequestSaveChannel = 1;
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
RADIO_ConfigureSquelchAndOutputPower(pVfo);
|
||||||
}
|
}
|
||||||
|
|
||||||
void RADIO_ConfigureSquelchAndOutputPower(VFO_Info_t *pInfo)
|
void RADIO_ConfigureSquelchAndOutputPower(VFO_Info_t *pInfo)
|
||||||
|
Reference in New Issue
Block a user