diff --git a/Marlin/src/inc/BaseConfiguration.h b/Marlin/src/inc/BaseConfiguration.h index 86429fb7ed2a..0a8229bb6369 100644 --- a/Marlin/src/inc/BaseConfiguration.h +++ b/Marlin/src/inc/BaseConfiguration.h @@ -56,25 +56,16 @@ #ifndef AXIS4_NAME #define AXIS4_NAME 'A' #endif - #ifndef AXIS4_ROTATES - #define AXIS4_ROTATES - #endif #endif #ifdef J_DRIVER_TYPE #ifndef AXIS5_NAME #define AXIS5_NAME 'B' #endif - #ifndef AXIS5_ROTATES - #define AXIS5_ROTATES - #endif #endif #ifdef K_DRIVER_TYPE #ifndef AXIS6_NAME #define AXIS6_NAME 'C' #endif - #ifndef AXIS6_ROTATES - #define AXIS6_ROTATES - #endif #endif #ifdef U_DRIVER_TYPE #ifndef AXIS7_NAME @@ -129,9 +120,6 @@ #define PARKING_EXTRUDER_GRAB_DISTANCE 1 #endif #if ENABLED(PARKING_EXTRUDER) - #ifndef PARKING_EXTRUDER_SOLENOIDS_INVERT - #define PARKING_EXTRUDER_SOLENOIDS_INVERT - #endif #ifndef PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE #define PARKING_EXTRUDER_SOLENOIDS_PINS_ACTIVE LOW #endif @@ -216,24 +204,6 @@ #define PS_EDM_RESPONSE 250 #endif #if ENABLED(AUTO_POWER_CONTROL) - #ifndef AUTO_POWER_FANS - #define AUTO_POWER_FANS - #endif - #ifndef AUTO_POWER_E_FANS - #define AUTO_POWER_E_FANS - #endif - #ifndef AUTO_POWER_CONTROLLERFAN - #define AUTO_POWER_CONTROLLERFAN - #endif - #ifndef AUTO_POWER_CHAMBER_FAN - #define AUTO_POWER_CHAMBER_FAN - #endif - #ifndef AUTO_POWER_COOLER_FAN - #define AUTO_POWER_COOLER_FAN - #endif - #ifndef AUTO_POWER_SPINDLE_LASER - #define AUTO_POWER_SPINDLE_LASER - #endif #ifndef POWER_TIMEOUT #define POWER_TIMEOUT 30 #endif @@ -427,9 +397,6 @@ #ifndef COOLER_OVERSHOOT #define COOLER_OVERSHOOT 2 #endif -#ifndef PIDTEMP - #define PIDTEMP -#endif #ifndef PID_MAX #define PID_MAX 255 #endif @@ -464,18 +431,12 @@ #endif #endif #if ENABLED(MPCTEMP) - #ifndef MPC_AUTOTUNE - #define MPC_AUTOTUNE - #endif #ifndef MPC_MAX #define MPC_MAX 255 #endif #ifndef MPC_HEATER_POWER #define MPC_HEATER_POWER { 40.0f } #endif - #ifndef MPC_INCLUDE_FAN - #define MPC_INCLUDE_FAN - #endif #ifndef MPC_BLOCK_HEAT_CAPACITY #define MPC_BLOCK_HEAT_CAPACITY { 16.7f } #endif @@ -546,30 +507,12 @@ #define PID_FUNCTIONAL_RANGE 10 #endif #endif -#ifndef PREVENT_COLD_EXTRUSION - #define PREVENT_COLD_EXTRUSION -#endif #ifndef EXTRUDE_MINTEMP #define EXTRUDE_MINTEMP 170 #endif -#ifndef PREVENT_LENGTHY_EXTRUDE - #define PREVENT_LENGTHY_EXTRUDE -#endif #ifndef EXTRUDE_MAXLENGTH #define EXTRUDE_MAXLENGTH 200 #endif -#ifndef THERMAL_PROTECTION_HOTENDS - #define THERMAL_PROTECTION_HOTENDS -#endif -#ifndef THERMAL_PROTECTION_BED - #define THERMAL_PROTECTION_BED -#endif -#ifndef THERMAL_PROTECTION_CHAMBER - #define THERMAL_PROTECTION_CHAMBER -#endif -#ifndef THERMAL_PROTECTION_COOLER - #define THERMAL_PROTECTION_COOLER -#endif #if ENABLED(POLARGRAPH) #ifndef POLARGRAPH_MAX_BELT_LEN #define POLARGRAPH_MAX_BELT_LEN 1035.0 @@ -577,9 +520,6 @@ #ifndef DEFAULT_SEGMENTS_PER_SECOND #define DEFAULT_SEGMENTS_PER_SECOND 5 #endif - #ifndef PEN_UP_DOWN_MENU - #define PEN_UP_DOWN_MENU - #endif #endif #if ENABLED(DELTA) #ifndef DEFAULT_SEGMENTS_PER_SECOND @@ -634,9 +574,6 @@ #define SCARA_OFFSET_Y -56 #endif #if ENABLED(MORGAN_SCARA) - #ifndef FEEDRATE_SCALING - #define FEEDRATE_SCALING - #endif #ifndef MIDDLE_DEAD_ZONE_R #define MIDDLE_DEAD_ZONE_R 0 #endif @@ -650,9 +587,6 @@ #endif #endif #if ENABLED(AXEL_TPARA) - #ifndef DEBUG_TPARA_KINEMATICS - #define DEBUG_TPARA_KINEMATICS - #endif #ifndef DEFAULT_SEGMENTS_PER_SECOND #define DEFAULT_SEGMENTS_PER_SECOND 200 #endif @@ -671,9 +605,6 @@ #ifndef TPARA_OFFSET_Z #define TPARA_OFFSET_Z 0 #endif - #ifndef FEEDRATE_SCALING - #define FEEDRATE_SCALING - #endif #ifndef MIDDLE_DEAD_ZONE_R #define MIDDLE_DEAD_ZONE_R 0 #endif @@ -691,12 +622,6 @@ #ifndef POLAR_CENTER_OFFSET #define POLAR_CENTER_OFFSET 0.0f #endif - #ifndef FEEDRATE_SCALING - #define FEEDRATE_SCALING - #endif -#endif -#ifndef ENDSTOPPULLUPS - #define ENDSTOPPULLUPS #endif #ifndef X_MIN_ENDSTOP_HIT_STATE #define X_MIN_ENDSTOP_HIT_STATE HIGH @@ -758,9 +683,6 @@ #ifndef DEFAULT_AXIS_STEPS_PER_UNIT #define DEFAULT_AXIS_STEPS_PER_UNIT { 80, 80, 400, 500 } #endif -#ifndef EDITABLE_STEPS_PER_UNIT - #define EDITABLE_STEPS_PER_UNIT -#endif #ifndef DEFAULT_MAX_FEEDRATE #define DEFAULT_MAX_FEEDRATE { 300, 300, 5, 25 } #endif @@ -809,12 +731,6 @@ #ifndef JUNCTION_DEVIATION_MM #define JUNCTION_DEVIATION_MM 0.013 #endif - #ifndef JD_HANDLE_SMALL_SEGMENTS - #define JD_HANDLE_SMALL_SEGMENTS - #endif -#endif -#ifndef Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN - #define Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN #endif #if ENABLED(MAGLEV4) #ifndef MAGLEV_TRIGGER_DELAY @@ -990,9 +906,6 @@ #ifndef E_ENABLE_ON #define E_ENABLE_ON 0 #endif -#ifndef DISABLE_OTHER_EXTRUDERS - #define DISABLE_OTHER_EXTRUDERS -#endif #ifndef INVERT_X_DIR #define INVERT_X_DIR false #endif @@ -1059,70 +972,6 @@ #ifndef Z_MAX_POS #define Z_MAX_POS 200 #endif -#ifndef MIN_SOFTWARE_ENDSTOPS - #define MIN_SOFTWARE_ENDSTOPS -#endif -#if ENABLED(MIN_SOFTWARE_ENDSTOPS) - #ifndef MIN_SOFTWARE_ENDSTOP_X - #define MIN_SOFTWARE_ENDSTOP_X - #endif - #ifndef MIN_SOFTWARE_ENDSTOP_Y - #define MIN_SOFTWARE_ENDSTOP_Y - #endif - #ifndef MIN_SOFTWARE_ENDSTOP_Z - #define MIN_SOFTWARE_ENDSTOP_Z - #endif - #ifndef MIN_SOFTWARE_ENDSTOP_I - #define MIN_SOFTWARE_ENDSTOP_I - #endif - #ifndef MIN_SOFTWARE_ENDSTOP_J - #define MIN_SOFTWARE_ENDSTOP_J - #endif - #ifndef MIN_SOFTWARE_ENDSTOP_K - #define MIN_SOFTWARE_ENDSTOP_K - #endif - #ifndef MIN_SOFTWARE_ENDSTOP_U - #define MIN_SOFTWARE_ENDSTOP_U - #endif - #ifndef MIN_SOFTWARE_ENDSTOP_V - #define MIN_SOFTWARE_ENDSTOP_V - #endif - #ifndef MIN_SOFTWARE_ENDSTOP_W - #define MIN_SOFTWARE_ENDSTOP_W - #endif -#endif -#ifndef MAX_SOFTWARE_ENDSTOPS - #define MAX_SOFTWARE_ENDSTOPS -#endif -#if ENABLED(MAX_SOFTWARE_ENDSTOPS) - #ifndef MAX_SOFTWARE_ENDSTOP_X - #define MAX_SOFTWARE_ENDSTOP_X - #endif - #ifndef MAX_SOFTWARE_ENDSTOP_Y - #define MAX_SOFTWARE_ENDSTOP_Y - #endif - #ifndef MAX_SOFTWARE_ENDSTOP_Z - #define MAX_SOFTWARE_ENDSTOP_Z - #endif - #ifndef MAX_SOFTWARE_ENDSTOP_I - #define MAX_SOFTWARE_ENDSTOP_I - #endif - #ifndef MAX_SOFTWARE_ENDSTOP_J - #define MAX_SOFTWARE_ENDSTOP_J - #endif - #ifndef MAX_SOFTWARE_ENDSTOP_K - #define MAX_SOFTWARE_ENDSTOP_K - #endif - #ifndef MAX_SOFTWARE_ENDSTOP_U - #define MAX_SOFTWARE_ENDSTOP_U - #endif - #ifndef MAX_SOFTWARE_ENDSTOP_V - #define MAX_SOFTWARE_ENDSTOP_V - #endif - #ifndef MAX_SOFTWARE_ENDSTOP_W - #define MAX_SOFTWARE_ENDSTOP_W - #endif -#endif #if ENABLED(FILAMENT_RUNOUT_SENSOR) #ifndef FIL_RUNOUT_ENABLED_DEFAULT #define FIL_RUNOUT_ENABLED_DEFAULT true @@ -1133,9 +982,6 @@ #ifndef FIL_RUNOUT_STATE #define FIL_RUNOUT_STATE LOW #endif - #ifndef FIL_RUNOUT_PULLUP - #define FIL_RUNOUT_PULLUP - #endif #ifndef FILAMENT_RUNOUT_SCRIPT #define FILAMENT_RUNOUT_SCRIPT "M600" #endif @@ -1163,17 +1009,11 @@ #endif #endif #if ANY(MESH_BED_LEVELING, AUTO_BED_LEVELING_BILINEAR, AUTO_BED_LEVELING_UBL) - #ifndef ENABLE_LEVELING_FADE_HEIGHT - #define ENABLE_LEVELING_FADE_HEIGHT - #endif #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) #ifndef DEFAULT_LEVELING_FADE_HEIGHT #define DEFAULT_LEVELING_FADE_HEIGHT 10.0 #endif #endif - #ifndef SEGMENT_LEVELED_MOVES - #define SEGMENT_LEVELED_MOVES - #endif #ifndef LEVELED_SEGMENT_LENGTH #define LEVELED_SEGMENT_LENGTH 5.0 #endif @@ -1225,12 +1065,6 @@ #ifndef GRID_MAX_POINTS_Y #define GRID_MAX_POINTS_Y GRID_MAX_POINTS_X #endif - #ifndef UBL_MESH_EDIT_MOVES_Z - #define UBL_MESH_EDIT_MOVES_Z - #endif - #ifndef UBL_SAVE_ACTIVE_ON_M500 - #define UBL_SAVE_ACTIVE_ON_M500 - #endif #if ENABLED(AVOID_OBSTACLES) #ifndef CLIP_W #define CLIP_W 23 @@ -1287,9 +1121,6 @@ #ifndef BED_TRAMMING_PROBE_TOLERANCE #define BED_TRAMMING_PROBE_TOLERANCE 0.1 #endif - #ifndef BED_TRAMMING_VERIFY_RAISED - #define BED_TRAMMING_VERIFY_RAISED - #endif #endif #ifndef BED_TRAMMING_LEVELING_ORDER #define BED_TRAMMING_LEVELING_ORDER { LF, RF, RB, LB } @@ -1306,9 +1137,6 @@ #ifndef HOMING_FEEDRATE_MM_M #define HOMING_FEEDRATE_MM_M { (50*60), (50*60), (4*60) } #endif -#ifndef VALIDATE_HOMING_ENDSTOPS - #define VALIDATE_HOMING_ENDSTOPS -#endif #if ENABLED(SKEW_CORRECTION) #ifndef XY_DIAG_AC #define XY_DIAG_AC 282.8427124746 @@ -1337,21 +1165,9 @@ #endif #endif #endif -#ifndef EEPROM_CHITCHAT - #define EEPROM_CHITCHAT -#endif -#ifndef EEPROM_BOOT_SILENT - #define EEPROM_BOOT_SILENT -#endif -#ifndef HOST_KEEPALIVE_FEATURE - #define HOST_KEEPALIVE_FEATURE -#endif #ifndef DEFAULT_KEEPALIVE_INTERVAL #define DEFAULT_KEEPALIVE_INTERVAL 2 #endif -#ifndef BUSY_WHILE_HEATING - #define BUSY_WHILE_HEATING -#endif #ifndef PREHEAT_1_LABEL #define PREHEAT_1_LABEL "PLA" #endif @@ -1400,15 +1216,6 @@ #endif #endif #if ENABLED(NOZZLE_CLEAN_FEATURE) - #ifndef NOZZLE_CLEAN_PATTERN_LINE - #define NOZZLE_CLEAN_PATTERN_LINE - #endif - #ifndef NOZZLE_CLEAN_PATTERN_ZIGZAG - #define NOZZLE_CLEAN_PATTERN_ZIGZAG - #endif - #ifndef NOZZLE_CLEAN_PATTERN_CIRCLE - #define NOZZLE_CLEAN_PATTERN_CIRCLE - #endif #ifndef NOZZLE_CLEAN_DEFAULT_PATTERN #define NOZZLE_CLEAN_DEFAULT_PATTERN 0 #endif @@ -1437,16 +1244,10 @@ #define NOZZLE_CLEAN_CIRCLE_MIDDLE NOZZLE_CLEAN_START_POINT #endif #endif - #ifndef NOZZLE_CLEAN_GOBACK - #define NOZZLE_CLEAN_GOBACK - #endif #ifndef NOZZLE_CLEAN_MIN_TEMP #define NOZZLE_CLEAN_MIN_TEMP 170 #endif #endif -#ifndef PRINTJOB_TIMER_AUTOSTART - #define PRINTJOB_TIMER_AUTOSTART -#endif #if ENABLED(PRINTCOUNTER) #ifndef PRINTCOUNTER_SAVE_INTERVAL #define PRINTCOUNTER_SAVE_INTERVAL 60 @@ -1456,15 +1257,6 @@ #ifndef PASSWORD_LENGTH #define PASSWORD_LENGTH 4 #endif - #ifndef PASSWORD_ON_STARTUP - #define PASSWORD_ON_STARTUP - #endif - #ifndef PASSWORD_UNLOCK_GCODE - #define PASSWORD_UNLOCK_GCODE - #endif - #ifndef PASSWORD_CHANGE_GCODE - #define PASSWORD_CHANGE_GCODE - #endif #endif #ifndef LCD_LANGUAGE #define LCD_LANGUAGE en @@ -1480,17 +1272,6 @@ #define ENCODER_SAMPLES 10 #endif #endif -#if ENABLED(SAV_3DGLCD) - #ifndef U8GLIB_SSD1306 - #define U8GLIB_SSD1306 - #endif -#endif -#if DGUS_UI_IS(MKS) - #ifndef USE_MKS_GREEN_UI - #define USE_MKS_GREEN_UI - #endif -#elif DGUS_UI_IS(IA_CREALITY) -#endif #if ENABLED(TFT_GENERIC) #ifndef TFT_DRIVER #define TFT_DRIVER AUTO @@ -1503,9 +1284,6 @@ #ifndef TFT_THEME #define TFT_THEME BLACK_MARLIN #endif - #ifndef COMPACT_MARLIN_BOOT_LOGO - #define COMPACT_MARLIN_BOOT_LOGO - #endif #endif #if ENABLED(TOUCH_SCREEN) #ifndef BUTTON_DELAY_EDIT @@ -1514,14 +1292,6 @@ #ifndef BUTTON_DELAY_MENU #define BUTTON_DELAY_MENU 250 #endif - #ifndef TOUCH_SCREEN_CALIBRATION - #define TOUCH_SCREEN_CALIBRATION - #endif - #if ALL(TOUCH_SCREEN_CALIBRATION, EEPROM_SETTINGS) - #ifndef TOUCH_CALIBRATION_AUTO_SAVE - #define TOUCH_CALIBRATION_AUTO_SAVE - #endif - #endif #endif #ifndef SOFT_PWM_SCALE #define SOFT_PWM_SCALE 0 @@ -1540,9 +1310,6 @@ #ifndef NEOPIXEL_PIXELS #define NEOPIXEL_PIXELS 30 #endif - #ifndef NEOPIXEL_IS_SEQUENTIAL - #define NEOPIXEL_IS_SEQUENTIAL - #endif #ifndef NEOPIXEL_BRIGHTNESS #define NEOPIXEL_BRIGHTNESS 127 #endif @@ -1553,20 +1320,12 @@ #ifndef NEOPIXEL2_BRIGHTNESS #define NEOPIXEL2_BRIGHTNESS 127 #endif - #ifndef NEOPIXEL2_STARTUP_TEST - #define NEOPIXEL2_STARTUP_TEST - #endif #ifndef NEOPIXEL_M150_DEFAULT #define NEOPIXEL_M150_DEFAULT -1 #endif #else #endif #endif -#if ANY(BLINKM, RGB_LED, RGBW_LED, PCA9632, PCA9533, NEOPIXEL_LED) - #ifndef PRINTER_EVENT_LEDS - #define PRINTER_EVENT_LEDS - #endif -#endif #ifndef SERVO_DELAY #define SERVO_DELAY { 300 } #endif diff --git a/Marlin/src/inc/BaseConfiguration_adv.h b/Marlin/src/inc/BaseConfiguration_adv.h index e3a39421dd1f..a60464791d59 100644 --- a/Marlin/src/inc/BaseConfiguration_adv.h +++ b/Marlin/src/inc/BaseConfiguration_adv.h @@ -324,9 +324,6 @@ #ifndef TEMP_COOLER_PIN #define TEMP_COOLER_PIN 15 #endif - #ifndef COOLER_FAN - #define COOLER_FAN - #endif #ifndef COOLER_FAN_INDEX #define COOLER_FAN_INDEX 0 #endif @@ -340,9 +337,6 @@ #endif #endif #if TEMP_SENSOR_BOARD - #ifndef THERMAL_PROTECTION_BOARD - #define THERMAL_PROTECTION_BOARD - #endif #ifndef BOARD_MINTEMP #define BOARD_MINTEMP 8 #endif @@ -351,9 +345,6 @@ #endif #endif #if TEMP_SENSOR_SOC - #ifndef THERMAL_PROTECTION_SOC - #define THERMAL_PROTECTION_SOC - #endif #ifndef SOC_MAXTEMP #define SOC_MAXTEMP 85 #endif @@ -453,9 +444,6 @@ #endif #endif #endif -#ifndef AUTOTEMP - #define AUTOTEMP -#endif #if ENABLED(AUTOTEMP) #ifndef AUTOTEMP_OLDWEIGHT #define AUTOTEMP_OLDWEIGHT 0.98 @@ -534,11 +522,6 @@ #ifndef CONTROLLERFAN_IDLE_TIME #define CONTROLLERFAN_IDLE_TIME 60 #endif - #if ENABLED(CONTROLLER_FAN_EDITABLE) - #ifndef CONTROLLER_FAN_MENU - #define CONTROLLER_FAN_MENU - #endif - #endif #endif #if ENABLED(FAST_PWM_FAN) #ifndef FAST_PWM_FAN_FREQUENCY @@ -712,12 +695,6 @@ #ifndef Z_STEPPER_ALIGN_ACC #define Z_STEPPER_ALIGN_ACC 0.02 #endif - #ifndef RESTORE_LEVELING_AFTER_G34 - #define RESTORE_LEVELING_AFTER_G34 - #endif - #ifndef HOME_AFTER_G34 - #define HOME_AFTER_G34 - #endif #endif #if ENABLED(ASSISTED_TRAMMING) #ifndef TRAMMING_POINT_XY @@ -735,9 +712,6 @@ #ifndef TRAMMING_POINT_NAME_4 #define TRAMMING_POINT_NAME_4 "Back-Left" #endif - #ifndef RESTORE_LEVELING_AFTER_G35 - #define RESTORE_LEVELING_AFTER_G35 - #endif #ifndef TRAMMING_SCREW_THREAD #define TRAMMING_SCREW_THREAD 30 #endif @@ -776,9 +750,6 @@ #ifndef FTM_SHAPING_V_TOL_Y #define FTM_SHAPING_V_TOL_Y 0.05f #endif - #ifndef FTM_UNIFIED_BWS - #define FTM_UNIFIED_BWS - #endif #if ENABLED(FTM_UNIFIED_BWS) #ifndef FTM_BW_SIZE #define FTM_BW_SIZE 100 @@ -893,18 +864,6 @@ #ifndef DEFAULT_STEPPER_TIMEOUT_SEC #define DEFAULT_STEPPER_TIMEOUT_SEC 120 #endif -#ifndef DISABLE_IDLE_X - #define DISABLE_IDLE_X -#endif -#ifndef DISABLE_IDLE_Y - #define DISABLE_IDLE_Y -#endif -#ifndef DISABLE_IDLE_Z - #define DISABLE_IDLE_Z -#endif -#ifndef DISABLE_IDLE_E - #define DISABLE_IDLE_E -#endif #ifndef DEFAULT_MINIMUMFEEDRATE #define DEFAULT_MINIMUMFEEDRATE 0.0 #endif @@ -914,9 +873,6 @@ #ifndef DEFAULT_MINSEGMENTTIME #define DEFAULT_MINSEGMENTTIME 20000 #endif -#ifndef SLOWDOWN - #define SLOWDOWN -#endif #if ENABLED(SLOWDOWN) #ifndef SLOWDOWN_DIVISOR #define SLOWDOWN_DIVISOR 2 @@ -935,9 +891,6 @@ #define BACKLASH_CORRECTION 0.0 #endif #if ENABLED(BACKLASH_GCODE) - #ifndef MEASURE_BACKLASH_WHEN_PROBING - #define MEASURE_BACKLASH_WHEN_PROBING - #endif #if ENABLED(MEASURE_BACKLASH_WHEN_PROBING) #ifndef BACKLASH_MEASUREMENT_LIMIT #define BACKLASH_MEASUREMENT_LIMIT 0.5 @@ -973,25 +926,10 @@ #ifndef CALIBRATION_OBJECT_DIMENSIONS #define CALIBRATION_OBJECT_DIMENSIONS { 10.0, 10.0, 10.0 } #endif - #ifndef CALIBRATION_MEASURE_RIGHT - #define CALIBRATION_MEASURE_RIGHT - #endif - #ifndef CALIBRATION_MEASURE_FRONT - #define CALIBRATION_MEASURE_FRONT - #endif - #ifndef CALIBRATION_MEASURE_LEFT - #define CALIBRATION_MEASURE_LEFT - #endif - #ifndef CALIBRATION_MEASURE_BACK - #define CALIBRATION_MEASURE_BACK - #endif #ifndef CALIBRATION_PIN #ifndef CALIBRATION_PIN_INVERTING #define CALIBRATION_PIN_INVERTING false #endif - #ifndef CALIBRATION_PIN_PULLUP - #define CALIBRATION_PIN_PULLUP - #endif #endif #endif #ifndef MULTISTEPPING_LIMIT @@ -1015,17 +953,6 @@ #ifndef FINE_MANUAL_MOVE #define FINE_MANUAL_MOVE 0.025 #endif - #if IS_ULTIPANEL - #ifndef MANUAL_E_MOVES_RELATIVE - #define MANUAL_E_MOVES_RELATIVE - #endif - #ifndef ULTIPANEL_FEEDMULTIPLY - #define ULTIPANEL_FEEDMULTIPLY - #endif - #endif -#endif -#ifndef ENCODER_RATE_MULTIPLIER - #define ENCODER_RATE_MULTIPLIER #endif #if ENABLED(ENCODER_RATE_MULTIPLIER) #ifndef ENCODER_10X_STEPS_PER_SEC @@ -1059,9 +986,6 @@ #define XATC_Z_OFFSETS { 0, 0, 0 } #endif #endif - #ifndef PROBE_DEPLOY_STOW_MENU - #define PROBE_DEPLOY_STOW_MENU - #endif #endif #ifndef MANUAL_MOVE_DISTANCE_MM #define MANUAL_MOVE_DISTANCE_MM 10, 1.0, 0.1 @@ -1074,26 +998,12 @@ #endif #endif #if HAS_DISPLAY - #ifndef SHOW_BOOTSCREEN - #define SHOW_BOOTSCREEN - #endif #if ENABLED(SHOW_BOOTSCREEN) #ifndef BOOTSCREEN_TIMEOUT #define BOOTSCREEN_TIMEOUT 3000 #endif - #if ANY(HAS_MARLINUI_U8GLIB, TFT_COLOR_UI) - #ifndef BOOT_MARLIN_LOGO_SMALL - #define BOOT_MARLIN_LOGO_SMALL - #endif - #endif - #endif - #ifndef SOUND_ON_DEFAULT - #define SOUND_ON_DEFAULT #endif #if ENABLED(LED_CONTROL_MENU) - #ifndef LED_COLOR_PRESETS - #define LED_COLOR_PRESETS - #endif #if ENABLED(LED_COLOR_PRESETS) #ifndef LED_USER_PRESET_RED #define LED_USER_PRESET_RED 255 @@ -1146,31 +1056,7 @@ #define FLOW_EDIT_MAX 999 #endif #endif -#if ENABLED(SET_PROGRESS_MANUALLY) - #ifndef SET_PROGRESS_PERCENT - #define SET_PROGRESS_PERCENT - #endif - #ifndef SET_REMAINING_TIME - #define SET_REMAINING_TIME - #endif - #if ALL(M73_REPORT, HAS_MEDIA) - #ifndef M73_REPORT_SD_ONLY - #define M73_REPORT_SD_ONLY - #endif - #endif -#endif #if HAS_DISPLAY && ANY(HAS_MEDIA, SET_PROGRESS_MANUALLY) - #ifndef SHOW_PROGRESS_PERCENT - #define SHOW_PROGRESS_PERCENT - #endif - #ifndef SHOW_ELAPSED_TIME - #define SHOW_ELAPSED_TIME - #endif - #if ENABLED(SET_INTERACTION_TIME) - #ifndef SHOW_INTERACTION_TIME - #define SHOW_INTERACTION_TIME - #endif - #endif #if ANY(HAS_MARLINUI_HD44780, IS_TFTGLCD_PANEL) #if ENABLED(LCD_PROGRESS_BAR) #ifndef PROGRESS_BAR_BAR_TIME @@ -1195,12 +1081,6 @@ #ifndef SD_FINISHED_RELEASECOMMAND #define SD_FINISHED_RELEASECOMMAND "M84" #endif - #ifndef SDCARD_RATHERRECENTFIRST - #define SDCARD_RATHERRECENTFIRST - #endif - #ifndef SD_MENU_CONFIRM_START - #define SD_MENU_CONFIRM_START - #endif #ifndef EVENT_GCODE_SD_ABORT #define EVENT_GCODE_SD_ABORT "G28XY" #endif @@ -1247,9 +1127,6 @@ #endif #endif #if ENABLED(USB_FLASH_DRIVE_SUPPORT) - #ifndef DISABLE_DUE_SD_MMC - #define DISABLE_DUE_SD_MMC - #endif #if DISABLED(USE_OTG_USB_HOST) #ifndef USB_CS_PIN #define USB_CS_PIN SDSS @@ -1271,12 +1148,6 @@ #endif #endif #if ENABLED(MULTI_VOLUME) - #ifndef VOLUME_SD_ONBOARD - #define VOLUME_SD_ONBOARD - #endif - #ifndef VOLUME_USB_FLASH_DRIVE - #define VOLUME_USB_FLASH_DRIVE - #endif #ifndef DEFAULT_VOLUME #define DEFAULT_VOLUME SV_SD_ONBOARD #endif @@ -1286,9 +1157,6 @@ #endif #endif #if HAS_MARLINUI_U8GLIB - #ifndef XYZ_HOLLOW_FRAME - #define XYZ_HOLLOW_FRAME - #endif #if IS_U8GLIB_ST7920 #if ENABLED(LIGHTWEIGHT_UI) #ifndef STATUS_EXPIRE_SECONDS @@ -1296,23 +1164,6 @@ #endif #endif #endif - #ifndef STATUS_HOTEND_INVERTED - #define STATUS_HOTEND_INVERTED - #endif - #ifndef STATUS_HOTEND_ANIM - #define STATUS_HOTEND_ANIM - #endif - #ifndef STATUS_BED_ANIM - #define STATUS_BED_ANIM - #endif - #ifndef STATUS_CHAMBER_ANIM - #define STATUS_CHAMBER_ANIM - #endif -#endif -#if HAS_MARLINUI_U8GLIB || IS_DWIN_MARLINUI - #ifndef MENU_HOLLOW_FRAME - #define MENU_HOLLOW_FRAME - #endif #endif #if HAS_DGUS_LCD #ifndef LCD_BAUDRATE @@ -1328,20 +1179,6 @@ #define DGUS_UPDATE_INTERVAL_MS 500 #endif #if DGUS_UI_IS(FYSETC, MKS, HIPRECY) - #ifndef DGUS_PRINT_FILENAME - #define DGUS_PRINT_FILENAME - #endif - #ifndef DGUS_PREHEAT_UI - #define DGUS_PREHEAT_UI - #endif - #if !(DGUS_UI_IS(FYSETC, MKS)) - #ifndef DGUS_UI_MOVE_DIS_OPTION - #define DGUS_UI_MOVE_DIS_OPTION - #endif - #endif - #ifndef DGUS_FILAMENT_LOADUNLOAD - #define DGUS_FILAMENT_LOADUNLOAD - #endif #if ENABLED(DGUS_FILAMENT_LOADUNLOAD) #ifndef DGUS_FILAMENT_PURGE_LENGTH #define DGUS_FILAMENT_PURGE_LENGTH 10 @@ -1350,9 +1187,6 @@ #define DGUS_FILAMENT_LOAD_LENGTH_PER_TIME 0.5 #endif #endif - #ifndef DGUS_UI_WAITING - #define DGUS_UI_WAITING - #endif #if ENABLED(DGUS_UI_WAITING) #ifndef DGUS_UI_WAITING_STATUS #define DGUS_UI_WAITING_STATUS 10 @@ -1362,26 +1196,12 @@ #endif #endif #elif DGUS_UI_IS(E3S1PRO) - #ifndef DGUS_SOFTWARE_AUTOSCROLL - #define DGUS_SOFTWARE_AUTOSCROLL - #endif #ifndef DGUS_AUTOSCROLL_START_CYCLES #define DGUS_AUTOSCROLL_START_CYCLES 1 #endif #ifndef DGUS_AUTOSCROLL_END_CYCLES #define DGUS_AUTOSCROLL_END_CYCLES 1 #endif - #ifndef DGUS_ADVANCED_SDCARD - #define DGUS_ADVANCED_SDCARD - #endif - #ifndef DGUS_USERCONFIRM - #define DGUS_USERCONFIRM - #endif - #endif -#endif -#if ENABLED(ANYCUBIC_LCD_CHIRON) - #ifndef AC_SD_FOLDER_VIEW - #define AC_SD_FOLDER_VIEW #endif #endif #if ENABLED(TOUCH_UI_FTDI_EVE) @@ -1404,28 +1224,12 @@ #endif #endif #endif - #if ENABLED(TOUCH_UI_USE_UTF8) - #ifndef TOUCH_UI_UTF8_WESTERN_CHARSET - #define TOUCH_UI_UTF8_WESTERN_CHARSET - #endif - #endif - #ifndef TOUCH_UI_FIT_TEXT - #define TOUCH_UI_FIT_TEXT - #endif -#endif -#if defined(DISPLAY_SLEEP_MINUTES) || defined(LCD_BACKLIGHT_TIMEOUT_MINS) - #ifndef EDITABLE_DISPLAY_TIMEOUT - #define EDITABLE_DISPLAY_TIMEOUT - #endif #endif #if HAS_ADC_BUTTONS #ifndef ADC_BUTTON_DEBOUNCE_DELAY #define ADC_BUTTON_DEBOUNCE_DELAY 16 #endif #endif -#ifndef USE_WATCHDOG - #define USE_WATCHDOG -#endif #if ENABLED(BABYSTEPPING) #ifndef BABYSTEP_MULTIPLICATOR_Z #define BABYSTEP_MULTIPLICATOR_Z 1 @@ -1459,9 +1263,6 @@ #ifndef G29_MAX_RETRIES #define G29_MAX_RETRIES 3 #endif - #ifndef G29_HALT_ON_FAILURE - #define G29_HALT_ON_FAILURE - #endif #ifndef G29_SUCCESS_COMMANDS #define G29_SUCCESS_COMMANDS "M117 Bed leveling done." #endif @@ -1530,9 +1331,6 @@ #endif #endif #endif -#ifndef ARC_SUPPORT - #define ARC_SUPPORT -#endif #if ENABLED(ARC_SUPPORT) #ifndef MIN_ARC_SEGMENT_MM #define MIN_ARC_SEGMENT_MM 0.1 @@ -1577,16 +1375,10 @@ #ifndef TX_BUFFER_SIZE #define TX_BUFFER_SIZE 0 #endif -#ifndef SERIAL_OVERRUN_PROTECTION - #define SERIAL_OVERRUN_PROTECTION -#endif #ifndef PROPORTIONAL_FONT_RATIO #define PROPORTIONAL_FONT_RATIO 1.0 #endif #if ENABLED(FWRETRACT) - #ifndef FWRETRACT_AUTORETRACT - #define FWRETRACT_AUTORETRACT - #endif #if ENABLED(FWRETRACT_AUTORETRACT) #ifndef MIN_AUTORETRACT #define MIN_AUTORETRACT 0.1 @@ -1655,9 +1447,6 @@ #ifndef TOOLCHANGE_FS_FAN_TIME #define TOOLCHANGE_FS_FAN_TIME 10 #endif - #ifndef TOOLCHANGE_MIGRATION_FEATURE - #define TOOLCHANGE_MIGRATION_FEATURE - #endif #endif #if ENABLED(TOOLCHANGE_PARK) #ifndef TOOLCHANGE_PARK_XY @@ -1726,12 +1515,6 @@ #ifndef FILAMENT_CHANGE_ALERT_BEEPS #define FILAMENT_CHANGE_ALERT_BEEPS 10 #endif - #ifndef PAUSE_PARK_NO_STEPPER_TIMEOUT - #define PAUSE_PARK_NO_STEPPER_TIMEOUT - #endif - #ifndef CONFIGURE_FILAMENT_CHANGE - #define CONFIGURE_FILAMENT_CHANGE - #endif #endif #if HAS_TRINAMIC_CONFIG #ifndef HOLD_MULTIPLIER @@ -2090,35 +1873,6 @@ #define E7_CHAIN_POS -1 #endif #endif - #if HAS_STEALTHCHOP - #ifndef STEALTHCHOP_XY - #define STEALTHCHOP_XY - #endif - #ifndef STEALTHCHOP_Z - #define STEALTHCHOP_Z - #endif - #ifndef STEALTHCHOP_I - #define STEALTHCHOP_I - #endif - #ifndef STEALTHCHOP_J - #define STEALTHCHOP_J - #endif - #ifndef STEALTHCHOP_K - #define STEALTHCHOP_K - #endif - #ifndef STEALTHCHOP_U - #define STEALTHCHOP_U - #endif - #ifndef STEALTHCHOP_V - #define STEALTHCHOP_V - #endif - #ifndef STEALTHCHOP_W - #define STEALTHCHOP_W - #endif - #ifndef STEALTHCHOP_E - #define STEALTHCHOP_E - #endif - #endif #ifndef CHOPPER_TIMING #define CHOPPER_TIMING CHOPPER_DEFAULT_12V #endif @@ -2126,12 +1880,6 @@ #ifndef CURRENT_STEP_DOWN #define CURRENT_STEP_DOWN 50 #endif - #ifndef REPORT_CURRENT_CHANGE - #define REPORT_CURRENT_CHANGE - #endif - #ifndef STOP_ON_ERROR - #define STOP_ON_ERROR - #endif #endif #ifndef X_HYBRID_THRESHOLD #define X_HYBRID_THRESHOLD 100 @@ -2213,11 +1961,8 @@ #define Y2_STALL_SENSITIVITY Y_STALL_SENSITIVITY #endif #endif - #ifndef EDGE_STEPPING - #define EDGE_STEPPING - #endif - #ifndef TMC_ADV - #define TMC_ADV () { } + #ifndef TMC_ADV() + #define TMC_ADV() { } #endif #endif #if ENABLED(EXPERIMENTAL_I2CBUS) @@ -2236,9 +1981,6 @@ #ifndef SPINDLE_LASER_ACTIVE_STATE #define SPINDLE_LASER_ACTIVE_STATE LOW #endif - #ifndef SPINDLE_LASER_USE_PWM - #define SPINDLE_LASER_USE_PWM - #endif #if ENABLED(SPINDLE_LASER_USE_PWM) #ifndef SPINDLE_LASER_PWM_INVERT #define SPINDLE_LASER_PWM_INVERT false @@ -2269,9 +2011,6 @@ #define CUTTER_POWER_UNIT PWM255 #endif #if ENABLED(SPINDLE_FEATURE) - #ifndef SPINDLE_CHANGE_DIR_STOP - #define SPINDLE_CHANGE_DIR_STOP - #endif #ifndef SPINDLE_INVERT_DIR #define SPINDLE_INVERT_DIR false #endif @@ -2343,9 +2082,6 @@ #ifndef FLOWMETER_INTERVAL #define FLOWMETER_INTERVAL 1000 #endif - #ifndef FLOWMETER_SAFETY - #define FLOWMETER_SAFETY - #endif #if ENABLED(FLOWMETER_SAFETY) #ifndef FLOWMETER_MIN_LITERS_PER_MINUTE #define FLOWMETER_MIN_LITERS_PER_MINUTE 1.5 @@ -2355,12 +2091,6 @@ #endif #endif #if ENABLED(COOLANT_CONTROL) - #ifndef COOLANT_MIST - #define COOLANT_MIST - #endif - #ifndef COOLANT_FLOOD - #define COOLANT_FLOOD - #endif #ifndef COOLANT_MIST_INVERT #define COOLANT_MIST_INVERT false #endif @@ -2414,23 +2144,6 @@ #endif #endif #endif -#ifndef AUTO_REPORT_TEMPERATURES - #define AUTO_REPORT_TEMPERATURES -#endif -#ifndef CAPABILITIES_REPORT - #define CAPABILITIES_REPORT -#endif -#if ENABLED(CAPABILITIES_REPORT) - #ifndef EXTENDED_CAPABILITIES_REPORT - #define EXTENDED_CAPABILITIES_REPORT - #endif -#endif -#ifndef FASTER_GCODE_PARSER - #define FASTER_GCODE_PARSER -#endif -#ifndef DEBUG_FLAGS_GCODE - #define DEBUG_FLAGS_GCODE -#endif #if ENABLED(GCODE_MACROS) #ifndef GCODE_MACROS_SLOTS #define GCODE_MACROS_SLOTS 5 @@ -2443,12 +2156,6 @@ #ifndef CUSTOM_MENU_MAIN_SCRIPT_DONE #define CUSTOM_MENU_MAIN_SCRIPT_DONE "M117 User Script Done" #endif - #ifndef CUSTOM_MENU_MAIN_SCRIPT_AUDIBLE_FEEDBACK - #define CUSTOM_MENU_MAIN_SCRIPT_AUDIBLE_FEEDBACK - #endif - #ifndef CUSTOM_MENU_MAIN_ONLY_IDLE - #define CUSTOM_MENU_MAIN_ONLY_IDLE - #endif #ifndef MAIN_MENU_ITEM_1_DESC #define MAIN_MENU_ITEM_1_DESC "Home & UBL Info" #endif @@ -2466,12 +2173,6 @@ #ifndef CUSTOM_MENU_CONFIG_SCRIPT_DONE #define CUSTOM_MENU_CONFIG_SCRIPT_DONE "M117 Wireless Script Done" #endif - #ifndef CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK - #define CUSTOM_MENU_CONFIG_SCRIPT_AUDIBLE_FEEDBACK - #endif - #ifndef CUSTOM_MENU_CONFIG_ONLY_IDLE - #define CUSTOM_MENU_CONFIG_ONLY_IDLE - #endif #ifndef CONFIG_MENU_ITEM_1_DESC #define CONFIG_MENU_ITEM_1_DESC "Wifi ON" #endif @@ -2529,11 +2230,6 @@ #endif #endif #endif -#if ENABLED(CANCEL_OBJECTS) - #ifndef CANCEL_OBJECTS_REPORTING - #define CANCEL_OBJECTS_REPORTING - #endif -#endif #if ENABLED(I2C_POSITION_ENCODERS) #ifndef I2CPE_ENCODER_CNT #define I2CPE_ENCODER_CNT 1 @@ -2613,9 +2309,6 @@ #ifndef I2CPE_MIN_UPD_TIME_MS #define I2CPE_MIN_UPD_TIME_MS 4 #endif - #ifndef I2CPE_ERR_ROLLING_AVERAGE - #define I2CPE_ERR_ROLLING_AVERAGE - #endif #endif #if ENABLED(JOYSTICK) #ifndef JOY_X_PIN @@ -2678,9 +2371,6 @@ #ifndef MAX7219_ROTATE #define MAX7219_ROTATE 0 #endif - #ifndef MAX7219_DEBUG_PRINTER_ALIVE - #define MAX7219_DEBUG_PRINTER_ALIVE - #endif #ifndef MAX7219_DEBUG_PLANNER_HEAD #define MAX7219_DEBUG_PLANNER_HEAD 2 #endif @@ -2699,22 +2389,33 @@ #define MAC_ADDRESS { 0xDE, 0xAD, 0xBE, 0xEF, 0xF0, 0x0D } #endif #endif -#if !(HAS_PRUSA_MMU1) && (HAS_PRUSA_MMU2) +#if !(HAS_PRUSA_MMU1) && (HAS_PRUSA_MMU2 || HAS_PRUSA_MMU3) #ifndef MMU2_SERIAL_PORT #define MMU2_SERIAL_PORT 2 #endif - #ifndef MMU2_FILAMENT_RUNOUT_SCRIPT - #define MMU2_FILAMENT_RUNOUT_SCRIPT "M600" + #ifndef MMU_BAUD + #define MMU_BAUD 115200 + #endif + #if HAS_PRUSA_MMU2 + #ifndef MMU2_FILAMENT_RUNOUT_SCRIPT + #define MMU2_FILAMENT_RUNOUT_SCRIPT "M600" + #endif #endif #ifndef MMU2_FILAMENTCHANGE_EJECT_FEED #define MMU2_FILAMENTCHANGE_EJECT_FEED 80.0 #endif + #ifndef MMU2_EXTRUDER_PTFE_LENGTH + #define MMU2_EXTRUDER_PTFE_LENGTH 42.3 + #endif + #ifndef MMU2_EXTRUDER_HEATBREAK_LENGTH + #define MMU2_EXTRUDER_HEATBREAK_LENGTH 17.7 + #endif #ifndef MMU2_LOAD_TO_NOZZLE_SEQUENCE - #define MMU2_LOAD_TO_NOZZLE_SEQUENCE { 7.2, 1145 }, { 14.4, 871 }, { 36.0, 1393 }, { 14.4, 871 }, { 50.0, 198 } + #define MMU2_LOAD_TO_NOZZLE_SEQUENCE { MMU2_EXTRUDER_PTFE_LENGTH, MMM_TO_MMS(810) }, { MMU2_EXTRUDER_HEATBREAK_LENGTH, MMM_TO_MMS(198) } #endif #ifndef MMU2_RAMMING_SEQUENCE - #define MMU2_RAMMING_SEQUENCE { 1.0, 1000 }, { 1.0, 1500 }, { 2.0, 2000 }, { 1.5, 3000 }, { 2.5, 4000 }, { -15.0, 5000 }, { -14.0, 1200 }, { -6.0, 600 }, { 10.0, 700 }, { -10.0, 400 }, { -50.0, 2000 } + #define MMU2_RAMMING_SEQUENCE { 0.2816, MMM_TO_MMS(1339.0) }, { 0.3051, MMM_TO_MMS(1451.0) }, { 0.3453, MMM_TO_MMS(1642.0) }, { 0.3990, MMM_TO_MMS(1897.0) }, { 0.4761, MMM_TO_MMS(2264.0) }, { 0.5767, MMM_TO_MMS(2742.0) }, { 0.5691, MMM_TO_MMS(3220.0) }, { 0.1081, MMM_TO_MMS(3220.0) }, { 0.7644, MMM_TO_MMS(3635.0) }, { 0.8248, MMM_TO_MMS(3921.0) }, { 0.8483, MMM_TO_MMS(4033.0) }, { -15.0, MMM_TO_MMS(6000.0) }, { -24.5, MMM_TO_MMS(1200.0) }, { -7.0, MMM_TO_MMS( 600.0) }, { -3.5, MMM_TO_MMS( 360.0) }, { 20.0, MMM_TO_MMS( 454.0) }, { -20.0, MMM_TO_MMS( 303.0) }, { -35.0, MMM_TO_MMS(2000.0) } #endif #if HAS_PRUSA_MMU2S #ifndef MMU2_C0_RETRY @@ -2724,7 +2425,7 @@ #define MMU2_CAN_LOAD_FEEDRATE 800 #endif #ifndef MMU2_CAN_LOAD_SEQUENCE - #define MMU2_CAN_LOAD_SEQUENCE { 0.1, MMU2_CAN_LOAD_FEEDRATE }, { 60.0, MMU2_CAN_LOAD_FEEDRATE }, { -52.0, MMU2_CAN_LOAD_FEEDRATE } + #define MMU2_CAN_LOAD_SEQUENCE { 5.0, MMU2_CAN_LOAD_FEEDRATE }, { 15.0, MMU2_CAN_LOAD_FEEDRATE }, { -10.0, MMU2_CAN_LOAD_FEEDRATE } #endif #ifndef MMU2_CAN_LOAD_RETRACT #define MMU2_CAN_LOAD_RETRACT 6.0 @@ -2738,6 +2439,43 @@ #ifndef MMU2_CAN_LOAD_INCREMENT_SEQUENCE #define MMU2_CAN_LOAD_INCREMENT_SEQUENCE { -MMU2_CAN_LOAD_INCREMENT, MMU2_CAN_LOAD_FEEDRATE } #endif + #elif HAS_PRUSA_MMU3 + #ifndef MMU2_MAX_RETRIES + #define MMU2_MAX_RETRIES 3 + #endif + #ifndef MMU2_LOAD_TO_NOZZLE_LENGTH + #define MMU2_LOAD_TO_NOZZLE_LENGTH 87.0 + 5.0 + #endif + #ifndef MMU2_FILAMENT_SENSOR_POSITION + #define MMU2_FILAMENT_SENSOR_POSITION 0 + #endif + #ifndef MMU2_LOAD_DISTANCE_PAST_GEARS + #define MMU2_LOAD_DISTANCE_PAST_GEARS 5 + #endif + #ifndef MMU2_TOOL_CHANGE_LOAD_LENGTH + #define MMU2_TOOL_CHANGE_LOAD_LENGTH MMU2_FILAMENT_SENSOR_POSITION + MMU2_LOAD_DISTANCE_PAST_GEARS + #endif + #ifndef MMU2_LOAD_TO_NOZZLE_FEED_RATE + #define MMU2_LOAD_TO_NOZZLE_FEED_RATE 20.0 + #endif + #ifndef MMU2_UNLOAD_TO_FINDA_FEED_RATE + #define MMU2_UNLOAD_TO_FINDA_FEED_RATE 120.0 + #endif + #ifndef MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE + #define MMU2_VERIFY_LOAD_TO_NOZZLE_FEED_RATE 50.0 + #endif + #ifndef MMU2_VERIFY_LOAD_TO_NOZZLE_TWEAK + #define MMU2_VERIFY_LOAD_TO_NOZZLE_TWEAK -5.0 + #endif + #ifndef MMU2_RETRY_UNLOAD_TO_FINDA_LENGTH + #define MMU2_RETRY_UNLOAD_TO_FINDA_LENGTH 80.0 + #endif + #ifndef MMU2_RETRY_UNLOAD_TO_FINDA_FEED_RATE + #define MMU2_RETRY_UNLOAD_TO_FINDA_FEED_RATE 80.0 + #endif + #ifndef MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH + #define MMU2_CHECK_FILAMENT_PRESENCE_EXTRUSION_LENGTH (MMU2_EXTRUDER_PTFE_LENGTH + MMU2_EXTRUDER_HEATBREAK_LENGTH + MMU2_VERIFY_LOAD_TO_NOZZLE_TWEAK + MMU2_FILAMENT_SENSOR_POSITION) + #endif #else #if ENABLED(MMU_EXTRUDER_SENSOR) #ifndef MMU_LOADING_ATTEMPTS_NR diff --git a/buildroot/share/scripts/makeBaseConfigs.py b/buildroot/share/scripts/makeBaseConfigs.py index 4050d62be830..c1d4a990fe6b 100755 --- a/buildroot/share/scripts/makeBaseConfigs.py +++ b/buildroot/share/scripts/makeBaseConfigs.py @@ -15,7 +15,7 @@ def make_base_configs(): no_disabled = True # Create a regex to match options and capture line parts - define_patt = re.compile(r'^(\s*)((//\s*)?#define\s+)([A-Z0-9_]+\b)(\s*)(.*?)(\s*)(//.*)?$', re.IGNORECASE) + define_patt = re.compile(r'^(\s*)((//\s*)?#define\s+)([A-Z0-9_]+\b(\(\))?)(\s*)(.*?)(\s*)(//.*)?$', re.IGNORECASE) ifndef_patt = re.compile(r'^(\s*#ifndef\s*.*?)(\s*//.*)?$', re.IGNORECASE) ifstat_patt = re.compile(r'^(\s*#(((if|ifn?def|elif)\s*.*?)|else|endif))(\s*//.*)?$', re.IGNORECASE) coment_patt = re.compile(r'/\*.*?\*/', re.DOTALL) @@ -50,7 +50,7 @@ def make_base_configs(): if not was_ifndef: lines_out += [f'{m[1]}#ifndef {name}'] entab = '' if was_ifndef else ' ' - indented = f'{entab}{m[1]}{m[2]}{m[4]} {m[6]}'.rstrip() + indented = f'{entab}{m[1]}{m[2]}{m[4]} {m[7]}'.rstrip() lines_out += [indented] if not was_ifndef: lines_out += [f'{m[1]}#endif'] @@ -59,11 +59,14 @@ def make_base_configs(): empty_patt = re.compile(r'(\s*#if.+)(\n\s*#el.+)*(\n\s*#endif.*)') ifelse_patt = re.compile(r'(\s*#(el)?if\s+)(.+)\n\s*#else') ifelif_patt = re.compile(r'(\s*#if\s+)(.+)\n\s*#elif\s*(.+)') + noforc_patt = re.compile(r'\s*#ifndef\s+([A-Z0-9_]+)\n\s*#define \1\n\s*#endif') + out_text = '\n'.join(lines_out) while True: old_text = out_text out_text = ifelse_patt.sub(r'\1!(\3)', out_text) out_text = ifelif_patt.sub(r'\1!(\2) && (\3)\n', out_text) + out_text = noforc_patt.sub('', out_text) out_text = empty_patt.sub('', out_text) if out_text == old_text: break