From 4797f254284dd72c7e1748fdaa70696b22194a52 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sun, 1 Dec 2024 23:05:34 -0600 Subject: [PATCH] =?UTF-8?q?=F0=9F=94=A8=20Update=20config.ini,=20move=20un?= =?UTF-8?q?defs=20(#27562)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Marlin/Configuration_adv.h | 13 ++-- Marlin/config.ini | 83 ++++++++++++------------- Marlin/src/inc/Conditionals-1-axes.h | 1 + Marlin/src/inc/Conditionals-3-etc.h | 7 ++- Marlin/src/inc/Conditionals-4-adv.h | 17 ++++- Marlin/src/inc/MarlinConfig.h | 2 +- Marlin/src/inc/MarlinConfigPre-6-type.h | 3 +- 7 files changed, 72 insertions(+), 54 deletions(-) diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h index 39cc1d5689..564f44df60 100644 --- 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/config.ini b/Marlin/config.ini index fed2a5c68c..d6d2395e39 100644 --- 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/inc/Conditionals-1-axes.h b/Marlin/src/inc/Conditionals-1-axes.h index 1ea88cec86..5f8dad37b0 100644 --- 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 index 3c685ad587..6a1b3b7999 100644 --- 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 index b6981e59a2..ccded2eec6 100644 --- 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 index b0a0434cdd..0164b7c2f7 100644 --- 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" diff --git a/Marlin/src/inc/MarlinConfigPre-6-type.h b/Marlin/src/inc/MarlinConfigPre-6-type.h index 358e34a7d6..31597c6eb8 100644 --- a/Marlin/src/inc/MarlinConfigPre-6-type.h +++ b/Marlin/src/inc/MarlinConfigPre-6-type.h @@ -26,5 +26,6 @@ #ifndef __MARLIN_DEPS__ #include HAL_PATH(.., inc/Conditionals_post.h) - #include "../core/types.h" // Ahead of sanity-checks #endif + +#include "../core/types.h" // Ahead of sanity-checks