Merge branch 'MarlinFirmware:bugfix-2.1.x' into bugfix-2.1.x

Marlin/Configuration.h

@@ -46,12 +46,13 @@
  *
  * Example Configs: https://github.com/MarlinFirmware/Configurations/branches/all
  *
- * Průša Calculator: https://blog.prusaprinters.org/calculator_3416/
+ * Průša Calculator: https://blog.prusa3d.com/calculator_3416/
  *
  * Calibration Guides: https://reprap.org/wiki/Calibration
  * https://reprap.org/wiki/Triffid_Hunter%27s_Calibration_Guide
- * https://sites.google.com/site/repraplogphase/calibration-of-your-reprap
+ * https://web.archive.org/web/20220907014303/https://sites.google.com/site/repraplogphase/calibration-of-your-reprap
  * https://youtu.be/wAL9d7FgInk
+ * https://teachingtechyt.github.io/calibration.html
  *
  * Calibration Objects: https://www.thingiverse.com/thing:5573
  * https://www.thingiverse.com/thing:1278865
@@ -990,8 +991,8 @@
  // Radius around the center where the arm cannot reach
  #define MIDDLE_DEAD_ZONE_R 0 // (mm)
 
- #define THETA_HOMING_OFFSET 0 // Calculated from Calibration Guide and M360 / M114. See http://reprap.harleystudio.co.za/?page_id=1073
- #define PSI_HOMING_OFFSET 0 // Calculated from Calibration Guide and M364 / M114. See http://reprap.harleystudio.co.za/?page_id=1073
+ #define THETA_HOMING_OFFSET 0 // Calculated from Calibration Guide and M360 / M114. See https://www.morgan3dp.com/morgan-calibration-guide/
+ #define PSI_HOMING_OFFSET 0 // Calculated from Calibration Guide and M364 / M114. See https://www.morgan3dp.com/morgan-calibration-guide/
 
  #elif ENABLED(MP_SCARA)
 
@@ -1025,7 +1026,7 @@
  // Radius around the center where the arm cannot reach
  #define MIDDLE_DEAD_ZONE_R 0 // (mm)
 
- // Calculated from Calibration Guide and M360 / M114. See http://reprap.harleystudio.co.za/?page_id=1073
+ // Calculated from Calibration Guide and M360 / M114. See https://www.morgan3dp.com/morgan-calibration-guide/
  #define THETA_HOMING_OFFSET 0
  #define PSI_HOMING_OFFSET 0
 #endif
@@ -1449,7 +1450,7 @@
  #define MAG_MOUNTED_STOW_5 { PROBE_STOW_FEEDRATE, { 0, 0, 0 } } // Extra move if needed
 #endif
 
-// Duet Smart Effector (for delta printers) - https://bit.ly/2ul5U7J
+// Duet Smart Effector (for delta printers) - https://docs.duet3d.com/en/Duet3D_hardware/Accessories/Smart_Effector
 // When the pin is defined you can use M672 to set/reset the probe sensitivity.
 //#define DUET_SMART_EFFECTOR
 #if ENABLED(DUET_SMART_EFFECTOR)
@@ -1465,7 +1466,7 @@
 //#define SENSORLESS_PROBING
 
 /**
- * Allen key retractable z-probe as seen on many Kossel delta printers - https://reprap.org/wiki/Kossel#Automatic_bed_leveling_probe
+ * Allen key retractable z-probe as seen on many Kossel delta printers - https://reprap.org/wiki/Kossel#Autolevel_probe
  * Deploys by touching z-axis belt. Retracts by pushing the probe down.
  */
 //#define Z_PROBE_ALLEN_KEY
@@ -2726,7 +2727,7 @@
 
 //
 // Original RADDS LCD Display+Encoder+SDCardReader
-// http://doku.radds.org/dokumentation/lcd-display/
+// https://web.archive.org/web/20200719145306/http://doku.radds.org/dokumentation/lcd-display/
 //
 //#define RADDS_DISPLAY
 
@@ -2756,7 +2757,6 @@
 
 //
 // RigidBot Panel V1.0
-// http://www.inventapart.com/
 //
 //#define RIGIDBOT_PANEL
 
@@ -2800,8 +2800,9 @@
 //
 // Sainsmart (YwRobot) LCD Displays
 //
-// These require F.Malpartida's LiquidCrystal_I2C library
-// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/Home
+// These require LiquidCrystal_I2C library:
+// https://github.com/MarlinFirmware/New-LiquidCrystal
+// https://github.com/fmalpartida/New-LiquidCrystal/wiki
 //
 //#define LCD_SAINSMART_I2C_1602
 //#define LCD_SAINSMART_I2C_2004
@@ -2834,7 +2835,7 @@
 //
 
 //
-// 2-wire Non-latching LCD SR from https://goo.gl/aJJ4sH
+// 2-wire Non-latching LCD SR from https://github.com/fmalpartida/New-LiquidCrystal/wiki/schematics#user-content-ShiftRegister_connection
 // LCD configuration: https://reprap.org/wiki/SAV_3D_LCD
 //
 //#define SAV_3DLCD
@@ -2906,7 +2907,7 @@
 
 //
 // MaKr3d Makr-Panel with graphic controller and SD support.
-// https://reprap.org/wiki/MaKr3d_MaKrPanel
+// https://reprap.org/wiki/MaKrPanel
 //
 //#define MAKRPANEL
 
@@ -2924,7 +2925,7 @@
 
 //
 // Cartesio UI
-// http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
+// https://web.archive.org/web/20180605050442/http://mauk.cc/webshop/cartesio-shop/electronics/user-interface
 //
 //#define CARTESIO_UI
 
@@ -2969,15 +2970,15 @@
 
 //
 // BigTreeTech Mini 12864 V1.0 is an alias for FYSETC_MINI_12864_2_1. Type A/B. NeoPixel RGB Backlight.
+// https://github.com/bigtreetech/MINI-12864/tree/master/mini12864_v1.0
 //
 //#define BTT_MINI_12864_V1
 
 //
-// Factory display for Creality CR-10
+// Factory display for Creality CR-10 / CR-7 / Ender-3
 // https://www.aliexpress.com/item/32833148327.html
 //
-// This is RAMPS-compatible using a single 10-pin connector.
-// (For CR-10 owners who want to replace the Melzi Creality board but retain the display)
+// Connect to EXP1 on RAMPS and compatible boards.
 //
 //#define CR10_STOCKDISPLAY
 
@@ -3183,6 +3184,7 @@
 //
 // 480x320, 3.5", SPI Display with Rotary Encoder from MKS
 // Usually paired with MKS Robin Nano V2 & V3
+// https://github.com/makerbase-mks/MKS-TFT-Hardware/tree/master/MKS%20TS35
 //
 //#define MKS_TS35_V2_0
 
@@ -3247,12 +3249,14 @@
 //#define ANET_ET5_TFT35
 
 //
-// 1024x600, 7", RGB Stock Display with Rotary Encoder from BIQU-BX
+// 1024x600, 7", RGB Stock Display with Rotary Encoder from BIQU BX
+// https://github.com/bigtreetech/BIQU-BX/tree/master/Hardware
 //
 //#define BIQU_BX_TFT70
 
 //
 // 480x320, 3.5", SPI Stock Display with Rotary Encoder from BIQU B1 SE Series
+// https://github.com/bigtreetech/TFT35-SPI/tree/master/v1
 //
 //#define BTT_TFT35_SPI_V1_0
 

Marlin/Configuration_adv.h

@@ -190,7 +190,7 @@
 
 /**
  * Hephestos 2 24V heated bed upgrade kit.
- * https://store.bq.com/en/heated-bed-kit-hephestos2
+ * https://www.en3dstudios.com/product/bq-hephestos-2-heated-bed-kit/
  */
 //#define HEPHESTOS2_HEATED_BED_KIT
 #if ENABLED(HEPHESTOS2_HEATED_BED_KIT)
@@ -3426,7 +3426,7 @@
  //#define PHOTOGRAPH_PIN 23
 
  // Canon Hack Development Kit
- // https://captain-slow.dk/2014/03/09/3d-printing-timelapses/
+ // https://web.archive.org/web/20200920094805/https://captain-slow.dk/2014/03/09/3d-printing-timelapses/
  //#define CHDK_PIN 4
 
  // Optional second move with delay to trigger the camera shutter
@@ -4028,7 +4028,7 @@
  * Wiki: https://wiki.aus3d.com.au/Magnetic_Encoder
  * Github: https://github.com/Aus3D/MagneticEncoder
  *
- * Supplier: https://aus3d.com.au/magnetic-encoder-module
+ * Supplier: https://aus3d.com.au/products/magnetic-encoder-module
  * Alternative Supplier: https://reliabuild3d.com/
  *
  * Reliabuild encoders have been modified to improve reliability.
@@ -4299,7 +4299,7 @@
  /**
  * Using a sensor like the MMU2S
  * This mode requires a MK3S extruder with a sensor at the extruder idler, like the MMU2S.
- * See https://help.prusa3d.com/en/guide/3b-mk3s-mk2-5s-extruder-upgrade_41560, step 11
+ * See https://help.prusa3d.com/guide/3b-mk3s-mk2-5s-extruder-upgrade_41560#42048, step 11
  */
  #if HAS_PRUSA_MMU2S
  #define MMU2_C0_RETRY 5 // Number of retries (total time = timeout*retries)

Marlin/Version.h

@@ -41,7 +41,7 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2023-07-02"
+//#define STRING_DISTRIBUTION_DATE "2023-07-05"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.

Marlin/src/MarlinCore.cpp

@@ -356,9 +356,7 @@ void startOrResumeJob() {
  TERN_(GCODE_REPEAT_MARKERS, repeat.reset());
  TERN_(CANCEL_OBJECTS, cancelable.reset());
  TERN_(LCD_SHOW_E_TOTAL, e_move_accumulator = 0);
- #if ENABLED(SET_REMAINING_TIME)
- ui.reset_remaining_time();
- #endif
+ TERN_(SET_REMAINING_TIME, ui.reset_remaining_time());
  }
  print_job_timer.start();
 }

Marlin/src/core/debug_section.h

@@ -41,6 +41,6 @@ class SectionLog {
  SERIAL_ECHO(fpre);
  if (the_msg) SERIAL_ECHO(AS_CHAR(' '), the_msg);
  SERIAL_CHAR(' ');
- print_pos(current_position);
+ print_xyz(xyz_pos_t(current_position));
  }
 };

Marlin/src/core/macros.h

@@ -375,6 +375,8 @@
  extern "C++" {
 
  // C++11 solution that is standards compliant. Return type is deduced automatically
+ template <class N> static constexpr N _MIN(const N val) { return val; }
+ template <class N> static constexpr N _MAX(const N val) { return val; }
  template <class L, class R> static constexpr auto _MIN(const L lhs, const R rhs) -> decltype(lhs + rhs) {
  return lhs < rhs ? lhs : rhs;
  }

Marlin/src/core/serial.cpp

@@ -121,12 +121,24 @@ void print_bin(uint16_t val) {
  }
 }
 
-void print_pos(NUM_AXIS_ARGS_(const_float_t) FSTR_P const prefix/*=nullptr*/, FSTR_P const suffix/*=nullptr*/) {
+void _print_xyz(NUM_AXIS_ARGS_(const_float_t) FSTR_P const prefix) {
  if (prefix) SERIAL_ECHO(prefix);
  #if NUM_AXES
  SERIAL_ECHOPGM_P(
  LIST_N(DOUBLE(NUM_AXES), SP_X_STR, x, SP_Y_STR, y, SP_Z_STR, z, SP_I_STR, i, SP_J_STR, j, SP_K_STR, k, SP_U_STR, u, SP_V_STR, v, SP_W_STR, w)
  );
  #endif
+}
+
+void print_xyz(NUM_AXIS_ARGS_(const_float_t) FSTR_P const prefix/*=nullptr*/, FSTR_P const suffix/*=nullptr*/) {
+ _print_xyz(NUM_AXIS_LIST_(x, y, z, i, j, k, u, v, w) prefix);
+ if (suffix) SERIAL_ECHO(suffix); else SERIAL_EOL();
+}
+
+void print_xyze(LOGICAL_AXIS_ARGS_(const_float_t) FSTR_P const prefix/*=nullptr*/, FSTR_P const suffix/*=nullptr*/) {
+ _print_xyz(NUM_AXIS_LIST_(x, y, z, i, j, k, u, v, w) prefix);
+ #if HAS_EXTRUDERS
+ SERIAL_ECHOPGM_P(SP_E_STR, e);
+ #endif
  if (suffix) SERIAL_ECHO(suffix); else SERIAL_EOL();
 }

Marlin/src/core/serial.h

@@ -242,14 +242,19 @@ void serialprint_truefalse(const bool tf);
 void serial_offset(const_float_t v, const uint8_t sp=0); // For v==0 draw space (sp==1) or plus (sp==2)
 
 void print_bin(const uint16_t val);
-void print_pos(NUM_AXIS_ARGS_(const_float_t) FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr);
 
-inline void print_pos(const xyze_pos_t &xyze, FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr) {
- print_pos(NUM_AXIS_ELEM_(xyze) prefix, suffix);
+void print_xyz(NUM_AXIS_ARGS_(const_float_t) FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr);
+inline void print_xyz(const xyz_pos_t &xyz, FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr) {
+ print_xyz(NUM_AXIS_ELEM_(xyz) prefix, suffix);
 }
 
-#define SERIAL_POS(SUFFIX,VAR) do { print_pos(VAR, F(" " STRINGIFY(VAR) "="), F(" : " SUFFIX "\n")); }while(0)
-#define SERIAL_XYZ(PREFIX,V...) do { print_pos(V, F(PREFIX)); }while(0)
+void print_xyze(LOGICAL_AXIS_ARGS_(const_float_t) FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr);
+inline void print_xyze(const xyze_pos_t &xyze, FSTR_P const prefix=nullptr, FSTR_P const suffix=nullptr) {
+ print_xyze(LOGICAL_AXIS_ELEM_(xyze) prefix, suffix);
+}
+
+#define SERIAL_POS(SUFFIX,VAR) do { print_xyz(VAR, F(" " STRINGIFY(VAR) "="), F(" : " SUFFIX "\n")); }while(0)
+#define SERIAL_XYZ(PREFIX,V...) do { print_xyz(V, F(PREFIX)); }while(0)
 
 /**
  * Extended string that can echo itself to serial

Marlin/src/core/types.h

@@ -48,6 +48,19 @@ template <class L, class R> struct IF<true, L, R> { typedef L type; };
 #define MAIN_AXIS_NAMES NUM_AXIS_LIST(X, Y, Z, I, J, K, U, V, W)
 #define STR_AXES_MAIN NUM_AXIS_GANG("X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W)
 
+#define LOGICAL_AXIS_GANG(E,V...) NUM_AXIS_GANG(V) GANG_ITEM_E(E)
+#define LOGICAL_AXIS_CODE(E,V...) NUM_AXIS_CODE(V) CODE_ITEM_E(E)
+#define LOGICAL_AXIS_LIST(E,V...) NUM_AXIS_LIST(V) LIST_ITEM_E(E)
+#define LOGICAL_AXIS_LIST_1(V) NUM_AXIS_LIST_1(V) LIST_ITEM_E(V)
+#define LOGICAL_AXIS_ARRAY(E,V...) { LOGICAL_AXIS_LIST(E,V) }
+#define LOGICAL_AXIS_ARRAY_1(V) { LOGICAL_AXIS_LIST_1(V) }
+#define LOGICAL_AXIS_ARGS(T) LOGICAL_AXIS_LIST(T e, T x, T y, T z, T i, T j, T k, T u, T v, T w)
+#define LOGICAL_AXIS_ELEM(O) LOGICAL_AXIS_LIST(O.e, O.x, O.y, O.z, O.i, O.j, O.k, O.u, O.v, O.w)
+#define LOGICAL_AXIS_DECL(T,V) LOGICAL_AXIS_LIST(T e=V, T x=V, T y=V, T z=V, T i=V, T j=V, T k=V, T u=V, T v=V, T w=V)
+#define LOGICAL_AXIS_NAMES LOGICAL_AXIS_LIST(E, X, Y, Z, I, J, K, U, V, W)
+#define LOGICAL_AXIS_MAP(F) MAP(F, LOGICAL_AXIS_NAMES)
+#define STR_AXES_LOGICAL LOGICAL_AXIS_GANG("E", "X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W)
+
 #if NUM_AXES
  #define NUM_AXES_SEP ,
  #define MAIN_AXIS_MAP(F) MAP(F, MAIN_AXIS_NAMES)
@@ -67,18 +80,18 @@ template <class L, class R> struct IF<true, L, R> { typedef L type; };
 #define NUM_AXIS_ELEM_(T) NUM_AXIS_ELEM(T) NUM_AXES_SEP
 #define MAIN_AXIS_NAMES_ MAIN_AXIS_NAMES NUM_AXES_SEP
 
-#define LOGICAL_AXIS_GANG(E,V...) NUM_AXIS_GANG(V) GANG_ITEM_E(E)
-#define LOGICAL_AXIS_CODE(E,V...) NUM_AXIS_CODE(V) CODE_ITEM_E(E)
-#define LOGICAL_AXIS_LIST(E,V...) NUM_AXIS_LIST(V) LIST_ITEM_E(E)
-#define LOGICAL_AXIS_LIST_1(V) NUM_AXIS_LIST_1(V) LIST_ITEM_E(V)
-#define LOGICAL_AXIS_ARRAY(E,V...) { LOGICAL_AXIS_LIST(E,V) }
-#define LOGICAL_AXIS_ARRAY_1(V) { LOGICAL_AXIS_LIST_1(V) }
-#define LOGICAL_AXIS_ARGS(T)  LOGICAL_AXIS_LIST(T e, T x, T y, T z, T i, T j, T k, T u, T v, T w)
-#define LOGICAL_AXIS_ELEM(O) LOGICAL_AXIS_LIST(O.e, O.x, O.y, O.z, O.i, O.j, O.k, O.u, O.v, O.w)
-#define LOGICAL_AXIS_DECL(T,V)  LOGICAL_AXIS_LIST(T e=V, T x=V, T y=V, T z=V, T i=V, T j=V, T k=V, T u=V, T v=V, T w=V)
-#define LOGICAL_AXIS_NAMES LOGICAL_AXIS_LIST(E, X, Y, Z, I, J, K, U, V, W)
-#define LOGICAL_AXIS_MAP(F)  MAP(F, LOGICAL_AXIS_NAMES)
-#define STR_AXES_LOGICAL  LOGICAL_AXIS_GANG("E", "X", "Y", "Z", STR_I, STR_J, STR_K, STR_U, STR_V, STR_W)
+#if LOGICAL_AXES
+ #define LOGICAL_AXES_SEP ,
+#else
+ #define LOGICAL_AXES_SEP
+#endif
+
+#define LOGICAL_AXIS_GANG_(V...) LOGICAL_AXIS_GANG(V) LOGICAL_AXES_SEP
+#define LOGICAL_AXIS_LIST_(V...) LOGICAL_AXIS_LIST(V) LOGICAL_AXES_SEP
+#define LOGICAL_AXIS_LIST_1_(V...) LOGICAL_AXIS_LIST_1(V) LOGICAL_AXES_SEP
+#define LOGICAL_AXIS_ARGS_(T) LOGICAL_AXIS_ARGS(T) LOGICAL_AXES_SEP
+#define LOGICAL_AXIS_ELEM_(T) LOGICAL_AXIS_ELEM(T) LOGICAL_AXES_SEP
+#define LOGICAL_AXIS_NAMES_ LOGICAL_AXIS_NAMES LOGICAL_AXES_SEP
 
 #define SECONDARY_AXIS_GANG(V...) GANG_N(SECONDARY_AXES, V)
 #define SECONDARY_AXIS_CODE(V...) CODE_N(SECONDARY_AXES, V)

Marlin/src/gcode/calibrate/G28.cpp

@@ -352,7 +352,9 @@ void GcodeSuite::G28() {
 
  endstops.enable(true); // Enable endstops for next homing move
 
- bool finalRaiseZ = false;
+ #if HAS_Z_AXIS
+ bool finalRaiseZ = false;
+ #endif
 
  #if ENABLED(DELTA)
 
@@ -622,10 +624,12 @@ void GcodeSuite::G28() {
  // Move to a height where we can use the full xy-area
  TERN_(DELTA_HOME_TO_SAFE_ZONE, do_blocking_move_to_z(delta_clip_start_height));
 
- // Move to the configured Z only if Z was homed to MIN, because machines that
- // home to MAX historically expect 'G28 Z' to be safe to use at the end of a
- // print, and do_move_after_z_homing is not very nuanced.
- if (finalRaiseZ) do_move_after_z_homing();
+ #if HAS_Z_AXIS
+ // Move to the configured Z only if Z was homed to MIN, because machines that
+ // home to MAX historically expect 'G28 Z' to be safe to use at the end of a
+ // print, and do_move_after_z_homing is not very nuanced.
+ if (finalRaiseZ) do_move_after_z_homing();
+ #endif
 
  TERN_(CAN_SET_LEVELING_AFTER_G28, if (leveling_restore_state) set_bed_leveling_enabled());
 

Marlin/src/gcode/control/M211.cpp

@@ -47,8 +47,8 @@ void GcodeSuite::M211_report(const bool forReplay/*=true*/) {
  report_echo_start(forReplay);
  const xyz_pos_t l_soft_min = soft_endstop.min.asLogical(),
  l_soft_max = soft_endstop.max.asLogical();
- print_pos(l_soft_min, F(STR_SOFT_MIN), F(" "));
- print_pos(l_soft_max, F(STR_SOFT_MAX));
+ print_xyz(l_soft_min, F(STR_SOFT_MIN), F(" "));
+ print_xyz(l_soft_max, F(STR_SOFT_MAX));
 }
 
 #endif // HAS_SOFTWARE_ENDSTOPS

Marlin/src/gcode/sd/M24_M25.cpp

@@ -70,7 +70,7 @@ void GcodeSuite::M24() {
  #endif
 
  if (card.isFileOpen()) {
- card.startOrResumeFilePrinting();  // SD card will now be read for commands
+ card.startOrResumeFilePrinting(); // SD card will now be read for commands
  startOrResumeJob(); // Start (or resume) the print job timer
  TERN_(POWER_LOSS_RECOVERY, recovery.prepare());
  }

Marlin/src/inc/Conditionals_LCD.h

@@ -454,7 +454,7 @@
 // Shift register panels
 // ---------------------
 // 2 wire Non-latching LCD SR from:
-// https://bitbucket.org/fmalpartida/new-liquidcrystal/wiki/schematics#!shiftregister-connection
+// https://github.com/fmalpartida/New-LiquidCrystal/wiki/schematics#user-content-ShiftRegister_connection
 #if ENABLED(FF_INTERFACEBOARD)
  #define SR_LCD_3W_NL // Non latching 3 wire shift register
  #define IS_ULTIPANEL 1

Marlin/src/inc/Version.h

@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
- #define STRING_DISTRIBUTION_DATE "2023-07-02"
+ #define STRING_DISTRIBUTION_DATE "2023-07-05"
 #endif
 
 /**