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

[nRF24] Using range check macro

Browse source
This commit is contained in:
jgromes 2020-03-30 19:27:17 +02:00
parent 46e5f88bf1
commit d58a4c008e
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -225,14 +225,11 @@ int16_t nRF24::readData(uint8_t* data, size_t len) {
}
int16_t nRF24::setFrequency(int16_t freq) {
// check allowed range
if(!((freq >= 2400) && (freq <= 2525))) {
return(ERR_INVALID_FREQUENCY);
}
RADIOLIB_CHECK_RANGE(freq, 2400, 2525, ERR_INVALID_FREQUENCY);
// set frequency
uint8_t freqRaw = freq - 2400;
return _mod->SPIsetRegValue(NRF24_REG_RF_CH, freqRaw, 6, 0);
return(_mod->SPIsetRegValue(NRF24_REG_RF_CH, freqRaw, 6, 0));
}
int16_t nRF24::setDataRate(int16_t dataRate) {
@ -420,7 +417,7 @@ int16_t nRF24::getStatus(uint8_t mask) {
}
bool nRF24::isCarrierDetected() {
return(_mod->SPIgetRegValue(NRF24_REG_RPD, 0,0)) == 1;
return(_mod->SPIgetRegValue(NRF24_REG_RPD, 0, 0) == 1);
}
int16_t nRF24::setFrequencyDeviation(float freqDev) {