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

Update radios to use new setRfSwitchState

Browse source 
This removes the compatibility wrapper and applies the following
replacements:

    sed -i 's/setRfSwitchState(LOW, LOW)/setRfSwitchState(Module::MODE_IDLE)/' src/modules/*/*.cpp
    sed -i 's/setRfSwitchState(HIGH, LOW)/setRfSwitchState(Module::MODE_RX)/' src/modules/*/*.cpp
    sed -i 's/setRfSwitchState(LOW, HIGH)/setRfSwitchState(Module::MODE_TX)/' src/modules/*/*.cpp
This commit is contained in:
Matthijs Kooijman 2022-12-06 13:27:19 +01:00
parent 3779faf600
commit 52ec165643
7 changed files with 39 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/Module.h
View file

@ -383,13 +383,6 @@ class Module {
*/
void setRfSwitchState(uint8_t mode);
/*! Temporary compatibility wrapper */
void setRfSwitchState(RADIOLIB_PIN_STATUS rxPinState, RADIOLIB_PIN_STATUS txPinState) {
if (rxPinState) setRfSwitchState(MODE_RX);
else if (txPinState) setRfSwitchState(MODE_TX);
else setRfSwitchState(MODE_IDLE);
}
/*!
\brief Wait for time to elapse, either using the microsecond timer, or the TimerFlag.
Note that in interrupt timing mode, it is up to the user to set up the timing interrupt!

10
src/modules/CC1101/CC1101.cpp
View file

@ -162,7 +162,7 @@ int16_t CC1101::standby() {
SPIsendCommand(RADIOLIB_CC1101_CMD_IDLE);
// set RF switch (if present)
_mod->setRfSwitchState(LOW, LOW);
_mod->setRfSwitchState(Module::MODE_IDLE);
return(RADIOLIB_ERR_NONE);
}
@ -176,7 +176,7 @@ int16_t CC1101::transmitDirectAsync(uint32_t frf) {
int16_t CC1101::transmitDirect(bool sync, uint32_t frf) {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, HIGH);
_mod->setRfSwitchState(Module::MODE_TX);
// user requested to start transmitting immediately (required for RTTY)
if(frf != 0) {
@ -206,7 +206,7 @@ int16_t CC1101::receiveDirectAsync() {
int16_t CC1101::receiveDirect(bool sync) {
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// activate direct mode
int16_t state = directMode(sync);
@ -291,7 +291,7 @@ int16_t CC1101::startTransmit(uint8_t* data, size_t len, uint8_t addr) {
dataSent += initialWrite;
// set RF switch (if present)
_mod->setRfSwitchState(LOW, HIGH);
_mod->setRfSwitchState(Module::MODE_TX);
// set mode to transmit
SPIsendCommand(RADIOLIB_CC1101_CMD_TX);
@ -344,7 +344,7 @@ int16_t CC1101::startReceive() {
RADIOLIB_ASSERT(state);
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// set mode to receive
SPIsendCommand(RADIOLIB_CC1101_CMD_RX);

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

@ -159,7 +159,7 @@ int16_t RF69::receive(uint8_t* data, size_t len) {
int16_t RF69::sleep() {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, LOW);
_mod->setRfSwitchState(Module::MODE_IDLE);
// set module to sleep
return(setMode(RADIOLIB_RF69_SLEEP));
@ -167,7 +167,7 @@ int16_t RF69::sleep() {
int16_t RF69::standby() {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, LOW);
_mod->setRfSwitchState(Module::MODE_IDLE);
// set module to standby
return(setMode(RADIOLIB_RF69_STANDBY));
@ -175,7 +175,7 @@ int16_t RF69::standby() {
int16_t RF69::transmitDirect(uint32_t frf) {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, HIGH);
_mod->setRfSwitchState(Module::MODE_TX);
// user requested to start transmitting immediately (required for RTTY)
if(frf != 0) {
@ -196,7 +196,7 @@ int16_t RF69::transmitDirect(uint32_t frf) {
int16_t RF69::receiveDirect() {
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// activate direct mode
int16_t state = directMode();
@ -254,7 +254,7 @@ int16_t RF69::startReceive() {
clearIRQFlags();
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// set mode to receive
state = _mod->SPIsetRegValue(RADIOLIB_RF69_REG_OCP, RADIOLIB_RF69_OCP_ON | RADIOLIB_RF69_OCP_TRIM);
@ -414,7 +414,7 @@ int16_t RF69::startTransmit(uint8_t* data, size_t len, uint8_t addr) {
}
// set RF switch (if present)
_mod->setRfSwitchState(LOW, HIGH);
_mod->setRfSwitchState(Module::MODE_TX);
// set mode to transmit
state = setMode(RADIOLIB_RF69_TX);

14
src/modules/SX126x/SX126x.cpp
View file

@ -299,7 +299,7 @@ int16_t SX126x::receive(uint8_t* data, size_t len) {
int16_t SX126x::transmitDirect(uint32_t frf) {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, HIGH);
_mod->setRfSwitchState(Module::MODE_TX);
// user requested to start transmitting immediately (required for RTTY)
int16_t state = RADIOLIB_ERR_NONE;
@ -315,7 +315,7 @@ int16_t SX126x::transmitDirect(uint32_t frf) {
int16_t SX126x::receiveDirect() {
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// SX126x is unable to output received data directly
return(RADIOLIB_ERR_UNKNOWN);
@ -337,7 +337,7 @@ int16_t SX126x::scanChannel(uint8_t symbolNum, uint8_t detPeak, uint8_t detMin)
int16_t SX126x::sleep(bool retainConfig) {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, LOW);
_mod->setRfSwitchState(Module::MODE_IDLE);
uint8_t sleepMode = RADIOLIB_SX126X_SLEEP_START_WARM | RADIOLIB_SX126X_SLEEP_RTC_OFF;
if(!retainConfig) {
@ -357,7 +357,7 @@ int16_t SX126x::standby() {
int16_t SX126x::standby(uint8_t mode) {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, LOW);
_mod->setRfSwitchState(Module::MODE_IDLE);
uint8_t data[] = {mode};
return(SPIwriteCommand(RADIOLIB_SX126X_CMD_SET_STANDBY, data, 1));
@ -418,7 +418,7 @@ int16_t SX126x::startTransmit(uint8_t* data, size_t len, uint8_t addr) {
RADIOLIB_ASSERT(state);
// set RF switch (if present)
_mod->setRfSwitchState(LOW, HIGH);
_mod->setRfSwitchState(Module::MODE_TX);
// start transmission
state = setTx(RADIOLIB_SX126X_TX_TIMEOUT_NONE);
@ -445,7 +445,7 @@ int16_t SX126x::startReceive(uint32_t timeout) {
RADIOLIB_ASSERT(state);
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// set mode to receive
state = setRx(timeout);
@ -600,7 +600,7 @@ int16_t SX126x::startChannelScan(uint8_t symbolNum, uint8_t detPeak, uint8_t det
RADIOLIB_ASSERT(state);
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// set DIO pin mapping
state = setDioIrqParams(RADIOLIB_SX126X_IRQ_CAD_DETECTED | RADIOLIB_SX126X_IRQ_CAD_DONE, RADIOLIB_SX126X_IRQ_CAD_DETECTED | RADIOLIB_SX126X_IRQ_CAD_DONE);

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

@ -275,7 +275,7 @@ int16_t SX127x::scanChannel() {
int16_t SX127x::sleep() {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, LOW);
_mod->setRfSwitchState(Module::MODE_IDLE);
// set mode to sleep
return(setMode(RADIOLIB_SX127X_SLEEP));
@ -283,7 +283,7 @@ int16_t SX127x::sleep() {
int16_t SX127x::standby() {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, LOW);
_mod->setRfSwitchState(Module::MODE_IDLE);
// set mode to standby
return(setMode(RADIOLIB_SX127X_STANDBY));
@ -296,7 +296,7 @@ int16_t SX127x::transmitDirect(uint32_t frf) {
}
// set RF switch (if present)
_mod->setRfSwitchState(LOW, HIGH);
_mod->setRfSwitchState(Module::MODE_TX);
// user requested to start transmitting immediately (required for RTTY)
if(frf != 0) {
@ -325,7 +325,7 @@ int16_t SX127x::receiveDirect() {
}
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// activate direct mode
int16_t state = directMode();
@ -405,13 +405,13 @@ int16_t SX127x::startReceive(uint8_t len, uint8_t mode) {
// FSK modem does not distinguish between Rx single and continuous
if(mode == RADIOLIB_SX127X_RXCONTINUOUS) {
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
return(setMode(RADIOLIB_SX127X_RX));
}
}
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// set mode to receive
return(setMode(mode));
@ -570,7 +570,7 @@ int16_t SX127x::startTransmit(uint8_t* data, size_t len, uint8_t addr) {
_mod->SPIwriteRegisterBurst(RADIOLIB_SX127X_REG_FIFO, data, packetLen);
// set RF switch (if present)
_mod->setRfSwitchState(LOW, HIGH);
_mod->setRfSwitchState(Module::MODE_TX);
// start transmission
state |= setMode(RADIOLIB_SX127X_TX);
@ -659,7 +659,7 @@ int16_t SX127x::startChannelScan() {
RADIOLIB_ASSERT(state);
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// set mode to CAD
state = setMode(RADIOLIB_SX127X_CAD);

14
src/modules/SX128x/SX128x.cpp
View file

@ -348,7 +348,7 @@ int16_t SX128x::receive(uint8_t* data, size_t len) {
int16_t SX128x::transmitDirect(uint32_t frf) {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, HIGH);
_mod->setRfSwitchState(Module::MODE_TX);
// user requested to start transmitting immediately (required for RTTY)
int16_t state = RADIOLIB_ERR_NONE;
@ -363,7 +363,7 @@ int16_t SX128x::transmitDirect(uint32_t frf) {
int16_t SX128x::receiveDirect() {
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// SX128x is unable to output received data directly
return(RADIOLIB_ERR_UNKNOWN);
@ -388,7 +388,7 @@ int16_t SX128x::scanChannel() {
RADIOLIB_ASSERT(state);
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// set mode to CAD
state = setCad();
@ -416,7 +416,7 @@ int16_t SX128x::scanChannel() {
int16_t SX128x::sleep(bool retainConfig) {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, LOW);
_mod->setRfSwitchState(Module::MODE_IDLE);
uint8_t sleepConfig = RADIOLIB_SX128X_SLEEP_DATA_BUFFER_RETAIN | RADIOLIB_SX128X_SLEEP_DATA_RAM_RETAIN;
if(!retainConfig) {
@ -436,7 +436,7 @@ int16_t SX128x::standby() {
int16_t SX128x::standby(uint8_t mode) {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, LOW);
_mod->setRfSwitchState(Module::MODE_IDLE);
uint8_t data[] = { mode };
return(SPIwriteCommand(RADIOLIB_SX128X_CMD_SET_STANDBY, data, 1));
@ -500,7 +500,7 @@ int16_t SX128x::startTransmit(uint8_t* data, size_t len, uint8_t addr) {
RADIOLIB_ASSERT(state);
// set RF switch (if present)
_mod->setRfSwitchState(LOW, HIGH);
_mod->setRfSwitchState(Module::MODE_TX);
// start transmission
state = setTx(RADIOLIB_SX128X_TX_TIMEOUT_NONE);
@ -553,7 +553,7 @@ int16_t SX128x::startReceive(uint16_t timeout) {
}
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// set mode to receive
state = setRx(timeout);

12
src/modules/Si443x/Si443x.cpp
View file

@ -119,7 +119,7 @@ int16_t Si443x::receive(uint8_t* data, size_t len) {
int16_t Si443x::sleep() {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, LOW);
_mod->setRfSwitchState(Module::MODE_IDLE);
// disable wakeup timer interrupt
int16_t state = _mod->SPIsetRegValue(RADIOLIB_SI443X_REG_INTERRUPT_ENABLE_1, 0x00);
@ -135,14 +135,14 @@ int16_t Si443x::sleep() {
int16_t Si443x::standby() {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, LOW);
_mod->setRfSwitchState(Module::MODE_IDLE);
return(_mod->SPIsetRegValue(RADIOLIB_SI443X_REG_OP_FUNC_CONTROL_1, RADIOLIB_SI443X_XTAL_ON, 7, 0, 10));
}
int16_t Si443x::transmitDirect(uint32_t frf) {
// set RF switch (if present)
_mod->setRfSwitchState(LOW, HIGH);
_mod->setRfSwitchState(Module::MODE_TX);
// user requested to start transmitting immediately (required for RTTY)
if(frf != 0) {
@ -184,7 +184,7 @@ int16_t Si443x::transmitDirect(uint32_t frf) {
int16_t Si443x::receiveDirect() {
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// activate direct mode
int16_t state = directMode();
@ -239,7 +239,7 @@ int16_t Si443x::startTransmit(uint8_t* data, size_t len, uint8_t addr) {
_mod->SPIwriteRegisterBurst(RADIOLIB_SI443X_REG_FIFO_ACCESS, data, len);
// set RF switch (if present)
_mod->setRfSwitchState(LOW, HIGH);
_mod->setRfSwitchState(Module::MODE_TX);
// set interrupt mapping
_mod->SPIwriteRegister(RADIOLIB_SI443X_REG_INTERRUPT_ENABLE_1, RADIOLIB_SI443X_PACKET_SENT_ENABLED);
@ -272,7 +272,7 @@ int16_t Si443x::startReceive() {
clearIRQFlags();
// set RF switch (if present)
_mod->setRfSwitchState(HIGH, LOW);
_mod->setRfSwitchState(Module::MODE_RX);
// set interrupt mapping
_mod->SPIwriteRegister(RADIOLIB_SI443X_REG_INTERRUPT_ENABLE_1, RADIOLIB_SI443X_VALID_PACKET_RECEIVED_ENABLED | RADIOLIB_SI443X_CRC_ERROR_ENABLED);