Revert "invertIQ refact (ExpressLRS#949)" (ExpressLRS#999)

pkendall64 · web-flow · commit eae8aab39584 · 2021-10-19T07:27:34.000+13:00
This reverts commit df1af6a.
diff --git a/src/include/common.h b/src/include/common.h
@@ -16,7 +16,6 @@ extern uint8_t BindingUID[6];
 extern uint8_t UID[6];
 extern uint8_t MasterUID[6];
 extern uint16_t CRCInitializer;
-extern uint8_t invertIQ;
 
 typedef enum
 {
diff --git a/src/src/common.cpp b/src/src/common.cpp
@@ -113,8 +113,6 @@ uint8_t MasterUID[6] = {UID[0], UID[1], UID[2], UID[3], UID[4], UID[5]}; // Spec
 
 uint16_t CRCInitializer = (UID[4] << 8) | UID[5];
 
-uint8_t invertIQ = UID[5] & 0x01;
-
 #define RSSI_FLOOR_NUM_READS 5 // number of times to sweep the noise foor to get avg. RSSI reading
 #define MEDIAN_SIZE 20
 
diff --git a/src/src/rx_main.cpp b/src/src/rx_main.cpp
@@ -241,6 +241,7 @@ void SetRFLinkRate(uint8_t index) // Set speed of RF link
 {
     expresslrs_mod_settings_s *const ModParams = get_elrs_airRateConfig(index);
     expresslrs_rf_pref_params_s *const RFperf = get_elrs_RFperfParams(index);
+    bool invertIQ = UID[5] & 0x01;
 
     hwTimer.updateInterval(ModParams->interval);
     Radio.Config(ModParams->bw, ModParams->sf, ModParams->cr, GetInitialFreq(), ModParams->PreambleLen, invertIQ, ModParams->PayloadLength);
diff --git a/src/src/tx_main.cpp b/src/src/tx_main.cpp
@@ -341,7 +341,7 @@ void ICACHE_RAM_ATTR SetRFLinkRate(uint8_t index) // Set speed of RF link (hz)
   index = adjustPacketRateForBaud(index);
   expresslrs_mod_settings_s *const ModParams = get_elrs_airRateConfig(index);
   expresslrs_rf_pref_params_s *const RFperf = get_elrs_RFperfParams(index);
-
+  bool invertIQ = UID[5] & 0x01;
   if ((ModParams == ExpressLRS_currAirRate_Modparams)
     && (RFperf == ExpressLRS_currAirRate_RFperfParams)
     && (invertIQ == Radio.IQinverted))

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@ extern uint8_t BindingUID[6];`
`16`	`16`	`extern uint8_t UID[6];`
`17`	`17`	`extern uint8_t MasterUID[6];`
`18`	`18`	`extern uint16_t CRCInitializer;`
`19`		`-extern uint8_t invertIQ;`
`20`	`19`
`21`	`20`	`typedef enum`
`22`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -241,6 +241,7 @@ void SetRFLinkRate(uint8_t index) // Set speed of RF link`
`241`	`241`	`{`
`242`	`242`	`expresslrs_mod_settings_s *const ModParams = get_elrs_airRateConfig(index);`
`243`	`243`	`expresslrs_rf_pref_params_s *const RFperf = get_elrs_RFperfParams(index);`
	`244`	`+ bool invertIQ = UID[5] & 0x01;`
`244`	`245`
`245`	`246`	`hwTimer.updateInterval(ModParams->interval);`
`246`	`247`	`Radio.Config(ModParams->bw, ModParams->sf, ModParams->cr, GetInitialFreq(), ModParams->PreambleLen, invertIQ, ModParams->PayloadLength);`