Merge upstream changes from Marlin 2.1.2.2
This commit is contained in:
@@ -20,14 +20,15 @@ opt_set MOTHERBOARD BOARD_TEENSY35_36 \
|
||||
GRID_MAX_POINTS_X 16 \
|
||||
NOZZLE_CLEAN_START_POINT "{ { 10, 10, 3 }, { 10, 10, 3 } }" \
|
||||
NOZZLE_CLEAN_END_POINT "{ { 10, 20, 3 }, { 10, 20, 3 } }"
|
||||
opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER LCD_INFO_MENU SDSUPPORT SDCARD_SORT_ALPHA \
|
||||
opt_enable REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER SDSUPPORT SDCARD_SORT_ALPHA \
|
||||
LCD_INFO_MENU LCD_PRINTER_INFO_IS_BOOTSCREEN TURBO_BACK_MENU_ITEM PREHEAT_SHORTCUT_MENU_ITEM \
|
||||
FILAMENT_WIDTH_SENSOR FILAMENT_LCD_DISPLAY CALIBRATION_GCODE BAUD_RATE_GCODE SOUND_MENU_ITEM \
|
||||
FIX_MOUNTED_PROBE Z_SAFE_HOMING AUTO_BED_LEVELING_BILINEAR Z_MIN_PROBE_REPEATABILITY_TEST DEBUG_LEVELING_FEATURE \
|
||||
BABYSTEPPING BABYSTEP_XY BABYSTEP_ZPROBE_OFFSET BABYSTEP_ZPROBE_GFX_OVERLAY \
|
||||
PRINTCOUNTER NOZZLE_PARK_FEATURE NOZZLE_CLEAN_FEATURE SLOW_PWM_HEATERS PIDTEMPBED EEPROM_SETTINGS INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT M100_FREE_MEMORY_WATCHER \
|
||||
ADVANCED_PAUSE_FEATURE ARC_SUPPORT BEZIER_CURVE_SUPPORT EXPERIMENTAL_I2CBUS EXTENDED_CAPABILITIES_REPORT AUTO_REPORT_TEMPERATURES PARK_HEAD_ON_PAUSE \
|
||||
PHOTO_GCODE PHOTO_POSITION PHOTO_SWITCH_POSITION PHOTO_SWITCH_MS PHOTO_DELAY_MS PHOTO_RETRACT_MM \
|
||||
HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT
|
||||
HOST_ACTION_COMMANDS HOST_PROMPT_SUPPORT HOST_STATUS_NOTIFICATIONS
|
||||
exec_test $1 $2 "Teensy3.5 with many features" "$3"
|
||||
|
||||
#
|
||||
@@ -67,7 +68,7 @@ exec_test $1 $2 "PARKING_EXTRUDER with LCD" "$3"
|
||||
restore_configs
|
||||
opt_set MOTHERBOARD BOARD_TEENSY35_36 MIXING_STEPPERS 2
|
||||
opt_enable MIXING_EXTRUDER DIRECT_MIXING_IN_G1 GRADIENT_MIX GRADIENT_VTOOL REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER
|
||||
opt_disable DISABLE_INACTIVE_EXTRUDER
|
||||
opt_disable DISABLE_OTHER_EXTRUDERS
|
||||
exec_test $1 $2 "Mixing Extruder" "$3"
|
||||
|
||||
#
|
||||
@@ -85,8 +86,9 @@ restore_configs
|
||||
opt_set MOTHERBOARD BOARD_TEENSY35_36 \
|
||||
X_DRIVER_TYPE TMC5160 Y_DRIVER_TYPE TMC5160 \
|
||||
X_MIN_ENDSTOP_INVERTING true Y_MIN_ENDSTOP_INVERTING true \
|
||||
X_CURRENT_HOME 750 Y_CURRENT_HOME 750 \
|
||||
X_CS_PIN 46 Y_CS_PIN 47
|
||||
opt_enable COREXY USE_ZMIN_PLUG MONITOR_DRIVER_STATUS SENSORLESS_HOMING
|
||||
opt_enable COREXY MONITOR_DRIVER_STATUS SENSORLESS_HOMING X_STALL_SENSITIVITY Y_STALL_SENSITIVITY
|
||||
exec_test $1 $2 "Teensy 3.5/3.6 COREXY" "$3"
|
||||
|
||||
#
|
||||
|
Reference in New Issue
Block a user