From 22217a42f721a9a25d5a2cd66a3fef20337f0240 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 6 Feb 2019 21:36:21 +0100 Subject: [PATCH 1/2] message change --- Firmware/ultralcd.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index b26b1c96c..8c2b52813 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -2264,7 +2264,7 @@ static void lcd_support_menu() MENU_ITEM_BACK_P(STR_SEPARATOR); MENU_ITEM_SUBMENU_P(_i("XYZ cal. details"), lcd_menu_xyz_y_min);////MSG_XYZ_DETAILS c=19 r=1 MENU_ITEM_SUBMENU_P(_i("Extruder info"), lcd_menu_extruder_info);////MSG_INFO_EXTRUDER c=18 r=1 - MENU_ITEM_SUBMENU_P(_i("Sensors info"), lcd_menu_show_sensors_state);////MSG_INFO_SENSORS c=18 r=1 + MENU_ITEM_SUBMENU_P(_i("Sensor info"), lcd_menu_show_sensors_state);////MSG_INFO_SENSORS c=18 r=1 #ifdef TMC2130 MENU_ITEM_SUBMENU_P(_i("Belt status"), lcd_menu_belt_status);////MSG_MENU_BELT_STATUS c=18 r=1 From e432e258dc150273b469700823d8aaf10d8a3a14 Mon Sep 17 00:00:00 2001 From: PavelSindler Date: Wed, 6 Feb 2019 22:56:10 +0100 Subject: [PATCH 2/2] extr fan RPM measuring fix --- Firmware/temperature.cpp | 7 +++++++ Firmware/ultralcd.cpp | 8 +++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/Firmware/temperature.cpp b/Firmware/temperature.cpp index 8dcfc9a9c..e156734b8 100644 --- a/Firmware/temperature.cpp +++ b/Firmware/temperature.cpp @@ -2070,10 +2070,17 @@ else { // ambient temperature is stan #if (defined(FANCHECK) && defined(TACH_0) && (TACH_0 > -1)) void check_fans() { +#ifdef FAN_SOFT_PWM + if (READ(TACH_0) != fan_state[0]) { + if(fan_measuring) fan_edge_counter[0] ++; + fan_state[0] = !fan_state[0]; + } +#else //FAN_SOFT_PWM if (READ(TACH_0) != fan_state[0]) { fan_edge_counter[0] ++; fan_state[0] = !fan_state[0]; } +#endif //if (READ(TACH_1) != fan_state[1]) { // fan_edge_counter[1] ++; // fan_state[1] = !fan_state[1]; diff --git a/Firmware/ultralcd.cpp b/Firmware/ultralcd.cpp index 8c2b52813..9614c9a4d 100644 --- a/Firmware/ultralcd.cpp +++ b/Firmware/ultralcd.cpp @@ -7352,15 +7352,13 @@ static bool lcd_selftest_fan_dialog(int _fan) setExtruderAutoFanState(EXTRUDER_0_AUTO_FAN_PIN, 1); //extruder fan #ifdef FAN_SOFT_PWM extruder_autofan_last_check = _millis(); + fan_measuring = true; #endif //FAN_SOFT_PWM _delay(2000); //delay_keep_alive would turn off extruder fan, because temerature is too low -#ifdef FAN_SOFT_PWM - countFanSpeed(); - if (!fan_speed[0]) _result = false; -#else //FAN_SOFT_PWM + manage_heater(); //count average fan speed from 2s delay and turn off fans if (!fan_speed[0]) _result = false; -#endif //FAN_SOFT_PWM + printf_P(PSTR("Test 1:\n")); printf_P(PSTR("Print fan speed: %d \n"), fan_speed[1]);