Merge remote-tracking branch 'upstream/bugfix-2.1.x' into bugfix-2.1.x

MarlinFirmware · Dec 2, 2024 · b6c8d50 · b6c8d50
2 parents 20ea87f + 4797f25
commit b6c8d50
Show file tree

Hide file tree

Showing 26 changed files with 162 additions and 155 deletions.
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -211,18 +211,19 @@
 //
 // Heated Chamber options
 //
-#if DISABLED(PIDTEMPCHAMBER)
-  #define CHAMBER_CHECK_INTERVAL 5000   // (ms) Interval between checks in bang-bang control
-  #if ENABLED(CHAMBER_LIMIT_SWITCHING)
-    #define CHAMBER_HYSTERESIS 2        // (°C) Only set the relevant heater state when ABS(T-target) > CHAMBER_HYSTERESIS
-  #endif
-#endif
 
 #if TEMP_SENSOR_CHAMBER
   //#define HEATER_CHAMBER_PIN      P2_04   // Required heater on/off pin (example: SKR 1.4 Turbo HE1 plug)
   //#define HEATER_CHAMBER_INVERTING false
   //#define FAN1_PIN                   -1   // Remove the fan signal on pin P2_04 (example: SKR 1.4 Turbo HE1 plug)
 
+  #if DISABLED(PIDTEMPCHAMBER)
+    #define CHAMBER_CHECK_INTERVAL 5000   // (ms) Interval between checks in bang-bang control
+    #if ENABLED(CHAMBER_LIMIT_SWITCHING)
+      #define CHAMBER_HYSTERESIS 2        // (°C) Only set the relevant heater state when ABS(T-target) > CHAMBER_HYSTERESIS
+    #endif
+  #endif
+
   //#define CHAMBER_FAN               // Enable a fan on the chamber
   #if ENABLED(CHAMBER_FAN)
     //#define CHAMBER_FAN_INDEX   2   // Index of a fan to repurpose as the chamber fan. (Default: first unused fan)

diff --git a/Marlin/Version.h b/Marlin/Version.h
@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2024-11-26"
+//#define STRING_DISTRIBUTION_DATE "2024-12-02"
 
 /**
  * The protocol for communication to the host. Protocol indicates communication

diff --git a/Marlin/config.ini b/Marlin/config.ini
@@ -62,6 +62,11 @@ motherboard                              = BOARD_RAMPS_14_EFB
 serial_port                              = 0
 baudrate                                 = 250000
 
+string_config_h_author                   = "(default from config.ini)"
+
+capabilities_report                      = on
+extended_capabilities_report             = on
+
 use_watchdog                             = on
 thermal_protection_hotends               = on
 thermal_protection_hysteresis            = 4
@@ -77,9 +82,7 @@ temp_sensor_0                            = 1
 temp_hysteresis                          = 3
 heater_0_mintemp                         = 5
 heater_0_maxtemp                         = 275
-preheat_1_temp_hotend                    = 180
 
-bang_max                                 = 255
 pidtemp                                  = on
 pid_k1                                   = 0.95
 pid_max                                  = 255
@@ -89,6 +92,14 @@ default_kp                               = 22.20
 default_ki                               = 1.08
 default_kd                               = 114.00
 
+temp_sensor_bed                          = 1
+bed_mintemp                              = 5
+bed_maxtemp                              = 150
+
+thermal_protection_bed                   = on
+thermal_protection_bed_hysteresis        = 2
+thermal_protection_bed_period            = 20
+
 x_driver_type                            = A4988
 y_driver_type                            = A4988
 z_driver_type                            = A4988
@@ -121,10 +132,10 @@ default_max_acceleration                 = { 3000, 3000, 100, 10000 }
 homing_feedrate_mm_m                     = { (50*60), (50*60), (4*60) }
 homing_bump_divisor                      = { 2, 2, 4 }
 
-x_enable_on                              = 0
-y_enable_on                              = 0
-z_enable_on                              = 0
-e_enable_on                              = 0
+x_enable_on                              = LOW
+y_enable_on                              = LOW
+z_enable_on                              = LOW
+e_enable_on                              = LOW
 
 invert_x_dir                             = false
 invert_y_dir                             = true
@@ -136,11 +147,6 @@ step_state_x                             = HIGH
 step_state_y                             = HIGH
 step_state_z                             = HIGH
 
-disable_x                                = off
-disable_y                                = off
-disable_z                                = off
-disable_e                                = off
-
 proportional_font_ratio                  = 1.0
 default_nominal_filament_dia             = 1.75
 
@@ -153,18 +159,13 @@ default_retract_acceleration             = 3000
 default_minimumfeedrate                  = 0.0
 default_mintravelfeedrate                = 0.0
 
-minimum_planner_speed                    = 0.05
 min_steps_per_segment                    = 6
 default_minsegmenttime                   = 20000
 
 [config:basic]
 bed_overshoot                            = 10
 busy_while_heating                       = on
-default_ejerk                            = 5.0
 default_keepalive_interval               = 2
-default_leveling_fade_height             = 0.0
-disable_other_extruders                  = on
-display_charset_hd44780                  = JAPANESE
 eeprom_boot_silent                       = on
 eeprom_chitchat                          = on
 endstoppullups                           = on
@@ -173,10 +174,8 @@ extrude_mintemp                          = 170
 host_keepalive_feature                   = on
 hotend_overshoot                         = 15
 jd_handle_small_segments                 = on
-lcd_info_screen_style                    = 0
-lcd_language                             = en
 max_bed_power                            = 255
-mesh_inset                               = 0
+
 min_software_endstops                    = on
 max_software_endstops                    = on
 min_software_endstop_x                   = on
@@ -185,50 +184,48 @@ min_software_endstop_z                   = on
 max_software_endstop_x                   = on
 max_software_endstop_y                   = on
 max_software_endstop_z                   = on
-preheat_1_fan_speed                      = 0
+
 preheat_1_label                          = "PLA"
+preheat_1_temp_hotend                    = 180
 preheat_1_temp_bed                       = 70
+preheat_1_fan_speed                      = 0
+
+preheat_2_label                          = "ABS"
+preheat_2_temp_hotend                    = 240
+preheat_2_temp_bed                       = 110
+preheat_2_fan_speed                      = 0
+
 prevent_cold_extrusion                   = on
 prevent_lengthy_extrude                  = on
 printjob_timer_autostart                 = on
-probing_margin                           = 10
-show_bootscreen                          = on
-soft_pwm_scale                           = 0
-string_config_h_author                   = "(none, default config)"
+
 temp_bed_hysteresis                      = 3
 temp_bed_residency_time                  = 10
 temp_bed_window                          = 1
 temp_residency_time                      = 10
 temp_window                              = 1
 validate_homing_endstops                 = on
-xy_probe_feedrate                        = (133*60)
-z_clearance_between_probes               = 5
-z_clearance_deploy_probe                 = 10
-z_clearance_multi_probe                  = 5
+
+editable_steps_per_unit                  = on
 
 [config:advanced]
 arc_support                              = on
 auto_report_temperatures                 = on
+
 autotemp                                 = on
+autotemp_min                             = 210
+autotemp_max                             = 250
+autotemp_factor                          = 0.1f
 autotemp_oldweight                       = 0.98
-bed_check_interval                       = 5000
+
 default_stepper_timeout_sec              = 120
-default_volumetric_extruder_limit        = 0.00
 disable_idle_x                           = on
 disable_idle_y                           = on
 disable_idle_z                           = on
 disable_idle_e                           = on
 e0_auto_fan_pin                          = -1
-encoder_100x_steps_per_sec               = 80
-encoder_10x_steps_per_sec                = 30
-encoder_rate_multiplier                  = on
-extended_capabilities_report             = on
-extruder_auto_fan_speed                  = 255
-extruder_auto_fan_temperature            = 50
-fanmux0_pin                              = -1
-fanmux1_pin                              = -1
-fanmux2_pin                              = -1
 faster_gcode_parser                      = on
+debug_flags_gcode                        = on
 homing_bump_mm                           = { 5, 5, 2 }
 max_arc_segment_mm                       = 1.0
 min_arc_segment_mm                       = 0.1
@@ -237,11 +234,11 @@ n_arc_correction                         = 25
 serial_overrun_protection                = on
 slowdown                                 = on
 slowdown_divisor                         = 2
-temp_sensor_bed                          = 0
-thermal_protection_bed_hysteresis        = 2
-thermocouple_max_errors                  = 15
 tx_buffer_size                           = 0
+
+bed_check_interval                       = 5000
 watch_bed_temp_increase                  = 2
 watch_bed_temp_period                    = 60
+
 watch_temp_increase                      = 2
-watch_temp_period                        = 20
+watch_temp_period                        = 40
diff --git a/Marlin/src/HAL/ESP32/wifi.cpp b/Marlin/src/HAL/ESP32/wifi.cpp
@@ -21,11 +21,12 @@
  */
 #ifdef ARDUINO_ARCH_ESP32
 
-#include "../../core/serial.h"
 #include "../../inc/MarlinConfigPre.h"
 
 #if ENABLED(WIFISUPPORT)
 
+#include "../../core/serial.h"
+
 #include <WiFi.h>
 #include <ESPmDNS.h>
 #include <ESPAsyncWebServer.h>

diff --git a/Marlin/src/HAL/HC32/HAL.h b/Marlin/src/HAL/HC32/HAL.h
@@ -30,7 +30,6 @@
 
 #include "../../inc/MarlinConfig.h"
 
-#include "../../core/macros.h"
 #include "../shared/Marduino.h"
 #include "../shared/math_32bit.h"
 #include "../shared/HAL_SPI.h"
@@ -39,8 +38,6 @@
 #include "timers.h"
 #include "MarlinSerial.h"
 
-#include <stdint.h>
-
 //
 // Serial Ports
 //

diff --git a/Marlin/src/feature/mixing.cpp b/Marlin/src/feature/mixing.cpp
@@ -28,10 +28,6 @@
 
 Mixer mixer;
 
-#ifdef MIXER_NORMALIZER_DEBUG
-  #include "../core/serial.h"
-#endif
-
 // Used up to Planner level
 uint_fast8_t  Mixer::selected_vtool = 0;
 float         Mixer::collector[MIXING_STEPPERS]; // mix proportion. 0.0 = off, otherwise <= COLOR_A_MASK.

diff --git a/Marlin/src/feature/powerloss.cpp b/Marlin/src/feature/powerloss.cpp
@@ -28,8 +28,9 @@
 
 #if ENABLED(POWER_LOSS_RECOVERY)
 
+#include "../inc/MarlinConfig.h"
+
 #include "powerloss.h"
-#include "../core/macros.h"
 
 #if ENABLED(EXTENSIBLE_UI)
   #include "../lcd/extui/ui_api.h"
@@ -60,7 +61,6 @@ uint32_t PrintJobRecovery::cmd_sdpos, // = 0
 #include "../module/planner.h"
 #include "../module/printcounter.h"
 #include "../module/temperature.h"
-#include "../core/serial.h"
 
 #if HOMING_Z_WITH_PROBE
   #include "../module/probe.h"

diff --git a/Marlin/src/gcode/eeprom/M500-M504.cpp b/Marlin/src/gcode/eeprom/M500-M504.cpp
@@ -22,7 +22,6 @@
 
 #include "../gcode.h"
 #include "../../module/settings.h"
-#include "../../core/serial.h"
 #include "../../inc/MarlinConfig.h"
 
 #if ENABLED(CONFIGURATION_EMBEDDING)

diff --git a/Marlin/src/gcode/motion/M290.cpp b/Marlin/src/gcode/motion/M290.cpp
@@ -29,10 +29,6 @@
 #include "../../module/probe.h"
 #include "../../module/planner.h"
 
-#if ENABLED(BABYSTEP_ZPROBE_OFFSET)
-  #include "../../core/serial.h"
-#endif
-
 #if ENABLED(MESH_BED_LEVELING)
   #include "../../feature/bedlevel/bedlevel.h"
 #endif

diff --git a/Marlin/src/gcode/stats/M31.cpp b/Marlin/src/gcode/stats/M31.cpp
@@ -21,7 +21,6 @@
  */
 
 #include "../gcode.h"
-#include "../../core/serial.h"
 #include "../../module/printcounter.h"
 #include "../../libs/duration_t.h"
 #include "../../lcd/marlinui.h"

diff --git a/Marlin/src/inc/Conditionals-1-axes.h b/Marlin/src/inc/Conditionals-1-axes.h
@@ -67,6 +67,7 @@
   #undef MECHANICAL_SWITCHING_NOZZLE
   #undef MIXING_EXTRUDER
   #undef HOTEND_IDLE_TIMEOUT
+  #undef HOTEND_OVERSHOOT
   #undef DISABLE_E
   #undef PREVENT_LENGTHY_EXTRUDE
   #undef FILAMENT_RUNOUT_SENSOR

diff --git a/Marlin/src/inc/Conditionals-3-etc.h b/Marlin/src/inc/Conditionals-3-etc.h
@@ -71,17 +71,19 @@
   #undef TEMP_SENSOR_BED
   #undef THERMAL_PROTECTION_BED
   #undef MAX_BED_POWER
+  #undef PREHEAT_1_TEMP_BED
+  #undef PREHEAT_2_TEMP_BED
 #endif
 #if !TEMP_SENSOR_CHAMBER
   #undef TEMP_SENSOR_CHAMBER
   #undef THERMAL_PROTECTION_CHAMBER
-  #undef CHAMBER_AUTO_FAN_PIN
   #undef MAX_CHAMBER_POWER
+  #undef PREHEAT_1_TEMP_CHAMBER
+  #undef PREHEAT_2_TEMP_CHAMBER
 #endif
 #if !TEMP_SENSOR_COOLER
   #undef TEMP_SENSOR_COOLER
   #undef THERMAL_PROTECTION_COOLER
-  #undef COOLER_AUTO_FAN_PIN
 #endif
 #if !TEMP_SENSOR_PROBE
   #undef TEMP_SENSOR_PROBE
@@ -442,6 +444,7 @@
 #else
   // Clear probe pin settings when no probe is selected
   #undef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN
+  #undef Z_MIN_PROBE_ENDSTOP_HIT_STATE
   #undef USE_PROBE_FOR_Z_HOMING
   #undef Z_MIN_PROBE_REPEATABILITY_TEST
   #undef HOMING_Z_WITH_PROBE

diff --git a/Marlin/src/inc/Conditionals-4-adv.h b/Marlin/src/inc/Conditionals-4-adv.h
@@ -233,6 +233,14 @@
   #undef STEALTHCHOP_E
 #endif
 
+#if !TEMP_SENSOR_CHAMBER
+  #undef CHAMBER_CHECK_INTERVAL
+  #undef CHAMBER_AUTO_FAN_PIN
+#endif
+#if !TEMP_SENSOR_COOLER
+  #undef COOLER_AUTO_FAN_PIN
+#endif
+
 #if ENABLED(DISABLE_X) && !defined(DISABLE_IDLE_X)
   #define DISABLE_IDLE_X
 #endif
@@ -821,7 +829,12 @@
   #undef TEMP_SENSOR_AD8495_GAIN
   #undef TEMP_SENSOR_AD8495_OFFSET
 #endif
-
+#if !ANY_THERMISTOR_IS(998)
+  #undef DUMMY_THERMISTOR_998_VALUE
+#endif
+#if !ANY_THERMISTOR_IS(999)
+  #undef DUMMY_THERMISTOR_999_VALUE
+#endif
 #if !ALL(HAS_X_AXIS, HAS_HOTEND)
   #undef AUTOTEMP
 #endif
@@ -838,6 +851,7 @@
 #if !TEMP_SENSOR_BED
   #undef BED_MINTEMP
   #undef BED_MAXTEMP
+  #undef BED_OVERSHOOT
   #undef CONTROLLER_FAN_BED_HEATING
 #endif
 #if DISABLED(THERMAL_PROTECTION_BED)
@@ -861,6 +875,7 @@
 #if !TEMP_SENSOR_COOLER
   #undef COOLER_MINTEMP
   #undef COOLER_MAXTEMP
+  #undef COOLER_OVERSHOOT
 #endif
 #if DISABLED(THERMAL_PROTECTION_COOLER)
   #undef THERMAL_PROTECTION_COOLER_PERIOD

diff --git a/Marlin/src/inc/MarlinConfig.h b/Marlin/src/inc/MarlinConfig.h
@@ -26,10 +26,10 @@
 //
 
 #include "MarlinConfigPre-6-type.h" // Include even with __MARLIN_DEPS__
+#include "Conditionals-6-type.h"
 
 #ifndef __MARLIN_DEPS__
 
-  #include "Conditionals-6-type.h"
   #include HAL_PATH(.., inc/Conditionals_type.h)
 
   #include "Changes.h"