Remove config passthroughs from tx_main

Author: CapnBry

src/include/rxtx_intf.h

@@ -14,11 +14,6 @@ extern bool RxWiFiReadyToSend;
 void SetSyncSpam();
 void ResetPower();
 uint8_t adjustPacketRateForBaud(uint8_t rate);
-
-void tx_SetPacketRateIdx(uint8_t idx, bool forceChange);
-void tx_SetSwitchMode(uint8_t idx);
-void tx_SetAntennaMode(uint8_t idx);
-void tx_SetTlmRatio(uint8_t idx);
 #endif
 
 /***

src/lib/SCREEN/menu.cpp

@@ -1,6 +1,7 @@
 #include "OLED/oleddisplay.h"
 #include "TFT/tftdisplay.h"
 
+#include "TXModuleEndpoint.h"
 #include "rxtx_intf.h"
 #include "config.h"
 #include "helpers.h"
@@ -221,16 +222,16 @@ static void saveValueIndex(bool init)
     switch (state_machine.getParentState())
     {
         case STATE_PACKET:
-            tx_SetPacketRateIdx(val, false);
+            crsfTransmitter.SetPacketRateIdx(val, false);
             break;
         case STATE_SWITCH:
-            tx_SetSwitchMode(val);
+            crsfTransmitter.SetSwitchMode(val);
             break;
         case STATE_ANTENNA:
-            tx_SetAntennaMode(val);
+            crsfTransmitter.SetAntennaMode(val);
             break;
         case STATE_TELEMETRY:
-            tx_SetTlmRatio(val);
+            crsfTransmitter.SetTlmRatio(val);
             break;
         case STATE_POWERSAVE:
             config.SetMotionMode(values_index);
@@ -240,15 +241,10 @@ static void saveValueIndex(bool init)
             break;
 
         case STATE_POWER_MAX:
-            config.SetPower(values_index);
-            if (!config.IsModified())
-            {
-                ResetPower();
-            }
+            crsfTransmitter.SetMaxPower(values_index);
             break;
         case STATE_POWER_DYNAMIC:
-            config.SetDynamicPower(values_index > 0);
-            config.SetBoostChannel((values_index - 1) > 0 ? values_index - 1 : 0);
+            crsfTransmitter.SetDynamicPower(values_index);
             break;
 
         case STATE_VTX_BAND:

src/lib/tx-crsf/TXModuleEndpoint.h

@@ -39,6 +39,8 @@ class TXModuleEndpoint final : public CRSFEndpoint {
     void SetSwitchMode(uint8_t idx);
     void SetAntennaMode(uint8_t idx);
     void SetTlmRatio(uint8_t idx);
+    void SetMaxPower(uint8_t idx);
+    void SetDynamicPower(uint8_t idx);
 protected:
     void devicePingCalled() override;
     void updateModelID();
@@ -60,4 +62,6 @@ class TXModuleEndpoint final : public CRSFEndpoint {
     void updateBackpackOpts();
 };
 
+extern TXModuleEndpoint crsfTransmitter;
+
 #endif //TX_MODULE_ENDPOINT_H

src/lib/tx-crsf/TXModuleParameters.cpp

@@ -710,6 +710,21 @@ void TXModuleEndpoint::SetTlmRatio(uint8_t idx)
   }
 }
 
+void TXModuleEndpoint::SetMaxPower(uint8_t idx)
+{
+  config.SetPower(idx);
+  if (!config.IsModified())
+  {
+      ResetPower();
+  }
+}
+
+void TXModuleEndpoint::SetDynamicPower(uint8_t idx)
+{
+  config.SetDynamicPower(idx > 0);
+  config.SetBoostChannel((idx - 1) > 0 ? idx - 1 : 0);
+}
+
 /***
  * @brief: Update the dynamic strings used for folder names and labels
  ***/
@@ -885,16 +900,11 @@ void TXModuleEndpoint::registerParameters()
     // POWER folder
     registerParameter(&luaPowerFolder);
     filterOptions(&luaPower, POWERMGNT::getMinPower(), POWERMGNT::getMaxPower(), strPowerLevels);
-    registerParameter(&luaPower, [](propertiesCommon *item, uint8_t arg) {
-      config.SetPower((PowerLevels_e)constrain(arg + POWERMGNT::getMinPower(), POWERMGNT::getMinPower(), POWERMGNT::getMaxPower()));
-      if (!config.IsModified())
-      {
-          ResetPower();
-      }
+    registerParameter(&luaPower, [this](propertiesCommon *item, uint8_t arg) {
+      SetMaxPower(constrain(arg + POWERMGNT::getMinPower(), POWERMGNT::getMinPower(), POWERMGNT::getMaxPower()));
     }, luaPowerFolder.common.id);
-    registerParameter(&luaDynamicPower, [](propertiesCommon *item, uint8_t arg) {
-      config.SetDynamicPower(arg > 0);
-      config.SetBoostChannel((arg - 1) > 0 ? arg - 1 : 0);
+    registerParameter(&luaDynamicPower, [this](propertiesCommon *item, uint8_t arg) {
+      SetDynamicPower(arg);
     }, luaPowerFolder.common.id);
   }
   if (GPIO_PIN_FAN_EN != UNDEF_PIN || GPIO_PIN_FAN_PWM != UNDEF_PIN) {

src/src/tx_main.cpp

@@ -424,26 +424,6 @@ uint8_t adjustPacketRateForBaud(const uint8_t rateIndex)
   return get_elrs_HandsetRate_max(rateIndex, handset->getMinPacketInterval());
 }
 
-void tx_SetPacketRateIdx(uint8_t idx, bool forceChange)
-{
-  crsfTransmitter.SetPacketRateIdx(idx, forceChange);
-}
-
-void tx_SetSwitchMode(uint8_t idx)
-{
-  crsfTransmitter.SetSwitchMode(idx);
-}
-
-void tx_SetAntennaMode(uint8_t idx)
-{
-  crsfTransmitter.SetAntennaMode(idx);
-}
-
-void tx_SetTlmRatio(uint8_t idx)
-{
-  crsfTransmitter.SetTlmRatio(idx);
-}
-
 void SetRFLinkRate(uint8_t index) // Set speed of RF link
 {
   expresslrs_mod_settings_s *const ModParams = get_elrs_airRateConfig(index);