forks/RadioLibSmol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge

Browse source
This commit is contained in:
Andrea Guglielmini 2020-02-26 16:25:59 +01:00
commit 1e718566d3
7 changed files with 16 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
library.properties
View file

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

8
src/Module.cpp
View file

@ -73,10 +73,16 @@ void Module::init(uint8_t interface) {
} }
void Module::term() { void Module::term() {
// stop SPI // stop hardware interfaces
if(_spi != nullptr) {
_spi->end(); _spi->end();
} }
if(ModuleSerial != nullptr) {
ModuleSerial->end();
}
}
void Module::ATemptyBuffer() { void Module::ATemptyBuffer() {
while(ModuleSerial->available() > 0) { while(ModuleSerial->available() > 0) {
ModuleSerial->read(); ModuleSerial->read();

2
src/TypeDef.h
View file

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

5
src/modules/RF69/RF69.cpp
View file

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

2
src/modules/SX1231/SX1231.cpp
View file

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

8
src/modules/SX127x/SX127x.cpp
View file

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

3
src/modules/nRF24/nRF24.cpp
View file

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