fix esp32 eeprom (ExpressLRS#283)

AlessandroAU · web-flow · commit 3c8f74f515c8 · 2021-01-06T15:47:41.000+10:00
diff --git a/src/lib/EEPROM/elrs_eeprom.cpp b/src/lib/EEPROM/elrs_eeprom.cpp
@@ -7,6 +7,7 @@
     extEEPROM EEPROM(kbits_2, 1, 1, 0x51);
 #elif defined(TARGET_R9M_RX)
     extEEPROM EEPROM(kbits_2, 1, 1, 0x50);
+#elif defined(PLATFORM_ESP32) 
 #else
 #define NO_EEPROM 1
 #endif
diff --git a/src/src/tx_main.cpp b/src/src/tx_main.cpp
@@ -449,23 +449,26 @@ void HandleUpdateParameter()
   case 1:
     if ((ExpressLRS_currAirRate_Modparams->index != enumRatetoIndex((expresslrs_RFrates_e)crsf.ParameterUpdateData[1])))
     {
+      Serial.print("Request AirRate: ");
+      Serial.println(crsf.ParameterUpdateData[1]);
       ExpressLRS_nextAirRateIndex = enumRatetoIndex((expresslrs_RFrates_e)crsf.ParameterUpdateData[1]);
+      config.SetRate(ExpressLRS_nextAirRateIndex);
     }
     break;
 
   case 2:
     if ((crsf.ParameterUpdateData[1] <= (uint8_t)TLM_RATIO_1_2) && (crsf.ParameterUpdateData[1] >= (uint8_t)TLM_RATIO_NO_TLM))
     {
-      ExpressLRS_currAirRate_Modparams->TLMinterval = (expresslrs_tlm_ratio_e)crsf.ParameterUpdateData[1];
-      Serial.print("TLM interval: ");
+      Serial.print("Request TLM interval: ");
       Serial.println(ExpressLRS_currAirRate_Modparams->TLMinterval);
+      config.SetTlm((expresslrs_tlm_ratio_e)crsf.ParameterUpdateData[1]);
     }
     break;
 
   case 3:
     Serial.print("Request Power: ");
     Serial.println(crsf.ParameterUpdateData[1]);
-    POWERMGNT.setPower((PowerLevels_e)crsf.ParameterUpdateData[1]);
+    config.SetPower((PowerLevels_e)crsf.ParameterUpdateData[1]);
     break;
 
   case 4:
@@ -504,15 +507,11 @@ void HandleUpdateParameter()
     break;
   }
   UpdateParamReq = false;
-  config.SetRate(ExpressLRS_nextAirRateIndex);
-  config.SetTlm(ExpressLRS_currAirRate_Modparams->TLMinterval);
-  config.SetPower(POWERMGNT.currPower());
-
+  
   if (config.IsModified())
   {
     // Stop the timer during eeprom writes
     hwTimer.stop();
-
     // Set a flag that will trigger the eeprom commit in the main loop
     // NOTE: This is required to ensure we wait long enough for any outstanding IRQ's to fire
     WaitEepromCommit = true;
@@ -668,21 +667,18 @@ void loop()
   // If there's an outstanding eeprom write, and we've waited long enough for any IRQs to fire...
   if (WaitEepromCommit && (micros() - PacketLastSentMicros) > ExpressLRS_currAirRate_Modparams->interval)
   {
-    if (ExpressLRS_currAirRate_Modparams->index != ExpressLRS_nextAirRateIndex)
-    {
-      Serial.println("Change Link rate");
-      SetRFLinkRate(ExpressLRS_nextAirRateIndex);
-      Serial.println(ExpressLRS_currAirRate_Modparams->enum_rate);
-      Serial.println(ExpressLRS_currAirRate_Modparams->index);
-    }
+    SetRFLinkRate(config.GetRate());
+    ExpressLRS_currAirRate_Modparams->TLMinterval = (expresslrs_tlm_ratio_e)config.GetTlm();
+    POWERMGNT.setPower((PowerLevels_e)config.GetPower());
+
     // Write the values, and restart the timer
     WaitEepromCommit = false;
     // Write the uncommitted eeprom values
-    config.Commit();
     Serial.println("EEPROM COMMIT");
+    config.Commit();
     // Resume the timer
-    hwTimer.resume();
     sendLuaParams();
+    hwTimer.resume();
   }
 
 #ifdef FEATURE_OPENTX_SYNC
