From 6bd495a49124bb85b8ff3ea82103f9fcbf2a11a7 Mon Sep 17 00:00:00 2001 From: Solanaceae <93513823+Solarvortx@users.noreply.github.com> Date: Thu, 2 Dec 2021 20:46:36 -0700 Subject: [PATCH] OCP limit into SX126x class where it belongs. --- src/mesh/RadioLibInterface.h | 6 +----- src/mesh/SX126xInterface.h | 2 ++ 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/mesh/RadioLibInterface.h b/src/mesh/RadioLibInterface.h index 25931f5b..54d9e674 100644 --- a/src/mesh/RadioLibInterface.h +++ b/src/mesh/RadioLibInterface.h @@ -88,11 +88,7 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified */ const uint8_t syncWord = 0x2b; - #ifdef USE_SX1262 - float currentLimit = 140; //SX1262 higher limit - this should allow for extra current used by the PA at +22dBm. - #else - float currentLimit = 100; // 100mA OCP - Should be acceptable for RFM95/SX127x chipset. - #endif + float currentLimit = 100; // 100mA OCP - Should be acceptable for RFM95/SX127x chipset. LockingModule module; // The HW interface to the radio diff --git a/src/mesh/SX126xInterface.h b/src/mesh/SX126xInterface.h index 1b4a1004..953f8907 100644 --- a/src/mesh/SX126xInterface.h +++ b/src/mesh/SX126xInterface.h @@ -29,6 +29,8 @@ class SX126xInterface : public RadioLibInterface protected: + float currentLimit = 140; // Higher OCP limit for SX126x PA + /** * Specific module instance */