Skip to content

Commit 00f2e26

Browse files
author
João Martins
committed
Merge branch 'Original/RCBugFix' into configurations/KosselXL
* Original/RCBugFix: (167 commits) Update language_de.h Added missing translations (MarlinFirmware#6458) Update language_tr.h (MarlinFirmware#6463) Update language_cz.h for new translations (MarlinFirmware#6465) Completed french translation (MarlinFirmware#6475) Add new strings as per recent changes in RCBugFix (MarlinFirmware#6482) Update language_nl.h (MarlinFirmware#6478) Fix issue in itostr4sign with numbers <100 (MarlinFirmware#6487) Allow BL-Touch users to control heaters during probe event (MarlinFirmware#6485) Shut down heaters during BL-Touch probe event Better tuned FolgerTech i3-2020 example file Better tuned Example file for FolgerTech i3-2020 Update language_de.h Update language_de.h Get example files fully into compliance Add my two 'Nice' machines as example configurations Fix stuck "Print Aborted" LCD message Minor optimization of FILAMENT_WIDTH_SENSOR Cosmetic patches Added more translation strings ... # Conflicts: # Marlin/Configuration.h # Marlin/Configuration_adv.h
2 parents fb4ba64 + dabca83 commit 00f2e26

File tree

168 files changed

+23036
-5412
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+23036
-5412
lines changed

‎.travis.yml

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -83,18 +83,23 @@ script:
8383
- opt_set TEMP_SENSOR_1 1
8484
- build_marlin
8585
#
86-
# Test 3 extruders on RUMBA (can use any board with >=3 extruders defined)
86+
# Test 5 extruders on AZTEEG_X3_PRO (can use any board with >=5 extruders defined)
8787
# Include a test for LIN_ADVANCE here also
8888
#
89-
- opt_set MOTHERBOARD BOARD_RUMBA
90-
- opt_set EXTRUDERS 3
91-
- opt_set TEMP_SENSOR_2 1
89+
- opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO
90+
- opt_set EXTRUDERS 5
91+
- opt_set TEMP_SENSOR_1 1
92+
- opt_set TEMP_SENSOR_2 5
93+
- opt_set TEMP_SENSOR_3 20
94+
- opt_set TEMP_SENSOR_4 999
95+
- opt_set TEMP_SENSOR_BED 1
9296
- opt_enable_adv LIN_ADVANCE
9397
- build_marlin
9498
#
9599
# Test PIDTEMPBED
96100
#
97101
- restore_configs
102+
- opt_set TEMP_SENSOR_BED 1
98103
- opt_enable PIDTEMPBED
99104
- build_marlin
100105
#
@@ -155,14 +160,15 @@ script:
155160
# INCH_MODE_SUPPORT, TEMPERATURE_UNITS_SUPPORT
156161
#
157162
- restore_configs
158-
- opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT M100_FREE_MEMORY_WATCHER INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT
163+
- opt_enable EEPROM_SETTINGS EEPROM_CHITCHAT M100_FREE_MEMORY_WATCHER M100_FREE_MEMORY_DUMPER M100_FREE_MEMORY_CORRUPTOR INCH_MODE_SUPPORT TEMPERATURE_UNITS_SUPPORT
159164
- build_marlin
160165
#
161-
# Mixing Extruder
166+
# Mixing Extruder with 5 steppers
162167
#
163168
- restore_configs
169+
- opt_set MOTHERBOARD BOARD_AZTEEG_X3_PRO
164170
- opt_enable MIXING_EXTRUDER
165-
- opt_set MIXING_STEPPERS 2
171+
- opt_set MIXING_STEPPERS 5
166172
- build_marlin
167173
#
168174
# Test DUAL_X_CARRIAGE
@@ -328,7 +334,7 @@ script:
328334
# RA_CONTROL_PANEL
329335
#
330336
- restore_configs
331-
- opt_enable RA_CONTROL_PANEL
337+
- opt_enable RA_CONTROL_PANEL PINS_DEBUGGING
332338
- build_marlin
333339
#
334340
######## I2C LCD/PANELS ##############
@@ -382,9 +388,9 @@ script:
382388
- opt_enable AUTO_BED_LEVELING_BILINEAR Z_PROBE_ALLEN_KEY
383389
- build_marlin
384390
#
385-
# Delta Config (Mini Kossel)
391+
# Delta Config (FLSUN AC because it's complex)
386392
#
387-
- use_example_configs delta/kossel_mini
393+
- use_example_configs delta/FLSUN/auto_calibrate
388394
- build_marlin
389395
#
390396
# Makibox Config need to check board type for Teensy++ 2.0
@@ -403,7 +409,7 @@ script:
403409
- restore_configs
404410
- opt_enable_adv HAVE_TMC2130 X_IS_TMC2130 Y_IS_TMC2130 Z_IS_TMC2130
405411
- build_marlin
406-
- opt_enable_adv AUTOMATIC_CURRENT_CONTROL STEALTHCHOP
412+
- opt_enable_adv AUTOMATIC_CURRENT_CONTROL STEALTHCHOP HYBRID_THRESHOLD SENSORLESS_HOMING
407413
- build_marlin
408414
#
409415
# tvrrug Config need to check board type for sanguino atmega644p

‎Marlin/Conditionals_LCD.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@
230230
#define LCD_STR_DEGREE "\x09"
231231

232232
#define LCD_STR_SPECIAL_MAX '\x09'
233-
// Maximum here is 0x1f because 0x20 is ' ' (space) and the normal charsets begin.
233+
// Maximum here is 0x1F because 0x20 is ' ' (space) and the normal charsets begin.
234234
// Better stay below 0x10 because DISPLAY_CHARSET_HD44780_WESTERN begins here.
235235

236236
// Symbol characters
@@ -374,7 +374,7 @@
374374
/**
375375
* Set a flag for any enabled probe
376376
*/
377-
#define PROBE_SELECTED (ENABLED(PROBE_MANUALLY) || ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))
377+
#define PROBE_SELECTED (ENABLED(PROBE_MANUALLY) || ENABLED(FIX_MOUNTED_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED) || ENABLED(SOLENOID_PROBE))
378378

379379
/**
380380
* Clear probe pin settings when no probe is selected
@@ -385,5 +385,7 @@
385385
#endif
386386

387387
#define HAS_SOFTWARE_ENDSTOPS (ENABLED(MIN_SOFTWARE_ENDSTOPS) || ENABLED(MAX_SOFTWARE_ENDSTOPS))
388+
#define HAS_RESUME_CONTINUE (ENABLED(NEWPANEL) || ENABLED(EMERGENCY_PARSER))
389+
#define HAS_COLOR_LEDS (ENABLED(BLINKM) || ENABLED(RGB_LED) || ENABLED(RGBW_LED))
388390

389391
#endif //CONDITIONALS_LCD_H

‎Marlin/Conditionals_post.h

Lines changed: 114 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -435,18 +435,100 @@
435435
/**
436436
* Shorthand for pin tests, used wherever needed
437437
*/
438+
439+
// Steppers
440+
#define HAS_X_ENABLE (PIN_EXISTS(X_ENABLE))
441+
#define HAS_X_DIR (PIN_EXISTS(X_DIR))
442+
#define HAS_X_STEP (PIN_EXISTS(X_STEP))
443+
#define HAS_X_MICROSTEPS (PIN_EXISTS(X_MS1))
444+
445+
#define HAS_X2_ENABLE (PIN_EXISTS(X2_ENABLE))
446+
#define HAS_X2_DIR (PIN_EXISTS(X2_DIR))
447+
#define HAS_X2_STEP (PIN_EXISTS(X2_STEP))
448+
#define HAS_Y_MICROSTEPS (PIN_EXISTS(Y_MS1))
449+
450+
#define HAS_Y_ENABLE (PIN_EXISTS(Y_ENABLE))
451+
#define HAS_Y_DIR (PIN_EXISTS(Y_DIR))
452+
#define HAS_Y_STEP (PIN_EXISTS(Y_STEP))
453+
#define HAS_Z_MICROSTEPS (PIN_EXISTS(Z_MS1))
454+
455+
#define HAS_Y2_ENABLE (PIN_EXISTS(Y2_ENABLE))
456+
#define HAS_Y2_DIR (PIN_EXISTS(Y2_DIR))
457+
#define HAS_Y2_STEP (PIN_EXISTS(Y2_STEP))
458+
459+
#define HAS_Z_ENABLE (PIN_EXISTS(Z_ENABLE))
460+
#define HAS_Z_DIR (PIN_EXISTS(Z_DIR))
461+
#define HAS_Z_STEP (PIN_EXISTS(Z_STEP))
462+
463+
#define HAS_Z2_ENABLE (PIN_EXISTS(Z2_ENABLE))
464+
#define HAS_Z2_DIR (PIN_EXISTS(Z2_DIR))
465+
#define HAS_Z2_STEP (PIN_EXISTS(Z2_STEP))
466+
467+
// Extruder steppers and solenoids
468+
#define HAS_E0_ENABLE (PIN_EXISTS(E0_ENABLE))
469+
#define HAS_E0_DIR (PIN_EXISTS(E0_DIR))
470+
#define HAS_E0_STEP (PIN_EXISTS(E0_STEP))
471+
#define HAS_E0_MICROSTEPS (PIN_EXISTS(E0_MS1))
472+
#define HAS_SOLENOID_0 (PIN_EXISTS(SOL0))
473+
474+
#define HAS_E1_ENABLE (PIN_EXISTS(E1_ENABLE))
475+
#define HAS_E1_DIR (PIN_EXISTS(E1_DIR))
476+
#define HAS_E1_STEP (PIN_EXISTS(E1_STEP))
477+
#define HAS_E1_MICROSTEPS (PIN_EXISTS(E1_MS1))
478+
#define HAS_SOLENOID_1 (PIN_EXISTS(SOL1))
479+
480+
#define HAS_E2_ENABLE (PIN_EXISTS(E2_ENABLE))
481+
#define HAS_E2_DIR (PIN_EXISTS(E2_DIR))
482+
#define HAS_E2_STEP (PIN_EXISTS(E2_STEP))
483+
#define HAS_E2_MICROSTEPS (PIN_EXISTS(E2_MS1))
484+
#define HAS_SOLENOID_2 (PIN_EXISTS(SOL2))
485+
486+
#define HAS_E3_ENABLE (PIN_EXISTS(E3_ENABLE))
487+
#define HAS_E3_DIR (PIN_EXISTS(E3_DIR))
488+
#define HAS_E3_STEP (PIN_EXISTS(E3_STEP))
489+
#define HAS_E3_MICROSTEPS (PIN_EXISTS(E3_MS1))
490+
#define HAS_SOLENOID_3 (PIN_EXISTS(SOL3))
491+
492+
#define HAS_E4_ENABLE (PIN_EXISTS(E4_ENABLE))
493+
#define HAS_E4_DIR (PIN_EXISTS(E4_DIR))
494+
#define HAS_E4_STEP (PIN_EXISTS(E4_STEP))
495+
#define HAS_E4_MICROSTEPS (PIN_EXISTS(E4_MS1))
496+
#define HAS_SOLENOID_4 (PIN_EXISTS(SOL4))
497+
498+
// Endstops and bed probe
499+
#define HAS_X_MIN (PIN_EXISTS(X_MIN) && !IS_Z2_OR_PROBE(X_MIN_PIN))
500+
#define HAS_X_MAX (PIN_EXISTS(X_MAX) && !IS_Z2_OR_PROBE(X_MAX_PIN))
501+
#define HAS_Y_MIN (PIN_EXISTS(Y_MIN) && !IS_Z2_OR_PROBE(Y_MIN_PIN))
502+
#define HAS_Y_MAX (PIN_EXISTS(Y_MAX) && !IS_Z2_OR_PROBE(Y_MAX_PIN))
503+
#define HAS_Z_MIN (PIN_EXISTS(Z_MIN) && !IS_Z2_OR_PROBE(Z_MIN_PIN))
504+
#define HAS_Z_MAX (PIN_EXISTS(Z_MAX) && !IS_Z2_OR_PROBE(Z_MAX_PIN))
505+
#define HAS_Z2_MIN (PIN_EXISTS(Z2_MIN))
506+
#define HAS_Z2_MAX (PIN_EXISTS(Z2_MAX))
507+
#define HAS_Z_MIN_PROBE_PIN (PIN_EXISTS(Z_MIN_PROBE))
508+
509+
// Thermistors
438510
#define HAS_TEMP_0 (PIN_EXISTS(TEMP_0) && TEMP_SENSOR_0 != 0 && TEMP_SENSOR_0 > -2)
439511
#define HAS_TEMP_1 (PIN_EXISTS(TEMP_1) && TEMP_SENSOR_1 != 0 && TEMP_SENSOR_1 > -2)
440512
#define HAS_TEMP_2 (PIN_EXISTS(TEMP_2) && TEMP_SENSOR_2 != 0 && TEMP_SENSOR_2 > -2)
441513
#define HAS_TEMP_3 (PIN_EXISTS(TEMP_3) && TEMP_SENSOR_3 != 0 && TEMP_SENSOR_3 > -2)
442514
#define HAS_TEMP_4 (PIN_EXISTS(TEMP_4) && TEMP_SENSOR_4 != 0 && TEMP_SENSOR_4 > -2)
515+
#define HAS_TEMP_HOTEND (HAS_TEMP_0 || ENABLED(HEATER_0_USES_MAX6675))
443516
#define HAS_TEMP_BED (PIN_EXISTS(TEMP_BED) && TEMP_SENSOR_BED != 0 && TEMP_SENSOR_BED > -2)
517+
518+
// Heaters
444519
#define HAS_HEATER_0 (PIN_EXISTS(HEATER_0))
445520
#define HAS_HEATER_1 (PIN_EXISTS(HEATER_1))
446521
#define HAS_HEATER_2 (PIN_EXISTS(HEATER_2))
447522
#define HAS_HEATER_3 (PIN_EXISTS(HEATER_3))
448523
#define HAS_HEATER_4 (PIN_EXISTS(HEATER_4))
449524
#define HAS_HEATER_BED (PIN_EXISTS(HEATER_BED))
525+
526+
// Thermal protection
527+
#define HAS_THERMALLY_PROTECTED_BED (ENABLED(THERMAL_PROTECTION_BED) && HAS_TEMP_BED && HAS_HEATER_BED)
528+
#define WATCH_HOTENDS (ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0)
529+
#define WATCH_THE_BED (HAS_THERMALLY_PROTECTED_BED && WATCH_BED_TEMP_PERIOD > 0)
530+
531+
// Auto fans
450532
#define HAS_AUTO_FAN_0 (PIN_EXISTS(E0_AUTO_FAN))
451533
#define HAS_AUTO_FAN_1 (HOTENDS > 1 && PIN_EXISTS(E1_AUTO_FAN))
452534
#define HAS_AUTO_FAN_2 (HOTENDS > 2 && PIN_EXISTS(E2_AUTO_FAN))
@@ -463,87 +545,38 @@
463545
#define AUTO_4_IS_1 (E4_AUTO_FAN_PIN == E1_AUTO_FAN_PIN)
464546
#define AUTO_4_IS_2 (E4_AUTO_FAN_PIN == E2_AUTO_FAN_PIN)
465547
#define AUTO_4_IS_3 (E4_AUTO_FAN_PIN == E3_AUTO_FAN_PIN)
548+
549+
// Other fans
466550
#define HAS_FAN0 (PIN_EXISTS(FAN))
467551
#define HAS_FAN1 (PIN_EXISTS(FAN1) && CONTROLLERFAN_PIN != FAN1_PIN && E0_AUTO_FAN_PIN != FAN1_PIN && E1_AUTO_FAN_PIN != FAN1_PIN && E2_AUTO_FAN_PIN != FAN1_PIN && E3_AUTO_FAN_PIN != FAN1_PIN)
468552
#define HAS_FAN2 (PIN_EXISTS(FAN2) && CONTROLLERFAN_PIN != FAN2_PIN && E0_AUTO_FAN_PIN != FAN2_PIN && E1_AUTO_FAN_PIN != FAN2_PIN && E2_AUTO_FAN_PIN != FAN2_PIN && E3_AUTO_FAN_PIN != FAN2_PIN)
469553
#define HAS_CONTROLLERFAN (PIN_EXISTS(CONTROLLERFAN))
554+
555+
// Servos
470556
#define HAS_SERVOS (defined(NUM_SERVOS) && NUM_SERVOS > 0)
471557
#define HAS_SERVO_0 (PIN_EXISTS(SERVO0))
472558
#define HAS_SERVO_1 (PIN_EXISTS(SERVO1))
473559
#define HAS_SERVO_2 (PIN_EXISTS(SERVO2))
474560
#define HAS_SERVO_3 (PIN_EXISTS(SERVO3))
561+
562+
// Sensors
475563
#define HAS_FILAMENT_WIDTH_SENSOR (PIN_EXISTS(FILWIDTH))
476564
#define HAS_FIL_RUNOUT (PIN_EXISTS(FIL_RUNOUT))
565+
566+
// User Interface
477567
#define HAS_HOME (PIN_EXISTS(HOME))
478568
#define HAS_KILL (PIN_EXISTS(KILL))
479569
#define HAS_SUICIDE (PIN_EXISTS(SUICIDE))
480570
#define HAS_PHOTOGRAPH (PIN_EXISTS(PHOTOGRAPH))
481-
#define HAS_X_MIN (PIN_EXISTS(X_MIN) && !IS_Z2_OR_PROBE(X_MIN_PIN))
482-
#define HAS_X_MAX (PIN_EXISTS(X_MAX) && !IS_Z2_OR_PROBE(X_MAX_PIN))
483-
#define HAS_Y_MIN (PIN_EXISTS(Y_MIN) && !IS_Z2_OR_PROBE(Y_MIN_PIN))
484-
#define HAS_Y_MAX (PIN_EXISTS(Y_MAX) && !IS_Z2_OR_PROBE(Y_MAX_PIN))
485-
#define HAS_Z_MIN (PIN_EXISTS(Z_MIN) && !IS_Z2_OR_PROBE(Z_MIN_PIN))
486-
#define HAS_Z_MAX (PIN_EXISTS(Z_MAX) && !IS_Z2_OR_PROBE(Z_MAX_PIN))
487-
#define HAS_Z2_MIN (PIN_EXISTS(Z2_MIN))
488-
#define HAS_Z2_MAX (PIN_EXISTS(Z2_MAX))
489-
#define HAS_Z_MIN_PROBE_PIN (PIN_EXISTS(Z_MIN_PROBE))
490-
#define HAS_SOLENOID_1 (PIN_EXISTS(SOL1))
491-
#define HAS_SOLENOID_2 (PIN_EXISTS(SOL2))
492-
#define HAS_SOLENOID_3 (PIN_EXISTS(SOL3))
493-
#define HAS_MICROSTEPS_X (PIN_EXISTS(X_MS1))
494-
#define HAS_MICROSTEPS_Y (PIN_EXISTS(Y_MS1))
495-
#define HAS_MICROSTEPS_Z (PIN_EXISTS(Z_MS1))
496-
#define HAS_MICROSTEPS_E0 (PIN_EXISTS(E0_MS1))
497-
#define HAS_MICROSTEPS_E1 (PIN_EXISTS(E1_MS1))
498-
#define HAS_MICROSTEPS_E2 (PIN_EXISTS(E2_MS1))
499-
#define HAS_MICROSTEPS (HAS_MICROSTEPS_X || HAS_MICROSTEPS_Y || HAS_MICROSTEPS_Z || HAS_MICROSTEPS_E0 || HAS_MICROSTEPS_E1 || HAS_MICROSTEPS_E2)
500-
#define HAS_STEPPER_RESET (PIN_EXISTS(STEPPER_RESET))
501-
#define HAS_X_ENABLE (PIN_EXISTS(X_ENABLE))
502-
#define HAS_X2_ENABLE (PIN_EXISTS(X2_ENABLE))
503-
#define HAS_Y_ENABLE (PIN_EXISTS(Y_ENABLE))
504-
#define HAS_Y2_ENABLE (PIN_EXISTS(Y2_ENABLE))
505-
#define HAS_Z_ENABLE (PIN_EXISTS(Z_ENABLE))
506-
#define HAS_Z2_ENABLE (PIN_EXISTS(Z2_ENABLE))
507-
#define HAS_E0_ENABLE (PIN_EXISTS(E0_ENABLE))
508-
#define HAS_E1_ENABLE (PIN_EXISTS(E1_ENABLE))
509-
#define HAS_E2_ENABLE (PIN_EXISTS(E2_ENABLE))
510-
#define HAS_E3_ENABLE (PIN_EXISTS(E3_ENABLE))
511-
#define HAS_E4_ENABLE (PIN_EXISTS(E4_ENABLE))
512-
#define HAS_X_DIR (PIN_EXISTS(X_DIR))
513-
#define HAS_X2_DIR (PIN_EXISTS(X2_DIR))
514-
#define HAS_Y_DIR (PIN_EXISTS(Y_DIR))
515-
#define HAS_Y2_DIR (PIN_EXISTS(Y2_DIR))
516-
#define HAS_Z_DIR (PIN_EXISTS(Z_DIR))
517-
#define HAS_Z2_DIR (PIN_EXISTS(Z2_DIR))
518-
#define HAS_E0_DIR (PIN_EXISTS(E0_DIR))
519-
#define HAS_E1_DIR (PIN_EXISTS(E1_DIR))
520-
#define HAS_E2_DIR (PIN_EXISTS(E2_DIR))
521-
#define HAS_E3_DIR (PIN_EXISTS(E3_DIR))
522-
#define HAS_E4_DIR (PIN_EXISTS(E4_DIR))
523-
#define HAS_X_STEP (PIN_EXISTS(X_STEP))
524-
#define HAS_X2_STEP (PIN_EXISTS(X2_STEP))
525-
#define HAS_Y_STEP (PIN_EXISTS(Y_STEP))
526-
#define HAS_Y2_STEP (PIN_EXISTS(Y2_STEP))
527-
#define HAS_Z_STEP (PIN_EXISTS(Z_STEP))
528-
#define HAS_Z2_STEP (PIN_EXISTS(Z2_STEP))
529-
#define HAS_E0_STEP (PIN_EXISTS(E0_STEP))
530-
#define HAS_E1_STEP (PIN_EXISTS(E1_STEP))
531-
#define HAS_E2_STEP (PIN_EXISTS(E2_STEP))
532-
#define HAS_E3_STEP (PIN_EXISTS(E3_STEP))
533-
#define HAS_E4_STEP (PIN_EXISTS(E4_STEP))
534-
#define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS))
535571
#define HAS_BUZZER (PIN_EXISTS(BEEPER) || ENABLED(LCD_USE_I2C_BUZZER))
536572
#define HAS_CASE_LIGHT (PIN_EXISTS(CASE_LIGHT))
537573

574+
// Digital control
575+
#define HAS_MICROSTEPS (HAS_X_MICROSTEPS || HAS_Y_MICROSTEPS || HAS_Z_MICROSTEPS || HAS_E0_MICROSTEPS || HAS_E1_MICROSTEPS || HAS_E2_MICROSTEPS || HAS_E3_MICROSTEPS || HAS_E4_MICROSTEPS)
576+
#define HAS_STEPPER_RESET (PIN_EXISTS(STEPPER_RESET))
577+
#define HAS_DIGIPOTSS (PIN_EXISTS(DIGIPOTSS))
538578
#define HAS_MOTOR_CURRENT_PWM (PIN_EXISTS(MOTOR_CURRENT_PWM_XY) || PIN_EXISTS(MOTOR_CURRENT_PWM_Z) || PIN_EXISTS(MOTOR_CURRENT_PWM_E))
539579

540-
#define HAS_TEMP_HOTEND (HAS_TEMP_0 || ENABLED(HEATER_0_USES_MAX6675))
541-
542-
#define HAS_THERMALLY_PROTECTED_BED (HAS_TEMP_BED && HAS_HEATER_BED && ENABLED(THERMAL_PROTECTION_BED))
543-
544-
#define WATCH_HOTENDS (ENABLED(THERMAL_PROTECTION_HOTENDS) && WATCH_TEMP_PERIOD > 0)
545-
#define WATCH_THE_BED (HAS_THERMALLY_PROTECTED_BED && WATCH_BED_TEMP_PERIOD > 0)
546-
547580
/**
548581
* This setting is also used by M109 when trying to calculate
549582
* a ballpark safe margin to prevent wait-forever situation.
@@ -658,6 +691,9 @@
658691
* Delta radius/rod trimmers/angle trimmers
659692
*/
660693
#if ENABLED(DELTA)
694+
#ifndef DELTA_ENDSTOP_ADJ
695+
#define DELTA_ENDSTOP_ADJ { 0 }
696+
#endif
661697
#ifndef DELTA_RADIUS_TRIM_TOWER_1
662698
#define DELTA_RADIUS_TRIM_TOWER_1 0.0
663699
#endif
@@ -685,6 +721,14 @@
685721
#ifndef DELTA_TOWER_ANGLE_TRIM_3
686722
#define DELTA_TOWER_ANGLE_TRIM_3 0.0
687723
#endif
724+
#if ENABLED(DELTA_AUTO_CALIBRATION)
725+
#ifndef H_FACTOR
726+
#define H_FACTOR 1.00
727+
#endif
728+
#ifndef R_FACTOR
729+
#define R_FACTOR -2.25
730+
#endif
731+
#endif
688732
#endif
689733

690734
/**
@@ -757,14 +801,19 @@
757801
// Stepper pulse duration, in cycles
758802
#define STEP_PULSE_CYCLES ((MINIMUM_STEPPER_PULSE) * CYCLES_PER_MICROSECOND)
759803

760-
#ifndef DELTA_ENDSTOP_ADJ
761-
#define DELTA_ENDSTOP_ADJ { 0 }
762-
#endif
763-
764804
#if ENABLED(SDCARD_SORT_ALPHA)
765805
#define HAS_FOLDER_SORTING (FOLDER_SORTING || ENABLED(SDSORT_GCODE))
766806
#endif
767807

808+
// Updated G92 behavior shifts the workspace
809+
#define HAS_POSITION_SHIFT DISABLED(NO_WORKSPACE_OFFSETS)
810+
// The home offset also shifts the coordinate space
811+
#define HAS_HOME_OFFSET (DISABLED(NO_WORKSPACE_OFFSETS) || ENABLED(DELTA))
812+
// Either offset yields extra calculations on all moves
813+
#define HAS_WORKSPACE_OFFSET (HAS_POSITION_SHIFT || HAS_HOME_OFFSET)
814+
// M206 doesn't apply to DELTA
815+
#define HAS_M206_COMMAND (HAS_HOME_OFFSET && DISABLED(DELTA))
816+
768817
// LCD timeout to status screen default is 15s
769818
#ifndef LCD_TIMEOUT_TO_STATUS
770819
#define LCD_TIMEOUT_TO_STATUS 15000

0 commit comments

Comments
 (0)