Merge upstream changes from Marlin 2.1.2.2
This commit is contained in:
Stefan Kalscheuer
643
Marlin/src/inc/Changes.h
Normal file
643
Marlin/src/inc/Changes.h
Normal file
@@ -0,0 +1,643 @@
|
||||
/**
|
||||
* Marlin 3D Printer Firmware
|
||||
* Copyright (c) 2023 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
||||
*
|
||||
* Based on Sprinter and grbl.
|
||||
* Copyright (c) 2011 Camiel Gubbels / Erik van der Zalm
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
/**
|
||||
* Changes.h
|
||||
*
|
||||
* Alert about Configuration changes at compile-time.
|
||||
*/
|
||||
|
||||
/**
|
||||
* Warnings for old configurations
|
||||
*/
|
||||
#ifdef GITHUB_ACTION
|
||||
// Skip change alerts during CI Test
|
||||
#elif WATCH_TEMP_PERIOD > 500
|
||||
#error "WATCH_TEMP_PERIOD now uses seconds instead of milliseconds."
|
||||
#elif DISABLED(THERMAL_PROTECTION_HOTENDS) && (defined(WATCH_TEMP_PERIOD) || defined(THERMAL_PROTECTION_PERIOD))
|
||||
#error "Thermal Runaway Protection for hotends is now enabled with THERMAL_PROTECTION_HOTENDS."
|
||||
#elif DISABLED(THERMAL_PROTECTION_BED) && defined(THERMAL_PROTECTION_BED_PERIOD)
|
||||
#error "Thermal Runaway Protection for the bed is now enabled with THERMAL_PROTECTION_BED."
|
||||
#elif (CORE_IS_XZ || CORE_IS_YZ) && ENABLED(Z_LATE_ENABLE)
|
||||
#error "Z_LATE_ENABLE can't be used with COREXZ, COREZX, COREYZ, or COREZY."
|
||||
#elif defined(X_HOME_RETRACT_MM)
|
||||
#error "[XYZ]_HOME_RETRACT_MM settings have been renamed [XYZ]_HOME_BUMP_MM."
|
||||
#elif defined(SDCARDDETECTINVERTED)
|
||||
#error "SDCARDDETECTINVERTED is now SD_DETECT_STATE (HIGH)."
|
||||
#elif defined(SD_DETECT_INVERTED)
|
||||
#error "SD_DETECT_INVERTED is now SD_DETECT_STATE (HIGH)."
|
||||
#elif defined(BTENABLED)
|
||||
#error "BTENABLED is now BLUETOOTH."
|
||||
#elif defined(CUSTOM_MENDEL_NAME)
|
||||
#error "CUSTOM_MENDEL_NAME is now CUSTOM_MACHINE_NAME."
|
||||
#elif defined(HAS_AUTOMATIC_VERSIONING)
|
||||
#error "HAS_AUTOMATIC_VERSIONING is now CUSTOM_VERSION_FILE."
|
||||
#elif defined(USE_AUTOMATIC_VERSIONING)
|
||||
#error "USE_AUTOMATIC_VERSIONING is now CUSTOM_VERSION_FILE."
|
||||
#elif defined(SDSLOW)
|
||||
#error "SDSLOW deprecated. Set SD_SPI_SPEED to SPI_HALF_SPEED instead."
|
||||
#elif defined(SDEXTRASLOW)
|
||||
#error "SDEXTRASLOW deprecated. Set SD_SPI_SPEED to SPI_QUARTER_SPEED instead."
|
||||
#elif defined(FILAMENT_SENSOR)
|
||||
#error "FILAMENT_SENSOR is now FILAMENT_WIDTH_SENSOR."
|
||||
#elif defined(ENDSTOPPULLUP_FIL_RUNOUT)
|
||||
#error "ENDSTOPPULLUP_FIL_RUNOUT is now FIL_RUNOUT_PULLUP."
|
||||
#elif defined(DISABLE_MAX_ENDSTOPS) || defined(DISABLE_MIN_ENDSTOPS)
|
||||
#error "DISABLE_MAX_ENDSTOPS and DISABLE_MIN_ENDSTOPS deprecated. Use individual USE_*_PLUG options instead."
|
||||
#elif defined(LANGUAGE_INCLUDE)
|
||||
#error "LANGUAGE_INCLUDE has been replaced by LCD_LANGUAGE."
|
||||
#elif defined(EXTRUDER_OFFSET_X) || defined(EXTRUDER_OFFSET_Y)
|
||||
#error "EXTRUDER_OFFSET_[XY] is deprecated. Use HOTEND_OFFSET_[XY] instead."
|
||||
#elif defined(PID_PARAMS_PER_EXTRUDER)
|
||||
#error "PID_PARAMS_PER_EXTRUDER is deprecated. Use PID_PARAMS_PER_HOTEND instead."
|
||||
#elif defined(EXTRUDER_WATTS) || defined(BED_WATTS)
|
||||
#error "EXTRUDER_WATTS and BED_WATTS are deprecated and should be removed."
|
||||
#elif defined(SERVO_ENDSTOP_ANGLES)
|
||||
#error "SERVO_ENDSTOP_ANGLES is deprecated. Use Z_SERVO_ANGLES instead."
|
||||
#elif defined(X_ENDSTOP_SERVO_NR) || defined(Y_ENDSTOP_SERVO_NR)
|
||||
#error "X_ENDSTOP_SERVO_NR and Y_ENDSTOP_SERVO_NR are deprecated and should be removed."
|
||||
#elif defined(Z_ENDSTOP_SERVO_NR)
|
||||
#error "Z_ENDSTOP_SERVO_NR is now Z_PROBE_SERVO_NR."
|
||||
#elif defined(DEFAULT_XYJERK)
|
||||
#error "DEFAULT_XYJERK is deprecated. Use DEFAULT_XJERK and DEFAULT_YJERK instead."
|
||||
#elif defined(XY_TRAVEL_SPEED)
|
||||
#error "XY_TRAVEL_SPEED is now XY_PROBE_FEEDRATE."
|
||||
#elif defined(XY_PROBE_SPEED)
|
||||
#error "XY_PROBE_SPEED is now XY_PROBE_FEEDRATE."
|
||||
#elif defined(Z_PROBE_SPEED_FAST)
|
||||
#error "Z_PROBE_SPEED_FAST is now Z_PROBE_FEEDRATE_FAST."
|
||||
#elif defined(Z_PROBE_SPEED_SLOW)
|
||||
#error "Z_PROBE_SPEED_SLOW is now Z_PROBE_FEEDRATE_SLOW."
|
||||
#elif defined(PROBE_SERVO_DEACTIVATION_DELAY)
|
||||
#error "PROBE_SERVO_DEACTIVATION_DELAY is deprecated. Use DEACTIVATE_SERVOS_AFTER_MOVE instead."
|
||||
#elif defined(SERVO_DEACTIVATION_DELAY)
|
||||
#error "SERVO_DEACTIVATION_DELAY is now SERVO_DELAY."
|
||||
#elif ENABLED(FILAMENTCHANGEENABLE)
|
||||
#error "FILAMENTCHANGEENABLE is now ADVANCED_PAUSE_FEATURE."
|
||||
#elif ENABLED(FILAMENT_CHANGE_FEATURE)
|
||||
#error "FILAMENT_CHANGE_FEATURE is now ADVANCED_PAUSE_FEATURE."
|
||||
#elif defined(FILAMENT_CHANGE_X_POS) || defined(FILAMENT_CHANGE_Y_POS)
|
||||
#error "FILAMENT_CHANGE_[XY]_POS is now set with NOZZLE_PARK_POINT."
|
||||
#elif defined(FILAMENT_CHANGE_Z_ADD)
|
||||
#error "FILAMENT_CHANGE_Z_ADD is now set with NOZZLE_PARK_POINT."
|
||||
#elif defined(FILAMENT_CHANGE_XY_FEEDRATE)
|
||||
#error "FILAMENT_CHANGE_XY_FEEDRATE is now NOZZLE_PARK_XY_FEEDRATE."
|
||||
#elif defined(FILAMENT_CHANGE_Z_FEEDRATE)
|
||||
#error "FILAMENT_CHANGE_Z_FEEDRATE is now NOZZLE_PARK_Z_FEEDRATE."
|
||||
#elif defined(PAUSE_PARK_X_POS) || defined(PAUSE_PARK_Y_POS)
|
||||
#error "PAUSE_PARK_[XY]_POS is now set with NOZZLE_PARK_POINT."
|
||||
#elif defined(PAUSE_PARK_Z_ADD)
|
||||
#error "PAUSE_PARK_Z_ADD is now set with NOZZLE_PARK_POINT."
|
||||
#elif defined(PAUSE_PARK_XY_FEEDRATE)
|
||||
#error "PAUSE_PARK_XY_FEEDRATE is now NOZZLE_PARK_XY_FEEDRATE."
|
||||
#elif defined(PAUSE_PARK_Z_FEEDRATE)
|
||||
#error "PAUSE_PARK_Z_FEEDRATE is now NOZZLE_PARK_Z_FEEDRATE."
|
||||
#elif defined(FILAMENT_CHANGE_RETRACT_FEEDRATE)
|
||||
#error "FILAMENT_CHANGE_RETRACT_FEEDRATE is now PAUSE_PARK_RETRACT_FEEDRATE."
|
||||
#elif defined(FILAMENT_CHANGE_RETRACT_LENGTH)
|
||||
#error "FILAMENT_CHANGE_RETRACT_LENGTH is now PAUSE_PARK_RETRACT_LENGTH."
|
||||
#elif defined(FILAMENT_CHANGE_EXTRUDE_FEEDRATE)
|
||||
#error "FILAMENT_CHANGE_EXTRUDE_FEEDRATE is now ADVANCED_PAUSE_PURGE_FEEDRATE."
|
||||
#elif defined(ADVANCED_PAUSE_EXTRUDE_FEEDRATE)
|
||||
#error "ADVANCED_PAUSE_EXTRUDE_FEEDRATE is now ADVANCED_PAUSE_PURGE_FEEDRATE."
|
||||
#elif defined(FILAMENT_CHANGE_EXTRUDE_LENGTH)
|
||||
#error "FILAMENT_CHANGE_EXTRUDE_LENGTH is now ADVANCED_PAUSE_PURGE_LENGTH."
|
||||
#elif defined(ADVANCED_PAUSE_EXTRUDE_LENGTH)
|
||||
#error "ADVANCED_PAUSE_EXTRUDE_LENGTH is now ADVANCED_PAUSE_PURGE_LENGTH."
|
||||
#elif defined(FILAMENT_CHANGE_NOZZLE_TIMEOUT)
|
||||
#error "FILAMENT_CHANGE_NOZZLE_TIMEOUT is now PAUSE_PARK_NOZZLE_TIMEOUT."
|
||||
#elif defined(FILAMENT_CHANGE_NUMBER_OF_ALERT_BEEPS)
|
||||
#error "FILAMENT_CHANGE_NUMBER_OF_ALERT_BEEPS is now FILAMENT_CHANGE_ALERT_BEEPS."
|
||||
#elif defined(FILAMENT_CHANGE_NO_STEPPER_TIMEOUT)
|
||||
#error "FILAMENT_CHANGE_NO_STEPPER_TIMEOUT is now PAUSE_PARK_NO_STEPPER_TIMEOUT."
|
||||
#elif defined(PLA_PREHEAT_HOTEND_TEMP)
|
||||
#error "PLA_PREHEAT_HOTEND_TEMP is now PREHEAT_1_TEMP_HOTEND."
|
||||
#elif defined(PLA_PREHEAT_HPB_TEMP)
|
||||
#error "PLA_PREHEAT_HPB_TEMP is now PREHEAT_1_TEMP_BED."
|
||||
#elif defined(PLA_PREHEAT_FAN_SPEED)
|
||||
#error "PLA_PREHEAT_FAN_SPEED is now PREHEAT_1_FAN_SPEED."
|
||||
#elif defined(ABS_PREHEAT_HOTEND_TEMP)
|
||||
#error "ABS_PREHEAT_HOTEND_TEMP is now PREHEAT_2_TEMP_HOTEND."
|
||||
#elif defined(ABS_PREHEAT_HPB_TEMP)
|
||||
#error "ABS_PREHEAT_HPB_TEMP is now PREHEAT_2_TEMP_BED."
|
||||
#elif defined(ABS_PREHEAT_FAN_SPEED)
|
||||
#error "ABS_PREHEAT_FAN_SPEED is now PREHEAT_2_FAN_SPEED."
|
||||
#elif defined(ENDSTOPS_ONLY_FOR_HOMING)
|
||||
#error "ENDSTOPS_ONLY_FOR_HOMING is deprecated. Use (disable) ENDSTOPS_ALWAYS_ON_DEFAULT instead."
|
||||
#elif defined(HOMING_FEEDRATE)
|
||||
#error "HOMING_FEEDRATE is now set using the HOMING_FEEDRATE_MM_M array instead."
|
||||
#elif (defined(HOMING_FEEDRATE_XY) || defined(HOMING_FEEDRATE_Z)) && !defined(HOMING_FEEDRATE_MM_M)
|
||||
#error "HOMING_FEEDRATE_XY and HOMING_FEEDRATE_Z are now set using the HOMING_FEEDRATE_MM_M array instead."
|
||||
#elif defined(MANUAL_HOME_POSITIONS)
|
||||
#error "MANUAL_HOME_POSITIONS is deprecated. Set MANUAL_[XYZ]_HOME_POS as-needed instead."
|
||||
#elif defined(PID_ADD_EXTRUSION_RATE)
|
||||
#error "PID_ADD_EXTRUSION_RATE is now PID_EXTRUSION_SCALING and is DISABLED by default."
|
||||
#elif defined(Z_RAISE_BEFORE_HOMING)
|
||||
#error "Z_RAISE_BEFORE_HOMING is now Z_HOMING_HEIGHT."
|
||||
#elif defined(MIN_Z_HEIGHT_FOR_HOMING)
|
||||
#error "MIN_Z_HEIGHT_FOR_HOMING is now Z_HOMING_HEIGHT."
|
||||
#elif defined(Z_RAISE_BEFORE_PROBING) || defined(Z_RAISE_AFTER_PROBING)
|
||||
#error "Z_RAISE_(BEFORE|AFTER)_PROBING are deprecated. Use Z_CLEARANCE_DEPLOY_PROBE and Z_AFTER_PROBING instead."
|
||||
#elif defined(Z_RAISE_PROBE_DEPLOY_STOW) || defined(Z_RAISE_BETWEEN_PROBINGS)
|
||||
#error "Z_RAISE_PROBE_DEPLOY_STOW and Z_RAISE_BETWEEN_PROBINGS are now Z_CLEARANCE_DEPLOY_PROBE and Z_CLEARANCE_BETWEEN_PROBES."
|
||||
#elif defined(Z_PROBE_DEPLOY_HEIGHT) || defined(Z_PROBE_TRAVEL_HEIGHT)
|
||||
#error "Z_PROBE_DEPLOY_HEIGHT and Z_PROBE_TRAVEL_HEIGHT are now Z_CLEARANCE_DEPLOY_PROBE and Z_CLEARANCE_BETWEEN_PROBES."
|
||||
#elif defined(MANUAL_BED_LEVELING)
|
||||
#error "MANUAL_BED_LEVELING is now LCD_BED_LEVELING."
|
||||
#elif defined(MESH_HOME_SEARCH_Z)
|
||||
#error "MESH_HOME_SEARCH_Z is now LCD_PROBE_Z_RANGE."
|
||||
#elif defined(MANUAL_PROBE_Z_RANGE)
|
||||
#error "MANUAL_PROBE_Z_RANGE is now LCD_PROBE_Z_RANGE."
|
||||
#elif !defined(MIN_STEPS_PER_SEGMENT)
|
||||
#error "Please replace 'const int dropsegments' with '#define MIN_STEPS_PER_SEGMENT' (and increase by 1)."
|
||||
#elif MIN_STEPS_PER_SEGMENT <= 0
|
||||
#error "MIN_STEPS_PER_SEGMENT must be at least 1."
|
||||
#elif defined(PREVENT_DANGEROUS_EXTRUDE)
|
||||
#error "PREVENT_DANGEROUS_EXTRUDE is now PREVENT_COLD_EXTRUSION."
|
||||
#elif defined(SCARA)
|
||||
#error "SCARA is now MORGAN_SCARA."
|
||||
#elif defined(ENABLE_AUTO_BED_LEVELING)
|
||||
#error "ENABLE_AUTO_BED_LEVELING is deprecated. Specify AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_3POINT."
|
||||
#elif defined(AUTO_BED_LEVELING_FEATURE)
|
||||
#error "AUTO_BED_LEVELING_FEATURE is deprecated. Specify AUTO_BED_LEVELING_LINEAR, AUTO_BED_LEVELING_BILINEAR, or AUTO_BED_LEVELING_3POINT."
|
||||
#elif defined(ABL_GRID_POINTS)
|
||||
#error "ABL_GRID_POINTS is now GRID_MAX_POINTS_X and GRID_MAX_POINTS_Y."
|
||||
#elif defined(ABL_GRID_POINTS_X) || defined(ABL_GRID_POINTS_Y)
|
||||
#error "ABL_GRID_POINTS_[XY] is now GRID_MAX_POINTS_[XY]."
|
||||
#elif defined(ABL_GRID_MAX_POINTS_X) || defined(ABL_GRID_MAX_POINTS_Y)
|
||||
#error "ABL_GRID_MAX_POINTS_[XY] is now GRID_MAX_POINTS_[XY]."
|
||||
#elif defined(MESH_NUM_X_POINTS) || defined(MESH_NUM_Y_POINTS)
|
||||
#error "MESH_NUM_[XY]_POINTS is now GRID_MAX_POINTS_[XY]."
|
||||
#elif defined(UBL_MESH_NUM_X_POINTS) || defined(UBL_MESH_NUM_Y_POINTS)
|
||||
#error "UBL_MESH_NUM_[XY]_POINTS is now GRID_MAX_POINTS_[XY]."
|
||||
#elif defined(UBL_G26_MESH_VALIDATION)
|
||||
#error "UBL_G26_MESH_VALIDATION is now G26_MESH_VALIDATION."
|
||||
#elif defined(UBL_MESH_EDIT_ENABLED)
|
||||
#error "UBL_MESH_EDIT_ENABLED is now G26_MESH_VALIDATION."
|
||||
#elif defined(UBL_MESH_EDITING)
|
||||
#error "UBL_MESH_EDITING is now G26_MESH_VALIDATION."
|
||||
#elif defined(BLTOUCH_HEATERS_OFF)
|
||||
#error "BLTOUCH_HEATERS_OFF is now PROBING_HEATERS_OFF."
|
||||
#elif defined(BLTOUCH_V3)
|
||||
#error "BLTOUCH_V3 is obsolete."
|
||||
#elif defined(BLTOUCH_FORCE_OPEN_DRAIN_MODE)
|
||||
#error "BLTOUCH_FORCE_OPEN_DRAIN_MODE is obsolete."
|
||||
#elif defined(BEEPER)
|
||||
#error "BEEPER is now BEEPER_PIN."
|
||||
#elif defined(SDCARDDETECT)
|
||||
#error "SDCARDDETECT is now SD_DETECT_PIN."
|
||||
#elif defined(STAT_LED_RED) || defined(STAT_LED_BLUE)
|
||||
#error "STAT_LED_RED/STAT_LED_BLUE are now STAT_LED_RED_PIN/STAT_LED_BLUE_PIN."
|
||||
#elif defined(LCD_PIN_BL)
|
||||
#error "LCD_PIN_BL is now LCD_BACKLIGHT_PIN."
|
||||
#elif defined(LCD_PIN_RESET)
|
||||
#error "LCD_PIN_RESET is now LCD_RESET_PIN."
|
||||
#elif defined(EXTRUDER_0_AUTO_FAN_PIN) || defined(EXTRUDER_1_AUTO_FAN_PIN) || defined(EXTRUDER_2_AUTO_FAN_PIN) || defined(EXTRUDER_3_AUTO_FAN_PIN)
|
||||
#error "EXTRUDER_[0123]_AUTO_FAN_PIN is now E[0123]_AUTO_FAN_PIN."
|
||||
#elif defined(PID_FAN_SCALING) && !HAS_FAN
|
||||
#error "PID_FAN_SCALING needs at least one fan enabled."
|
||||
#elif defined(min_software_endstops) || defined(max_software_endstops)
|
||||
#error "(min|max)_software_endstops are now (MIN|MAX)_SOFTWARE_ENDSTOPS."
|
||||
#elif ENABLED(Z_PROBE_SLED) && defined(SLED_PIN)
|
||||
#error "Replace SLED_PIN with SOL1_PIN (applies to both Z_PROBE_SLED and SOLENOID_PROBE)."
|
||||
#elif defined(CONTROLLERFAN_PIN)
|
||||
#error "CONTROLLERFAN_PIN is now CONTROLLER_FAN_PIN, enabled with USE_CONTROLLER_FAN."
|
||||
#elif defined(CONTROLLERFAN_SPEED)
|
||||
#error "CONTROLLERFAN_SPEED is now CONTROLLERFAN_SPEED_ACTIVE."
|
||||
#elif defined(CONTROLLERFAN_SECS)
|
||||
#error "CONTROLLERFAN_SECS is now CONTROLLERFAN_IDLE_TIME."
|
||||
#elif defined(MIN_RETRACT)
|
||||
#error "MIN_RETRACT is now MIN_AUTORETRACT and MAX_AUTORETRACT."
|
||||
#elif defined(ADVANCE)
|
||||
#error "ADVANCE is now LIN_ADVANCE."
|
||||
#elif defined(LIN_ADVANCE_E_D_RATIO)
|
||||
#error "LIN_ADVANCE (1.5) no longer uses LIN_ADVANCE_E_D_RATIO."
|
||||
#elif defined(NEOPIXEL_RGBW_LED)
|
||||
#error "NEOPIXEL_RGBW_LED is now NEOPIXEL_LED."
|
||||
#elif ENABLED(DELTA) && defined(DELTA_PROBEABLE_RADIUS)
|
||||
#error "Remove DELTA_PROBEABLE_RADIUS and use PROBING_MARGIN to inset the probe area instead."
|
||||
#elif ENABLED(DELTA) && defined(DELTA_CALIBRATION_RADIUS)
|
||||
#error "Remove DELTA_CALIBRATION_RADIUS and use PROBING_MARGIN to inset the probe area instead."
|
||||
#elif defined(UBL_MESH_INSET)
|
||||
#error "UBL_MESH_INSET is now just MESH_INSET."
|
||||
#elif defined(UBL_MESH_MIN_X) || defined(UBL_MESH_MIN_Y) || defined(UBL_MESH_MAX_X) || defined(UBL_MESH_MAX_Y)
|
||||
#error "UBL_MESH_(MIN|MAX)_[XY] is now just MESH_(MIN|MAX)_[XY]."
|
||||
#elif defined(ABL_PROBE_PT_1_X) || defined(ABL_PROBE_PT_1_Y) || defined(ABL_PROBE_PT_2_X) || defined(ABL_PROBE_PT_2_Y) || defined(ABL_PROBE_PT_3_X) || defined(ABL_PROBE_PT_3_Y)
|
||||
#error "ABL_PROBE_PT_[123]_[XY] is no longer required. Please remove it."
|
||||
#elif defined(UBL_PROBE_PT_1_X) || defined(UBL_PROBE_PT_1_Y) || defined(UBL_PROBE_PT_2_X) || defined(UBL_PROBE_PT_2_Y) || defined(UBL_PROBE_PT_3_X) || defined(UBL_PROBE_PT_3_Y)
|
||||
#error "UBL_PROBE_PT_[123]_[XY] is no longer required. Please remove it."
|
||||
#elif defined(MIN_PROBE_EDGE)
|
||||
#error "MIN_PROBE_EDGE is now called PROBING_MARGIN."
|
||||
#elif defined(MIN_PROBE_EDGE_LEFT)
|
||||
#error "MIN_PROBE_EDGE_LEFT is now called PROBING_MARGIN_LEFT."
|
||||
#elif defined(MIN_PROBE_EDGE_RIGHT)
|
||||
#error "MIN_PROBE_EDGE_RIGHT is now called PROBING_MARGIN_RIGHT."
|
||||
#elif defined(MIN_PROBE_EDGE_FRONT)
|
||||
#error "MIN_PROBE_EDGE_FRONT is now called PROBING_MARGIN_FRONT."
|
||||
#elif defined(MIN_PROBE_EDGE_BACK)
|
||||
#error "MIN_PROBE_EDGE_BACK is now called PROBING_MARGIN_BACK."
|
||||
#elif defined(LEFT_PROBE_BED_POSITION)
|
||||
#error "LEFT_PROBE_BED_POSITION is obsolete. Set a margin with PROBING_MARGIN or PROBING_MARGIN_LEFT instead."
|
||||
#elif defined(RIGHT_PROBE_BED_POSITION)
|
||||
#error "RIGHT_PROBE_BED_POSITION is obsolete. Set a margin with PROBING_MARGIN or PROBING_MARGIN_RIGHT instead."
|
||||
#elif defined(FRONT_PROBE_BED_POSITION)
|
||||
#error "FRONT_PROBE_BED_POSITION is obsolete. Set a margin with PROBING_MARGIN or PROBING_MARGIN_FRONT instead."
|
||||
#elif defined(BACK_PROBE_BED_POSITION)
|
||||
#error "BACK_PROBE_BED_POSITION is obsolete. Set a margin with PROBING_MARGIN or PROBING_MARGIN_BACK instead."
|
||||
#elif defined(ENABLE_MESH_EDIT_GFX_OVERLAY)
|
||||
#error "ENABLE_MESH_EDIT_GFX_OVERLAY is now MESH_EDIT_GFX_OVERLAY."
|
||||
#elif defined(BABYSTEP_ZPROBE_GFX_REVERSE)
|
||||
#error "BABYSTEP_ZPROBE_GFX_REVERSE is now set by OVERLAY_GFX_REVERSE."
|
||||
#elif defined(UBL_GRANULAR_SEGMENTATION_FOR_CARTESIAN)
|
||||
#error "UBL_GRANULAR_SEGMENTATION_FOR_CARTESIAN is now SEGMENT_LEVELED_MOVES."
|
||||
#elif HAS_PID_HEATING && (defined(K1) || !defined(PID_K1))
|
||||
#error "K1 is now PID_K1."
|
||||
#elif defined(PROBE_DOUBLE_TOUCH)
|
||||
#error "PROBE_DOUBLE_TOUCH is now MULTIPLE_PROBING."
|
||||
#elif defined(ANET_KEYPAD_LCD)
|
||||
#error "ANET_KEYPAD_LCD is now ZONESTAR_LCD."
|
||||
#elif defined(LCD_I2C_SAINSMART_YWROBOT)
|
||||
#error "LCD_I2C_SAINSMART_YWROBOT is now LCD_SAINSMART_I2C_(1602|2004)."
|
||||
#elif defined(MEASURED_LOWER_LIMIT) || defined(MEASURED_UPPER_LIMIT)
|
||||
#error "MEASURED_(UPPER|LOWER)_LIMIT is now FILWIDTH_ERROR_MARGIN."
|
||||
#elif defined(HAVE_TMCDRIVER)
|
||||
#error "HAVE_TMCDRIVER is now [AXIS]_DRIVER_TYPE TMC26X."
|
||||
#elif defined(STEALTHCHOP)
|
||||
#error "STEALTHCHOP is now STEALTHCHOP_(XY|Z|E)."
|
||||
#elif defined(HAVE_TMC26X)
|
||||
#error "HAVE_TMC26X is now [AXIS]_DRIVER_TYPE TMC26X."
|
||||
#elif defined(HAVE_TMC2130)
|
||||
#error "HAVE_TMC2130 is now [AXIS]_DRIVER_TYPE TMC2130."
|
||||
#elif defined(HAVE_TMC2208)
|
||||
#error "HAVE_TMC2208 is now [AXIS]_DRIVER_TYPE TMC2208."
|
||||
#elif defined(HAVE_L6470DRIVER)
|
||||
#error "HAVE_L6470DRIVER is obsolete. L64xx stepper drivers are no longer supported in Marlin."
|
||||
#elif defined(X_IS_TMC) || defined(X2_IS_TMC) || defined(Y_IS_TMC) || defined(Y2_IS_TMC) || defined(Z_IS_TMC) || defined(Z2_IS_TMC) || defined(Z3_IS_TMC) \
|
||||
|| defined(E0_IS_TMC) || defined(E1_IS_TMC) || defined(E2_IS_TMC) || defined(E3_IS_TMC) || defined(E4_IS_TMC) || defined(E5_IS_TMC) || defined(E6_IS_TMC) || defined(E7_IS_TMC)
|
||||
#error "[AXIS]_IS_TMC is now [AXIS]_DRIVER_TYPE TMC26X."
|
||||
#elif defined(X_IS_TMC26X) || defined(X2_IS_TMC26X) || defined(Y_IS_TMC26X) || defined(Y2_IS_TMC26X) || defined(Z_IS_TMC26X) || defined(Z2_IS_TMC26X) || defined(Z3_IS_TMC26X) \
|
||||
|| defined(E0_IS_TMC26X) || defined(E1_IS_TMC26X) || defined(E2_IS_TMC26X) || defined(E3_IS_TMC26X) || defined(E4_IS_TMC26X) || defined(E5_IS_TMC26X) || defined(E6_IS_TMC26X) || defined(E7_IS_TMC26X)
|
||||
#error "[AXIS]_IS_TMC26X is now [AXIS]_DRIVER_TYPE TMC26X."
|
||||
#elif defined(X_IS_TMC2130) || defined(X2_IS_TMC2130) || defined(Y_IS_TMC2130) || defined(Y2_IS_TMC2130) || defined(Z_IS_TMC2130) || defined(Z2_IS_TMC2130) || defined(Z3_IS_TMC2130) \
|
||||
|| defined(E0_IS_TMC2130) || defined(E1_IS_TMC2130) || defined(E2_IS_TMC2130) || defined(E3_IS_TMC2130) || defined(E4_IS_TMC2130) || defined(E5_IS_TMC2130) || defined(E6_IS_TMC2130) || defined(E7_IS_TMC2130)
|
||||
#error "[AXIS]_IS_TMC2130 is now [AXIS]_DRIVER_TYPE TMC2130."
|
||||
#elif defined(X_IS_TMC2208) || defined(X2_IS_TMC2208) || defined(Y_IS_TMC2208) || defined(Y2_IS_TMC2208) || defined(Z_IS_TMC2208) || defined(Z2_IS_TMC2208) || defined(Z3_IS_TMC2208) \
|
||||
|| defined(E0_IS_TMC2208) || defined(E1_IS_TMC2208) || defined(E2_IS_TMC2208) || defined(E3_IS_TMC2208) || defined(E4_IS_TMC2208) || defined(E5_IS_TMC2208) || defined(E6_IS_TMC2208) || defined(E7_IS_TMC2208)
|
||||
#error "[AXIS]_IS_TMC2208 is now [AXIS]_DRIVER_TYPE TMC2208."
|
||||
#elif defined(AUTOMATIC_CURRENT_CONTROL)
|
||||
#error "AUTOMATIC_CURRENT_CONTROL is now MONITOR_DRIVER_STATUS."
|
||||
#elif defined(FILAMENT_CHANGE_LOAD_LENGTH)
|
||||
#error "FILAMENT_CHANGE_LOAD_LENGTH is now FILAMENT_CHANGE_FAST_LOAD_LENGTH."
|
||||
#elif defined(LEVEL_CORNERS_INSET)
|
||||
#error "LEVEL_CORNERS_INSET is now BED_TRAMMING_INSET_LFRB."
|
||||
#elif defined(BEZIER_JERK_CONTROL)
|
||||
#error "BEZIER_JERK_CONTROL is now S_CURVE_ACCELERATION."
|
||||
#elif HAS_JUNCTION_DEVIATION && defined(JUNCTION_DEVIATION_FACTOR)
|
||||
#error "JUNCTION_DEVIATION_FACTOR is now JUNCTION_DEVIATION_MM."
|
||||
#elif defined(JUNCTION_ACCELERATION_FACTOR)
|
||||
#error "JUNCTION_ACCELERATION_FACTOR is obsolete. Delete it from Configuration_adv.h."
|
||||
#elif defined(JUNCTION_ACCELERATION)
|
||||
#error "JUNCTION_ACCELERATION is obsolete. Delete it from Configuration_adv.h."
|
||||
#elif defined(MAX7219_DEBUG_STEPPER_HEAD)
|
||||
#error "MAX7219_DEBUG_STEPPER_HEAD is now MAX7219_DEBUG_PLANNER_HEAD."
|
||||
#elif defined(MAX7219_DEBUG_STEPPER_TAIL)
|
||||
#error "MAX7219_DEBUG_STEPPER_TAIL is now MAX7219_DEBUG_PLANNER_TAIL."
|
||||
#elif defined(MAX7219_DEBUG_STEPPER_QUEUE)
|
||||
#error "MAX7219_DEBUG_STEPPER_QUEUE is now MAX7219_DEBUG_PLANNER_QUEUE."
|
||||
#elif defined(ENDSTOP_NOISE_FILTER)
|
||||
#error "ENDSTOP_NOISE_FILTER is now ENDSTOP_NOISE_THRESHOLD [2-7]."
|
||||
#elif defined(RETRACT_ZLIFT)
|
||||
#error "RETRACT_ZLIFT is now RETRACT_ZRAISE."
|
||||
#elif defined(TOOLCHANGE_FS_INIT_BEFORE_SWAP)
|
||||
#error "TOOLCHANGE_FS_INIT_BEFORE_SWAP is now TOOLCHANGE_FS_SLOW_FIRST_PRIME."
|
||||
#elif defined(TOOLCHANGE_PARK_ZLIFT) || defined(TOOLCHANGE_UNPARK_ZLIFT)
|
||||
#error "TOOLCHANGE_PARK_ZLIFT and TOOLCHANGE_UNPARK_ZLIFT are now TOOLCHANGE_ZRAISE."
|
||||
#elif defined(SINGLENOZZLE_TOOLCHANGE_ZRAISE)
|
||||
#error "SINGLENOZZLE_TOOLCHANGE_ZRAISE is now TOOLCHANGE_ZRAISE."
|
||||
#elif defined(SINGLENOZZLE_SWAP_LENGTH)
|
||||
#error "SINGLENOZZLE_SWAP_LENGTH is now TOOLCHANGE_FIL_SWAP_LENGTH."
|
||||
#elif defined(SINGLENOZZLE_SWAP_RETRACT_SPEED)
|
||||
#error "SINGLENOZZLE_SWAP_RETRACT_SPEED is now TOOLCHANGE_FIL_SWAP_RETRACT_SPEED."
|
||||
#elif defined(SINGLENOZZLE_SWAP_PRIME_SPEED)
|
||||
#error "SINGLENOZZLE_SWAP_PRIME_SPEED is now TOOLCHANGE_FIL_SWAP_PRIME_SPEED."
|
||||
#elif defined(SINGLENOZZLE_SWAP_PARK)
|
||||
#error "SINGLENOZZLE_SWAP_PARK is now TOOLCHANGE_PARK."
|
||||
#elif defined(SINGLENOZZLE_TOOLCHANGE_XY)
|
||||
#error "SINGLENOZZLE_TOOLCHANGE_XY is now TOOLCHANGE_PARK_XY."
|
||||
#elif defined(SINGLENOZZLE_PARK_XY_FEEDRATE)
|
||||
#error "SINGLENOZZLE_PARK_XY_FEEDRATE is now TOOLCHANGE_PARK_XY_FEEDRATE."
|
||||
#elif defined(PARKING_EXTRUDER_SECURITY_RAISE)
|
||||
#error "PARKING_EXTRUDER_SECURITY_RAISE is now TOOLCHANGE_ZRAISE."
|
||||
#elif defined(SWITCHING_TOOLHEAD_SECURITY_RAISE)
|
||||
#error "SWITCHING_TOOLHEAD_SECURITY_RAISE is now TOOLCHANGE_ZRAISE."
|
||||
#elif defined(G0_FEEDRATE) && G0_FEEDRATE == 0
|
||||
#error "G0_FEEDRATE is now used to set the G0 feedrate."
|
||||
#elif defined(MBL_Z_STEP)
|
||||
#error "MBL_Z_STEP is now MESH_EDIT_Z_STEP."
|
||||
#elif defined(CHDK)
|
||||
#error "CHDK is now CHDK_PIN."
|
||||
#elif ANY_PIN( \
|
||||
MAX6675_SS, MAX6675_SS2, MAX6675_SS3, MAX6675_CS, MAX6675_CS2, MAX6675_CS3,\
|
||||
MAX31855_SS, MAX31855_SS2, MAX31855_SS3, MAX31855_CS, MAX31855_CS2, MAX31855_CS3, \
|
||||
MAX31865_SS, MAX31865_SS2, MAX31865_SS3, MAX31865_CS, MAX31865_CS2, MAX31865_CS3)
|
||||
#warning "MAX*_SS_PIN, MAX*_SS2_PIN, MAX*_SS3_PIN, MAX*_CS_PIN, MAX*_CS2_PIN, and MAX*_CS3_PIN, are obsolete. Please use TEMP_0_CS_PIN/TEMP_1_CS_PIN/TEMP_2_CS_PIN instead."
|
||||
#elif ANY_PIN(MAX6675_SCK, MAX31855_SCK, MAX31865_SCK)
|
||||
#warning "MAX*_SCK_PIN is obsolete. Please use TEMP_0_SCK_PIN/TEMP_1_SCK_PIN/TEMP_2_SCK_PIN instead."
|
||||
#elif ANY_PIN(MAX6675_MISO, MAX6675_DO, MAX31855_MISO, MAX31855_DO, MAX31865_MISO, MAX31865_DO)
|
||||
#warning "MAX*_MISO_PIN and MAX*_DO_PIN are obsolete. Please use TEMP_0_MISO_PIN/TEMP_1_MISO_PIN/TEMP_2_MISO_PIN instead."
|
||||
#elif PIN_EXISTS(MAX31865_MOSI)
|
||||
#warning "MAX31865_MOSI_PIN is obsolete. Please use TEMP_0_MOSI_PIN/TEMP_1_MOSI_PIN/TEMP_2_MOSI_PIN instead."
|
||||
#elif ANY_PIN(THERMO_CS1_PIN, THERMO_CS2_PIN, THERMO_CS3_PIN, THERMO_DO_PIN, THERMO_SCK_PIN)
|
||||
#error "THERMO_*_PIN is now TEMP_n_CS_PIN, TEMP_n_SCK_PIN, TEMP_n_MOSI_PIN, TEMP_n_MISO_PIN."
|
||||
#elif defined(MAX31865_SENSOR_OHMS)
|
||||
#error "MAX31865_SENSOR_OHMS is now MAX31865_SENSOR_OHMS_0."
|
||||
#elif defined(MAX31865_CALIBRATION_OHMS)
|
||||
#error "MAX31865_CALIBRATION_OHMS is now MAX31865_CALIBRATION_OHMS_0."
|
||||
#elif defined(SPINDLE_LASER_ENABLE)
|
||||
#error "SPINDLE_LASER_ENABLE is now SPINDLE_FEATURE or LASER_FEATURE."
|
||||
#elif defined(SPINDLE_LASER_ENABLE_PIN)
|
||||
#error "SPINDLE_LASER_ENABLE_PIN is now SPINDLE_LASER_ENA_PIN."
|
||||
#elif defined(SPINDLE_DIR_CHANGE)
|
||||
#error "SPINDLE_DIR_CHANGE is now SPINDLE_CHANGE_DIR."
|
||||
#elif defined(SPINDLE_STOP_ON_DIR_CHANGE)
|
||||
#error "SPINDLE_STOP_ON_DIR_CHANGE is now SPINDLE_CHANGE_DIR_STOP."
|
||||
#elif defined(SPINDLE_LASER_ACTIVE_HIGH)
|
||||
#error "SPINDLE_LASER_ACTIVE_HIGH is now SPINDLE_LASER_ACTIVE_STATE."
|
||||
#elif defined(SPINDLE_LASER_ENABLE_INVERT)
|
||||
#error "SPINDLE_LASER_ENABLE_INVERT is now SPINDLE_LASER_ACTIVE_STATE."
|
||||
#elif defined(LASER_POWER_INLINE)
|
||||
#error "LASER_POWER_INLINE is not required, inline mode is enabled with 'M3 I' and disabled with 'M5 I'."
|
||||
#elif defined(LASER_POWER_INLINE_TRAPEZOID)
|
||||
#error "LASER_POWER_INLINE_TRAPEZOID is now LASER_POWER_TRAP."
|
||||
#elif defined(LASER_POWER_INLINE_TRAPEZOID_CONT)
|
||||
#error "LASER_POWER_INLINE_TRAPEZOID_CONT is replaced with LASER_POWER_TRAP."
|
||||
#elif defined(LASER_POWER_INLINE_TRAPEZOID_PER)
|
||||
#error "LASER_POWER_INLINE_TRAPEZOID_CONT_PER replaced with LASER_POWER_TRAP."
|
||||
#elif defined(LASER_POWER_INLINE_CONTINUOUS)
|
||||
#error "LASER_POWER_INLINE_CONTINUOUS is not required, inline mode is enabled with 'M3 I' and disabled with 'M5 I'."
|
||||
#elif defined(CUTTER_POWER_DISPLAY)
|
||||
#error "CUTTER_POWER_DISPLAY is now CUTTER_POWER_UNIT."
|
||||
#elif defined(CHAMBER_HEATER_PIN)
|
||||
#error "CHAMBER_HEATER_PIN is now HEATER_CHAMBER_PIN."
|
||||
#elif defined(TMC_Z_CALIBRATION)
|
||||
#error "TMC_Z_CALIBRATION has been deprecated in favor of MECHANICAL_GANTRY_CALIBRATION."
|
||||
#elif defined(Z_MIN_PROBE_ENDSTOP)
|
||||
#error "Z_MIN_PROBE_ENDSTOP is no longer required. Please remove it."
|
||||
#elif defined(DUAL_NOZZLE_DUPLICATION_MODE)
|
||||
#error "DUAL_NOZZLE_DUPLICATION_MODE is now MULTI_NOZZLE_DUPLICATION."
|
||||
#elif defined(MENU_ITEM_CASE_LIGHT)
|
||||
#error "MENU_ITEM_CASE_LIGHT is now CASE_LIGHT_MENU."
|
||||
#elif defined(CASE_LIGHT_NEOPIXEL_COLOR)
|
||||
#error "CASE_LIGHT_NEOPIXEL_COLOR is now CASE_LIGHT_DEFAULT_COLOR."
|
||||
#elif defined(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
|
||||
#error "ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED is now SD_ABORT_ON_ENDSTOP_HIT."
|
||||
#elif defined(LPC_SD_LCD) || defined(LPC_SD_ONBOARD) || defined(LPC_SD_CUSTOM_CABLE)
|
||||
#error "LPC_SD_(LCD|ONBOARD|CUSTOM_CABLE) are now SDCARD_CONNECTION."
|
||||
#elif defined(USB_SD_DISABLED)
|
||||
#error "USB_SD_DISABLED is now NO_SD_HOST_DRIVE."
|
||||
#elif defined(USB_SD_ONBOARD)
|
||||
#error "USB_SD_ONBOARD is obsolete. Disable NO_SD_HOST_DRIVE instead."
|
||||
#elif defined(PSU_ACTIVE_HIGH)
|
||||
#error "PSU_ACTIVE_HIGH is now PSU_ACTIVE_STATE."
|
||||
#elif POWER_SUPPLY == 1
|
||||
#error "Replace POWER_SUPPLY 1 by enabling PSU_CONTROL and setting PSU_ACTIVE_STATE to 'LOW'."
|
||||
#elif POWER_SUPPLY == 2
|
||||
#error "Replace POWER_SUPPLY 2 by enabling PSU_CONTROL and setting PSU_ACTIVE_STATE to 'HIGH'."
|
||||
#elif defined(POWER_SUPPLY)
|
||||
#error "POWER_SUPPLY is now obsolete. Please remove it."
|
||||
#elif defined(MKS_ROBIN_TFT)
|
||||
#error "MKS_ROBIN_TFT is now FSMC_GRAPHICAL_TFT."
|
||||
#elif defined(SDPOWER)
|
||||
#error "SDPOWER is now SDPOWER_PIN."
|
||||
#elif defined(STRING_SPLASH_LINE1) || defined(STRING_SPLASH_LINE2)
|
||||
#error "STRING_SPLASH_LINE[12] are now obsolete. Please remove them."
|
||||
#elif defined(Z_PROBE_ALLEN_KEY_DEPLOY_1_X) || defined(Z_PROBE_ALLEN_KEY_STOW_1_X)
|
||||
#error "Z_PROBE_ALLEN_KEY_(DEPLOY|STOW) coordinates are now a single setting."
|
||||
#elif defined(X_PROBE_OFFSET_FROM_EXTRUDER) || defined(Y_PROBE_OFFSET_FROM_EXTRUDER) || defined(Z_PROBE_OFFSET_FROM_EXTRUDER)
|
||||
#error "[XYZ]_PROBE_OFFSET_FROM_EXTRUDER is now NOZZLE_TO_PROBE_OFFSET."
|
||||
#elif defined(MIN_PROBE_X) || defined(MIN_PROBE_Y) || defined(MAX_PROBE_X) || defined(MAX_PROBE_Y)
|
||||
#error "(MIN|MAX)_PROBE_[XY] are now calculated at runtime. Please remove them."
|
||||
#elif defined(Z_STEPPER_ALIGN_X) || defined(Z_STEPPER_ALIGN_X)
|
||||
#error "Z_STEPPER_ALIGN_X and Z_STEPPER_ALIGN_Y are now combined as Z_STEPPER_ALIGN_XY."
|
||||
#elif defined(JUNCTION_DEVIATION)
|
||||
#error "JUNCTION_DEVIATION is no longer required. (See CLASSIC_JERK). Please remove it."
|
||||
#elif defined(BABYSTEP_MULTIPLICATOR)
|
||||
#error "BABYSTEP_MULTIPLICATOR is now BABYSTEP_MULTIPLICATOR_[XY|Z]."
|
||||
#elif defined(LULZBOT_TOUCH_UI)
|
||||
#error "LULZBOT_TOUCH_UI is now TOUCH_UI_FTDI_EVE."
|
||||
#elif defined(PS_DEFAULT_OFF)
|
||||
#error "PS_DEFAULT_OFF is now PSU_DEFAULT_OFF."
|
||||
#elif defined(FILAMENT_UNLOAD_RETRACT_LENGTH)
|
||||
#error "FILAMENT_UNLOAD_RETRACT_LENGTH is now FILAMENT_UNLOAD_PURGE_RETRACT."
|
||||
#elif defined(FILAMENT_UNLOAD_DELAY)
|
||||
#error "FILAMENT_UNLOAD_DELAY is now FILAMENT_UNLOAD_PURGE_DELAY."
|
||||
#elif defined(HOME_USING_SPREADCYCLE)
|
||||
#error "HOME_USING_SPREADCYCLE is now obsolete. Please remove it."
|
||||
#elif defined(DGUS_LCD)
|
||||
#error "DGUS_LCD is now DGUS_LCD_UI ORIGIN|FYSETC|HIPRECY)."
|
||||
#elif defined(DGUS_SERIAL_PORT)
|
||||
#error "DGUS_SERIAL_PORT is now LCD_SERIAL_PORT."
|
||||
#elif defined(DGUS_BAUDRATE)
|
||||
#error "DGUS_BAUDRATE is now LCD_BAUDRATE."
|
||||
#elif defined(DGUS_STATS_RX_BUFFER_OVERRUNS)
|
||||
#error "DGUS_STATS_RX_BUFFER_OVERRUNS is now STATS_RX_BUFFER_OVERRUNS."
|
||||
#elif defined(ANYCUBIC_LCD_SERIAL_PORT)
|
||||
#error "ANYCUBIC_LCD_SERIAL_PORT is now LCD_SERIAL_PORT."
|
||||
#elif defined(INTERNAL_SERIAL_PORT)
|
||||
#error "INTERNAL_SERIAL_PORT is now MMU2_SERIAL_PORT."
|
||||
#elif defined(X_DUAL_ENDSTOPS_ADJUSTMENT) || defined(Y_DUAL_ENDSTOPS_ADJUSTMENT) || defined(Z_DUAL_ENDSTOPS_ADJUSTMENT)
|
||||
#error "[XYZ]_DUAL_ENDSTOPS_ADJUSTMENT is now [XYZ]2_ENDSTOP_ADJUSTMENT."
|
||||
#elif defined(Z_TRIPLE_ENDSTOPS_ADJUSTMENT2) || defined(Z_TRIPLE_ENDSTOPS_ADJUSTMENT3)
|
||||
#error "Z_TRIPLE_ENDSTOPS_ADJUSTMENT[23] is now Z[23]_ENDSTOP_ADJUSTMENT."
|
||||
#elif defined(Z_QUAD_ENDSTOPS_ADJUSTMENT2) || defined(Z_QUAD_ENDSTOPS_ADJUSTMENT3) || defined(Z_QUAD_ENDSTOPS_ADJUSTMENT4)
|
||||
#error "Z_QUAD_ENDSTOPS_ADJUSTMENT[234] is now Z[234]_ENDSTOP_ADJUSTMENT."
|
||||
#elif defined(Z_DUAL_STEPPER_DRIVERS)
|
||||
#error "Z_DUAL_STEPPER_DRIVERS is no longer needed and should be removed."
|
||||
#elif defined(Z_TRIPLE_STEPPER_DRIVERS)
|
||||
#error "Z_TRIPLE_STEPPER_DRIVERS is no longer needed and should be removed."
|
||||
#elif defined(Z_QUAD_STEPPER_DRIVERS)
|
||||
#error "Z_QUAD_STEPPER_DRIVERS is no longer needed and should be removed."
|
||||
#elif defined(Z_DUAL_ENDSTOPS) || defined(Z_TRIPLE_ENDSTOPS) || defined(Z_QUAD_ENDSTOPS)
|
||||
#error "Z_(DUAL|TRIPLE|QUAD)_ENDSTOPS is now Z_MULTI_ENDSTOPS."
|
||||
#elif defined(DUGS_UI_MOVE_DIS_OPTION)
|
||||
#error "DUGS_UI_MOVE_DIS_OPTION is spelled DGUS_UI_MOVE_DIS_OPTION."
|
||||
#elif defined(ORIG_E0_AUTO_FAN_PIN) || defined(ORIG_E1_AUTO_FAN_PIN) || defined(ORIG_E2_AUTO_FAN_PIN) || defined(ORIG_E3_AUTO_FAN_PIN) || defined(ORIG_E4_AUTO_FAN_PIN) || defined(ORIG_E5_AUTO_FAN_PIN) || defined(ORIG_E6_AUTO_FAN_PIN) || defined(ORIG_E7_AUTO_FAN_PIN)
|
||||
#error "ORIG_Ex_AUTO_FAN_PIN is now just Ex_AUTO_FAN_PIN."
|
||||
#elif defined(ORIG_CHAMBER_AUTO_FAN_PIN)
|
||||
#error "ORIG_CHAMBER_AUTO_FAN_PIN is now just CHAMBER_AUTO_FAN_PIN."
|
||||
#elif defined(HOMING_BACKOFF_MM)
|
||||
#error "HOMING_BACKOFF_MM is now HOMING_BACKOFF_POST_MM."
|
||||
#elif defined(X_HOME_BUMP_MM) || defined(Y_HOME_BUMP_MM) || defined(Z_HOME_BUMP_MM)
|
||||
#error "[XYZ]_HOME_BUMP_MM is now HOMING_BUMP_MM."
|
||||
#elif defined(DIGIPOT_I2C)
|
||||
#error "DIGIPOT_I2C is now DIGIPOT_MCP4451 (or DIGIPOT_MCP4018)."
|
||||
#elif defined(TOUCH_BUTTONS)
|
||||
#error "TOUCH_BUTTONS is now TOUCH_SCREEN."
|
||||
#elif defined(LCD_FULL_PIXEL_HEIGHT) || defined(LCD_FULL_PIXEL_WIDTH)
|
||||
#error "LCD_FULL_PIXEL_(WIDTH|HEIGHT) is deprecated and should be removed."
|
||||
#elif defined(FSMC_UPSCALE)
|
||||
#error "FSMC_UPSCALE is now GRAPHICAL_TFT_UPSCALE."
|
||||
#elif defined(ANYCUBIC_TFT_MODEL)
|
||||
#error "ANYCUBIC_TFT_MODEL is now ANYCUBIC_LCD_I3MEGA."
|
||||
#elif defined(EVENT_GCODE_SD_STOP)
|
||||
#error "EVENT_GCODE_SD_STOP is now EVENT_GCODE_SD_ABORT."
|
||||
#elif defined(GRAPHICAL_TFT_ROTATE_180)
|
||||
#error "GRAPHICAL_TFT_ROTATE_180 is now TFT_ROTATION set to TFT_ROTATE_180."
|
||||
#elif defined(PROBE_OFFSET_START)
|
||||
#error "PROBE_OFFSET_START is now PROBE_OFFSET_WIZARD_START_Z."
|
||||
#elif defined(POWER_LOSS_PULL)
|
||||
#error "POWER_LOSS_PULL is now specifically POWER_LOSS_PULL(UP|DOWN)."
|
||||
#elif defined(SHORT_MANUAL_Z_MOVE)
|
||||
#error "SHORT_MANUAL_Z_MOVE is now FINE_MANUAL_MOVE, applying to Z on most printers."
|
||||
#elif defined(FIL_RUNOUT_INVERTING)
|
||||
#if FIL_RUNOUT_INVERTING
|
||||
#error "FIL_RUNOUT_INVERTING true is now FIL_RUNOUT_STATE HIGH."
|
||||
#else
|
||||
#error "FIL_RUNOUT_INVERTING false is now FIL_RUNOUT_STATE LOW."
|
||||
#endif
|
||||
#elif defined(ASSISTED_TRAMMING_MENU_ITEM)
|
||||
#error "ASSISTED_TRAMMING_MENU_ITEM is deprecated and should be removed."
|
||||
#elif defined(UNKNOWN_Z_NO_RAISE)
|
||||
#error "UNKNOWN_Z_NO_RAISE is replaced by setting Z_IDLE_HEIGHT to Z_MAX_POS."
|
||||
#elif defined(Z_AFTER_DEACTIVATE)
|
||||
#error "Z_AFTER_DEACTIVATE is replaced by Z_IDLE_HEIGHT."
|
||||
#elif defined(MEATPACK)
|
||||
#error "MEATPACK is now enabled with MEATPACK_ON_SERIAL_PORT_1, MEATPACK_ON_SERIAL_PORT_2, etc."
|
||||
#elif defined(CUSTOM_USER_MENUS)
|
||||
#error "CUSTOM_USER_MENUS has been replaced by CUSTOM_MENU_MAIN and CUSTOM_MENU_CONFIG."
|
||||
#elif defined(MKS_LCD12864)
|
||||
#error "MKS_LCD12864 is now MKS_LCD12864A or MKS_LCD12864B."
|
||||
#elif defined(DOGM_SD_PERCENT)
|
||||
#error "DOGM_SD_PERCENT is now SHOW_PROGRESS_PERCENT."
|
||||
#elif defined(NEOPIXEL_BKGD_LED_INDEX)
|
||||
#error "NEOPIXEL_BKGD_LED_INDEX is now NEOPIXEL_BKGD_INDEX_FIRST."
|
||||
#elif defined(TEMP_SENSOR_1_AS_REDUNDANT)
|
||||
#error "TEMP_SENSOR_1_AS_REDUNDANT is now TEMP_SENSOR_REDUNDANT, with associated TEMP_SENSOR_REDUNDANT_* config."
|
||||
#elif defined(MAX_REDUNDANT_TEMP_SENSOR_DIFF)
|
||||
#error "MAX_REDUNDANT_TEMP_SENSOR_DIFF is now TEMP_SENSOR_REDUNDANT_MAX_DIFF"
|
||||
#elif defined(LCD_ALEPHOBJECTS_CLCD_UI)
|
||||
#error "LCD_ALEPHOBJECTS_CLCD_UI is now LCD_LULZBOT_CLCD_UI."
|
||||
#elif defined(MIN_ARC_SEGMENTS)
|
||||
#error "MIN_ARC_SEGMENTS is now MIN_CIRCLE_SEGMENTS."
|
||||
#elif defined(ARC_SEGMENTS_PER_R)
|
||||
#error "ARC_SUPPORT no longer uses ARC_SEGMENTS_PER_R."
|
||||
#elif ENABLED(ARC_SUPPORT) && (!defined(MIN_ARC_SEGMENT_MM) || !defined(MAX_ARC_SEGMENT_MM))
|
||||
#error "ARC_SUPPORT now requires MIN_ARC_SEGMENT_MM and MAX_ARC_SEGMENT_MM."
|
||||
#elif defined(LASER_POWER_INLINE)
|
||||
#error "LASER_POWER_INLINE is obsolete."
|
||||
#elif defined(SPINDLE_LASER_PWM)
|
||||
#error "SPINDLE_LASER_PWM (true) is now set with SPINDLE_LASER_USE_PWM (enabled)."
|
||||
#elif ANY(IS_RAMPS_EEB, IS_RAMPS_EEF, IS_RAMPS_EFB, IS_RAMPS_EFF, IS_RAMPS_SF)
|
||||
#error "The IS_RAMPS_* conditionals (for heater/fan/bed pins) are now called FET_ORDER_*."
|
||||
#elif defined(PROBE_TEMP_COMPENSATION)
|
||||
#error "PROBE_TEMP_COMPENSATION is now set using the PTC_PROBE, PTC_BED, PTC_HOTEND options."
|
||||
#elif defined(BTC_PROBE_TEMP)
|
||||
#error "BTC_PROBE_TEMP is now PTC_PROBE_TEMP."
|
||||
#elif defined(LCD_SCREEN_ROT_90)
|
||||
#error "LCD_SCREEN_ROT_90 is now LCD_SCREEN_ROTATE with a value of 90."
|
||||
#elif defined(LCD_SCREEN_ROT_180)
|
||||
#error "LCD_SCREEN_ROT_180 is now LCD_SCREEN_ROTATE with a value of 180."
|
||||
#elif defined(LCD_SCREEN_ROT_270)
|
||||
#error "LCD_SCREEN_ROT_270 is now LCD_SCREEN_ROTATE with a value of 270."
|
||||
#elif defined(DEFAULT_LCD_BRIGHTNESS)
|
||||
#error "DEFAULT_LCD_BRIGHTNESS is now LCD_BRIGHTNESS_DEFAULT."
|
||||
#elif defined(NOZZLE_PARK_X_ONLY)
|
||||
#error "NOZZLE_PARK_X_ONLY is now NOZZLE_PARK_MOVE 1."
|
||||
#elif defined(NOZZLE_PARK_Y_ONLY)
|
||||
#error "NOZZLE_PARK_Y_ONLY is now NOZZLE_PARK_MOVE 2."
|
||||
#elif defined(Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS)
|
||||
#error "Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS is now just Z_STEPPER_ALIGN_STEPPER_XY."
|
||||
#elif defined(DWIN_CREALITY_LCD_ENHANCED)
|
||||
#error "DWIN_CREALITY_LCD_ENHANCED is now DWIN_LCD_PROUI."
|
||||
#elif defined(LINEAR_AXES)
|
||||
#error "LINEAR_AXES is now NUM_AXES (to account for rotational axes)."
|
||||
#elif defined(X_DUAL_STEPPER_DRIVERS)
|
||||
#error "X_DUAL_STEPPER_DRIVERS is no longer needed and should be removed."
|
||||
#elif defined(Y_DUAL_STEPPER_DRIVERS)
|
||||
#error "Y_DUAL_STEPPER_DRIVERS is no longer needed and should be removed."
|
||||
#elif defined(NUM_Z_STEPPER_DRIVERS)
|
||||
#error "NUM_Z_STEPPER_DRIVERS is no longer needed and should be removed."
|
||||
#elif defined(LEVEL_BED_CORNERS)
|
||||
#error "LEVEL_BED_CORNERS is now LCD_BED_TRAMMING."
|
||||
#elif defined(LEVEL_CORNERS_INSET_LFRB) || defined(LEVEL_CORNERS_HEIGHT) || defined(LEVEL_CORNERS_Z_HOP) || defined(LEVEL_CORNERS_USE_PROBE) || defined(LEVEL_CORNERS_PROBE_TOLERANCE) || defined(LEVEL_CORNERS_VERIFY_RAISED) || defined(LEVEL_CORNERS_AUDIO_FEEDBACK)
|
||||
#error "LEVEL_CORNERS_* settings have been renamed BED_TRAMMING_*."
|
||||
#elif defined(LEVEL_CENTER_TOO)
|
||||
#error "LEVEL_CENTER_TOO is now BED_TRAMMING_INCLUDE_CENTER."
|
||||
#elif defined(TOUCH_IDLE_SLEEP)
|
||||
#error "TOUCH_IDLE_SLEEP (seconds) is now TOUCH_IDLE_SLEEP_MINS (minutes)."
|
||||
#elif defined(LCD_BACKLIGHT_TIMEOUT)
|
||||
#error "LCD_BACKLIGHT_TIMEOUT (seconds) is now LCD_BACKLIGHT_TIMEOUT_MINS (minutes)."
|
||||
#elif defined(LCD_SET_PROGRESS_MANUALLY)
|
||||
#error "LCD_SET_PROGRESS_MANUALLY is now SET_PROGRESS_MANUALLY."
|
||||
#elif defined(USE_M73_REMAINING_TIME)
|
||||
#error "USE_M73_REMAINING_TIME is now SET_REMAINING_TIME."
|
||||
#elif defined(SHOW_SD_PERCENT)
|
||||
#error "SHOW_SD_PERCENT is now SHOW_PROGRESS_PERCENT."
|
||||
#elif defined(LIN_ADVANCE_K)
|
||||
#error "LIN_ADVANCE_K is now ADVANCE_K."
|
||||
#elif defined(EXTRA_LIN_ADVANCE_K)
|
||||
#error "EXTRA_LIN_ADVANCE_K is now ADVANCE_K_EXTRA."
|
||||
#elif defined(POLAR_SEGMENTS_PER_SECOND) || defined(DELTA_SEGMENTS_PER_SECOND) || defined(SCARA_SEGMENTS_PER_SECOND) || defined(TPARA_SEGMENTS_PER_SECOND)
|
||||
#error "(POLAR|DELTA|SCARA|TPARA)_SEGMENTS_PER_SECOND is now DEFAULT_SEGMENTS_PER_SECOND."
|
||||
#elif defined(EXPERIMENTAL_SCURVE)
|
||||
#error "EXPERIMENTAL_SCURVE is no longer needed and should be removed."
|
||||
#elif defined(DISABLE_INACTIVE_EXTRUDER)
|
||||
#error "DISABLE_INACTIVE_EXTRUDER is now DISABLE_OTHER_EXTRUDERS."
|
||||
#elif defined(FAN_PIN)
|
||||
#error "FAN_PIN is now FAN0_PIN."
|
||||
#elif defined(DISABLE_INACTIVE_X) || defined(DISABLE_INACTIVE_Y) || defined(DISABLE_INACTIVE_Z) \
|
||||
|| defined(DISABLE_INACTIVE_I) || defined(DISABLE_INACTIVE_J) || defined(DISABLE_INACTIVE_K) \
|
||||
|| defined(DISABLE_INACTIVE_U) || defined(DISABLE_INACTIVE_V) || defined(DISABLE_INACTIVE_W) || defined(DISABLE_INACTIVE_E)
|
||||
#error "DISABLE_INACTIVE_[XYZIJKUVWE] is now DISABLE_IDLE_[XYZIJKUVWE]."
|
||||
#elif defined(DEFAULT_STEPPER_DEACTIVE_TIME)
|
||||
#error "DEFAULT_STEPPER_DEACTIVE_TIME is now DEFAULT_STEPPER_TIMEOUT_SEC."
|
||||
#elif defined(TFT_SHARED_SPI)
|
||||
#error "TFT_SHARED_SPI is now TFT_SHARED_IO."
|
||||
#elif defined(LCD_PINS_ENABLE)
|
||||
#error "LCD_PINS_ENABLE is now LCD_PINS_EN."
|
||||
#elif defined(FOLDER_SORTING)
|
||||
#error "FOLDER_SORTING is now SDSORT_FOLDERS."
|
||||
#elif defined(BTT_MINI_12864_V1)
|
||||
#error "BTT_MINI_12864_V1 is now BTT_MINI_12864."
|
||||
#elif defined(SDIO_SUPPORT)
|
||||
#error "SDIO_SUPPORT is now ONBOARD_SDIO."
|
||||
#endif
|
||||
|
||||
// L64xx stepper drivers have been removed
|
||||
#define _L6470 0x6470
|
||||
#define _L6474 0x6474
|
||||
#define _L6480 0x6480
|
||||
#define _POWERSTEP01 0xF00D
|
||||
#if HAS_DRIVER(L6470)
|
||||
#error "L6470 stepper drivers are no longer supported in Marlin."
|
||||
#elif HAS_DRIVER(L6474)
|
||||
#error "L6474 stepper drivers are no longer supported in Marlin."
|
||||
#elif HAS_DRIVER(L6480)
|
||||
#error "L6480 stepper drivers are no longer supported in Marlin."
|
||||
#elif HAS_DRIVER(POWERSTEP01)
|
||||
#error "POWERSTEP01 stepper drivers are no longer supported in Marlin."
|
||||
#endif
|
||||
#undef _L6470
|
||||
#undef _L6474
|
||||
#undef _L6480
|
||||
#undef _POWERSTEP01
|
||||
File diff suppressed because it is too large
Load Diff
@@ -37,19 +37,19 @@
|
||||
// Determine NUM_SERVOS if none was supplied
|
||||
#ifndef NUM_SERVOS
|
||||
#define NUM_SERVOS 0
|
||||
#if ANY(HAS_Z_SERVO_PROBE, CHAMBER_VENT, SWITCHING_TOOLHEAD, SWITCHING_EXTRUDER, SWITCHING_NOZZLE, SPINDLE_SERVO)
|
||||
#if NUM_SERVOS <= Z_PROBE_SERVO_NR
|
||||
#undef NUM_SERVOS
|
||||
#define NUM_SERVOS (Z_PROBE_SERVO_NR + 1)
|
||||
#endif
|
||||
#if NUM_SERVOS <= CHAMBER_VENT_SERVO_NR
|
||||
#undef NUM_SERVOS
|
||||
#define NUM_SERVOS (CHAMBER_VENT_SERVO_NR + 1)
|
||||
#endif
|
||||
#if NUM_SERVOS <= SWITCHING_TOOLHEAD_SERVO_NR
|
||||
#undef NUM_SERVOS
|
||||
#define NUM_SERVOS (SWITCHING_TOOLHEAD_SERVO_NR + 1)
|
||||
#endif
|
||||
#if HAS_Z_SERVO_PROBE && NUM_SERVOS <= Z_PROBE_SERVO_NR
|
||||
#undef NUM_SERVOS
|
||||
#define NUM_SERVOS (Z_PROBE_SERVO_NR + 1)
|
||||
#endif
|
||||
#if ENABLED(CHAMBER_VENT) && NUM_SERVOS <= CHAMBER_VENT_SERVO_NR
|
||||
#undef NUM_SERVOS
|
||||
#define NUM_SERVOS (CHAMBER_VENT_SERVO_NR + 1)
|
||||
#endif
|
||||
#if ENABLED(SWITCHING_TOOLHEAD) && NUM_SERVOS <= SWITCHING_TOOLHEAD_SERVO_NR
|
||||
#undef NUM_SERVOS
|
||||
#define NUM_SERVOS (SWITCHING_TOOLHEAD_SERVO_NR + 1)
|
||||
#endif
|
||||
#if ENABLED(SWITCHING_NOZZLE)
|
||||
#if NUM_SERVOS <= SWITCHING_NOZZLE_SERVO_NR
|
||||
#undef NUM_SERVOS
|
||||
#define NUM_SERVOS (SWITCHING_NOZZLE_SERVO_NR + 1)
|
||||
@@ -58,6 +58,8 @@
|
||||
#undef NUM_SERVOS
|
||||
#define NUM_SERVOS (SWITCHING_NOZZLE_E1_SERVO_NR + 1)
|
||||
#endif
|
||||
#endif
|
||||
#if ENABLED(SWITCHING_EXTRUDER)
|
||||
#if NUM_SERVOS <= SWITCHING_EXTRUDER_SERVO_NR
|
||||
#undef NUM_SERVOS
|
||||
#define NUM_SERVOS (SWITCHING_EXTRUDER_SERVO_NR + 1)
|
||||
@@ -66,12 +68,12 @@
|
||||
#undef NUM_SERVOS
|
||||
#define NUM_SERVOS (SWITCHING_EXTRUDER_E23_SERVO_NR + 1)
|
||||
#endif
|
||||
#if NUM_SERVOS <= SPINDLE_SERVO_NR
|
||||
#undef NUM_SERVOS
|
||||
#define NUM_SERVOS (SPINDLE_SERVO_NR + 1)
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#if ENABLED(SPINDLE_SERVO) && NUM_SERVOS <= SPINDLE_SERVO_NR
|
||||
#undef NUM_SERVOS
|
||||
#define NUM_SERVOS (SPINDLE_SERVO_NR + 1)
|
||||
#endif
|
||||
#endif // !defined(NUM_SERVOS)
|
||||
|
||||
// Convenience override for a BLTouch alone
|
||||
#if ENABLED(BLTOUCH) && NUM_SERVOS == 1
|
||||
@@ -87,70 +89,197 @@
|
||||
#endif
|
||||
|
||||
// Some options are disallowed without required axes
|
||||
#if !HAS_X_AXIS
|
||||
//#define LCD_SHOW_E_TOTAL
|
||||
#define NO_WORKSPACE_OFFSETS
|
||||
#undef AUTOTEMP
|
||||
#undef CALIBRATION_MEASURE_LEFT
|
||||
#undef CALIBRATION_MEASURE_RIGHT
|
||||
#undef DISABLE_IDLE_X
|
||||
#undef INPUT_SHAPING_X
|
||||
#undef SAFE_BED_LEVELING_START_X
|
||||
#undef SHAPING_FREQ_X
|
||||
#undef STEALTHCHOP_X
|
||||
#undef INVERT_X_STEP_PIN
|
||||
#endif
|
||||
|
||||
#if !HAS_Y_AXIS
|
||||
#undef SAFE_BED_LEVELING_START_Y
|
||||
#undef ARC_SUPPORT
|
||||
#undef CALIBRATION_MEASURE_BACK
|
||||
#undef CALIBRATION_MEASURE_FRONT
|
||||
#undef DISABLE_IDLE_Y
|
||||
#undef HOME_Y_BEFORE_X
|
||||
#undef INPUT_SHAPING_Y
|
||||
#undef QUICK_HOME
|
||||
#undef SAFE_BED_LEVELING_START_Y
|
||||
#undef SHAPING_FREQ_Y
|
||||
#undef SHAPING_BUFFER_Y
|
||||
#undef STEALTHCHOP_Y
|
||||
#undef INVERT_Y_STEP_PIN
|
||||
#endif
|
||||
|
||||
#if !HAS_Z_AXIS
|
||||
#undef CNC_WORKSPACE_PLANES
|
||||
#undef DISABLE_IDLE_Z
|
||||
#undef ENABLE_LEVELING_FADE_HEIGHT
|
||||
#undef HOME_Z_FIRST
|
||||
#undef HOMING_Z_WITH_PROBE
|
||||
#undef NUM_Z_STEPPERS
|
||||
#undef SAFE_BED_LEVELING_START_Z
|
||||
#undef STEALTHCHOP_Z
|
||||
#undef INVERT_Z_STEP_PIN
|
||||
#undef Z_IDLE_HEIGHT
|
||||
#undef Z_PROBE_SLED
|
||||
#undef Z_SAFE_HOMING
|
||||
#endif
|
||||
|
||||
#if !HAS_I_AXIS
|
||||
#undef CALIBRATION_MEASURE_IMAX
|
||||
#undef CALIBRATION_MEASURE_IMIN
|
||||
#undef DISABLE_IDLE_I
|
||||
#undef SAFE_BED_LEVELING_START_I
|
||||
#undef STEALTHCHOP_I
|
||||
#undef INVERT_I_STEP_PIN
|
||||
#endif
|
||||
|
||||
#if !HAS_J_AXIS
|
||||
#undef CALIBRATION_MEASURE_JMAX
|
||||
#undef CALIBRATION_MEASURE_JMIN
|
||||
#undef DISABLE_IDLE_J
|
||||
#undef SAFE_BED_LEVELING_START_J
|
||||
#undef STEALTHCHOP_J
|
||||
#undef INVERT_J_STEP_PIN
|
||||
#endif
|
||||
|
||||
#if !HAS_K_AXIS
|
||||
#undef CALIBRATION_MEASURE_KMAX
|
||||
#undef CALIBRATION_MEASURE_KMIN
|
||||
#undef DISABLE_IDLE_K
|
||||
#undef SAFE_BED_LEVELING_START_K
|
||||
#undef STEALTHCHOP_K
|
||||
#undef INVERT_K_STEP_PIN
|
||||
#endif
|
||||
|
||||
#if !HAS_U_AXIS
|
||||
#undef CALIBRATION_MEASURE_UMAX
|
||||
#undef CALIBRATION_MEASURE_UMIN
|
||||
#undef DISABLE_IDLE_U
|
||||
#undef SAFE_BED_LEVELING_START_U
|
||||
#undef STEALTHCHOP_U
|
||||
#undef INVERT_U_STEP_PIN
|
||||
#endif
|
||||
|
||||
#if !HAS_V_AXIS
|
||||
#undef CALIBRATION_MEASURE_VMAX
|
||||
#undef CALIBRATION_MEASURE_VMIN
|
||||
#undef DISABLE_IDLE_V
|
||||
#undef SAFE_BED_LEVELING_START_V
|
||||
#undef STEALTHCHOP_V
|
||||
#undef INVERT_V_STEP_PIN
|
||||
#endif
|
||||
|
||||
#if !HAS_W_AXIS
|
||||
#undef CALIBRATION_MEASURE_WMAX
|
||||
#undef CALIBRATION_MEASURE_WMIN
|
||||
#undef DISABLE_IDLE_W
|
||||
#undef SAFE_BED_LEVELING_START_W
|
||||
#undef STEALTHCHOP_W
|
||||
#undef INVERT_W_STEP_PIN
|
||||
#endif
|
||||
|
||||
// Disallowed with no extruders
|
||||
#if !HAS_EXTRUDERS
|
||||
#define NO_VOLUMETRICS
|
||||
#undef FWRETRACT
|
||||
#undef PIDTEMP
|
||||
#undef AUTOTEMP
|
||||
#undef PID_EXTRUSION_SCALING
|
||||
#undef LIN_ADVANCE
|
||||
#undef ADVANCED_PAUSE_FEATURE
|
||||
#undef FILAMENT_LOAD_UNLOAD_GCODES
|
||||
#undef DISABLE_IDLE_E
|
||||
#undef EXTRUDER_RUNOUT_PREVENT
|
||||
#undef THERMAL_PROTECTION_PERIOD
|
||||
#undef WATCH_TEMP_PERIOD
|
||||
#undef SHOW_TEMP_ADC_VALUES
|
||||
#undef FILAMENT_LOAD_UNLOAD_GCODES
|
||||
#undef FWRETRACT
|
||||
#undef LCD_SHOW_E_TOTAL
|
||||
#undef LIN_ADVANCE
|
||||
#undef MANUAL_E_MOVES_RELATIVE
|
||||
#undef PID_EXTRUSION_SCALING
|
||||
#undef SHOW_TEMP_ADC_VALUES
|
||||
#undef STEALTHCHOP_E
|
||||
#endif
|
||||
|
||||
#if HOTENDS <= 7
|
||||
#if ENABLED(DISABLE_X) && !defined(DISABLE_IDLE_X)
|
||||
#define DISABLE_IDLE_X
|
||||
#endif
|
||||
#if ENABLED(DISABLE_Y) && !defined(DISABLE_IDLE_Y)
|
||||
#define DISABLE_IDLE_Y
|
||||
#endif
|
||||
#if ENABLED(DISABLE_Z) && !defined(DISABLE_IDLE_Z)
|
||||
#define DISABLE_IDLE_Z
|
||||
#endif
|
||||
#if ENABLED(DISABLE_I) && !defined(DISABLE_IDLE_I)
|
||||
#define DISABLE_IDLE_I
|
||||
#endif
|
||||
#if ENABLED(DISABLE_J) && !defined(DISABLE_IDLE_J)
|
||||
#define DISABLE_IDLE_J
|
||||
#endif
|
||||
#if ENABLED(DISABLE_K) && !defined(DISABLE_IDLE_K)
|
||||
#define DISABLE_IDLE_K
|
||||
#endif
|
||||
#if ENABLED(DISABLE_U) && !defined(DISABLE_IDLE_U)
|
||||
#define DISABLE_IDLE_U
|
||||
#endif
|
||||
#if ENABLED(DISABLE_V) && !defined(DISABLE_IDLE_V)
|
||||
#define DISABLE_IDLE_V
|
||||
#endif
|
||||
#if ENABLED(DISABLE_W) && !defined(DISABLE_IDLE_W)
|
||||
#define DISABLE_IDLE_W
|
||||
#endif
|
||||
#if ENABLED(DISABLE_E) && !defined(DISABLE_IDLE_E)
|
||||
#define DISABLE_IDLE_E
|
||||
#endif
|
||||
|
||||
#define _OR_HAS_DI(A) || ALL(HAS_##A##_AXIS, DISABLE_IDLE_##A)
|
||||
#if ALL(HAS_EXTRUDERS, DISABLE_IDLE_E) MAP(_OR_HAS_DI, X, Y, Z, I, J, K, U, V, W)
|
||||
#define HAS_DISABLE_IDLE_AXES 1
|
||||
#endif
|
||||
#undef _OR_HAS_DI
|
||||
|
||||
// Remove hotend-dependent settings
|
||||
#if HOTENDS < 8
|
||||
#undef E7_AUTO_FAN_PIN
|
||||
#if HOTENDS <= 6
|
||||
#undef HEATER_7_MAXTEMP
|
||||
#undef HEATER_7_MINTEMP
|
||||
#if HOTENDS < 7
|
||||
#undef E6_AUTO_FAN_PIN
|
||||
#if HOTENDS <= 5
|
||||
#undef HEATER_6_MAXTEMP
|
||||
#undef HEATER_6_MINTEMP
|
||||
#if HOTENDS < 6
|
||||
#undef E5_AUTO_FAN_PIN
|
||||
#if HOTENDS <= 4
|
||||
#undef HEATER_5_MAXTEMP
|
||||
#undef HEATER_5_MINTEMP
|
||||
#if HOTENDS < 5
|
||||
#undef E4_AUTO_FAN_PIN
|
||||
#if HOTENDS <= 3
|
||||
#undef HEATER_4_MAXTEMP
|
||||
#undef HEATER_4_MINTEMP
|
||||
#if HOTENDS < 4
|
||||
#undef E3_AUTO_FAN_PIN
|
||||
#if HOTENDS <= 2
|
||||
#undef HEATER_3_MAXTEMP
|
||||
#undef HEATER_3_MINTEMP
|
||||
#if HOTENDS < 3
|
||||
#undef E2_AUTO_FAN_PIN
|
||||
#if HOTENDS <= 1
|
||||
#undef HEATER_2_MAXTEMP
|
||||
#undef HEATER_2_MINTEMP
|
||||
#if HOTENDS < 2
|
||||
#undef E1_AUTO_FAN_PIN
|
||||
#if HOTENDS == 0
|
||||
#undef HEATER_1_MAXTEMP
|
||||
#undef HEATER_1_MINTEMP
|
||||
#if HOTENDS < 1
|
||||
#undef AUTOTEMP
|
||||
#undef E0_AUTO_FAN_PIN
|
||||
#undef HEATER_0_MAXTEMP
|
||||
#undef HEATER_0_MINTEMP
|
||||
#undef PID_PARAMS_PER_HOTEND
|
||||
#undef PIDTEMP
|
||||
#undef MPCTEMP
|
||||
#undef PREVENT_COLD_EXTRUSION
|
||||
#undef THERMAL_PROTECTION_HOTENDS
|
||||
#undef THERMAL_PROTECTION_PERIOD
|
||||
#undef WATCH_TEMP_PERIOD
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
@@ -160,11 +289,32 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// This flag indicates some kind of jerk storage is needed
|
||||
#if ANY(CLASSIC_JERK, IS_KINEMATIC)
|
||||
#define HAS_CLASSIC_JERK 1
|
||||
#endif
|
||||
|
||||
// Use Junction Deviation for motion if Jerk is disabled
|
||||
#if DISABLED(CLASSIC_JERK)
|
||||
#define HAS_JUNCTION_DEVIATION 1
|
||||
#endif
|
||||
|
||||
// E jerk exists with JD disabled (of course) but also when Linear Advance is disabled on Delta/SCARA
|
||||
#if HAS_EXTRUDERS && (ENABLED(CLASSIC_JERK) || (IS_KINEMATIC && DISABLED(LIN_ADVANCE)))
|
||||
#define HAS_CLASSIC_E_JERK 1
|
||||
#endif
|
||||
|
||||
// Linear advance uses Jerk since E is an isolated axis
|
||||
#if ALL(HAS_JUNCTION_DEVIATION, LIN_ADVANCE)
|
||||
#define HAS_LINEAR_E_JERK 1
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Temperature Sensors; define what sensor(s) we have.
|
||||
*/
|
||||
|
||||
// Temperature sensor IDs
|
||||
#define HID_NONE -128
|
||||
#define HID_REDUNDANT -6
|
||||
#define HID_BOARD -5
|
||||
#define HID_COOLER -4
|
||||
@@ -183,9 +333,8 @@
|
||||
#define _SENSOR_IS(I,N) || (TEMP_SENSOR(N) == I)
|
||||
#define _E_SENSOR_IS(I,N) _SENSOR_IS(N,I)
|
||||
#define ANY_E_SENSOR_IS(N) (0 REPEAT2(HOTENDS, _E_SENSOR_IS, N))
|
||||
#define ANY_THERMISTOR_IS(N) ( ANY_E_SENSOR_IS(N) \
|
||||
_SENSOR_IS(N,BED) _SENSOR_IS(N,PROBE) _SENSOR_IS(N,CHAMBER) \
|
||||
_SENSOR_IS(N,COOLER) _SENSOR_IS(N,BOARD) _SENSOR_IS(N,REDUNDANT) )
|
||||
#define ANY_THERMISTOR_IS(N) ( ANY_E_SENSOR_IS(N) _SENSOR_IS(N,REDUNDANT) \
|
||||
_SENSOR_IS(N,BED) _SENSOR_IS(N,PROBE) _SENSOR_IS(N,CHAMBER) _SENSOR_IS(N,COOLER) _SENSOR_IS(N,BOARD) )
|
||||
|
||||
#if ANY_THERMISTOR_IS(1000)
|
||||
#define HAS_USER_THERMISTORS 1
|
||||
@@ -223,15 +372,13 @@
|
||||
#define TEMP_SENSOR_0_IS_AD8495 1
|
||||
#elif TEMP_SENSOR_0 == -1
|
||||
#define TEMP_SENSOR_0_IS_AD595 1
|
||||
#elif TEMP_SENSOR_0 == 1000
|
||||
#define TEMP_SENSOR_0_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_0 == 998 || TEMP_SENSOR_0 == 999
|
||||
#define TEMP_SENSOR_0_IS_DUMMY 1
|
||||
#elif TEMP_SENSOR_0 > 0
|
||||
#define TEMP_SENSOR_0_IS_THERMISTOR 1
|
||||
#else
|
||||
#undef HEATER_0_MINTEMP
|
||||
#undef HEATER_0_MAXTEMP
|
||||
#if TEMP_SENSOR_0 == 1000
|
||||
#define TEMP_SENSOR_0_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_0 == 998 || TEMP_SENSOR_0 == 999
|
||||
#define TEMP_SENSOR_0_IS_DUMMY 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if TEMP_SENSOR_IS_MAX_TC(1)
|
||||
@@ -268,15 +415,13 @@
|
||||
#define TEMP_SENSOR_1_IS_AD8495 1
|
||||
#elif TEMP_SENSOR_1 == -1
|
||||
#define TEMP_SENSOR_1_IS_AD595 1
|
||||
#elif TEMP_SENSOR_1 == 1000
|
||||
#define TEMP_SENSOR_1_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_1 == 998 || TEMP_SENSOR_1 == 999
|
||||
#define TEMP_SENSOR_1_IS_DUMMY 1
|
||||
#elif TEMP_SENSOR_1 > 0
|
||||
#define TEMP_SENSOR_1_IS_THERMISTOR 1
|
||||
#else
|
||||
#undef HEATER_1_MINTEMP
|
||||
#undef HEATER_1_MAXTEMP
|
||||
#if TEMP_SENSOR_1 == 1000
|
||||
#define TEMP_SENSOR_1_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_1 == 998 || TEMP_SENSOR_1 == 999
|
||||
#define TEMP_SENSOR_1_IS_DUMMY 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if TEMP_SENSOR_IS_MAX_TC(2)
|
||||
@@ -313,100 +458,90 @@
|
||||
#define TEMP_SENSOR_2_IS_AD8495 1
|
||||
#elif TEMP_SENSOR_2 == -1
|
||||
#define TEMP_SENSOR_2_IS_AD595 1
|
||||
#elif TEMP_SENSOR_2 == 1000
|
||||
#define TEMP_SENSOR_2_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_2 == 998 || TEMP_SENSOR_2 == 999
|
||||
#define TEMP_SENSOR_2_IS_DUMMY 1
|
||||
#elif TEMP_SENSOR_2 > 0
|
||||
#define TEMP_SENSOR_2_IS_THERMISTOR 1
|
||||
#else
|
||||
#undef HEATER_2_MINTEMP
|
||||
#undef HEATER_2_MAXTEMP
|
||||
#if TEMP_SENSOR_2 == 1000
|
||||
#define TEMP_SENSOR_2_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_2 == 998 || TEMP_SENSOR_2 == 999
|
||||
#define TEMP_SENSOR_2_IS_DUMMY 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if TEMP_SENSOR_3 == 1000
|
||||
#define TEMP_SENSOR_3_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_3 == 998 || TEMP_SENSOR_3 == 999
|
||||
#define TEMP_SENSOR_3_IS_DUMMY 1
|
||||
#elif TEMP_SENSOR_3 > 0
|
||||
#if TEMP_SENSOR_3 > 0
|
||||
#define TEMP_SENSOR_3_IS_THERMISTOR 1
|
||||
#elif !TEMP_SENSOR_3
|
||||
#undef HEATER_3_MINTEMP
|
||||
#undef HEATER_3_MAXTEMP
|
||||
#if TEMP_SENSOR_3 == 1000
|
||||
#define TEMP_SENSOR_3_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_3 == 998 || TEMP_SENSOR_3 == 999
|
||||
#define TEMP_SENSOR_3_IS_DUMMY 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if TEMP_SENSOR_4 == 1000
|
||||
#define TEMP_SENSOR_4_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_4 == 998 || TEMP_SENSOR_4 == 999
|
||||
#define TEMP_SENSOR_4_IS_DUMMY 1
|
||||
#elif TEMP_SENSOR_4 > 0
|
||||
#if TEMP_SENSOR_4 > 0
|
||||
#define TEMP_SENSOR_4_IS_THERMISTOR 1
|
||||
#elif !TEMP_SENSOR_4
|
||||
#undef HEATER_4_MINTEMP
|
||||
#undef HEATER_4_MAXTEMP
|
||||
#if TEMP_SENSOR_4 == 1000
|
||||
#define TEMP_SENSOR_4_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_4 == 998 || TEMP_SENSOR_4 == 999
|
||||
#define TEMP_SENSOR_4_IS_DUMMY 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if TEMP_SENSOR_5 == 1000
|
||||
#define TEMP_SENSOR_5_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_5 == 998 || TEMP_SENSOR_5 == 999
|
||||
#define TEMP_SENSOR_5_IS_DUMMY 1
|
||||
#elif TEMP_SENSOR_5 > 0
|
||||
#if TEMP_SENSOR_5 > 0
|
||||
#define TEMP_SENSOR_5_IS_THERMISTOR 1
|
||||
#elif !TEMP_SENSOR_5
|
||||
#undef HEATER_5_MINTEMP
|
||||
#undef HEATER_5_MAXTEMP
|
||||
#if TEMP_SENSOR_5 == 1000
|
||||
#define TEMP_SENSOR_5_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_5 == 998 || TEMP_SENSOR_5 == 999
|
||||
#define TEMP_SENSOR_5_IS_DUMMY 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if TEMP_SENSOR_6 == 1000
|
||||
#define TEMP_SENSOR_6_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_6 == 998 || TEMP_SENSOR_6 == 999
|
||||
#define TEMP_SENSOR_6_IS_DUMMY 1
|
||||
#elif TEMP_SENSOR_6 > 0
|
||||
#if TEMP_SENSOR_6 > 0
|
||||
#define TEMP_SENSOR_6_IS_THERMISTOR 1
|
||||
#elif !TEMP_SENSOR_6
|
||||
#undef HEATER_6_MINTEMP
|
||||
#undef HEATER_6_MAXTEMP
|
||||
#if TEMP_SENSOR_6 == 1000
|
||||
#define TEMP_SENSOR_6_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_6 == 998 || TEMP_SENSOR_6 == 999
|
||||
#define TEMP_SENSOR_6_IS_DUMMY 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if TEMP_SENSOR_7 == 1000
|
||||
#define TEMP_SENSOR_7_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_7 == 998 || TEMP_SENSOR_7 == 999
|
||||
#define TEMP_SENSOR_7_IS_DUMMY 1
|
||||
#elif TEMP_SENSOR_7 > 0
|
||||
#if TEMP_SENSOR_7 > 0
|
||||
#define TEMP_SENSOR_7_IS_THERMISTOR 1
|
||||
#elif !TEMP_SENSOR_7
|
||||
#undef HEATER_7_MINTEMP
|
||||
#undef HEATER_7_MAXTEMP
|
||||
#if TEMP_SENSOR_7 == 1000
|
||||
#define TEMP_SENSOR_7_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_7 == 998 || TEMP_SENSOR_7 == 999
|
||||
#define TEMP_SENSOR_7_IS_DUMMY 1
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
|
||||
#define _REDUNDANT_E (REDUNDANT_TEMP_MATCH(SOURCE, E0) || REDUNDANT_TEMP_MATCH(SOURCE, E1) || REDUNDANT_TEMP_MATCH(SOURCE, E2))
|
||||
#if TEMP_SENSOR_REDUNDANT == -5
|
||||
#if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1) && !REDUNDANT_TEMP_MATCH(SOURCE, E2)
|
||||
#error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 (0/1/2)."
|
||||
#if !_REDUNDANT_E
|
||||
#error "MAX31865 Thermocouples (-5) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_[0-2]."
|
||||
#endif
|
||||
|
||||
#define TEMP_SENSOR_REDUNDANT_IS_MAX31865 1
|
||||
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN 0
|
||||
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
|
||||
#elif TEMP_SENSOR_REDUNDANT == -3
|
||||
#if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1) && !REDUNDANT_TEMP_MATCH(SOURCE, E2)
|
||||
#error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 (0/1/2)."
|
||||
#if !_REDUNDANT_E
|
||||
#error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_[0-2]."
|
||||
#endif
|
||||
|
||||
#define TEMP_SENSOR_REDUNDANT_IS_MAX31855 1
|
||||
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN -270
|
||||
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1800
|
||||
#elif TEMP_SENSOR_REDUNDANT == -2
|
||||
#if !REDUNDANT_TEMP_MATCH(SOURCE, E0) && !REDUNDANT_TEMP_MATCH(SOURCE, E1) && !REDUNDANT_TEMP_MATCH(SOURCE, E2)
|
||||
#error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 (0/1/2)."
|
||||
#if !_REDUNDANT_E
|
||||
#error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_REDUNDANT_SOURCE other than TEMP_SENSOR_[0-2]."
|
||||
#endif
|
||||
|
||||
#define TEMP_SENSOR_REDUNDANT_IS_MAX6675 1
|
||||
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN 0
|
||||
#define TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX 1024
|
||||
#endif
|
||||
#undef _REDUNDANT_E
|
||||
|
||||
// mimic setting up the source TEMP_SENSOR
|
||||
// Mimic setting up the source TEMP_SENSOR
|
||||
#if REDUNDANT_TEMP_MATCH(SOURCE, E0)
|
||||
#define TEMP_SENSOR_0_MAX_TC_TMIN TEMP_SENSOR_REDUNDANT_MAX_TC_TMIN
|
||||
#define TEMP_SENSOR_0_MAX_TC_TMAX TEMP_SENSOR_REDUNDANT_MAX_TC_TMAX
|
||||
@@ -429,36 +564,36 @@
|
||||
|
||||
#if (TEMP_SENSOR_IS_MAX_TC(0) && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_0) || (TEMP_SENSOR_IS_MAX_TC(1) && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_1) || (TEMP_SENSOR_IS_MAX_TC(2) && TEMP_SENSOR_REDUNDANT != TEMP_SENSOR_2)
|
||||
#if TEMP_SENSOR_REDUNDANT == -5
|
||||
#error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 then TEMP_SENSOR_REDUNDANT must match."
|
||||
#error "If MAX31865 Thermocouple (-5) is used for TEMP_SENSOR_[0-2] then TEMP_SENSOR_REDUNDANT must match."
|
||||
#elif TEMP_SENSOR_REDUNDANT == -3
|
||||
#error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 then TEMP_SENSOR_REDUNDANT must match."
|
||||
#error "If MAX31855 Thermocouple (-3) is used for TEMP_SENSOR_[0-2] then TEMP_SENSOR_REDUNDANT must match."
|
||||
#elif TEMP_SENSOR_REDUNDANT == -2
|
||||
#error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_0/TEMP_SENSOR_1/TEMP_SENSOR_2 then TEMP_SENSOR_REDUNDANT must match."
|
||||
#error "If MAX6675 Thermocouple (-2) is used for TEMP_SENSOR_[0-2] then TEMP_SENSOR_REDUNDANT must match."
|
||||
#endif
|
||||
#endif
|
||||
#elif TEMP_SENSOR_REDUNDANT == -4
|
||||
#define TEMP_SENSOR_REDUNDANT_IS_AD8495 1
|
||||
#elif TEMP_SENSOR_REDUNDANT == -1
|
||||
#define TEMP_SENSOR_REDUNDANT_IS_AD595 1
|
||||
#elif TEMP_SENSOR_REDUNDANT == 998 || TEMP_SENSOR_REDUNDANT == 999
|
||||
#error "Dummy sensors are not supported for TEMP_SENSOR_REDUNDANT."
|
||||
#elif TEMP_SENSOR_REDUNDANT > 0
|
||||
#define TEMP_SENSOR_REDUNDANT_IS_THERMISTOR 1
|
||||
#if TEMP_SENSOR_REDUNDANT == 1000
|
||||
#define TEMP_SENSOR_REDUNDANT_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_REDUNDANT == 998 || TEMP_SENSOR_REDUNDANT == 999
|
||||
#error "Dummy sensors are not supported for TEMP_SENSOR_REDUNDANT."
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if TEMP_SENSOR_IS_MAX_TC(0) || TEMP_SENSOR_IS_MAX_TC(1) || TEMP_SENSOR_IS_MAX_TC(2) || TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
|
||||
#if TEMP_SENSOR_IS_MAX_TC(0) || TEMP_SENSOR_IS_MAX_TC(1) || TEMP_SENSOR_IS_MAX_TC(2) || TEMP_SENSOR_IS_MAX_TC(BED) || TEMP_SENSOR_IS_MAX_TC(REDUNDANT)
|
||||
#define HAS_MAX_TC 1
|
||||
#endif
|
||||
#if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675 || TEMP_SENSOR_2_IS_MAX6675 || TEMP_SENSOR_REDUNDANT_IS_MAX6675
|
||||
#if TEMP_SENSOR_0_IS_MAX6675 || TEMP_SENSOR_1_IS_MAX6675 || TEMP_SENSOR_2_IS_MAX6675 || TEMP_SENSOR_BED_IS_MAX6675 || TEMP_SENSOR_REDUNDANT_IS_MAX6675
|
||||
#define HAS_MAX6675 1
|
||||
#endif
|
||||
#if TEMP_SENSOR_0_IS_MAX31855 || TEMP_SENSOR_1_IS_MAX31855 || TEMP_SENSOR_2_IS_MAX31855 || TEMP_SENSOR_REDUNDANT_IS_MAX31855
|
||||
#if TEMP_SENSOR_0_IS_MAX31855 || TEMP_SENSOR_1_IS_MAX31855 || TEMP_SENSOR_2_IS_MAX31855 || TEMP_SENSOR_BED_IS_MAX31855 || TEMP_SENSOR_REDUNDANT_IS_MAX31855
|
||||
#define HAS_MAX31855 1
|
||||
#endif
|
||||
#if TEMP_SENSOR_0_IS_MAX31865 || TEMP_SENSOR_1_IS_MAX31865 || TEMP_SENSOR_2_IS_MAX31865 || TEMP_SENSOR_REDUNDANT_IS_MAX31865
|
||||
#if TEMP_SENSOR_0_IS_MAX31865 || TEMP_SENSOR_1_IS_MAX31865 || TEMP_SENSOR_2_IS_MAX31865 || TEMP_SENSOR_BED_IS_MAX31865 || TEMP_SENSOR_REDUNDANT_IS_MAX31865
|
||||
#define HAS_MAX31865 1
|
||||
#endif
|
||||
|
||||
@@ -470,16 +605,13 @@
|
||||
#error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_3."
|
||||
#elif TEMP_SENSOR_3 == -1
|
||||
#define TEMP_SENSOR_3_IS_AD595 1
|
||||
#elif TEMP_SENSOR_3 == 998 || TEMP_SENSOR_3 == 999
|
||||
#define TEMP_SENSOR_3_IS_DUMMY 1
|
||||
#elif TEMP_SENSOR_3 > 0
|
||||
#define TEMP_SENSOR_3_IS_THERMISTOR 1
|
||||
#if TEMP_SENSOR_3 == 1000
|
||||
#define TEMP_SENSOR_3_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_3 == 998 || TEMP_SENSOR_3 == 999
|
||||
#define TEMP_SENSOR_3_IS_DUMMY 1
|
||||
#endif
|
||||
#else
|
||||
#undef HEATER_3_MINTEMP
|
||||
#undef HEATER_3_MAXTEMP
|
||||
#endif
|
||||
|
||||
#if TEMP_SENSOR_4 == -4
|
||||
@@ -490,16 +622,13 @@
|
||||
#error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_4."
|
||||
#elif TEMP_SENSOR_4 == -1
|
||||
#define TEMP_SENSOR_4_IS_AD595 1
|
||||
#elif TEMP_SENSOR_4 == 998 || TEMP_SENSOR_4 == 999
|
||||
#define TEMP_SENSOR_4_IS_DUMMY 1
|
||||
#elif TEMP_SENSOR_4 > 0
|
||||
#define TEMP_SENSOR_4_IS_THERMISTOR 1
|
||||
#if TEMP_SENSOR_4 == 1000
|
||||
#define TEMP_SENSOR_4_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_4 == 998 || TEMP_SENSOR_4 == 999
|
||||
#define TEMP_SENSOR_4_IS_DUMMY 1
|
||||
#endif
|
||||
#else
|
||||
#undef HEATER_4_MINTEMP
|
||||
#undef HEATER_4_MAXTEMP
|
||||
#endif
|
||||
|
||||
#if TEMP_SENSOR_5 == -4
|
||||
@@ -510,16 +639,13 @@
|
||||
#error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_5."
|
||||
#elif TEMP_SENSOR_5 == -1
|
||||
#define TEMP_SENSOR_5_IS_AD595 1
|
||||
#elif TEMP_SENSOR_5 == 998 || TEMP_SENSOR_5 == 999
|
||||
#define TEMP_SENSOR_5_IS_DUMMY 1
|
||||
#elif TEMP_SENSOR_5 > 0
|
||||
#define TEMP_SENSOR_5_IS_THERMISTOR 1
|
||||
#if TEMP_SENSOR_5 == 1000
|
||||
#define TEMP_SENSOR_5_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_5 == 998 || TEMP_SENSOR_5 == 999
|
||||
#define TEMP_SENSOR_5_IS_DUMMY 1
|
||||
#endif
|
||||
#else
|
||||
#undef HEATER_5_MINTEMP
|
||||
#undef HEATER_5_MAXTEMP
|
||||
#endif
|
||||
|
||||
#if TEMP_SENSOR_6 == -4
|
||||
@@ -530,16 +656,13 @@
|
||||
#error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_6."
|
||||
#elif TEMP_SENSOR_6 == -1
|
||||
#define TEMP_SENSOR_6_IS_AD595 1
|
||||
#elif TEMP_SENSOR_6 == 998 || TEMP_SENSOR_6 == 999
|
||||
#define TEMP_SENSOR_6_IS_DUMMY 1
|
||||
#elif TEMP_SENSOR_6 > 0
|
||||
#define TEMP_SENSOR_6_IS_THERMISTOR 1
|
||||
#if TEMP_SENSOR_6 == 1000
|
||||
#define TEMP_SENSOR_6_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_6 == 998 || TEMP_SENSOR_6 == 999
|
||||
#define TEMP_SENSOR_6_IS_DUMMY 1
|
||||
#endif
|
||||
#else
|
||||
#undef HEATER_6_MINTEMP
|
||||
#undef HEATER_6_MAXTEMP
|
||||
#endif
|
||||
|
||||
#if TEMP_SENSOR_7 == -4
|
||||
@@ -550,24 +673,37 @@
|
||||
#error "MAX7775 Thermocouples (-2) not supported for TEMP_SENSOR_7."
|
||||
#elif TEMP_SENSOR_7 == -1
|
||||
#define TEMP_SENSOR_7_IS_AD595 1
|
||||
#elif TEMP_SENSOR_7 == 998 || TEMP_SENSOR_7 == 999
|
||||
#define TEMP_SENSOR_7_IS_DUMMY 1
|
||||
#elif TEMP_SENSOR_7 > 0
|
||||
#define TEMP_SENSOR_7_IS_THERMISTOR 1
|
||||
#if TEMP_SENSOR_7 == 1000
|
||||
#define TEMP_SENSOR_7_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_7 == 998 || TEMP_SENSOR_7 == 999
|
||||
#define TEMP_SENSOR_7_IS_DUMMY 1
|
||||
#endif
|
||||
#else
|
||||
#undef HEATER_7_MINTEMP
|
||||
#undef HEATER_7_MAXTEMP
|
||||
#endif
|
||||
|
||||
#if TEMP_SENSOR_BED == -4
|
||||
#if TEMP_SENSOR_IS_MAX_TC(BED)
|
||||
#if TEMP_SENSOR_BED == -5
|
||||
#define TEMP_SENSOR_BED_IS_MAX31865 1
|
||||
#define TEMP_SENSOR_BED_MAX_TC_TMIN 0
|
||||
#define TEMP_SENSOR_BED_MAX_TC_TMAX 1024
|
||||
#ifndef MAX31865_SENSOR_WIRES_BED
|
||||
#define MAX31865_SENSOR_WIRES_BED 2
|
||||
#endif
|
||||
#ifndef MAX31865_WIRE_OHMS_BED
|
||||
#define MAX31865_WIRE_OHMS_BED 0.0f
|
||||
#endif
|
||||
#elif TEMP_SENSOR_BED == -3
|
||||
#define TEMP_SENSOR_BED_IS_MAX31855 1
|
||||
#define TEMP_SENSOR_BED_MAX_TC_TMIN -270
|
||||
#define TEMP_SENSOR_BED_MAX_TC_TMAX 1800
|
||||
#elif TEMP_SENSOR_BED == -2
|
||||
#define TEMP_SENSOR_BED_IS_MAX6675 1
|
||||
#define TEMP_SENSOR_BED_MAX_TC_TMIN 0
|
||||
#define TEMP_SENSOR_BED_MAX_TC_TMAX 1024
|
||||
#endif
|
||||
#elif TEMP_SENSOR_BED == -4
|
||||
#define TEMP_SENSOR_BED_IS_AD8495 1
|
||||
#elif TEMP_SENSOR_BED == -3
|
||||
#error "MAX31855 Thermocouples (-3) not supported for TEMP_SENSOR_BED."
|
||||
#elif TEMP_SENSOR_BED == -2
|
||||
#error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_BED."
|
||||
#elif TEMP_SENSOR_BED == -1
|
||||
#define TEMP_SENSOR_BED_IS_AD595 1
|
||||
#elif TEMP_SENSOR_BED > 0
|
||||
@@ -578,8 +714,6 @@
|
||||
#define TEMP_SENSOR_BED_IS_DUMMY 1
|
||||
#endif
|
||||
#else
|
||||
#undef THERMAL_PROTECTION_BED
|
||||
#undef THERMAL_PROTECTION_BED_PERIOD
|
||||
#undef BED_MINTEMP
|
||||
#undef BED_MAXTEMP
|
||||
#endif
|
||||
@@ -613,12 +747,12 @@
|
||||
#error "MAX6675 Thermocouples (-2) not supported for TEMP_SENSOR_COOLER."
|
||||
#elif TEMP_SENSOR_COOLER == -1
|
||||
#define TEMP_SENSOR_COOLER_IS_AD595 1
|
||||
#elif TEMP_SENSOR_COOLER == 998 || TEMP_SENSOR_COOLER == 999
|
||||
#define TEMP_SENSOR_COOLER_IS_DUMMY 1
|
||||
#elif TEMP_SENSOR_COOLER > 0
|
||||
#define TEMP_SENSOR_COOLER_IS_THERMISTOR 1
|
||||
#if TEMP_SENSOR_COOLER == 1000
|
||||
#define TEMP_SENSOR_COOLER_IS_CUSTOM 1
|
||||
#elif TEMP_SENSOR_COOLER == 998 || TEMP_SENSOR_COOLER == 999
|
||||
#define TEMP_SENSOR_COOLER_IS_DUMMY 1
|
||||
#endif
|
||||
#else
|
||||
#undef THERMAL_PROTECTION_COOLER
|
||||
@@ -660,11 +794,11 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if ENABLED(MIXING_EXTRUDER) && (ENABLED(RETRACT_SYNC_MIXING) || BOTH(FILAMENT_LOAD_UNLOAD_GCODES, FILAMENT_UNLOAD_ALL_EXTRUDERS))
|
||||
#if ENABLED(MIXING_EXTRUDER) && (ENABLED(RETRACT_SYNC_MIXING) || ALL(FILAMENT_LOAD_UNLOAD_GCODES, FILAMENT_UNLOAD_ALL_EXTRUDERS))
|
||||
#define HAS_MIXER_SYNC_CHANNEL 1
|
||||
#endif
|
||||
|
||||
#if EITHER(DUAL_X_CARRIAGE, MULTI_NOZZLE_DUPLICATION)
|
||||
#if ANY(DUAL_X_CARRIAGE, MULTI_NOZZLE_DUPLICATION)
|
||||
#define HAS_DUPLICATION_MODE 1
|
||||
#endif
|
||||
|
||||
@@ -702,7 +836,7 @@
|
||||
#undef MENU_ADDAUTOSTART
|
||||
#endif
|
||||
|
||||
#if EITHER(SDSUPPORT, SET_PROGRESS_MANUALLY)
|
||||
#if ANY(HAS_MEDIA, SET_PROGRESS_MANUALLY)
|
||||
#define HAS_PRINT_PROGRESS 1
|
||||
#endif
|
||||
|
||||
@@ -720,11 +854,11 @@
|
||||
#define HAS_STATUS_MESSAGE_TIMEOUT 1
|
||||
#endif
|
||||
|
||||
#if ENABLED(SDSUPPORT) && SD_PROCEDURE_DEPTH
|
||||
#if HAS_MEDIA && SD_PROCEDURE_DEPTH
|
||||
#define HAS_MEDIA_SUBCALLS 1
|
||||
#endif
|
||||
|
||||
#if HAS_PRINT_PROGRESS && EITHER(PRINT_PROGRESS_SHOW_DECIMALS, SHOW_REMAINING_TIME)
|
||||
#if HAS_PRINT_PROGRESS && ANY(PRINT_PROGRESS_SHOW_DECIMALS, SHOW_REMAINING_TIME)
|
||||
#define HAS_PRINT_PROGRESS_PERMYRIAD 1
|
||||
#endif
|
||||
|
||||
@@ -742,7 +876,7 @@
|
||||
#if ANY(X_DUAL_ENDSTOPS, Y_DUAL_ENDSTOPS, Z_MULTI_ENDSTOPS)
|
||||
#define HAS_EXTRA_ENDSTOPS 1
|
||||
#endif
|
||||
#if EITHER(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
|
||||
#if ANY(MIN_SOFTWARE_ENDSTOPS, MAX_SOFTWARE_ENDSTOPS)
|
||||
#define HAS_SOFTWARE_ENDSTOPS 1
|
||||
#endif
|
||||
#if ANY(EXTENSIBLE_UI, IS_NEWPANEL, EMERGENCY_PARSER, HAS_ADC_BUTTONS, HAS_DWIN_E3V2)
|
||||
@@ -754,7 +888,7 @@
|
||||
#else
|
||||
#undef LED_POWEROFF_TIMEOUT
|
||||
#endif
|
||||
#if ALL(HAS_RESUME_CONTINUE, PRINTER_EVENT_LEDS, SDSUPPORT)
|
||||
#if ALL(HAS_RESUME_CONTINUE, PRINTER_EVENT_LEDS, HAS_MEDIA)
|
||||
#define HAS_LEDS_OFF_FLAG 1
|
||||
#endif
|
||||
#if DISPLAY_SLEEP_MINUTES || TOUCH_IDLE_SLEEP_MINS
|
||||
@@ -764,7 +898,7 @@
|
||||
#define HAS_GCODE_M255 1
|
||||
#endif
|
||||
|
||||
#if EITHER(DIGIPOT_MCP4018, DIGIPOT_MCP4451)
|
||||
#if ANY(DIGIPOT_MCP4018, DIGIPOT_MCP4451)
|
||||
#define HAS_MOTOR_CURRENT_I2C 1
|
||||
#endif
|
||||
|
||||
@@ -779,6 +913,17 @@
|
||||
#endif
|
||||
|
||||
// Multiple Z steppers
|
||||
#ifdef INVERT_Z_DIR
|
||||
#if NUM_Z_STEPPERS >= 2 && !defined(INVERT_Z2_DIR)
|
||||
#define INVERT_Z2_DIR INVERT_Z_DIR
|
||||
#if NUM_Z_STEPPERS >= 3 && !defined(INVERT_Z3_DIR)
|
||||
#define INVERT_Z3_DIR INVERT_Z_DIR
|
||||
#if NUM_Z_STEPPERS >= 4 && !defined(INVERT_Z4_DIR)
|
||||
#define INVERT_Z4_DIR INVERT_Z_DIR
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#if NUM_Z_STEPPERS < 4
|
||||
#undef INVERT_Z4_VS_Z_DIR
|
||||
#if NUM_Z_STEPPERS < 3
|
||||
@@ -797,7 +942,7 @@
|
||||
// Spindle/Laser power display types
|
||||
// Defined here so sanity checks can use them
|
||||
//
|
||||
#if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
|
||||
#if ANY(SPINDLE_FEATURE, LASER_FEATURE)
|
||||
#define HAS_CUTTER 1
|
||||
#define _CUTTER_POWER_PWM255 1
|
||||
#define _CUTTER_POWER_PERCENT 2
|
||||
@@ -870,7 +1015,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if EITHER(FYSETC_MINI_12864_2_1, FYSETC_242_OLED_12864)
|
||||
#if ANY(FYSETC_MINI_12864_2_1, FYSETC_242_OLED_12864)
|
||||
#ifndef LED_USER_PRESET_GREEN
|
||||
#define LED_USER_PRESET_GREEN 128
|
||||
#endif
|
||||
@@ -905,7 +1050,7 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if BOTH(LED_CONTROL_MENU, NEOPIXEL2_SEPARATE)
|
||||
#if ALL(LED_CONTROL_MENU, NEOPIXEL2_SEPARATE)
|
||||
#ifndef LED2_USER_PRESET_RED
|
||||
#define LED2_USER_PRESET_RED 255
|
||||
#endif
|
||||
@@ -928,7 +1073,7 @@
|
||||
#endif
|
||||
|
||||
// Full Touch Screen needs 'tft/xpt2046'
|
||||
#if EITHER(TFT_TOUCH_DEVICE_XPT2046, HAS_TFT_LVGL_UI)
|
||||
#if ANY(TFT_TOUCH_DEVICE_XPT2046, HAS_TFT_LVGL_UI)
|
||||
#define HAS_TFT_XPT2046 1
|
||||
#endif
|
||||
|
||||
@@ -948,10 +1093,8 @@
|
||||
#define POLL_JOG
|
||||
#endif
|
||||
|
||||
#if X2_HOME_DIR > 0
|
||||
#if ENABLED(DUAL_X_CARRIAGE)
|
||||
#define X2_HOME_TO_MAX 1
|
||||
#elif X2_HOME_DIR < 0
|
||||
#define X2_HOME_TO_MIN 1
|
||||
#endif
|
||||
|
||||
#ifndef HOMING_BUMP_MM
|
||||
@@ -1039,53 +1182,6 @@
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// Remove unused STEALTHCHOP flags
|
||||
#if NUM_AXES < 9
|
||||
#undef STEALTHCHOP_W
|
||||
#undef CALIBRATION_MEASURE_WMIN
|
||||
#undef CALIBRATION_MEASURE_WMAX
|
||||
#if NUM_AXES < 8
|
||||
#undef STEALTHCHOP_V
|
||||
#undef CALIBRATION_MEASURE_VMIN
|
||||
#undef CALIBRATION_MEASURE_VMAX
|
||||
#if NUM_AXES < 7
|
||||
#undef STEALTHCHOP_U
|
||||
#undef CALIBRATION_MEASURE_UMIN
|
||||
#undef CALIBRATION_MEASURE_UMAX
|
||||
#if NUM_AXES < 6
|
||||
#undef STEALTHCHOP_K
|
||||
#undef CALIBRATION_MEASURE_KMIN
|
||||
#undef CALIBRATION_MEASURE_KMAX
|
||||
#if NUM_AXES < 5
|
||||
#undef STEALTHCHOP_J
|
||||
#undef CALIBRATION_MEASURE_JMIN
|
||||
#undef CALIBRATION_MEASURE_JMAX
|
||||
#if NUM_AXES < 4
|
||||
#undef STEALTHCHOP_I
|
||||
#undef CALIBRATION_MEASURE_IMIN
|
||||
#undef CALIBRATION_MEASURE_IMAX
|
||||
#if NUM_AXES < 3
|
||||
#undef STEALTHCHOP_Z
|
||||
#undef Z_IDLE_HEIGHT
|
||||
#undef Z_PROBE_SLED
|
||||
#undef Z_SAFE_HOMING
|
||||
#undef HOME_Z_FIRST
|
||||
#undef HOMING_Z_WITH_PROBE
|
||||
#undef ENABLE_LEVELING_FADE_HEIGHT
|
||||
#undef NUM_Z_STEPPERS
|
||||
#undef CNC_WORKSPACE_PLANES
|
||||
#if NUM_AXES < 2
|
||||
#undef STEALTHCHOP_Y
|
||||
#undef QUICK_HOME
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if defined(SAFE_BED_LEVELING_START_X) || defined(SAFE_BED_LEVELING_START_Y) || defined(SAFE_BED_LEVELING_START_Z) \
|
||||
|| defined(SAFE_BED_LEVELING_START_I) || defined(SAFE_BED_LEVELING_START_J) || defined(SAFE_BED_LEVELING_START_K) \
|
||||
|| defined(SAFE_BED_LEVELING_START_U) || defined(SAFE_BED_LEVELING_START_V) || defined(SAFE_BED_LEVELING_START_W)
|
||||
@@ -1096,7 +1192,7 @@
|
||||
// SD Card connection methods
|
||||
// Defined here so pins and sanity checks can use them
|
||||
//
|
||||
#if ENABLED(SDSUPPORT)
|
||||
#if HAS_MEDIA
|
||||
#define _SDCARD_LCD 1
|
||||
#define _SDCARD_ONBOARD 2
|
||||
#define _SDCARD_CUSTOM_CABLE 3
|
||||
@@ -1104,10 +1200,11 @@
|
||||
#define SD_CONNECTION_IS(V) (_SDCARD_ID(SDCARD_CONNECTION) == _SDCARD_ID(V))
|
||||
#else
|
||||
#define SD_CONNECTION_IS(...) 0
|
||||
#undef SD_ABORT_ON_ENDSTOP_HIT
|
||||
#endif
|
||||
|
||||
// Power Monitor sensors
|
||||
#if EITHER(POWER_MONITOR_CURRENT, POWER_MONITOR_VOLTAGE)
|
||||
#if ANY(POWER_MONITOR_CURRENT, POWER_MONITOR_VOLTAGE)
|
||||
#define HAS_POWER_MONITOR 1
|
||||
#if ENABLED(POWER_MONITOR_CURRENT) && (ENABLED(POWER_MONITOR_VOLTAGE) || defined(POWER_MONITOR_FIXED_VOLTAGE))
|
||||
#define HAS_POWER_MONITOR_WATTS 1
|
||||
@@ -1126,7 +1223,7 @@
|
||||
|
||||
// Flags for Case Light having a color property or a single pin
|
||||
#if ENABLED(CASE_LIGHT_ENABLE)
|
||||
#if EITHER(CASE_LIGHT_USE_NEOPIXEL, CASE_LIGHT_USE_RGB_LED)
|
||||
#if ANY(CASE_LIGHT_USE_NEOPIXEL, CASE_LIGHT_USE_RGB_LED)
|
||||
#define CASE_LIGHT_IS_COLOR_LED 1
|
||||
#else
|
||||
#define NEED_CASE_LIGHT_PIN 1
|
||||
@@ -1143,15 +1240,16 @@
|
||||
#define NEED_LSF 1
|
||||
#endif
|
||||
|
||||
#if BOTH(HAS_TFT_LVGL_UI, CUSTOM_MENU_MAIN)
|
||||
#if ALL(HAS_TFT_LVGL_UI, CUSTOM_MENU_MAIN)
|
||||
#define _HAS_1(N) (defined(MAIN_MENU_ITEM_##N##_DESC) && defined(MAIN_MENU_ITEM_##N##_GCODE))
|
||||
#define HAS_USER_ITEM(V...) DO(HAS,||,V)
|
||||
#else
|
||||
#define HAS_USER_ITEM(N) 0
|
||||
#define HAS_USER_ITEM(...) 0
|
||||
#endif
|
||||
|
||||
/**
|
||||
* LCD_SERIAL_PORT must be defined ahead of HAL.h
|
||||
* LCD_SERIAL_PORT must be defined ahead of HAL.h and
|
||||
* currently HAL.h must be included ahead of pins.h.
|
||||
*/
|
||||
#ifndef LCD_SERIAL_PORT
|
||||
#if HAS_DWIN_E3V2 || IS_DWIN_MARLINUI || HAS_DGUS_LCD
|
||||
@@ -1171,20 +1269,16 @@
|
||||
#if !HAS_MULTI_SERIAL
|
||||
#undef MEATPACK_ON_SERIAL_PORT_2
|
||||
#endif
|
||||
#if EITHER(MEATPACK_ON_SERIAL_PORT_1, MEATPACK_ON_SERIAL_PORT_2)
|
||||
#if ANY(MEATPACK_ON_SERIAL_PORT_1, MEATPACK_ON_SERIAL_PORT_2)
|
||||
#define HAS_MEATPACK 1
|
||||
#endif
|
||||
|
||||
// AVR are (usually) too limited in resources to store the configuration into the binary
|
||||
#if ENABLED(CONFIGURATION_EMBEDDING) && !defined(FORCE_CONFIG_EMBED) && (defined(__AVR__) || DISABLED(SDSUPPORT) || EITHER(SDCARD_READONLY, DISABLE_M503))
|
||||
#if ENABLED(CONFIGURATION_EMBEDDING) && !defined(FORCE_CONFIG_EMBED) && (defined(__AVR__) || !HAS_MEDIA || ANY(SDCARD_READONLY, DISABLE_M503))
|
||||
#undef CONFIGURATION_EMBEDDING
|
||||
#define CANNOT_EMBED_CONFIGURATION defined(__AVR__)
|
||||
#endif
|
||||
|
||||
#if ANY(DISABLE_INACTIVE_X, DISABLE_INACTIVE_Y, DISABLE_INACTIVE_Z, DISABLE_INACTIVE_I, DISABLE_INACTIVE_J, DISABLE_INACTIVE_K, DISABLE_INACTIVE_U, DISABLE_INACTIVE_V, DISABLE_INACTIVE_W, DISABLE_INACTIVE_E)
|
||||
#define HAS_DISABLE_INACTIVE_AXIS 1
|
||||
#endif
|
||||
|
||||
// Fan Kickstart
|
||||
#if FAN_KICKSTART_TIME && !defined(FAN_KICKSTART_POWER)
|
||||
#define FAN_KICKSTART_POWER 180
|
||||
@@ -1197,6 +1291,6 @@
|
||||
#endif
|
||||
|
||||
// Input shaping
|
||||
#if EITHER(INPUT_SHAPING_X, INPUT_SHAPING_Y)
|
||||
#define HAS_SHAPING 1
|
||||
#if ANY(INPUT_SHAPING_X, INPUT_SHAPING_Y)
|
||||
#define HAS_ZV_SHAPING 1
|
||||
#endif
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -27,7 +27,9 @@
|
||||
|
||||
#include "MarlinConfigPre.h"
|
||||
|
||||
#ifndef __MARLIN_DEPS__
|
||||
#ifdef __MARLIN_DEPS__
|
||||
#include "../HAL/shared/fauxpins.h"
|
||||
#else
|
||||
#include "../HAL/HAL.h"
|
||||
#endif
|
||||
|
||||
@@ -46,6 +48,7 @@
|
||||
|
||||
#include "../core/types.h" // Ahead of sanity-checks
|
||||
|
||||
#include "Changes.h"
|
||||
#include "SanityCheck.h"
|
||||
#include HAL_PATH(.., inc/SanityCheck.h)
|
||||
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -25,7 +25,7 @@
|
||||
* Release version. Leave the Marlin version or apply a custom scheme.
|
||||
*/
|
||||
#ifndef SHORT_BUILD_VERSION
|
||||
#define SHORT_BUILD_VERSION "2.1.2.1"
|
||||
#define SHORT_BUILD_VERSION "2.1.2.2"
|
||||
#endif
|
||||
|
||||
/**
|
||||
@@ -44,7 +44,7 @@
|
||||
#define CUSTOM_BUILD_VERSION "1.5.3"
|
||||
|
||||
#ifndef STRING_DISTRIBUTION_DATE
|
||||
#define STRING_DISTRIBUTION_DATE "2024-01-07"
|
||||
#define STRING_DISTRIBUTION_DATE "2024-02-08"
|
||||
#endif
|
||||
|
||||
/**
|
||||
@@ -54,7 +54,7 @@
|
||||
* to alert users to major changes.
|
||||
*/
|
||||
|
||||
#define MARLIN_HEX_VERSION 02010201
|
||||
#define MARLIN_HEX_VERSION 02010202
|
||||
#ifndef REQUIRED_CONFIGURATION_H_VERSION
|
||||
#define REQUIRED_CONFIGURATION_H_VERSION MARLIN_HEX_VERSION
|
||||
#endif
|
||||
|
||||
@@ -33,6 +33,13 @@
|
||||
|
||||
#if ENABLED(MARLIN_DEV_MODE)
|
||||
#warning "WARNING! Disable MARLIN_DEV_MODE for the final build!"
|
||||
#ifdef __LONG_MAX__
|
||||
#if __LONG_MAX__ > __INT_MAX__
|
||||
#warning "The 'long' type is larger than the 'int' type on this platform."
|
||||
#else
|
||||
#warning "The 'long' type is the same as the 'int' type on this platform."
|
||||
#endif
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#if ENABLED(LA_DEBUG)
|
||||
@@ -749,17 +756,17 @@
|
||||
/**
|
||||
* FYSETC/MKS/BTT Mini Panel backlighting
|
||||
*/
|
||||
#if EITHER(FYSETC_242_OLED_12864, FYSETC_MINI_12864_2_1) && !ALL(NEOPIXEL_LED, LED_CONTROL_MENU, LED_USER_PRESET_STARTUP, LED_COLOR_PRESETS)
|
||||
#if ANY(FYSETC_242_OLED_12864, FYSETC_MINI_12864_2_1) && !ALL(NEOPIXEL_LED, LED_CONTROL_MENU, LED_USER_PRESET_STARTUP, LED_COLOR_PRESETS)
|
||||
#warning "Your FYSETC/MKS/BTT Mini Panel works best with NEOPIXEL_LED, LED_CONTROL_MENU, LED_USER_PRESET_STARTUP, and LED_COLOR_PRESETS."
|
||||
#endif
|
||||
|
||||
#if EITHER(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) && DISABLED(RGB_LED)
|
||||
#if ANY(FYSETC_MINI_12864_1_2, FYSETC_MINI_12864_2_0) && DISABLED(RGB_LED)
|
||||
#warning "Your FYSETC Mini Panel works best with RGB_LED."
|
||||
#elif EITHER(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1) && DISABLED(LED_USER_PRESET_STARTUP)
|
||||
#elif ANY(FYSETC_MINI_12864_2_0, FYSETC_MINI_12864_2_1) && DISABLED(LED_USER_PRESET_STARTUP)
|
||||
#warning "Your FYSETC Mini Panel works best with LED_USER_PRESET_STARTUP."
|
||||
#endif
|
||||
|
||||
#if EITHER(FYSETC_242_OLED_12864, FYSETC_MINI_12864) && BOTH(PSU_CONTROL, HAS_COLOR_LEDS) && !LED_POWEROFF_TIMEOUT
|
||||
#if ANY(FYSETC_242_OLED_12864, FYSETC_MINI_12864) && ALL(PSU_CONTROL, HAS_COLOR_LEDS) && !LED_POWEROFF_TIMEOUT
|
||||
#warning "Your FYSETC display with PSU_CONTROL works best with LED_POWEROFF_TIMEOUT."
|
||||
#endif
|
||||
|
||||
@@ -794,6 +801,30 @@
|
||||
/**
|
||||
* Input Shaping
|
||||
*/
|
||||
#if HAS_SHAPING && ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
|
||||
#if HAS_ZV_SHAPING && ANY(CORE_IS_XY, MARKFORGED_XY, MARKFORGED_YX)
|
||||
#warning "Input Shaping for CORE / MARKFORGED kinematic axes is still experimental."
|
||||
#endif
|
||||
|
||||
/**
|
||||
* SD Card extras
|
||||
*/
|
||||
#if SDSORT_CACHE_VFATS_WARNING
|
||||
#warning "SDSORT_CACHE_VFATS has been reduced to VFAT_ENTRIES_LIMIT."
|
||||
#endif
|
||||
#if SDSORT_CACHE_LPC1768_WARNING
|
||||
#warning "SDCARD_SORT_ALPHA sub-options overridden for LPC1768 with DOGM LCD SCK overlap."
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Ender-5 S1 bootloader
|
||||
*/
|
||||
#ifdef STM32F4_UPDATE_FOLDER
|
||||
#warning "Place the firmware bin file in a folder named 'STM32F4_UPDATE' on the SD card. Install with 'M936 V2'."
|
||||
#endif
|
||||
|
||||
/**
|
||||
* ProUI Boot Screen Duration
|
||||
*/
|
||||
#if ENABLED(DWIN_LCD_PROUI) && BOOTSCREEN_TIMEOUT > 2000
|
||||
#warning "For ProUI the original BOOTSCREEN_TIMEOUT of 1100 is recommended."
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user