Merge

library.properties

@@ -1,5 +1,5 @@
 name=RadioLib
-version=3.3.0
+version=3.3.1
 author=Jan Gromes <gromes.jan@gmail.com>
 maintainer=Jan Gromes <gromes.jan@gmail.com>
 sentence=Universal wireless communication library for Arduino

src/Module.cpp

@@ -73,8 +73,14 @@ void Module::init(uint8_t interface) {
 }
 
 void Module::term() {
-  // stop SPI
+  // stop hardware interfaces
+  if(_spi != nullptr) {
     _spi->end();
+  }
+
+  if(ModuleSerial != nullptr) {
+    ModuleSerial->end();
+  }
 }
 
 void Module::ATemptyBuffer() {

src/TypeDef.h

@@ -10,7 +10,7 @@
 // version definitions
 #define RADIOLIB_VERSION_MAJOR  (0x03)
 #define RADIOLIB_VERSION_MINOR  (0x03)
-#define RADIOLIB_VERSION_PATCH  (0x00)
+#define RADIOLIB_VERSION_PATCH  (0x01)
 #define RADIOLIB_VERSION_EXTRA  (0x00)
 
 #define RADIOLIB_VERSION ((RADIOLIB_VERSION_MAJOR << 24) | (RADIOLIB_VERSION_MAJOR << 16) | (RADIOLIB_VERSION_MAJOR << 8) | (RADIOLIB_VERSION_EXTRA))

src/modules/RF69/RF69.cpp

@@ -47,7 +47,7 @@ int16_t RF69::begin(float freq, float br, float freqDev, float rxBw, int8_t powe
 
   if(!flagFound) {
     RADIOLIB_DEBUG_PRINTLN(F("No RF69 found!"));
-    SPI.end();
+    _mod->term();
     return(ERR_CHIP_NOT_FOUND);
   } else {
     RADIOLIB_DEBUG_PRINTLN(F("Found RF69! (match by RF69_REG_VERSION == 0x24)"));
@@ -326,9 +326,6 @@ int16_t RF69::readData(uint8_t* data, size_t len) {
   // read packet data
   _mod->SPIreadRegisterBurst(RF69_REG_FIFO, length, data);
 
-  // add terminating null
-  data[length] = 0;
-
   // update RSSI
   lastPacketRSSI = -1.0 * (_mod->SPIgetRegValue(RF69_REG_RSSI_VALUE)/2.0);
 

src/modules/SX1231/SX1231.cpp

@@ -37,7 +37,7 @@ int16_t SX1231::begin(float freq, float br, float rxBw, float freqDev, int8_t po
 
   if(!flagFound) {
     RADIOLIB_DEBUG_PRINTLN(F("No SX1231 found!"));
-    SPI.end();
+    _mod->term();
     return(ERR_CHIP_NOT_FOUND);
   } else {
     RADIOLIB_DEBUG_PRINTLN(F("Found SX1231!"));

src/modules/SX127x/SX127x.cpp

@@ -74,6 +74,10 @@ int16_t SX127x::beginFSK(uint8_t chipVersion, float br, float freqDev, float rxB
     RADIOLIB_ASSERT(state);
   }
 
+  // enable/disable OOK
+  state = setOOK(enableOOK);
+  RADIOLIB_ASSERT(state);
+
   // set bit rate
   state = SX127x::setBitRate(br);
   RADIOLIB_ASSERT(state);
@@ -103,10 +107,6 @@ int16_t SX127x::beginFSK(uint8_t chipVersion, float br, float freqDev, float rxB
   state = disableAddressFiltering();
   RADIOLIB_ASSERT(state);
 
-  // enable/disable OOK
-  state = setOOK(enableOOK);
-  RADIOLIB_ASSERT(state);
-
   // set default RSSI measurement config
   state = setRSSIConfig(2);
   RADIOLIB_ASSERT(state);

src/modules/nRF24/nRF24.cpp

@@ -218,9 +218,6 @@ int16_t nRF24::readData(uint8_t* data, size_t len) {
   // read packet data
   SPIreadRxPayload(data, length);
 
-  // add terminating null
-  data[length] = 0;
-
   // clear interrupt
   clearIRQ();