From d58a4c008e6fcabcb6a26b2e927210dd4b302113 Mon Sep 17 00:00:00 2001 From: jgromes Date: Mon, 30 Mar 2020 19:27:17 +0200 Subject: [PATCH] [nRF24] Using range check macro --- src/modules/nRF24/nRF24.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/modules/nRF24/nRF24.cpp b/src/modules/nRF24/nRF24.cpp index 7316f2f0..a05d52e3 100644 --- a/src/modules/nRF24/nRF24.cpp +++ b/src/modules/nRF24/nRF24.cpp @@ -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) {