Fix warning: implicit conversion from 'float' to 'double' (#59)

* Fix warning: implicit conversion from 'float' to 'double' * Fix warning: implicit conversion from 'float' to 'double' * Fix code smells found by SonarCloud * Fix code smells found by SonarCloud * Replace: isinf -> isinff, isnan -> isnanf * Revert "Replace: isinf -> isinff, isnan -> isnanf" This reverts commit 119bca2.
ruuvi · Jul 15, 2024 · 360f4d7 · 360f4d7
1 parent 48697c8
commit 360f4d7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/src/ruuvi_endpoint_3.c b/src/ruuvi_endpoint_3.c
@@ -9,11 +9,11 @@
 #define RE_3_ENCODE_INVALID_PRECISION       0.00001f
 #define RE_3_ENCODE_ACC_CONVERT_RATIO       1000
 #define RE_3_ENCODE_HUMIDITY_CONVERT_RATIO  2
-#define RE_3_ENCODE_HUMIDITY_CONVERT_OFFSET 0.5
+#define RE_3_ENCODE_HUMIDITY_CONVERT_OFFSET 0.5f
 #define RE_3_ENCODE_PRESSURE_INIT_OFFSET    50000
 #define RE_3_ENCODE_BATTERY_CONVERT_RATIO   1000
 #define RE_3_ENCODE_TEMP_CONVERT_RATIO      100
-#define RE_3_ENCODE_TEMP_CONVERT_CAP        127.99
+#define RE_3_ENCODE_TEMP_CONVERT_CAP        127.99f
 
 #define RE_3_BYTE_SIGN_OFFSET               7
 #define RE_3_BYTE_OFFSET                    8
@@ -57,8 +57,7 @@ static void re_3_encode_acceleration (uint8_t * const buffer,
 {
     if (!isnan (re_3_encode_check_invalid (acceleration, invalid)))
     {
-        int16_t decimal = (int16_t) round ( (acceleration *
-                                             RE_3_ENCODE_ACC_CONVERT_RATIO));
+        int16_t decimal = (int16_t) roundf (acceleration * RE_3_ENCODE_ACC_CONVERT_RATIO);
         buffer[0] = ( (uint16_t) decimal) >> RE_3_BYTE_OFFSET;
         buffer[1] = ( (uint16_t) decimal) & RE_3_BYTE_MASK;
     }
@@ -78,9 +77,8 @@ static void re_3_encode_data (uint8_t * const buffer,
     if (!isnan (re_3_encode_check_invalid (data->humidity_rh, invalid)))
     {
         //Humidity (one lsb is 0.5%, e.g. 128 is 64%). Round the value
-        buffer[RE_3_OFFSET_HUMIDITY] = (uint8_t) ( (re_float) ( (data->humidity_rh *
-                                       RE_3_ENCODE_HUMIDITY_CONVERT_RATIO) +
-                                       RE_3_ENCODE_HUMIDITY_CONVERT_OFFSET));
+        buffer[RE_3_OFFSET_HUMIDITY] = (uint8_t) roundf (data->humidity_rh *
+                                       RE_3_ENCODE_HUMIDITY_CONVERT_RATIO);
     }
     else
     {
@@ -110,12 +108,12 @@ static void re_3_encode_data (uint8_t * const buffer,
         // cap the temperature
         if (RE_3_ENCODE_TEMP_CONVERT_CAP < temperature)
         {
-            temperature = (re_float) RE_3_ENCODE_TEMP_CONVERT_CAP;
+            temperature = RE_3_ENCODE_TEMP_CONVERT_CAP;
         }
 
         buffer[RE_3_OFFSET_TEMPERATURE_DECIMAL] = (uint8_t) temperature | (uint8_t) (
                     sign << RE_3_BYTE_SIGN_OFFSET);
-        uint8_t temperature_fraction = (uint8_t) round ( (temperature - floor (
+        uint8_t temperature_fraction = (uint8_t) roundf ( (temperature - floorf (
                                            temperature)) *
                                        RE_3_ENCODE_TEMP_CONVERT_RATIO);
         buffer[RE_3_OFFSET_TEMPERATURE_FRACTION] = temperature_fraction;

diff --git a/src/ruuvi_endpoints.c b/src/ruuvi_endpoints.c
@@ -150,7 +150,7 @@ re_status_t re_log_write_timestamp (uint8_t * const buffer, const uint64_t times
 static int32_t f2i (re_float value)
 {
     int32_t rvalue = 0x80000000;
-    value = (value) >= 0 ? (value) + 0.5 : (value) - 0.5;
+    value = (value) >= 0 ? (value) + 0.5f : (value) - 0.5f;
 
     if (value >= INT32_MAX)
     {
@@ -254,4 +254,4 @@ void re_clip (float * const value, const float min, const float max)
     {
         *value = min;
     }
-}
+}