- main.c: change type to float

- main.c: equalize when error linear value to 0xFFFF

- main.c: change type to float
- main.c: equalize when error linear value to 0xFFFF
a98dc5b9 · Alén Arias Vázquez · 972b05bc · a98dc5b9
Commit a98dc5b9 authored Sep 19, 2023 by Alén Arias Vázquez 😎
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

main.c main_fw/src/main.c +6 -6

No files found.
--- a/main_fw/src/main.c
+++ b/main_fw/src/main.c
@@ -53,12 +53,12 @@ static uint16_t fan_ramp_up_count __xMR = 0;
 #endif

 /* MAX Speed Datasheet: 3600.0 */
-#define FAN_MAX_RPMS 1500.0
+#define FAN_MAX_RPMS 1500.0f
 #define FAN_MAX_FAIL_CNT 100
 #define FAN_DEAD_WORD 0xFFFF
 static volatile uint16_t tacho_cnt[3] __xMR;
-static volatile uint16_t tacho_rpm[3] __xMR;
-static volatile uint16_t tacho_rpm_prev[3] __xMR;
+static volatile float tacho_rpm[3] __xMR;
+static volatile float tacho_rpm_prev[3] __xMR;
 static volatile uint16_t tacho_rpm_fail_cnt[3] __xMR;

 // when fan_cmdrpm is 0, setfrpms and temp_curve_points_y represent
@@ -247,7 +247,7 @@ void __xMR update_rpm()
                } else {
                        tacho_rpm_fail_cnt[0]++;
                        if (tacho_rpm_fail_cnt[0] >= FAN_MAX_FAIL_CNT) {
-                                frpms_lin[0] = float_to_linear(FAN_DEAD_WORD);
+                                frpms_lin[0] = FAN_DEAD_WORD;
                        } else {
                                frpms_lin[0] = float_to_linear(tacho_rpm_prev[0]);
                        }
@@ -270,7 +270,7 @@ void __xMR update_rpm()
                } else {
                        tacho_rpm_fail_cnt[1]++;
                        if (tacho_rpm_fail_cnt[1] >= FAN_MAX_FAIL_CNT) {
-                                frpms_lin[1] = float_to_linear(FAN_DEAD_WORD);
+                                frpms_lin[1] = FAN_DEAD_WORD;
                        } else {
                                frpms_lin[1] = float_to_linear(tacho_rpm_prev[1]);
                        }
@@ -293,7 +293,7 @@ void __xMR update_rpm()
                } else {
                        tacho_rpm_fail_cnt[2]++;
                        if (tacho_rpm_fail_cnt[2] >= FAN_MAX_FAIL_CNT) {
-                                frpms_lin[2] = float_to_linear(FAN_DEAD_WORD);
+                                frpms_lin[2] = FAN_DEAD_WORD;
                        } else {
                                frpms_lin[2] = float_to_linear(tacho_rpm_prev[2]);
                        }