Extruder fan speed

vovodroid · vovodroid · commit 608b5d11f61e · 2024-12-05T15:47:53.000+02:00
diff --git a/Marlin/src/lcd/language/language_de.h b/Marlin/src/lcd/language/language_de.h
@@ -305,7 +305,7 @@ namespace LanguageNarrow_de {
   LSTR MSG_STORED_FAN_N                   = _UxGT("Gespeich. Lüfter ~");
   LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Geschw. Extralüfter");
   LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Geschw. Extralüfter ~");
-  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Lüfter Kontroller");
+  LSTR MSG_FANS                           = _UxGT("Lüfter Kontroller");
   LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Lüfter Leerlauf");
   LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Motorlast Modus");
   LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Lüfter Motorlast");
diff --git a/Marlin/src/lcd/language/language_en.h b/Marlin/src/lcd/language/language_en.h
@@ -365,11 +365,12 @@ namespace LanguageNarrow_en {
   LSTR MSG_STORED_FAN_N                   = _UxGT("Stored Fan ~");
   LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Extra Fan Speed");
   LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Extra Fan Speed ~");
-  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Controller Fan");
+  LSTR MSG_FANS                           = _UxGT("Fans");
   LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Idle Speed");
   LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Auto Mode");
   LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Active Speed");
   LSTR MSG_CONTROLLER_FAN_DURATION        = _UxGT("Idle Period");
+  LSTR MSG_EXTRUDER_AUTO_FAN_SPEED        = _UxGT("Extruder fan speed");
   LSTR MSG_FLOW_PERCENTAGE                = _UxGT("Set Flowrate Percentage");
   LSTR MSG_FLOW                           = _UxGT("Flow");
   LSTR MSG_FLOW_N                         = _UxGT("Flow ~");
diff --git a/Marlin/src/lcd/language/language_es.h b/Marlin/src/lcd/language/language_es.h
@@ -242,7 +242,7 @@ namespace LanguageNarrow_es {
   LSTR MSG_STORED_FAN_N                   = _UxGT("Vent. almacenado ~");
   LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Vel. Ext. ventil.");
   LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Vel. Ext. ventil. ~");
-  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Controlador Vent.");
+  LSTR MSG_FANS                           = _UxGT("Controlador Vent.");
   LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Velocidad en reposo");
   LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Modo Auto");
   LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Velocidad Activa");
diff --git a/Marlin/src/lcd/language/language_gl.h b/Marlin/src/lcd/language/language_gl.h
@@ -239,7 +239,7 @@ namespace LanguageNarrow_gl {
   LSTR MSG_STORED_FAN_N                   = _UxGT("Ventilador Mem. ~");
   LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Vel. Vent. Extra");
   LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Vel. Vent. Extra ~");
-  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Controlador Vent.");
+  LSTR MSG_FANS                           = _UxGT("Controlador Vent.");
   LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Velocidade Repouso");
   LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Modo Auto");
   LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Velocidade Activa");
diff --git a/Marlin/src/lcd/language/language_hu.h b/Marlin/src/lcd/language/language_hu.h
@@ -277,7 +277,7 @@ namespace LanguageNarrow_hu {
   LSTR MSG_STORED_FAN_N                   = _UxGT("Tárolt hütés {");
   LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Extra hütés sebesség");
   LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Extra hütés sebesség {");
-  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Hütésvezérlés");
+  LSTR MSG_FANS                           = _UxGT("Hütésvezérlés");
   LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Alapjárat");
   LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Automatikus mód");
   LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Aktív sebesség");
diff --git a/Marlin/src/lcd/language/language_it.h b/Marlin/src/lcd/language/language_it.h
@@ -341,7 +341,7 @@ namespace LanguageNarrow_it {
   LSTR MSG_STORED_FAN_N                   = _UxGT("Ventola mem. ~"); // Max 15 characters
   LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Extra vel.vent."); // Max 15 characters
   LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Extra v.vent. ~"); // Max 15 characters
-  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Controller vent.");
+  LSTR MSG_FANS                           = _UxGT("Controller vent.");
   LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Vel. inattivo");
   LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Modo autom.");
   LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Vel. attivo");
diff --git a/Marlin/src/lcd/language/language_pl.h b/Marlin/src/lcd/language/language_pl.h
@@ -252,7 +252,7 @@ namespace LanguageNarrow_pl {
   LSTR MSG_FAN_SPEED_N                    = _UxGT("Obroty wentylatora ~");
   LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Obroty dodatkowego wentylatora");
   LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Obroty dodatkowego wentylatora ~");
-  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Wentylator kontrolera");
+  LSTR MSG_FANS                           = _UxGT("Wentylator kontrolera");
   LSTR MSG_FLOW                           = _UxGT("Przepływ");
   LSTR MSG_FLOW_N                         = _UxGT("Przepływ ~");
   LSTR MSG_CONTROL                        = _UxGT("Ustawienia");
diff --git a/Marlin/src/lcd/language/language_ro.h b/Marlin/src/lcd/language/language_ro.h
@@ -238,7 +238,7 @@ namespace LanguageNarrow_ro {
   LSTR MSG_STORED_FAN_N                   = _UxGT("Stored Fan ~");
   LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Extra Fan Speed");
   LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Extra Fan Speed ~");
-  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Controller Fan");
+  LSTR MSG_FANS                           = _UxGT("Controller Fan");
   LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Idle Speed");
   LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Auto Mode");
   LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Active Speed");
diff --git a/Marlin/src/lcd/language/language_ru.h b/Marlin/src/lcd/language/language_ru.h
@@ -277,7 +277,7 @@ namespace LanguageNarrow_ru {
   LSTR MSG_STORED_FAN_N                     = _UxGT("Сохранённый кулер ~");
   LSTR MSG_EXTRA_FAN_SPEED                  = _UxGT("Дополн. кулер");
   LSTR MSG_EXTRA_FAN_SPEED_N                = _UxGT("Дополн. кулер ~");
-  LSTR MSG_CONTROLLER_FAN                   = _UxGT("Кулер контроллера");
+  LSTR MSG_FANS                             = _UxGT("Кулер контроллера");
   LSTR MSG_CONTROLLER_FAN_IDLE_SPEED        = _UxGT("Холостые обороты");
   LSTR MSG_CONTROLLER_FAN_AUTO_ON           = _UxGT("Автовключение");
   LSTR MSG_CONTROLLER_FAN_SPEED             = _UxGT("Рабочие обороты");
diff --git a/Marlin/src/lcd/language/language_sk.h b/Marlin/src/lcd/language/language_sk.h
@@ -324,7 +324,7 @@ namespace LanguageNarrow_sk {
   LSTR MSG_STORED_FAN_N                   = _UxGT("Ulož. vent. ~");
   LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Rýchlosť ex. vent.");
   LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Rýchlosť ex. vent. ~");
-  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Vent. riad. jedn.");
+  LSTR MSG_FANS                           = _UxGT("Vent. riad. jedn.");
   LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Voľno. rýchl.");
   LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Auto-režim");
   LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Aktív. rýchl.");
diff --git a/Marlin/src/lcd/language/language_sv.h b/Marlin/src/lcd/language/language_sv.h
@@ -264,7 +264,7 @@ namespace LanguageNarrow_sv {
   LSTR MSG_STORED_FAN_N                   = _UxGT("Lagrad Fläkt ~");
   LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Extra Fläkt Hastighet");
   LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Extra Fläkt Hastighet ~");
-  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Kontroller Fläkt");
+  LSTR MSG_FANS                           = _UxGT("Kontroller Fläkt");
   LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Overksam Hastighet");
   LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Auto läga");
   LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Aktive Hastighet");
diff --git a/Marlin/src/lcd/language/language_tr.h b/Marlin/src/lcd/language/language_tr.h
@@ -327,7 +327,7 @@ namespace LanguageNarrow_tr {
   LSTR MSG_STORED_FAN_N                   = _UxGT("Depolanan Fan ~");
   LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("Ekstra Fan Hızı");
   LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("Ekstra Fan Hızı ~");
-  LSTR MSG_CONTROLLER_FAN                 = _UxGT("Sistem Fan Kontrol");
+  LSTR MSG_FANS                           = _UxGT("Sistem Fan Kontrol");
   LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("Rölanti Hızı");
   LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("Otomatik Mod");
   LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("Aktif Hız");
diff --git a/Marlin/src/lcd/language/language_uk.h b/Marlin/src/lcd/language/language_uk.h
@@ -276,7 +276,7 @@ namespace LanguageNarrow_uk {
   LSTR MSG_STORED_FAN_N                     = _UxGT("Збереж. вент. ~");
   LSTR MSG_EXTRA_FAN_SPEED_N                = _UxGT("Додат.вент. ~");
   LSTR MSG_EXTRA_FAN_SPEED                  = _UxGT("Дод. швидк. вент.");
-  LSTR MSG_CONTROLLER_FAN                   = _UxGT("Вент. контролера");
+  LSTR MSG_FANS                             = _UxGT("Вент. контролера");
   LSTR MSG_CONTROLLER_FAN_IDLE_SPEED        = _UxGT("Холості оберти");
   LSTR MSG_CONTROLLER_FAN_AUTO_ON           = _UxGT("Авто-режим");
   LSTR MSG_CONTROLLER_FAN_SPEED             = _UxGT("Робочі оберти");
diff --git a/Marlin/src/lcd/language/language_zh_CN.h b/Marlin/src/lcd/language/language_zh_CN.h
@@ -248,7 +248,7 @@ namespace LanguageNarrow_zh_CN {
   LSTR MSG_STORED_FAN_N                   = _UxGT("存储的风扇 ~");
   LSTR MSG_EXTRA_FAN_SPEED                = _UxGT("额外风扇速率"); // "Extra fan speed"
   LSTR MSG_EXTRA_FAN_SPEED_N              = _UxGT("额外风扇速率 ~"); // "Extra fan speed"
-  LSTR MSG_CONTROLLER_FAN                 = _UxGT("控制器风扇");
+  LSTR MSG_FANS                           = _UxGT("控制器风扇");
   LSTR MSG_CONTROLLER_FAN_IDLE_SPEED      = _UxGT("空闲速度");
   LSTR MSG_CONTROLLER_FAN_AUTO_ON         = _UxGT("自动模式");
   LSTR MSG_CONTROLLER_FAN_SPEED           = _UxGT("工作速度");
diff --git a/Marlin/src/lcd/menu/menu_configuration.cpp b/Marlin/src/lcd/menu/menu_configuration.cpp
@@ -350,19 +350,24 @@ void menu_advanced_settings();
 
 #endif
 
-#if ENABLED(CONTROLLER_FAN_MENU)
+#if ANY(CONTROLLER_FAN_MENU, HAS_E_AUTO_FAN)
 
   #include "../../feature/controllerfan.h"
 
-  void menu_controller_fan() {
+  void menu_fans() {
     START_MENU();
     BACK_ITEM(MSG_CONFIGURATION);
-    EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_IDLE_SPEED, &controllerFan.settings.idle_speed, CONTROLLERFAN_SPEED_MIN, 255);
-    EDIT_ITEM(bool, MSG_CONTROLLER_FAN_AUTO_ON, &controllerFan.settings.auto_mode);
-    if (controllerFan.settings.auto_mode) {
-      EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_SPEED, &controllerFan.settings.active_speed, CONTROLLERFAN_SPEED_MIN, 255);
-      EDIT_ITEM(uint16_4, MSG_CONTROLLER_FAN_DURATION, &controllerFan.settings.duration, 0, 4800);
-    }
+    #if ENABLED(CONTROLLER_FAN_MENU)
+      EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_IDLE_SPEED, &controllerFan.settings.idle_speed, CONTROLLERFAN_SPEED_MIN, 255);
+      EDIT_ITEM(bool, MSG_CONTROLLER_FAN_AUTO_ON, &controllerFan.settings.auto_mode);
+      if (controllerFan.settings.auto_mode) {
+        EDIT_ITEM_FAST(percent, MSG_CONTROLLER_FAN_SPEED, &controllerFan.settings.active_speed, CONTROLLERFAN_SPEED_MIN, 255);
+        EDIT_ITEM(uint16_4, MSG_CONTROLLER_FAN_DURATION, &controllerFan.settings.duration, 0, 4800);
+      }
+    #endif
+    #if ENABLED(HAS_E_AUTO_FAN)
+      EDIT_ITEM_FAST(percent, MSG_EXTRUDER_AUTO_FAN_SPEED, &Temperature::extruder_fan_speed, 0, 255);
+    #endif
     END_MENU();
   }
 
@@ -598,8 +603,8 @@ void menu_configuration() {
   //
   // Set Fan Controller speed
   //
-  #if ENABLED(CONTROLLER_FAN_MENU)
-    SUBMENU(MSG_CONTROLLER_FAN, menu_controller_fan);
+  #if ANY(CONTROLLER_FAN_MENU, EXTRUDER_AUTO_FAN_SPEED_MENU)
+    SUBMENU(MSG_FANS, menu_fans);
   #endif
 
   if (!busy) {
diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
@@ -36,7 +36,7 @@
  */
 
 // Change EEPROM version if the structure changes
-#define EEPROM_VERSION "V90"
+#define EEPROM_VERSION "V91"
 #define EEPROM_OFFSET 100
 
 // Check the integrity of data offsets.
@@ -449,6 +449,13 @@ typedef struct SettingsDataStruct {
   // Controller fan settings
   //
   controllerFan_settings_t controllerFan_settings;      // M710
+  
+  //
+  // Extruder fan settings
+  //
+  #if ENABLED(HAS_E_AUTO_FAN)
+    uint8_t extruder_fan_speed;
+  #endif
 
   //
   // POWER_LOSS_RECOVERY
@@ -1313,6 +1320,16 @@ void MarlinSettings::postprocess() {
       EEPROM_WRITE(cfs);
     }
 
+    //
+    // Extruder fan
+    //
+    {
+      #if ENABLED(HAS_E_AUTO_FAN)
+        _FIELD_TEST(Temperature::extruder_fan_speed);
+        EEPROM_WRITE(Temperature::extruder_fan_speed);
+      #endif
+    }
+
     //
     // Power-Loss Recovery
     //
@@ -2403,6 +2420,18 @@ void MarlinSettings::postprocess() {
         TERN_(CONTROLLER_FAN_EDITABLE, if (!validating) controllerFan.settings = cfs);
       }
 
+      //
+      // Extruder Fan
+      //
+      {
+        #if ENABLED(HAS_E_AUTO_FAN)
+          uint8_t extruder_fan_speed;
+          _FIELD_TEST(Temperature::extruder_fan_speed);
+          EEPROM_READ(extruder_fan_speed);
+          TERN_(CONTROLLER_FAN_EDITABLE, if (!validating) Temperature::extruder_fan_speed = extruder_fan_speed);
+        #endif
+      }
+
       //
       // Power-Loss Recovery
       //
@@ -3666,6 +3695,11 @@ void MarlinSettings::reset() {
   //
   TERN_(USE_CONTROLLER_FAN, controllerFan.reset());
 
+  //
+  // Extruder Fan
+  //
+  TERN_(HAS_E_AUTO_FAN, Temperature::extruder_fan_speed = EXTRUDER_AUTO_FAN_SPEED);
+
   //
   // Power-Loss Recovery
   //
diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp
@@ -398,6 +398,10 @@ PGMSTR(str_t_heating_failed, STR_T_HEATING_FAILED);
   uint8_t Temperature::autofan_speed[HOTENDS] = ARRAY_N_1(HOTENDS, FAN_OFF_PWM);
 #endif
 
+#if ENABLED(HAS_E_AUTO_FAN)
+  uint8_t Temperature::extruder_fan_speed = EXTRUDER_AUTO_FAN_SPEED;
+#endif
+
 #if ENABLED(AUTO_POWER_CHAMBER_FAN)
   uint8_t Temperature::chamberfan_speed = FAN_OFF_PWM;
 #endif
@@ -1439,7 +1443,7 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
     #endif
 
     #define _UPDATE_AUTO_FAN(P,D,A) do{                   \
-      if (PWM_PIN(P##_AUTO_FAN_PIN) && A < 255)           \
+      if (PWM_PIN(P##_AUTO_FAN_PIN))                      \
         hal.set_pwm_duty(pin_t(P##_AUTO_FAN_PIN), D ? A : 0); \
       else                                                \
         WRITE(P##_AUTO_FAN_PIN, D);                       \
@@ -1463,15 +1467,15 @@ int16_t Temperature::getHeaterPower(const heater_id_t heater_id) {
         #endif
         default:
           #if ANY(AUTO_POWER_E_FANS, HAS_FANCHECK)
-            autofan_speed[realFan] = fan_on ? EXTRUDER_AUTO_FAN_SPEED : 0;
+            autofan_speed[realFan] = fan_on ? extruder_fan_speed : 0;
           #endif
           break;
       }
 
       #if ALL(HAS_FANCHECK, HAS_PWMFANCHECK)
-        #define _AUTOFAN_SPEED() fan_check.is_measuring() ? 255 : EXTRUDER_AUTO_FAN_SPEED
+        #define _AUTOFAN_SPEED() fan_check.is_measuring() ? 255 : extruder_fan_speed
       #else
-        #define _AUTOFAN_SPEED() EXTRUDER_AUTO_FAN_SPEED
+        #define _AUTOFAN_SPEED() extruder_fan_speed
       #endif
       #define _AUTOFAN_CASE(N) case N: _UPDATE_AUTO_FAN(E##N, fan_on, _AUTOFAN_SPEED()); break;
       #define _AUTOFAN_NOT(N)
diff --git a/Marlin/src/module/temperature.h b/Marlin/src/module/temperature.h
@@ -634,6 +634,11 @@ class Temperature {
     #if ANY(AUTO_POWER_E_FANS, HAS_FANCHECK)
       static uint8_t autofan_speed[HOTENDS];
     #endif
+
+    #if HAS_E_AUTO_FAN
+      static uint8_t extruder_fan_speed;
+    #endif
+
     #if ENABLED(AUTO_POWER_CHAMBER_FAN)
       static uint8_t chamberfan_speed;
     #endif
