More extra externs

Author: CapnBry

src/include/rxtx_intf.h

@@ -10,6 +10,7 @@
  ***/
 #if defined(TARGET_TX)
 extern bool RxWiFiReadyToSend;
+extern char backpackVersion[];
 
 void SetSyncSpam();
 void ResetPower();

src/lib/Backpack/devBackpack.cpp

@@ -1,5 +1,6 @@
 #include "targets.h"
 
+#include "rxtx_intf.h"
 #include "CRSFHandset.h"
 #include "CRSFRouter.h"
 #include "config.h"
@@ -17,8 +18,6 @@
 // Stop overriding channels with PTR data if older than this
 #define HT_STALE_TIMEOUT_MS 1000
 
-extern char backpackVersion[];
-
 bool TxBackpackWiFiReadyToSend = false;
 bool VRxBackpackWiFiReadyToSend = false;
 bool BackpackTelemReadyToSend = false;

src/lib/tx-crsf/TXModuleParameters.cpp

@@ -43,9 +43,6 @@
 
 #define HAS_RADIO (GPIO_PIN_SCK != UNDEF_PIN)
 
-extern char backpackVersion[];
-extern TXModuleEndpoint crsfTransmitter;
-
 #if defined(Regulatory_Domain_EU_CE_2400)
 #if defined(RADIO_LR1121)
 char strPowerLevels[] = "10/10;25/25;25/50;25/100;25/250;25/500;25/1000;25/2000;MatchTX ";
@@ -394,7 +391,7 @@ void TXModuleEndpoint::sendELRSstatus(const crsf_addr_e origin)
 }
 
 void TXModuleEndpoint::updateModelID() {
-  itoa(crsfTransmitter.modelId, modelMatchUnit+6, 10);
+  itoa(modelId, modelMatchUnit+6, 10);
   strcat(modelMatchUnit, ")");
 }
 
@@ -890,7 +887,7 @@ void TXModuleEndpoint::registerParameters()
           msp.makeCommand();
           msp.function = MSP_SET_RX_CONFIG;
           msp.addByte(MSP_ELRS_MODEL_ID);
-          msp.addByte(newModelMatch ? crsfTransmitter.modelId : 0xff);
+          msp.addByte(newModelMatch ? modelId : 0xff);
           crsfRouter.AddMspMessage(&msp, CRSF_ADDRESS_CRSF_RECEIVER, CRSF_ADDRESS_CRSF_TRANSMITTER);
         }
         updateModelID();

src/lib/tx-crsf/devTXLUA.cpp

@@ -2,8 +2,6 @@
 #include "common.h"
 #include "device.h"
 
-extern TXModuleEndpoint crsfTransmitter;
-
 static int event()
 {
   if (connectionState < FAILURE_STATES)