Fix Power High action for RescueOps mode
This commit is contained in:
16
app/action.c
16
app/action.c
@@ -620,18 +620,10 @@ void ACTION_BackLightOnDemand(void)
|
||||
#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
|
||||
void ACTION_Power_High(void)
|
||||
{
|
||||
if(gEeprom.MENU_LOCK == true) // RO is active
|
||||
{
|
||||
if (gTxVfo->OUTPUT_POWER == gInitialPower)
|
||||
gTxVfo->OUTPUT_POWER = OUTPUT_POWER_HIGH;
|
||||
else if(gTxVfo->OUTPUT_POWER == OUTPUT_POWER_HIGH)
|
||||
gTxVfo->OUTPUT_POWER = gInitialPower;
|
||||
}
|
||||
else
|
||||
{
|
||||
if (++gTxVfo->OUTPUT_POWER > OUTPUT_POWER_HIGH)
|
||||
gTxVfo->OUTPUT_POWER = OUTPUT_POWER_LOW1;
|
||||
}
|
||||
if (gTxVfo->OUTPUT_POWER == gInitialPower)
|
||||
gTxVfo->OUTPUT_POWER = OUTPUT_POWER_HIGH;
|
||||
else if(gTxVfo->OUTPUT_POWER == OUTPUT_POWER_HIGH)
|
||||
gTxVfo->OUTPUT_POWER = gInitialPower;
|
||||
}
|
||||
#endif
|
||||
#endif
|
8
radio.c
8
radio.c
@@ -436,14 +436,6 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
|
||||
pVfo->Compander = att.compander;
|
||||
|
||||
RADIO_ConfigureSquelchAndOutputPower(pVfo);
|
||||
|
||||
#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
|
||||
if(gEeprom.MENU_LOCK && gResetPower) // RO is active
|
||||
{
|
||||
gInitialPower = pVfo->OUTPUT_POWER;
|
||||
gResetPower = false;
|
||||
}
|
||||
#endif
|
||||
}
|
||||
|
||||
void RADIO_ConfigureSquelchAndOutputPower(VFO_Info_t *pInfo)
|
||||
|
@@ -1202,6 +1202,14 @@ void UI_DisplayMain(void)
|
||||
uint8_t arrowPos = 19;
|
||||
bool userPower = false;
|
||||
|
||||
#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
|
||||
if(gResetPower) // RO is active
|
||||
{
|
||||
gInitialPower = currentPower;
|
||||
gResetPower = false;
|
||||
}
|
||||
#endif
|
||||
|
||||
if(currentPower == OUTPUT_POWER_USER)
|
||||
{
|
||||
currentPower = gSetting_set_pwr;
|
||||
|
Reference in New Issue
Block a user