BRNSystems/brnQuanFW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Fix Power High action for RescueOps mode

Browse Source
This commit is contained in:
Armel FAUVEAU
2024-11-22 04:47:01 +01:00
parent dba1db3ea6
commit 91c95142c7
3 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/action.c
View File

@@ -619,19 +619,11 @@ void ACTION_BackLightOnDemand(void)
#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS #ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
void ACTION_Power_High(void) void ACTION_Power_High(void)
{
if(gEeprom.MENU_LOCK == true) // RO is active
{ {
if (gTxVfo->OUTPUT_POWER == gInitialPower) if (gTxVfo->OUTPUT_POWER == gInitialPower)
gTxVfo->OUTPUT_POWER = OUTPUT_POWER_HIGH; gTxVfo->OUTPUT_POWER = OUTPUT_POWER_HIGH;
else if(gTxVfo->OUTPUT_POWER == OUTPUT_POWER_HIGH) else if(gTxVfo->OUTPUT_POWER == OUTPUT_POWER_HIGH)
gTxVfo->OUTPUT_POWER = gInitialPower; gTxVfo->OUTPUT_POWER = gInitialPower;
} }
else
{
if (++gTxVfo->OUTPUT_POWER > OUTPUT_POWER_HIGH)
gTxVfo->OUTPUT_POWER = OUTPUT_POWER_LOW1;
}
}
#endif #endif
#endif #endif

8
radio.c
View File

@@ -436,14 +436,6 @@ void RADIO_ConfigureChannel(const unsigned int VFO, const unsigned int configure
pVfo->Compander = att.compander; pVfo->Compander = att.compander;
RADIO_ConfigureSquelchAndOutputPower(pVfo); 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) void RADIO_ConfigureSquelchAndOutputPower(VFO_Info_t *pInfo)

8
ui/main.c
View File

@@ -1202,6 +1202,14 @@ void UI_DisplayMain(void)
uint8_t arrowPos = 19; uint8_t arrowPos = 19;
bool userPower = false; bool userPower = false;
#ifdef ENABLE_FEAT_F4HWN_RESCUE_OPS
if(gResetPower) // RO is active
{
gInitialPower = currentPower;
gResetPower = false;
}
#endif
if(currentPower == OUTPUT_POWER_USER) if(currentPower == OUTPUT_POWER_USER)
{ {
currentPower = gSetting_set_pwr; currentPower = gSetting_set_pwr;