From 40599baef1c70db2d992bb6a6394f822af3ac658 Mon Sep 17 00:00:00 2001 From: obones Date: Thu, 25 Aug 2022 10:39:21 +0200 Subject: [PATCH] Use the RADIOLIB_CHECK_RANGE macro along with proper lower value (it has to be negative) --- src/modules/RF69/RF69.cpp | 3 +-- src/modules/SX127x/SX127x.cpp | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/modules/RF69/RF69.cpp b/src/modules/RF69/RF69.cpp index 25818a4f..9867b576 100644 --- a/src/modules/RF69/RF69.cpp +++ b/src/modules/RF69/RF69.cpp @@ -873,8 +873,7 @@ float RF69::getRSSI() { } int16_t RF69::setRSSIThreshold(float dbm) { - if (dbm < 127.5 || dbm > 0) - return RADIOLIB_ERR_INVALID_RSSI_THRESHOLD; + RADIOLIB_CHECK_RANGE(dbm, -127.5, 0, RADIOLIB_ERR_INVALID_RSSI_THRESHOLD); return _mod->SPIsetRegValue(RADIOLIB_RF69_REG_RSSI_THRESH, (uint8_t)(-2.0 * dbm), 7, 0); } diff --git a/src/modules/SX127x/SX127x.cpp b/src/modules/SX127x/SX127x.cpp index 1adf22b8..6734b1b5 100644 --- a/src/modules/SX127x/SX127x.cpp +++ b/src/modules/SX127x/SX127x.cpp @@ -1185,8 +1185,7 @@ int16_t SX127x::setCrcFiltering(bool crcOn) { } int16_t SX127x::setRSSIThreshold(float dbm) { - if (dbm < 127.5 || dbm > 0) - return RADIOLIB_ERR_INVALID_RSSI_THRESHOLD; + RADIOLIB_CHECK_RANGE(dbm, -127.5, 0, RADIOLIB_ERR_INVALID_RSSI_THRESHOLD); return _mod->SPIsetRegValue(RADIOLIB_SX127X_REG_RSSI_THRESH, (uint8_t)(-2.0 * dbm), 7, 0); }