pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-04-25 01:42:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

override new RadioLib's default current limit value (60 mA) to the previous value of 100mA

Browse Source
This commit is contained in:
Vladislav Osmanov 2021-09-08 14:30:52 +03:00
parent c8269d67c3
commit 1a671f2877
4 changed files with 23 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesh/RF95Interface.cpp
View File

@ -70,6 +70,12 @@ bool RF95Interface::init()
int res = lora->begin(freq, bw, sf, cr, syncWord, power, currentLimit, preambleLength); int res = lora->begin(freq, bw, sf, cr, syncWord, power, currentLimit, preambleLength);
DEBUG_MSG("RF95 init result %d\n", res); DEBUG_MSG("RF95 init result %d\n", res);
// current limit was removed from module' ctor
// override default value (60 mA)
res = lora->setCurrentLimit(currentLimit);
DEBUG_MSG("Current limit set to %f\n", currentLimit);
DEBUG_MSG("Current limit set result %d\n", res);
if (res == ERR_NONE) if (res == ERR_NONE)
res = lora->setCRC(SX126X_LORA_CRC_ON); res = lora->setCRC(SX126X_LORA_CRC_ON);

6
src/mesh/RadioLibRF95.cpp
View File

@ -19,6 +19,12 @@ int16_t RadioLibRF95::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_
state = SX127x::begin(RF95_ALT_VERSION, syncWord, preambleLength); state = SX127x::begin(RF95_ALT_VERSION, syncWord, preambleLength);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// current limit was removed from module' ctor
// override default value (60 mA)
state = setCurrentLimit(currentLimit);
DEBUG_MSG("Current limit set to %f\n", currentLimit);
DEBUG_MSG("Current limit set result %d\n", state);
// configure settings not accessible by API // configure settings not accessible by API
state = config(); state = config();
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);

5
src/mesh/RadioLibRF95.h
View File

@ -62,6 +62,11 @@ class RadioLibRF95: public SX1278 {
/// For debugging /// For debugging
uint8_t readReg(uint8_t addr); uint8_t readReg(uint8_t addr);
protected:
// since default current limit for SX126x/127x in updated RadioLib is 60mA
// use the previous value
float currentLimit = 100;
#ifndef RADIOLIB_GODMODE #ifndef RADIOLIB_GODMODE
private: private:
#endif #endif

6
src/mesh/SX1262Interface.cpp
View File

@ -53,6 +53,12 @@ bool SX1262Interface::init()
int res = lora.begin(freq, bw, sf, cr, syncWord, power, preambleLength, tcxoVoltage, useRegulatorLDO); int res = lora.begin(freq, bw, sf, cr, syncWord, power, preambleLength, tcxoVoltage, useRegulatorLDO);
DEBUG_MSG("SX1262 init result %d\n", res); DEBUG_MSG("SX1262 init result %d\n", res);
// current limit was removed from module' ctor
// override default value (60 mA)
res = lora.setCurrentLimit(currentLimit);
DEBUG_MSG("Current limit set to %f\n", currentLimit);
DEBUG_MSG("Current limit set result %d\n", res);
#ifdef SX1262_TXEN #ifdef SX1262_TXEN
// lora.begin sets Dio2 as RF switch control, which is not true if we are manually controlling RX and TX // lora.begin sets Dio2 as RF switch control, which is not true if we are manually controlling RX and TX
if (res == ERR_NONE) if (res == ERR_NONE)