From fe3afaab3d5dc196e5cf8cbe8562b99d910c250e Mon Sep 17 00:00:00 2001 From: Vladislav Osmanov <7123463+osmanovv@users.noreply.github.com> Date: Thu, 2 Sep 2021 02:28:19 +0300 Subject: [PATCH] Reflecting changes from upstream RadioLib in https://github.com/osmanovv/RadioLib/tree/upstream-merge (https://github.com/osmanovv/RadioLib/commit/252fe74d5386c4a28bc7f69f5d3bd3962a6c9780) The argument `currentLimit` was removed from the `begin` method: https://github.com/jgromes/RadioLib/commit/e1141ca64c2f19110eac84f123d89861e98c4650#diff-507c32190e4a29ffe411c8eab06c75b594c5d2a5fd92e5cb703b787e5f019589L568 --- src/mesh/RadioLibRF95.cpp | 4 ++-- src/mesh/SX1262Interface.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesh/RadioLibRF95.cpp b/src/mesh/RadioLibRF95.cpp index 364a7591f..fa4299b8e 100644 --- a/src/mesh/RadioLibRF95.cpp +++ b/src/mesh/RadioLibRF95.cpp @@ -14,9 +14,9 @@ int16_t RadioLibRF95::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_ uint16_t preambleLength, uint8_t gain) { // execute common part - int16_t state = SX127x::begin(RF95_CHIP_VERSION, syncWord, currentLimit, preambleLength); + int16_t state = SX127x::begin(RF95_CHIP_VERSION, syncWord, preambleLength); if (state != ERR_NONE) - state = SX127x::begin(RF95_ALT_VERSION, syncWord, currentLimit, preambleLength); + state = SX127x::begin(RF95_ALT_VERSION, syncWord, preambleLength); RADIOLIB_ASSERT(state); // configure settings not accessible by API diff --git a/src/mesh/SX1262Interface.cpp b/src/mesh/SX1262Interface.cpp index 002050f13..0d27bb0b2 100644 --- a/src/mesh/SX1262Interface.cpp +++ b/src/mesh/SX1262Interface.cpp @@ -50,7 +50,7 @@ bool SX1262Interface::init() limitPower(); - int res = lora.begin(freq, bw, sf, cr, syncWord, power, currentLimit, preambleLength, tcxoVoltage, useRegulatorLDO); + int res = lora.begin(freq, bw, sf, cr, syncWord, power, preambleLength, tcxoVoltage, useRegulatorLDO); DEBUG_MSG("SX1262 init result %d\n", res); #ifdef SX1262_TXEN