From b67c359129d9b970980d3ef3a5ba6091d39636d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gu=C3=B0ni=20M=C3=A1r=20Gilbert?= Date: Fri, 14 Apr 2023 17:23:48 +0000 Subject: [PATCH] Move fan_state to fancheck.cpp and make it static No change in memory --- Firmware/Marlin.h | 1 - Firmware/Marlin_main.cpp | 2 +- Firmware/fancheck.cpp | 1 + 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Firmware/Marlin.h b/Firmware/Marlin.h index c65ec9d3d..9628219e3 100755 --- a/Firmware/Marlin.h +++ b/Firmware/Marlin.h @@ -320,7 +320,6 @@ extern uint32_t total_filament_used; // mm/100 or 10um /// @param _total_print_time has unit minutes, for example 123 minutes void save_statistics(uint32_t _total_filament_used, uint32_t _total_print_time); -extern bool fan_state[2]; extern int fan_edge_counter[2]; extern int fan_speed[2]; diff --git a/Firmware/Marlin_main.cpp b/Firmware/Marlin_main.cpp index e59718cb3..3762cc0f4 100644 --- a/Firmware/Marlin_main.cpp +++ b/Firmware/Marlin_main.cpp @@ -188,7 +188,7 @@ bool loading_flag = false; #define XY_NO_RESTORE_FLAG (mesh_bed_leveling_flag || homing_flag) -bool fan_state[2]; + int fan_edge_counter[2]; int fan_speed[2]; diff --git a/Firmware/fancheck.cpp b/Firmware/fancheck.cpp index 4e6ae2741..236db6c53 100755 --- a/Firmware/fancheck.cpp +++ b/Firmware/fancheck.cpp @@ -220,6 +220,7 @@ void checkExtruderAutoFans() #if (defined(FANCHECK) && defined(TACH_0) && (TACH_0 > -1)) void readFanTach() { + static bool fan_state[2]; #ifdef FAN_SOFT_PWM if (READ(TACH_0) != fan_state[0]) { if(fan_measuring) fan_edge_counter[0] ++;