Merge branch 'bugfix-2.1.x' into bugfix-2.1.x-September3

MarlinFirmware · Oct 21, 2024 · 4f08b90 · 4f08b90
2 parents 719fa29 + d2bda12
commit 4f08b90
Show file tree

Hide file tree

Showing 17 changed files with 126 additions and 286 deletions.
diff --git a/Marlin/Version.h b/Marlin/Version.h
@@ -41,7 +41,14 @@
  * here we define this default string as the date where the latest release
  * version was tagged.
  */
-//#define STRING_DISTRIBUTION_DATE "2024-10-20"
+//#define STRING_DISTRIBUTION_DATE "2024-10-21"
+
+/**
+ * The protocol for communication to the host. Protocol indicates communication
+ * standards such as the use of ASCII, "echo:" and "error:" line prefixes, etc.
+ * (Other behaviors are given by the firmware version and capabilities report.)
+ */
+//#define PROTOCOL_VERSION "1.0"
 
 /**
  * Defines a generic printer name to be output to the LCD after booting Marlin.
@@ -68,8 +75,8 @@
 //#define WEBSITE_URL "marlinfw.org"
 
 /**
- * Set the vendor info the serial USB interface, if changable
- * Currently only supported by DUE platform
+ * Set the vendor info the serial USB interface, if changeable.
+ * Currently only supported by DUE platform.
  */
 //#define USB_DEVICE_VENDOR_ID           0x0000
 //#define USB_DEVICE_PRODUCT_ID          0x0000

diff --git a/Marlin/src/core/utility.cpp b/Marlin/src/core/utility.cpp
@@ -60,29 +60,38 @@ void safe_delay(millis_t ms) {
   #include "../feature/bedlevel/bedlevel.h"
 
   void log_machine_info() {
-    SERIAL_ECHOLNPGM("Machine Type: "
-      TERN_(DELTA,         "Delta")
-      TERN_(IS_SCARA,      "SCARA")
-      TERN_(IS_CORE,       "Core")
-      TERN_(MARKFORGED_XY, "MarkForgedXY")
-      TERN_(MARKFORGED_YX, "MarkForgedYX")
-      TERN_(IS_CARTESIAN,  "Cartesian")
+    SERIAL_ECHOLNPGM("Machine Type:"
+      TERN_(DELTA,                 " Delta")
+      TERN_(IS_SCARA,              " SCARA")
+      TERN_(AXEL_TPARA,            " TPARA")
+      TERN_(IS_CORE,               " Core")
+      TERN_(BELTPRINTER,           " Belt Printer")
+      TERN_(MARKFORGED_XY,         " MarkForgedXY")
+      TERN_(MARKFORGED_YX,         " MarkForgedYX")
+      TERN_(POLAR,                 " Polar")
+      TERN_(POLARGRAPH,            " Polargraph")
+      TERN_(ARTICULATED_ROBOT_ARM, " Robot Arm")
+      TERN_(FOAMCUTTER_XYUV,       " Foam Cutter")
+      TERN_(IS_CARTESIAN,          " Cartesian")
     );
 
     SERIAL_ECHOLNPGM("Probe: "
-      TERN_(PROBE_MANUALLY, "PROBE_MANUALLY")
-      TERN_(NOZZLE_AS_PROBE, "NOZZLE_AS_PROBE")
-      TERN_(FIX_MOUNTED_PROBE, "FIX_MOUNTED_PROBE")
-      TERN_(HAS_Z_SERVO_PROBE, TERN(BLTOUCH, "BLTOUCH", "SERVO PROBE"))
-      TERN_(BD_SENSOR, "BD_SENSOR")
-      TERN_(TOUCH_MI_PROBE, "TOUCH_MI_PROBE")
-      TERN_(Z_PROBE_SLED, "Z_PROBE_SLED")
-      TERN_(Z_PROBE_ALLEN_KEY, "Z_PROBE_ALLEN_KEY")
-      TERN_(SOLENOID_PROBE, "SOLENOID_PROBE")
-      TERN_(MAGLEV4, "MAGLEV4")
-      TERN_(BIQU_MICROPROBE_V1, "BIQU_MICROPROBE_V1")
-      TERN_(BIQU_MICROPROBE_V2, "BIQU_MICROPROBE_V2")
-      IF_DISABLED(PROBE_SELECTED, "NONE")
+      TERN_(PROBE_MANUALLY,        "PROBE_MANUALLY")
+      TERN_(NOZZLE_AS_PROBE,       "NOZZLE_AS_PROBE")
+      TERN_(FIX_MOUNTED_PROBE,     "FIX_MOUNTED_PROBE")
+      TERN_(HAS_Z_SERVO_PROBE,     TERN(BLTOUCH, "BLTOUCH", "SERVO PROBE"))
+      TERN_(BD_SENSOR,             "BD_SENSOR")
+      TERN_(TOUCH_MI_PROBE,        "TOUCH_MI_PROBE")
+      TERN_(Z_PROBE_ALLEN_KEY,     "Z_PROBE_ALLEN_KEY")
+      TERN_(Z_PROBE_SLED,          "Z_PROBE_SLED")
+      TERN_(RACK_AND_PINION_PROBE, "RACK_AND_PINION_PROBE")
+      TERN_(SOLENOID_PROBE,        "SOLENOID_PROBE")
+      TERN_(SENSORLESS_PROBING,    "SENSORLESS_PROBING")
+      TERN_(MAGLEV4,               "MAGLEV4")
+      TERN_(MAG_MOUNTED_PROBE,     "MAG_MOUNTED_PROBE")
+      TERN_(BIQU_MICROPROBE_V1,    "BIQU_MICROPROBE_V1")
+      TERN_(BIQU_MICROPROBE_V2,    "BIQU_MICROPROBE_V2")
+      IF_DISABLED(PROBE_SELECTED,  "NONE")
     );
 
     #if HAS_BED_PROBE

diff --git a/Marlin/src/inc/Version.h b/Marlin/src/inc/Version.h
@@ -42,7 +42,7 @@
  * version was tagged.
  */
 #ifndef STRING_DISTRIBUTION_DATE
-  #define STRING_DISTRIBUTION_DATE "2024-10-20"
+  #define STRING_DISTRIBUTION_DATE "2024-10-21"
 #endif
 
 /**
@@ -101,8 +101,8 @@
 #endif
 
 /**
- * Set the vendor info the serial USB interface, if changable
- * Currently only supported by DUE platform
+ * Set the vendor info the serial USB interface, if changeable.
+ * Currently only supported by DUE platform.
  */
 #ifndef USB_DEVICE_VENDOR_ID
   #define USB_DEVICE_VENDOR_ID            0x03EB /* ATMEL VID */

diff --git a/Marlin/src/pins/sanguino/pins_ANET_10.h b/Marlin/src/pins/sanguino/pins_ANET_10.h
@@ -51,20 +51,14 @@
  */
 
 /**
- * Another usable Arduino IDE extension (Boards Manager) can be found at
+ * Requires this Arduino IDE extension for Boards Manager:
  * https://github.com/Lauszus/Sanguino
  *
- * This extension has been tested on Arduino 1.6.12 & 1.8.0
- *
- * Here's the JSON path:
+ * Follow the installation instructions at https://learn.sparkfun.com/pages/CustomBoardsArduino
+ * Just use this JSON URL instead of Sparkfun's:
  * https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
  *
- * When installing select 1.0.2
- *
- * Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
- * Just use the above JSON URL instead of Sparkfun's JSON.
- *
- * Once installed select the Sanguino board and then select the CPU.
+ * Once installed select the SANGUINO board and then select the CPU.
  */
 
 /**

diff --git a/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h b/Marlin/src/pins/sanguino/pins_GEN3_MONOLITHIC.h
@@ -27,26 +27,14 @@
  */
 
 /**
- * Rev B    26 DEC 2016
- *
- * added pointer to a current Arduino IDE extension
- */
-
-/**
- * A useable Arduino IDE extension (Boards Manager) can be found at
+ * Requires this Arduino IDE extension for Boards Manager:
  * https://github.com/Lauszus/Sanguino
  *
- * This extension has been tested on Arduino 1.6.12 & 1.8.0
- *
- * Here's the JSON path:
+ * Follow the installation instructions at https://learn.sparkfun.com/pages/CustomBoardsArduino
+ * Just use this JSON URL instead of Sparkfun's:
  * https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
  *
- * When installing select 1.0.2
- *
- * Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
- * Just use the above JSON URL instead of Sparkfun's JSON.
- *
- * Once installed select the Sanguino board and then select the CPU.
+ * Once installed select the SANGUINO board and then select the CPU.
  */
 
 #define REQUIRE_MEGA644P

diff --git a/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h b/Marlin/src/pins/sanguino/pins_GEN3_PLUS.h
@@ -26,25 +26,13 @@
  */
 
 /**
- * Rev B    26 DEC 2016
- *
- * added pointer to a current Arduino IDE extension
- */
-
-/**
- * A useable Arduino IDE extension (Boards Manager) can be found at
+ * Requires this Arduino IDE extension for Boards Manager:
  * https://github.com/Lauszus/Sanguino
  *
- * This extension has been tested on Arduino 1.6.12 & 1.8.0
- *
- * Here's the JSON path:
+ * Follow the installation instructions at https://learn.sparkfun.com/pages/CustomBoardsArduino
+ * Just use this JSON URL instead of Sparkfun's:
  * https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
  *
- * When installing select 1.0.2
- *
- * Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
- * Just use the above JSON URL instead of Sparkfun's JSON.
- *
  * Once installed select the SANGUINO board and then select the CPU.
  */
 

diff --git a/Marlin/src/pins/sanguino/pins_GEN6.h b/Marlin/src/pins/sanguino/pins_GEN6.h
@@ -26,29 +26,15 @@
  * Schematic: https://reprap.org/mediawiki/images/0/0f/GEN6_Mendel_Circuit.pdf
  */
 
- /**
- * Rev B    26 DEC 2016
- *
- * 1) added pointer to a current Arduino IDE extension
- * 2) added support for M3, M4 & M5 spindle control commands
- * 3) added case light pin definition
- */
-
 /**
- * A useable Arduino IDE extension (Boards Manager) can be found at
+ * Requires this Arduino IDE extension for Boards Manager:
  * https://github.com/Lauszus/Sanguino
  *
- * This extension has been tested on Arduino 1.6.12 & 1.8.0
- *
- * Here's the JSON path:
+ * Follow the installation instructions at https://learn.sparkfun.com/pages/CustomBoardsArduino
+ * Just use this JSON URL instead of Sparkfun's:
  * https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
  *
- * When installing select 1.0.2
- *
- * Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
- * Just use the above JSON URL instead of Sparkfun's JSON.
- *
- * Once installed select the Sanguino board and then select the CPU.
+ * Once installed select the SANGUINO board and then select the CPU.
  */
 
 #define ALLOW_MEGA644P

diff --git a/Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h b/Marlin/src/pins/sanguino/pins_GEN6_DELUXE.h
@@ -26,25 +26,13 @@
  */
 
 /**
- * Rev B    26 DEC 2016
- *
- * added pointer to a current Arduino IDE extension
- */
-
-/**
- * A useable Arduino IDE extension (Boards Manager) can be found at
+ * Requires this Arduino IDE extension for Boards Manager:
  * https://github.com/Lauszus/Sanguino
  *
- * This extension has been tested on Arduino 1.6.12 & 1.8.0
- *
- * Here's the JSON path:
+ * Follow the installation instructions at https://learn.sparkfun.com/pages/CustomBoardsArduino
+ * Just use this JSON URL instead of Sparkfun's:
  * https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
  *
- * When installing select 1.0.2
- *
- * Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
- * Just use the above JSON URL instead of Sparkfun's JSON.
- *
  * Once installed select the SANGUINO board and then select the CPU.
  */
 

diff --git a/Marlin/src/pins/sanguino/pins_GEN7_12.h b/Marlin/src/pins/sanguino/pins_GEN7_12.h
@@ -29,29 +29,15 @@
  * Schematic (1.3.1): https://github.com/Traumflug/Generation_7_Electronics/blob/release-1.3.1/release%20documents/Gen7Board%20Schematic.pdf
  */
 
- /**
- * Rev B    26 DEC 2016
- *
- * 1) added pointer to a current Arduino IDE extension
- * 2) added support for M3, M4 & M5 spindle control commands
- * 3) added case light pin definition
- */
-
 /**
- * A useable Arduino IDE extension (Boards Manager) can be found at
+ * Requires this Arduino IDE extension for Boards Manager:
  * https://github.com/Lauszus/Sanguino
  *
- * This extension has been tested on Arduino 1.6.12 & 1.8.0
- *
- * Here's the JSON path:
+ * Follow the installation instructions at https://learn.sparkfun.com/pages/CustomBoardsArduino
+ * Just use this JSON URL instead of Sparkfun's:
  * https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
  *
- * When installing select 1.0.2
- *
- * Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
- * Just use the above JSON URL instead of Sparkfun's JSON.
- *
- * Once installed select the Sanguino board and then select the CPU.
+ * Once installed select the SANGUINO board and then select the CPU.
  */
 
 #define ALLOW_MEGA644

diff --git a/Marlin/src/pins/sanguino/pins_GEN7_13.h b/Marlin/src/pins/sanguino/pins_GEN7_13.h
@@ -26,26 +26,14 @@
  */
 
 /**
- * Rev B    26 DEC 2016
- *
- * added pointer to a current Arduino IDE extension
- */
-
-/**
- * A useable Arduino IDE extension (Boards Manager) can be found at
+ * Requires this Arduino IDE extension for Boards Manager:
  * https://github.com/Lauszus/Sanguino
  *
- * This extension has been tested on Arduino 1.6.12 & 1.8.0
- *
- * Here's the JSON path:
+ * Follow the installation instructions at https://learn.sparkfun.com/pages/CustomBoardsArduino
+ * Just use this JSON URL instead of Sparkfun's:
  * https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
  *
- * When installing select 1.0.2
- *
- * Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
- * Just use the above JSON URL instead of Sparkfun's JSON.
- *
- * Once installed select the Sanguino board and then select the CPU.
+ * Once installed select the SANGUINO board and then select the CPU.
  */
 
 #define BOARD_INFO_NAME "Gen7 v1.3"

diff --git a/Marlin/src/pins/sanguino/pins_GEN7_14.h b/Marlin/src/pins/sanguino/pins_GEN7_14.h
@@ -28,28 +28,14 @@
  */
 
 /**
- * Rev B    26 DEC 2016
- *
- * 1) added pointer to a current Arduino IDE extension
- * 2) added support for M3, M4 & M5 spindle control commands
- * 3) added case light pin definition
- */
-
-/**
- * A useable Arduino IDE extension (Boards Manager) can be found at
+ * Requires this Arduino IDE extension for Boards Manager:
  * https://github.com/Lauszus/Sanguino
  *
- * This extension has been tested on Arduino 1.6.12 & 1.8.0
- *
- * Here's the JSON path:
+ * Follow the installation instructions at https://learn.sparkfun.com/pages/CustomBoardsArduino
+ * Just use this JSON URL instead of Sparkfun's:
  * https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
  *
- * When installing select 1.0.2
- *
- * Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
- * Just use the above JSON URL instead of Sparkfun's JSON.
- *
- * Once installed select the Sanguino board and then select the CPU.
+ * Once installed select the SANGUINO board and then select the CPU.
  */
 
 #define ALLOW_MEGA644

diff --git a/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h b/Marlin/src/pins/sanguino/pins_GEN7_CUSTOM.h
@@ -29,28 +29,14 @@
  */
 
 /**
- * Rev B    26 DEC 2016
- *
- * 1) added pointer to a current Arduino IDE extension
- * 2) added support for M3, M4 & M5 spindle control commands
- * 3) added case light pin definition
- */
-
-/**
- * A useable Arduino IDE extension (Boards Manager) can be found at
+ * Requires this Arduino IDE extension for Boards Manager:
  * https://github.com/Lauszus/Sanguino
  *
- * This extension has been tested on Arduino 1.6.12 & 1.8.0
- *
- * Here's the JSON path:
+ * Follow the installation instructions at https://learn.sparkfun.com/pages/CustomBoardsArduino
+ * Just use this JSON URL instead of Sparkfun's:
  * https://raw.githubusercontent.com/Lauszus/Sanguino/master/package_lauszus_sanguino_index.json
  *
- * When installing select 1.0.2
- *
- * Installation instructions can be found at https://learn.sparkfun.com/pages/CustomBoardsArduino
- * Just use the above JSON URL instead of Sparkfun's JSON.
- *
- * Once installed select the Sanguino board and then select the CPU.
+ * Once installed select the SANGUINO board and then select the CPU.
  */
 
 #define ALLOW_MEGA644