change power work but config.commit crashes?

ExpressLRS · Feb 2, 2022 · 54fd64c · 54fd64c
1 parent 9a51be3
commit 54fd64c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/lib/CONFIG/config.cpp b/src/lib/CONFIG/config.cpp
@@ -507,7 +507,7 @@ RxConfig::SetModelId(uint8_t modelId)
 void
 RxConfig::SetPower(uint8_t power)
 {
-    if (GetPower() != power)
+    if (m_config.power != power)
     {
         m_config.power = power;
         m_modified = true;
@@ -534,7 +534,7 @@ RxConfig::SetDefaults()
     SetIsBound(false);
     SetPowerOnCounter(0);
     SetModelId(0xFF);
-    SetPower(POWERMGNT::getDefaultPower());
+    SetPower(MaxPower);
 #if defined(GPIO_PIN_ANTENNA_SELECT) && defined(USE_DIVERSITY)
     SetAntennaMode(2); //2 is diversity
 #else

diff --git a/src/lib/LUA/rx_devLUA.cpp b/src/lib/LUA/rx_devLUA.cpp
@@ -72,13 +72,13 @@ static void registerLuaParameters()
 
 registerLUAParameter(&luaTlmPower, [](uint8_t id, uint8_t arg){
     config.SetPower(arg);
+    //config.Commit();
     if(arg == 0){
       POWERMGNT.setPower(MinPower);
     } else {
       POWERMGNT.setPower(MaxPower);
     }
-      config.Commit();
-      devicesTriggerEvent();
+    devicesTriggerEvent();
   });
 
 #if defined(PLATFORM_ESP32) || defined(PLATFORM_ESP8266)
@@ -99,6 +99,7 @@ static int event()
 #if defined(GPIO_PIN_ANTENNA_SELECT) && defined(USE_DIVERSITY)
   setLuaTextSelectionValue(&luaAntennaMode, config.GetAntennaMode());
 #endif
+  setLuaTextSelectionValue(&luaTlmPower, config.GetPower());
   return DURATION_IMMEDIATELY;
 }