From 91c95142c7b5a221512c856741b2813ff2188db2 Mon Sep 17 00:00:00 2001
From: Armel FAUVEAU <armel.fauveau@globalis-ms.com>
Date: Fri, 22 Nov 2024 04:47:01 +0100
Subject: [PATCH] Fix Power High action for RescueOps mode

---
 app/action.c | 16 ++++------------
 radio.c      |  8 --------
 ui/main.c    |  8 ++++++++
 3 files changed, 12 insertions(+), 20 deletions(-)

diff --git a/app/action.c b/app/action.c
index c2593b0..0d5af21 100644
--- a/app/action.c
+++ b/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
\ No newline at end of file
diff --git a/radio.c b/radio.c
index 44e5793..7539303 100644
--- a/radio.c
+++ b/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)
diff --git a/ui/main.c b/ui/main.c
index d99753e..f56ea74 100644
--- a/ui/main.c
+++ b/ui/main.c
@@ -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;