Merge remote-tracking branch 'upstream/bugfix-2.0.x' into X5SA-2E-Bug…

…fix-ColorUI

.github/workflows/test-builds.yml

@@ -106,7 +106,7 @@ jobs:
 
  - name: Install PlatformIO
  run: |
- pip install -U https://github.com/platformio/platformio-core/archive/master.zip
+ pip install -U https://github.com/platformio/platformio-core/archive/develop.zip
  platformio update
 
  - name: Check out the PR

Marlin/Configuration.h

@@ -237,8 +237,8 @@
 
  #elif ENABLED(MAGNETIC_PARKING_EXTRUDER)
 
- #define MPE_FAST_SPEED 9000 // (mm/m) Speed for travel before last distance point
- #define MPE_SLOW_SPEED 4500 // (mm/m) Speed for last distance travel to park and couple
+ #define MPE_FAST_SPEED 9000 // (mm/min) Speed for travel before last distance point
+ #define MPE_SLOW_SPEED 4500 // (mm/min) Speed for last distance travel to park and couple
  #define MPE_TRAVEL_DISTANCE 10 // (mm) Last distance point
  #define MPE_COMPENSATION 0 // Offset Compensation -1 , 0 , 1 (multiplier) only for coupling
 
@@ -286,8 +286,8 @@
  #if ENABLED(PRIME_BEFORE_REMOVE)
  #define SWITCHING_TOOLHEAD_PRIME_MM 20 // (mm) Extruder prime length
  #define SWITCHING_TOOLHEAD_RETRACT_MM 10 // (mm) Retract after priming length
- #define SWITCHING_TOOLHEAD_PRIME_FEEDRATE 300 // (mm/m) Extruder prime feedrate
- #define SWITCHING_TOOLHEAD_RETRACT_FEEDRATE 2400 // (mm/m) Extruder retract feedrate
+ #define SWITCHING_TOOLHEAD_PRIME_FEEDRATE 300 // (mm/min) Extruder prime feedrate
+ #define SWITCHING_TOOLHEAD_RETRACT_FEEDRATE 2400 // (mm/min) Extruder retract feedrate
  #endif
  #elif ENABLED(ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
  #define SWITCHING_TOOLHEAD_Z_HOP 2 // (mm) Z raise for switching
@@ -332,7 +332,7 @@
 //#define PSU_NAME "Power Supply"
 
 #if ENABLED(PSU_CONTROL)
- #define PSU_ACTIVE_HIGH false // Set 'false' for ATX, 'true' for X-Box
+ #define PSU_ACTIVE_STATE LOW  // Set 'LOW' for ATX, 'HIGH' for X-Box
 
  //#define PSU_DEFAULT_OFF // Keep power off until enabled directly with M80
  //#define PSU_POWERUP_DELAY 250 // (ms) Delay for the PSU to warm up to full power
@@ -1003,13 +1003,13 @@
 // with NOZZLE_AS_PROBE this can be negative for a wider probing area.
 #define PROBING_MARGIN 50
 
-// X and Y axis travel speed (mm/m) between probes
-#define XY_PROBE_SPEED 8000
+// X and Y axis travel speed (mm/min) between probes
+#define XY_PROBE_SPEED (133*60)
 
-// Feedrate (mm/m) for the first approach when double-probing (MULTIPLE_PROBING == 2)
+// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
 
-// Feedrate (mm/m) for the "accurate" probe of each point
+// Feedrate (mm/min) for the "accurate" probe of each point
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
 
 /**
@@ -1182,10 +1182,11 @@
  */
 #define FILAMENT_RUNOUT_SENSOR
 #if ENABLED(FILAMENT_RUNOUT_SENSOR)
- #define NUM_RUNOUT_SENSORS 2 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
- #define FIL_RUNOUT_STATE HIGH // Pin state indicating that filament is NOT present.
- //#define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
- //#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
+ #define FIL_RUNOUT_ENABLED_DEFAULT true // Enable the sensor on startup. Override with M412 followed by M500.
+ #define NUM_RUNOUT_SENSORS 2 // Number of sensors, up to one per extruder. Define a FIL_RUNOUT#_PIN for each.
+ #define FIL_RUNOUT_STATE LOW // Pin state indicating that filament is NOT present.
+ #define FIL_RUNOUT_PULLUP // Use internal pullup for filament runout pins.
+ //#define FIL_RUNOUT_PULLDOWN // Use internal pulldown for filament runout pins.
 
  // Set one or more commands to execute on filament runout.
  // (After 'M412 H' Marlin will ask the host to handle the process.)
@@ -1402,7 +1403,7 @@
  #define Z_SAFE_HOMING_Y_POINT Y_CENTER // Y point for Z homing
 #endif
 
-// Homing speeds (mm/m)
+// Homing speeds (mm/min)
 #define HOMING_FEEDRATE_XY (50*60)
 #define HOMING_FEEDRATE_Z (4*60)
 
@@ -1612,9 +1613,12 @@
  // Move the nozzle to the initial position after cleaning
  #define NOZZLE_CLEAN_GOBACK
 
- // Enable for a purge/clean station that's always at the gantry height (thus no Z move)
+ // For a purge/clean station that's always at the gantry height (thus no Z move)
  //#define NOZZLE_CLEAN_NO_Z
 
+ // For a purge/clean station mounted on the X axis
+ //#define NOZZLE_CLEAN_NO_Y
+
  // Explicit wipe G-code script applies to a G12 with no arguments.
  //#define WIPE_SEQUENCE_COMMANDS "G1 X-17 Y25 Z10 F4000\nG1 Z1\nM114\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 X-17 Y25\nG1 X-17 Y95\nG1 Z15\nM400\nG0 X-10.0 Y-9.0"
 
@@ -1651,6 +1655,37 @@
  */
 #define PRINTCOUNTER
 
+/**
+ * Password
+ *
+ * Set a numerical password for the printer which can be requested:
+ *
+ * - When the printer boots up
+ * - Upon opening the 'Print from Media' Menu
+ * - When SD printing is completed or aborted
+ *
+ * The following G-codes can be used:
+ *
+ * M510 - Lock Printer. Blocks all commands except M511.
+ * M511 - Unlock Printer.
+ * M512 - Set, Change and Remove Password.
+ *
+ * If you forget the password and get locked out you'll need to re-flash
+ * the firmware with the feature disabled, reset EEPROM, and (optionally)
+ * re-flash the firmware again with this feature enabled.
+ */
+//#define PASSWORD_FEATURE
+#if ENABLED(PASSWORD_FEATURE)
+ #define PASSWORD_LENGTH 4 // (#) Number of digits (1-9). 3 or 4 is recommended
+ #define PASSWORD_ON_STARTUP
+ #define PASSWORD_UNLOCK_GCODE // Unlock with the M511 P<password> command. Disable to prevent brute-force attack.
+ #define PASSWORD_CHANGE_GCODE // Change the password with M512 P<old> S<new>.
+ //#define PASSWORD_ON_SD_PRINT_MENU // This does not prevent gcodes from running
+ //#define PASSWORD_AFTER_SD_PRINT_END
+ //#define PASSWORD_AFTER_SD_PRINT_ABORT
+ //#include "Configuration_Secure.h" // External file with PASSWORD_DEFAULT_VALUE
+#endif
+
 //=============================================================================
 //============================= LCD and SD support ============================
 //=============================================================================
@@ -2036,7 +2071,7 @@
 //#define FYSETC_MINI_12864_X_X // Type C/D/E/F. No tunable RGB Backlight by default
 //#define FYSETC_MINI_12864_1_2 // Type C/D/E/F. Simple RGB Backlight (always on)
 //#define FYSETC_MINI_12864_2_0 // Type A/B. Discreet RGB Backlight
-//#define FYSETC_MINI_12864_2_1 // Type A/B. Neopixel RGB Backlight
+//#define FYSETC_MINI_12864_2_1 // Type A/B. NeoPixel RGB Backlight
 //#define FYSETC_GENERIC_12864_1_1 // Larger display with basic ON/OFF backlight.
 
 //
@@ -2251,6 +2286,10 @@
 
 // @section extras
 
+// Set number of user-controlled fans. Disable to use all board-defined fans.
+// :[1,2,3,4,5,6,7,8]
+//#define NUM_M106_FANS 1
+
 // Increase the FAN PWM frequency. Removes the PWM noise but increases heating in the FET/Arduino
 //#define FAST_PWM_FAN
 
@@ -2301,13 +2340,13 @@
  * Adds the M150 command to set the LED (or LED strip) color.
  * If pins are PWM capable (e.g., 4, 5, 6, 11) then a range of
  * luminance values can be set from 0 to 255.
- * For Neopixel LED an overall brightness parameter is also available.
+ * For NeoPixel LED an overall brightness parameter is also available.
  *
  * *** CAUTION ***
  * LED Strips require a MOSFET Chip between PWM lines and LEDs,
  * as the Arduino cannot handle the current the LEDs will require.
  * Failure to follow this precaution can destroy your Arduino!
- * NOTE: A separate 5V power supply is required! The Neopixel LED needs
+ * NOTE: A separate 5V power supply is required! The NeoPixel LED needs
  * more current than the Arduino 5V linear regulator can produce.
  * *** CAUTION ***
  *
@@ -2324,20 +2363,20 @@
  //#define RGB_LED_W_PIN -1
 #endif
 
-// Support for Adafruit Neopixel LED driver
+// Support for Adafruit NeoPixel LED driver
 //#define NEOPIXEL_LED
 #if ENABLED(NEOPIXEL_LED)
  #define NEOPIXEL_TYPE NEO_GRBW // NEO_GRBW / NEO_GRB - four/three channel driver type (defined in Adafruit_NeoPixel.h)
  #define NEOPIXEL_PIN 4 // LED driving pin
  //#define NEOPIXEL2_TYPE NEOPIXEL_TYPE
  //#define NEOPIXEL2_PIN 5
- #define NEOPIXEL2_INSERIES false // The default behaviour is 'false' with neopixel2 in parallel
- #define NEOPIXEL_PIXELS 30 // Number of LEDs in the strip, larger of 2 strips if 2 neopixel strips are used
+ //#define NEOPIXEL2_INSERIES  // Default behavior is NeoPixel 2 in parallel
+ #define NEOPIXEL_PIXELS 30 // Number of LEDs in the strip, larger of 2 strips if 2 NeoPixel strips are used
  #define NEOPIXEL_IS_SEQUENTIAL // Sequential display for temperature change - LED by LED. Disable to change all LEDs at once.
  #define NEOPIXEL_BRIGHTNESS 127 // Initial brightness (0-255)
  //#define NEOPIXEL_STARTUP_TEST // Cycle through colors at startup
 
- // Use a single Neopixel LED for static (background) lighting
+ // Use a single NeoPixel LED for static (background) lighting
  //#define NEOPIXEL_BKGD_LED_INDEX 0 // Index of the LED to use
  //#define NEOPIXEL_BKGD_COLOR { 255, 255, 255, 0 } // R, G, B, W
 #endif

Marlin/Configuration_adv.h

@@ -341,7 +341,7 @@
 #if ENABLED(EXTRUDER_RUNOUT_PREVENT)
  #define EXTRUDER_RUNOUT_MINTEMP 190
  #define EXTRUDER_RUNOUT_SECONDS 30
- #define EXTRUDER_RUNOUT_SPEED 1500 // (mm/m)
+ #define EXTRUDER_RUNOUT_SPEED 1500 // (mm/min)
  #define EXTRUDER_RUNOUT_EXTRUDE 5 // (mm)
 #endif
 
@@ -490,7 +490,7 @@
  //#define CASE_LIGHT_MAX_PWM 128 // Limit pwm
  //#define CASE_LIGHT_MENU // Add Case Light options to the LCD menu
  //#define CASE_LIGHT_NO_BRIGHTNESS // Disable brightness control. Enable for non-PWM lighting.
- //#define CASE_LIGHT_USE_NEOPIXEL // Use Neopixel LED as case light, requires NEOPIXEL_LED.
+ //#define CASE_LIGHT_USE_NEOPIXEL // Use NeoPixel LED as case light, requires NEOPIXEL_LED.
  #if ENABLED(CASE_LIGHT_USE_NEOPIXEL)
  #define CASE_LIGHT_NEOPIXEL_COLOR { 255, 255, 255, 255 } // { Red, Green, Blue, White }
  #endif
@@ -825,10 +825,14 @@
 
 //#define HOME_AFTER_DEACTIVATE // Require rehoming after steppers are deactivated
 
-// Minimum time that a segment needs to take if the buffer is emptied
-#define DEFAULT_MINSEGMENTTIME 20000 // (µs)
+// Default Minimum Feedrates for printing and travel moves
+#define DEFAULT_MINIMUMFEEDRATE 0.0 // (mm/s) Minimum feedrate. Set with M205 S.
+#define DEFAULT_MINTRAVELFEEDRATE 0.0 // (mm/s) Minimum travel feedrate. Set with M205 T.
 
-// Slow down the machine if the look ahead buffer is (by default) half full.
+// Minimum time that a segment needs to take as the buffer gets emptied
+#define DEFAULT_MINSEGMENTTIME 20000 // (µs) Set with M205 B.
+
+// Slow down the machine if the lookahead buffer is (by default) half full.
 // Increase the slowdown divisor for larger buffer sizes.
 #define SLOWDOWN
 #if ENABLED(SLOWDOWN)
@@ -879,7 +883,7 @@
  // increments while checking for the contact to be broken.
  #define BACKLASH_MEASUREMENT_LIMIT 0.5 // (mm)
  #define BACKLASH_MEASUREMENT_RESOLUTION 0.005 // (mm)
- #define BACKLASH_MEASUREMENT_FEEDRATE Z_PROBE_SPEED_SLOW // (mm/m)
+ #define BACKLASH_MEASUREMENT_FEEDRATE Z_PROBE_SPEED_SLOW // (mm/min)
  #endif
  #endif
 #endif
@@ -905,9 +909,9 @@
 
  #define CALIBRATION_MEASUREMENT_RESOLUTION 0.01 // mm
 
- #define CALIBRATION_FEEDRATE_SLOW 60 // mm/m
- #define CALIBRATION_FEEDRATE_FAST 1200 // mm/m
- #define CALIBRATION_FEEDRATE_TRAVEL 3000 // mm/m
+ #define CALIBRATION_FEEDRATE_SLOW 60 // mm/min
+ #define CALIBRATION_FEEDRATE_FAST 1200 // mm/min
+ #define CALIBRATION_FEEDRATE_TRAVEL 3000 // mm/min
 
  // The following parameters refer to the conical section of the nozzle tip.
  #define CALIBRATION_NOZZLE_TIP_HEIGHT 1.0 // mm
@@ -1021,7 +1025,7 @@
 // @section lcd
 
 #if EITHER(ULTIPANEL, EXTENSIBLE_UI)
- #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 2*60 } // (mm/m) Feedrates for manual moves along X, Y, Z, E from panel
+ #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 2*60 } // (mm/min) Feedrates for manual moves along X, Y, Z, E from panel
  #define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm)
  #if ENABLED(ULTIPANEL)
  #define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
@@ -1981,13 +1985,13 @@
  // Load / Unload
  #define TOOLCHANGE_FS_LENGTH 12 // (mm) Load / Unload length
  #define TOOLCHANGE_FS_EXTRA_RESUME_LENGTH 0 // (mm) Extra length for better restart, fine tune by LCD/Gcode)
- #define TOOLCHANGE_FS_RETRACT_SPEED (50*60) // (mm/m) (Unloading)
- #define TOOLCHANGE_FS_UNRETRACT_SPEED (25*60) // (mm/m) (On SINGLENOZZLE or Bowden loading must be slowed down)
+ #define TOOLCHANGE_FS_RETRACT_SPEED (50*60) // (mm/min) (Unloading)
+ #define TOOLCHANGE_FS_UNRETRACT_SPEED (25*60) // (mm/min) (On SINGLENOZZLE or Bowden loading must be slowed down)
 
  // Longer prime to clean out a SINGLENOZZLE
  #define TOOLCHANGE_FS_EXTRA_PRIME 0 // (mm) Extra priming length
- #define TOOLCHANGE_FS_PRIME_SPEED (4.6*60) // (mm/m) Extra priming feedrate
- #define TOOLCHANGE_FS_WIPE_RETRACT 0 // (mm/m) Retract before cooling for less stringing, better wipe, etc.
+ #define TOOLCHANGE_FS_PRIME_SPEED (4.6*60) // (mm/min) Extra priming feedrate
+ #define TOOLCHANGE_FS_WIPE_RETRACT 0 // (mm/min) Retract before cooling for less stringing, better wipe, etc.
 
  // Cool after prime to reduce stringing
  #define TOOLCHANGE_FS_FAN -1 // Fan index or -1 to skip
@@ -2023,7 +2027,7 @@
  //#define TOOLCHANGE_PARK
  #if ENABLED(TOOLCHANGE_PARK)
  #define TOOLCHANGE_PARK_XY { X_MIN_POS + 10, Y_MIN_POS + 10 }
- #define TOOLCHANGE_PARK_XY_FEEDRATE 6000 // (mm/m)
+ #define TOOLCHANGE_PARK_XY_FEEDRATE 6000 // (mm/min)
  //#define TOOLCHANGE_PARK_X_ONLY // X axis only move
  //#define TOOLCHANGE_PARK_Y_ONLY // Y axis only move
  #endif
@@ -2847,7 +2851,7 @@
 //#define SPINDLE_FEATURE
 //#define LASER_FEATURE
 #if EITHER(SPINDLE_FEATURE, LASER_FEATURE)
- #define SPINDLE_LASER_ACTIVE_HIGH  false // Set to "true" if the on/off function is active HIGH
+ #define SPINDLE_LASER_ACTIVE_STATE LOW // Set to "HIGH" if the on/off function is active HIGH
  #define SPINDLE_LASER_PWM true // Set to "true" if your controller supports setting the speed/power
  #define SPINDLE_LASER_PWM_INVERT false // Set to "true" if the speed/power goes up when you want it to go slower
 
@@ -3147,7 +3151,7 @@
 //#define GCODE_MOTION_MODES // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
 
 // Enable and set a (default) feedrate for all G0 moves
-//#define G0_FEEDRATE 3000 // (mm/m)
+//#define G0_FEEDRATE 3000 // (mm/min)
 #ifdef G0_FEEDRATE
  //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
 #endif
@@ -3464,7 +3468,7 @@
  #if ENABLED(PRUSA_MMU2_S_MODE)
  #define MMU2_C0_RETRY 5 // Number of retries (total time = timeout*retries)
 
- #define MMU2_CAN_LOAD_FEEDRATE 800 // (mm/m)
+ #define MMU2_CAN_LOAD_FEEDRATE 800 // (mm/min)
  #define MMU2_CAN_LOAD_SEQUENCE \
  { 0.1, MMU2_CAN_LOAD_FEEDRATE }, \
  { 60.0, MMU2_CAN_LOAD_FEEDRATE }, \

Marlin/src/HAL/AVR/ServoTimers.h

@@ -59,9 +59,9 @@
 // Say which 16 bit timers can be used and in what order
 #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
  //#define _useTimer1
- #define _useTimer3
+ #define _useTimer4
  #if NUM_SERVOS > SERVOS_PER_TIMER
- #define _useTimer4
+ #define _useTimer3
  #if !HAS_MOTOR_CURRENT_PWM && SERVOS > 2 * SERVOS_PER_TIMER
  #define _useTimer5 // Timer 5 is used for motor current PWM and can't be used for servos.
  #endif

Marlin/src/HAL/DUE/usb/arduino_due_x.h

@@ -93,5 +93,5 @@
 #define USB_VBOF_GPIO (PIO_PB10_IDX)
 #define USB_VBOF_FLAGS (PIO_PERIPH_A | PIO_DEFAULT)
 /*! Active level of the USB_VBOF output pin. */
-#define USB_VBOF_ACTIVE_LEVEL LOW
+#define USB_VBOF_ACTIVE_STATE LOW
 /* ------------------------------------------------------------------------ */

Marlin/src/HAL/HAL.h

@@ -38,7 +38,7 @@
 
 // String helper
 #ifndef PGMSTR
- #define PGMSTR(NAM,STR) constexpr char NAM[] = STR
+ #define PGMSTR(NAM,STR) const char NAM[] = STR
 #endif
 
 inline void watchdog_refresh() {