From 8c0a7a2ea31d2f92b47cd5d7e2fe76578a1b814c Mon Sep 17 00:00:00 2001 From: Bernd Giesecke Date: Tue, 4 Jun 2019 15:35:24 +0800 Subject: [PATCH] Moved DIO2 setting into begin()/beginFSK() Signed-off-by: Bernd Giesecke --- src/modules/SX126x.cpp | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/modules/SX126x.cpp b/src/modules/SX126x.cpp index deb2dba8..3a74fe4e 100644 --- a/src/modules/SX126x.cpp +++ b/src/modules/SX126x.cpp @@ -33,6 +33,11 @@ int16_t SX126x::begin(float bw, uint8_t sf, uint8_t cr, uint16_t syncWord, uint1 } // configure publicly accessible settings + state = setDio2AsRfSwitch(false); + if(state != ERR_NONE) { + return(state); + } + state = setSpreadingFactor(sf); if(state != ERR_NONE) { return(state); @@ -86,6 +91,11 @@ int16_t SX126x::beginFSK(float br, float freqDev, float rxBw, uint16_t preambleL } // configure publicly accessible settings + state = setDio2AsRfSwitch(false); + if(state != ERR_NONE) { + return(state); + } + state = setBitRate(br); if(state != ERR_NONE) { return(state); @@ -1080,18 +1090,10 @@ int16_t SX126x::setDio2AsRfSwitch(bool enable) { } int16_t SX126x::config(uint8_t modem) { - // set DIO2 as IRQ - _dio2RfSwitch = false; - uint8_t* data = new uint8_t[1]; - data[0] = SX126X_DIO2_AS_IRQ; - int16_t state = SPIwriteCommand(SX126X_CMD_SET_DIO2_AS_RF_SWITCH_CTRL, data, 1); - if(state != ERR_NONE) { - return(state); - } - // set regulator mode + uint8_t* data = new uint8_t[1]; data[0] = SX126X_REGULATOR_DC_DC; - state = SPIwriteCommand(SX126X_CMD_SET_REGULATOR_MODE, data, 1); + int16_t state = SPIwriteCommand(SX126X_CMD_SET_REGULATOR_MODE, data, 1); if(state != ERR_NONE) { return(state); }