Unextern the hell out of everything

Author: CapnBry

src/include/common.h

@@ -340,7 +340,10 @@ extern bool crsfBaroSensorDetected;
 void ChannelDataReset();
 uint32_t uidMacSeedGet();
 bool isDualRadio();
-void EnterBindingModeSafely(); // defined in rx_main/tx_main
+
+// defined in rx_main/tx_main
+extern unsigned long rebootTime;
+void EnterBindingModeSafely();
 
 #if defined(RADIO_LR1121)
 bool isSupportedRFRate(uint8_t index);

src/include/rxtx_intf.h

@@ -9,7 +9,11 @@
  * TX interface
  ***/
 #if defined(TARGET_TX)
+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);

src/lib/Backpack/devBackpack.cpp

@@ -5,7 +5,6 @@
 #include "config.h"
 #include "device.h"
 #include "logging.h"
-#include "msp.h"
 #include "msptypes.h"
 
 // How often to check for backpack commands

src/lib/Backpack/devBackpack.h

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "device.h"
+#include "msp.h"
 
 /**
  * @brief process backpack PTR (pan/tilt/roll) MSP packet from goggles/head tracker.
@@ -35,4 +36,8 @@ void sendCRSFTelemetryToBackpack(const uint8_t *data);
  */
 void sendMAVLinkTelemetryToBackpack(const uint8_t *data);
 
+extern bool TxBackpackWiFiReadyToSend;
+extern bool VRxBackpackWiFiReadyToSend;
+extern bool BackpackTelemReadyToSend;
+
 extern device_t Backpack_device;

src/lib/OTA/OTA.cpp

@@ -461,6 +461,15 @@ bool ICACHE_RAM_ATTR UnpackChannelData8ch(OTA_Packet_s const * const otaPktPtr,
 }
 #endif
 
+uint8_t OtaAdjustSwitchModeForAirRate(OtaSwitchMode_e eSwitchMode, uint8_t packetSize)
+{
+    // Only the fullres modes have 3 switch modes, so reset the switch mode if outside the
+    // range for 4ch mode
+    if (packetSize == OTA4_PACKET_SIZE && eSwitchMode > smHybridOr16ch)
+        return smWideOr8ch;
+    return eSwitchMode;
+}
+
 bool ICACHE_RAM_ATTR ValidatePacketCrcFull(OTA_Packet_s * const otaPktPtr)
 {
     uint16_t nonceValidator = (otaPktPtr->std.type == PACKET_TYPE_SYNC) ? 0 : OtaNonce;

src/lib/OTA/OTA.h

@@ -174,6 +174,7 @@ void OtaUpdateCrcInitFromUid();
 
 enum OtaSwitchMode_e { smWideOr8ch = 0, smHybridOr16ch = 1, sm12ch = 2 };
 void OtaUpdateSerializers(OtaSwitchMode_e const mode, uint8_t packetSize);
+uint8_t OtaAdjustSwitchModeForAirRate(OtaSwitchMode_e eSwitchMode, uint8_t packetSize);
 extern OtaSwitchMode_e OtaSwitchModeCurrent;
 
 // CRC

src/lib/SCREEN/menu.cpp

@@ -7,28 +7,20 @@
 #include "logging.h"
 #include "POWERMGNT.h"
 #include "handset.h"
-#include "OTA.h"
 #include "deferred.h"
 
+#include "devBackpack.h"
+#include "devVTX.h"
+#include "devWIFI.h"
+
 #include "thermal.h"
 #define UPDATE_TEMP_TIMEOUT 5000
 extern Thermal thermal;
 
 extern FiniteStateMachine state_machine;
 
-extern bool RxWiFiReadyToSend;
-extern bool TxBackpackWiFiReadyToSend;
-extern bool VRxBackpackWiFiReadyToSend;
-extern void VtxTriggerSend();
-extern void ResetPower();
-extern void setWifiUpdateMode();
-extern uint8_t adjustPacketRateForBaud(uint8_t rate);
-extern uint8_t adjustSwitchModeForAirRate(OtaSwitchMode_e eSwitchMode, uint8_t packetSize);
-
 extern Display *display;
 
-extern unsigned long rebootTime;
-
 fsm_state_t getInitialState()
 {
 #if defined(PLATFORM_ESP32)

src/lib/WIFI/devWIFI.cpp

@@ -51,8 +51,6 @@
 extern void setButtonColors(uint8_t b1, uint8_t b2);
 #endif
 
-extern unsigned long rebootTime;
-
 static char station_ssid[33];
 static char station_password[65];
 

src/lib/WIFI/devWIFI.h

@@ -2,4 +2,6 @@
 
 #include "device.h"
 
+void setWifiUpdateMode();
+
 extern device_t WIFI_device;

src/lib/tx-crsf/TXModuleParameters.cpp

@@ -11,6 +11,10 @@
 #include "deferred.h"
 #include "msptypes.h"
 
+#include "devBackpack.h"
+#include "devVTX.h"
+#include "devWIFI.h"
+
 #define STR_LUA_ALLAUX         "AUX1;AUX2;AUX3;AUX4;AUX5;AUX6;AUX7;AUX8;AUX9;AUX10"
 
 #define STR_LUA_ALLAUX_UPDOWN  "AUX1" LUASYM_ARROW_UP ";AUX1" LUASYM_ARROW_DN ";AUX2" LUASYM_ARROW_UP ";AUX2" LUASYM_ARROW_DN \
@@ -319,18 +323,6 @@ static stringParameter luaBackpackVersion = {
 
 //---------------------------- BACKPACK ------------------
 
-extern TxConfig config;
-extern void VtxTriggerSend();
-extern void ResetPower();
-extern uint8_t adjustPacketRateForBaud(uint8_t rate);
-extern uint8_t adjustSwitchModeForAirRate(OtaSwitchMode_e eSwitchMode, uint8_t packetSize);
-extern bool RxWiFiReadyToSend;
-extern bool BackpackTelemReadyToSend;
-extern bool TxBackpackWiFiReadyToSend;
-extern bool VRxBackpackWiFiReadyToSend;
-extern unsigned long rebootTime;
-extern void setWifiUpdateMode();
-
 void TXModuleEndpoint::supressCriticalErrors()
 {
     // clear the critical error bits of the warning flags
@@ -647,7 +639,7 @@ void TXModuleEndpoint::SetPacketRateIdx(uint8_t idx, bool forceChange)
     return;
 
   const auto newModParams = get_elrs_airRateConfig(actualRate);
-  uint8_t newSwitchMode = adjustSwitchModeForAirRate((OtaSwitchMode_e)config.GetSwitchMode(), newModParams->PayloadLength);
+  uint8_t newSwitchMode = OtaAdjustSwitchModeForAirRate((OtaSwitchMode_e)config.GetSwitchMode(), newModParams->PayloadLength);
   // Force Gemini when using dual band modes.
   uint8_t newAntennaMode = (newModParams->radio_type == RADIO_TYPE_LR1121_LORA_DUAL) ? TX_RADIO_MODE_GEMINI : config.GetAntennaMode();
   // If the switch mode is going to change, block the change while connected
@@ -1013,7 +1005,7 @@ void TXModuleEndpoint::registerParameters()
 void TXModuleEndpoint::updateParameters()
 {
   bool isMavlinkMode = config.GetLinkMode() == TX_MAVLINK_MODE;
-  uint8_t currentRate = adjustPacketRateForBaud(config.GetRate());
+  uint8_t currentRate = ExpressLRS_currAirRate_Modparams->index;
 #if defined(RADIO_LR1121)
   // calculate RFMode from current packet-rate
   switch (get_elrs_airRateConfig(currentRate)->radio_type)