common, sx1280 driver, revert powercalc with frequencyband, doesn't m…

…ake sense
olliw42 · Jul 29, 2024 · 1b74e3e · 1b74e3e
1 parent 141b0d7
commit 1b74e3e
Showing 1 changed file with 1 addition and 11 deletions.
diff --git a/mLRS/Common/sx-drivers/sx128x_driver.h b/mLRS/Common/sx-drivers/sx128x_driver.h
@@ -316,12 +316,10 @@ class Sx128xDriverCommon : public Sx128xDriverBase
         return actual_power_dbm;
     }
 
-  protected:
-    tSxGlobalConfig* gconfig;
-
   private:
     const tSxLoraConfiguration* lora_configuration;
     const tSxFlrcConfiguration* flrc_configuration;
+    tSxGlobalConfig* gconfig;
     uint8_t sx_power;
     int8_t actual_power_dbm;
 };
@@ -390,11 +388,7 @@ class Sx128xDriver : public Sx128xDriverCommon
 
     void RfPowerCalc(int8_t power_dbm, uint8_t* sx_power, int8_t* actual_power_dbm) override
     {
-#ifdef POWER_USE_DEFAULT_RFPOWER_CALC
         sx1280_rfpower_calc(power_dbm, sx_power, actual_power_dbm, POWER_GAIN_DBM, POWER_SX1280_MAX_DBM);
-#else
-        sx1280_rfpower_calc(power_dbm, sx_power, actual_power_dbm, gconfig->FrequencyBand);
-#endif
     }
 
     //-- init API functions
@@ -542,11 +536,7 @@ class Sx128xDriver2 : public Sx128xDriverCommon
 #ifdef DEVICE_HAS_DUAL_SX126x_SX128x
         sx1280_rfpower_calc(power_dbm, sx_power, actual_power_dbm, POWER2_GAIN_DBM, POWER2_SX1280_MAX_DBM);
 #else
-  #ifdef POWER_USE_DEFAULT_RFPOWER_CALC
         sx1280_rfpower_calc(power_dbm, sx_power, actual_power_dbm, POWER_GAIN_DBM, POWER_SX1280_MAX_DBM);
-  #else
-        sx1280_rfpower_calc(power_dbm, sx_power, actual_power_dbm, gconfig->FrequencyBand);
-  #endif
 #endif
     }