From ba71e92eb1663d3f198837ae117b89bb8d9f3b77 Mon Sep 17 00:00:00 2001 From: jgromes Date: Tue, 4 May 2021 09:22:01 +0200 Subject: [PATCH] [SX126x] Replace abs() with fabs() (#297) CI_BUILD_ALL --- src/modules/SX126x/SX126x.cpp | 62 +++++++++++++++++------------------ 1 file changed, 31 insertions(+), 31 deletions(-) diff --git a/src/modules/SX126x/SX126x.cpp b/src/modules/SX126x/SX126x.cpp index 0f0e2804..51e0368e 100644 --- a/src/modules/SX126x/SX126x.cpp +++ b/src/modules/SX126x/SX126x.cpp @@ -788,47 +788,47 @@ int16_t SX126x::setRxBandwidth(float rxBw) { _rxBwKhz = rxBw; // check allowed receiver bandwidth values - if(abs(rxBw - 4.8) <= 0.001) { + if(fabs(rxBw - 4.8) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_4_8; - } else if(abs(rxBw - 5.8) <= 0.001) { + } else if(fabs(rxBw - 5.8) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_5_8; - } else if(abs(rxBw - 7.3) <= 0.001) { + } else if(fabs(rxBw - 7.3) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_7_3; - } else if(abs(rxBw - 9.7) <= 0.001) { + } else if(fabs(rxBw - 9.7) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_9_7; - } else if(abs(rxBw - 11.7) <= 0.001) { + } else if(fabs(rxBw - 11.7) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_11_7; - } else if(abs(rxBw - 14.6) <= 0.001) { + } else if(fabs(rxBw - 14.6) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_14_6; - } else if(abs(rxBw - 19.5) <= 0.001) { + } else if(fabs(rxBw - 19.5) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_19_5; - } else if(abs(rxBw - 23.4) <= 0.001) { + } else if(fabs(rxBw - 23.4) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_23_4; - } else if(abs(rxBw - 29.3) <= 0.001) { + } else if(fabs(rxBw - 29.3) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_29_3; - } else if(abs(rxBw - 39.0) <= 0.001) { + } else if(fabs(rxBw - 39.0) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_39_0; - } else if(abs(rxBw - 46.9) <= 0.001) { + } else if(fabs(rxBw - 46.9) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_46_9; - } else if(abs(rxBw - 58.6) <= 0.001) { + } else if(fabs(rxBw - 58.6) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_58_6; - } else if(abs(rxBw - 78.2) <= 0.001) { + } else if(fabs(rxBw - 78.2) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_78_2; - } else if(abs(rxBw - 93.8) <= 0.001) { + } else if(fabs(rxBw - 93.8) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_93_8; - } else if(abs(rxBw - 117.3) <= 0.001) { + } else if(fabs(rxBw - 117.3) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_117_3; - } else if(abs(rxBw - 156.2) <= 0.001) { + } else if(fabs(rxBw - 156.2) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_156_2; - } else if(abs(rxBw - 187.2) <= 0.001) { + } else if(fabs(rxBw - 187.2) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_187_2; - } else if(abs(rxBw - 234.3) <= 0.001) { + } else if(fabs(rxBw - 234.3) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_234_3; - } else if(abs(rxBw - 312.0) <= 0.001) { + } else if(fabs(rxBw - 312.0) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_312_0; - } else if(abs(rxBw - 373.6) <= 0.001) { + } else if(fabs(rxBw - 373.6) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_373_6; - } else if(abs(rxBw - 467.0) <= 0.001) { + } else if(fabs(rxBw - 467.0) <= 0.001) { _rxBw = SX126X_GFSK_RX_BW_467_0; } else { return(ERR_INVALID_RX_BANDWIDTH); @@ -1219,27 +1219,27 @@ int16_t SX126x::setTCXO(float voltage, uint32_t delay) { } // check 0 V disable - if(abs(voltage - 0.0) <= 0.001) { + if(fabs(voltage - 0.0) <= 0.001) { return(reset(true)); } // check alowed voltage values uint8_t data[4]; - if(abs(voltage - 1.6) <= 0.001) { + if(fabs(voltage - 1.6) <= 0.001) { data[0] = SX126X_DIO3_OUTPUT_1_6; - } else if(abs(voltage - 1.7) <= 0.001) { + } else if(fabs(voltage - 1.7) <= 0.001) { data[0] = SX126X_DIO3_OUTPUT_1_7; - } else if(abs(voltage - 1.8) <= 0.001) { + } else if(fabs(voltage - 1.8) <= 0.001) { data[0] = SX126X_DIO3_OUTPUT_1_8; - } else if(abs(voltage - 2.2) <= 0.001) { + } else if(fabs(voltage - 2.2) <= 0.001) { data[0] = SX126X_DIO3_OUTPUT_2_2; - } else if(abs(voltage - 2.4) <= 0.001) { + } else if(fabs(voltage - 2.4) <= 0.001) { data[0] = SX126X_DIO3_OUTPUT_2_4; - } else if(abs(voltage - 2.7) <= 0.001) { + } else if(fabs(voltage - 2.7) <= 0.001) { data[0] = SX126X_DIO3_OUTPUT_2_7; - } else if(abs(voltage - 3.0) <= 0.001) { + } else if(fabs(voltage - 3.0) <= 0.001) { data[0] = SX126X_DIO3_OUTPUT_3_0; - } else if(abs(voltage - 3.3) <= 0.001) { + } else if(fabs(voltage - 3.3) <= 0.001) { data[0] = SX126X_DIO3_OUTPUT_3_3; } else { return(ERR_INVALID_TCXO_VOLTAGE); @@ -1468,7 +1468,7 @@ int16_t SX126x::fixSensitivity() { RADIOLIB_ASSERT(state); // fix the value for LoRa with 500 kHz bandwidth - if((getPacketType() == SX126X_PACKET_TYPE_LORA) && (abs(_bwKhz - 500.0) <= 0.001)) { + if((getPacketType() == SX126X_PACKET_TYPE_LORA) && (fabs(_bwKhz - 500.0) <= 0.001)) { sensitivityConfig &= 0xFB; } else { sensitivityConfig |= 0x04;