From 532c1e6fe94eecbb7644de14db0b7ff9e16e73be Mon Sep 17 00:00:00 2001 From: jgromes Date: Mon, 30 Mar 2020 19:31:20 +0200 Subject: [PATCH] [RF69] Using range check macro --- src/modules/RF69/RF69.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/modules/RF69/RF69.cpp b/src/modules/RF69/RF69.cpp index 2ef86d4e..2e2eab0e 100644 --- a/src/modules/RF69/RF69.cpp +++ b/src/modules/RF69/RF69.cpp @@ -359,10 +359,7 @@ int16_t RF69::setFrequency(float freq) { } int16_t RF69::setBitRate(float br) { - // check allowed bitrate - if((br < 1.2) || (br > 300.0)) { - return(ERR_INVALID_BIT_RATE); - } + RADIOLIB_CHECK_RANGE(br, 1.2, 300.0, ERR_INVALID_BIT_RATE); // check bitrate-bandwidth ratio if(!(br < 2000 * _rxBw)) { @@ -496,10 +493,7 @@ int16_t RF69::setFrequencyDeviation(float freqDev) { } int16_t RF69::setOutputPower(int8_t power) { - // check output power range - if((power < -18) || (power > 17)) { - return(ERR_INVALID_OUTPUT_POWER); - } + RADIOLIB_CHECK_RANGE(power, -18, 17, ERR_INVALID_OUTPUT_POWER); // set mode to standby setMode(RF69_STANDBY);