From 00749d8ef032a3c8712d5babd0b7b15a1ceb983e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 25 Dec 2017 01:25:51 -0600
Subject: [PATCH 1/6] Add pause/resume action to example configs
---
.../AlephObjects/TAZ4/Configuration_adv.h | 8 ++++++++
.../example_configurations/Anet/A6/Configuration_adv.h | 8 ++++++++
.../example_configurations/Anet/A8/Configuration_adv.h | 8 ++++++++
.../BQ/Hephestos/Configuration_adv.h | 8 ++++++++
.../BQ/Hephestos_2/Configuration_adv.h | 8 ++++++++
.../example_configurations/BQ/WITBOX/Configuration_adv.h | 8 ++++++++
.../example_configurations/Cartesio/Configuration_adv.h | 8 ++++++++
.../Creality/CR-10/Configuration_adv.h | 8 ++++++++
Marlin/example_configurations/Felix/Configuration_adv.h | 8 ++++++++
.../FolgerTech/i3-2020/Configuration_adv.h | 8 ++++++++
.../Infitary/i3-M508/Configuration_adv.h | 8 ++++++++
.../Malyan/M150/Configuration_adv.h | 8 ++++++++
.../Micromake/C1/enhanced/Configuration_adv.h | 8 ++++++++
.../example_configurations/RigidBot/Configuration_adv.h | 8 ++++++++
Marlin/example_configurations/SCARA/Configuration_adv.h | 8 ++++++++
.../Sanguinololu/Configuration_adv.h | 8 ++++++++
.../example_configurations/TinyBoy2/Configuration_adv.h | 8 ++++++++
.../Velleman/K8200/Configuration_adv.h | 8 ++++++++
.../Velleman/K8400/Configuration_adv.h | 8 ++++++++
.../Wanhao/Duplicator 6/Configuration_adv.h | 8 ++++++++
.../delta/FLSUN/auto_calibrate/Configuration_adv.h | 8 ++++++++
.../delta/FLSUN/kossel_mini/Configuration_adv.h | 8 ++++++++
.../delta/generic/Configuration_adv.h | 8 ++++++++
.../delta/kossel_mini/Configuration_adv.h | 8 ++++++++
.../delta/kossel_pro/Configuration_adv.h | 8 ++++++++
.../delta/kossel_xl/Configuration_adv.h | 8 ++++++++
.../gCreate/gMax1.5+/Configuration_adv.h | 8 ++++++++
.../example_configurations/makibox/Configuration_adv.h | 8 ++++++++
.../tvrrug/Round2/Configuration_adv.h | 8 ++++++++
Marlin/example_configurations/wt150/Configuration_adv.h | 9 ++++++++-
30 files changed, 240 insertions(+), 1 deletion(-)
diff --git a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
index 25ac13ffb52..1074bc45d62 100644
--- a/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
+++ b/Marlin/example_configurations/AlephObjects/TAZ4/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/Anet/A6/Configuration_adv.h b/Marlin/example_configurations/Anet/A6/Configuration_adv.h
index d94cad29efa..36e87826b98 100644
--- a/Marlin/example_configurations/Anet/A6/Configuration_adv.h
+++ b/Marlin/example_configurations/Anet/A6/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/Anet/A8/Configuration_adv.h b/Marlin/example_configurations/Anet/A8/Configuration_adv.h
index 28c22bfaddd..6d7e288d9fc 100644
--- a/Marlin/example_configurations/Anet/A8/Configuration_adv.h
+++ b/Marlin/example_configurations/Anet/A8/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h b/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
index 2da2fbadf4f..e8f52140679 100644
--- a/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/Hephestos/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h b/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
index 1be24990601..14776c62c61 100644
--- a/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/Hephestos_2/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h b/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
index 2da2fbadf4f..e8f52140679 100644
--- a/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
+++ b/Marlin/example_configurations/BQ/WITBOX/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/Cartesio/Configuration_adv.h b/Marlin/example_configurations/Cartesio/Configuration_adv.h
index f316dd2b54c..aa7bcff1db4 100644
--- a/Marlin/example_configurations/Cartesio/Configuration_adv.h
+++ b/Marlin/example_configurations/Cartesio/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h b/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
index 8f526a9ce35..f1dc2f0d3ba 100755
--- a/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
+++ b/Marlin/example_configurations/Creality/CR-10/Configuration_adv.h
@@ -1444,6 +1444,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/Felix/Configuration_adv.h b/Marlin/example_configurations/Felix/Configuration_adv.h
index a203ea0040e..778c8e088df 100644
--- a/Marlin/example_configurations/Felix/Configuration_adv.h
+++ b/Marlin/example_configurations/Felix/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h b/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h
index 08d9dcf8e6b..d700c25cfa3 100644
--- a/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h
+++ b/Marlin/example_configurations/FolgerTech/i3-2020/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h b/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
index 2d1fe5ed6ff..4715634ed2f 100644
--- a/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
+++ b/Marlin/example_configurations/Infitary/i3-M508/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/Malyan/M150/Configuration_adv.h b/Marlin/example_configurations/Malyan/M150/Configuration_adv.h
index 9240e049514..c46e7f7b731 100644
--- a/Marlin/example_configurations/Malyan/M150/Configuration_adv.h
+++ b/Marlin/example_configurations/Malyan/M150/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h b/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h
index 9f4f89d66c8..db9065568f6 100644
--- a/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h
+++ b/Marlin/example_configurations/Micromake/C1/enhanced/Configuration_adv.h
@@ -1442,6 +1442,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/RigidBot/Configuration_adv.h b/Marlin/example_configurations/RigidBot/Configuration_adv.h
index 81d6d94bff2..fdcac909a70 100644
--- a/Marlin/example_configurations/RigidBot/Configuration_adv.h
+++ b/Marlin/example_configurations/RigidBot/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/SCARA/Configuration_adv.h b/Marlin/example_configurations/SCARA/Configuration_adv.h
index 7fdceb29367..8909af8146b 100644
--- a/Marlin/example_configurations/SCARA/Configuration_adv.h
+++ b/Marlin/example_configurations/SCARA/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/Sanguinololu/Configuration_adv.h b/Marlin/example_configurations/Sanguinololu/Configuration_adv.h
index ff798b6c161..4b326e8cbb8 100644
--- a/Marlin/example_configurations/Sanguinololu/Configuration_adv.h
+++ b/Marlin/example_configurations/Sanguinololu/Configuration_adv.h
@@ -1408,6 +1408,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h
index 54f0aba71e9..8fdc831cbb5 100644
--- a/Marlin/example_configurations/TinyBoy2/Configuration_adv.h
+++ b/Marlin/example_configurations/TinyBoy2/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h b/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
index 00d0f12f693..a593ca7f9cc 100644
--- a/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
+++ b/Marlin/example_configurations/Velleman/K8200/Configuration_adv.h
@@ -1452,6 +1452,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h b/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
index e002aaa423e..19d0433b31a 100644
--- a/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
+++ b/Marlin/example_configurations/Velleman/K8400/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h b/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h
index 4f8e037b202..4aae63702e8 100644
--- a/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h
+++ b/Marlin/example_configurations/Wanhao/Duplicator 6/Configuration_adv.h
@@ -1443,6 +1443,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
index f9b65351773..8e2568bb1ce 100644
--- a/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/FLSUN/auto_calibrate/Configuration_adv.h
@@ -1443,6 +1443,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
index 7fb61329131..60d7c0a2810 100644
--- a/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/FLSUN/kossel_mini/Configuration_adv.h
@@ -1443,6 +1443,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/delta/generic/Configuration_adv.h b/Marlin/example_configurations/delta/generic/Configuration_adv.h
index 7fb61329131..60d7c0a2810 100644
--- a/Marlin/example_configurations/delta/generic/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/generic/Configuration_adv.h
@@ -1443,6 +1443,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
index 7fb61329131..60d7c0a2810 100644
--- a/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_mini/Configuration_adv.h
@@ -1443,6 +1443,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
index ec76617c1d7..c5330406ff0 100644
--- a/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_pro/Configuration_adv.h
@@ -1448,6 +1448,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
index 7a6aceeb193..0edc91d4766 100644
--- a/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
+++ b/Marlin/example_configurations/delta/kossel_xl/Configuration_adv.h
@@ -1443,6 +1443,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
index 6221ac302b9..8bad79a5f07 100644
--- a/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
+++ b/Marlin/example_configurations/gCreate/gMax1.5+/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/makibox/Configuration_adv.h b/Marlin/example_configurations/makibox/Configuration_adv.h
index 2989630e0cb..35af6427b61 100644
--- a/Marlin/example_configurations/makibox/Configuration_adv.h
+++ b/Marlin/example_configurations/makibox/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
index 06e61612faf..cf2d78b4066 100644
--- a/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
+++ b/Marlin/example_configurations/tvrrug/Round2/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/example_configurations/wt150/Configuration_adv.h b/Marlin/example_configurations/wt150/Configuration_adv.h
index 1e5eba5da31..ea1b4610fd6 100644
--- a/Marlin/example_configurations/wt150/Configuration_adv.h
+++ b/Marlin/example_configurations/wt150/Configuration_adv.h
@@ -1427,10 +1427,17 @@
/**
* Specify an action command to send to the host when the printer is killed.
* Will be sent in the form '//action:ACTION_ON_KILL', e.g. '//action:poweroff'.
- * The host must be configured to handle the action command.
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
From b12eb33febe7f4166158aba1b5ad34f535feff3b Mon Sep 17 00:00:00 2001
From: silentninja1 <silent.ninja1@gmail.com>
Date: Wed, 20 Dec 2017 09:22:13 -0500
Subject: [PATCH 2/6] Add support for pause and resume action commands on M600
---
Marlin/Configuration_adv.h | 8 ++++++++
Marlin/Marlin_main.cpp | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
index d2cfff0af56..bcae08a0aea 100644
--- a/Marlin/Configuration_adv.h
+++ b/Marlin/Configuration_adv.h
@@ -1441,6 +1441,14 @@
*/
//#define ACTION_ON_KILL "poweroff"
+/**
+ * Specify an action command to send to the host on pause and resume.
+ * Will be sent in the form '//action:ACTION_ON_PAUSE', e.g. '//action:pause'.
+ * The host must be configured to handle the action command.
+ */
+//#define ACTION_ON_PAUSE "pause"
+//#define ACTION_ON_RESUME "resume"
+
//===========================================================================
//====================== I2C Position Encoder Settings ======================
//===========================================================================
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 2647a5232ab..4fb4a39f761 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -6497,6 +6497,10 @@ inline void gcode_M17() {
) {
if (move_away_flag) return false; // already paused
+ #ifdef ACTION_ON_PAUSE
+ SERIAL_ECHOLNPGM("//action:" ACTION_ON_PAUSE);
+ #endif
+
if (!DEBUGGING(DRYRUN) && unload_length != 0) {
#if ENABLED(PREVENT_COLD_EXTRUSION)
if (!thermalManager.allow_cold_extrude &&
@@ -6729,6 +6733,10 @@ inline void gcode_M17() {
lcd_advanced_pause_show_message(ADVANCED_PAUSE_MESSAGE_STATUS);
#endif
+ #ifdef ACTION_ON_RESUME
+ SERIAL_ECHOLNPGM("//action:" ACTION_ON_RESUME);
+ #endif
+
#if ENABLED(SDSUPPORT)
if (sd_print_paused) {
card.startFileprint();
From 05a6d487530246a628c72585b5bd3e0b73906a5c Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 25 Dec 2017 01:33:36 -0600
Subject: [PATCH 3/6] Tweak to M125 code
---
Marlin/Marlin_main.cpp | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index 4fb4a39f761..c546fc229e4 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -8608,7 +8608,6 @@ inline void gcode_M121() { endstops.enable_globally(false); }
* Z = override Z raise
*/
inline void gcode_M125() {
- point_t park_point = NOZZLE_PARK_POINT;
// Initial retract before move to filament change position
const float retract = parser.seen('L') ? parser.value_axis_units(E_AXIS) : 0
@@ -8617,16 +8616,14 @@ inline void gcode_M121() { endstops.enable_globally(false); }
#endif
;
- // Lift Z axis
- if (parser.seenval('Z'))
- park_point.z = parser.linearval('Z');
+ point_t park_point = NOZZLE_PARK_POINT;
// Move XY axes to filament change position or given position
- if (parser.seenval('X'))
- park_point.x = parser.linearval('X');
+ if (parser.seenval('X')) park_point.x = parser.linearval('X');
+ if (parser.seenval('Y')) park_point.y = parser.linearval('Y');
- if (parser.seenval('Y'))
- park_point.y = parser.linearval('Y');
+ // Lift Z axis
+ if (parser.seenval('Z')) park_point.z = parser.linearval('Z');
#if HOTENDS > 1 && DISABLED(DUAL_X_CARRIAGE)
park_point.x += (active_extruder ? hotend_offset[X_AXIS][active_extruder] : 0);
From defff1e4a89f89fbd63c10b67c80587f5c7e89b6 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 25 Dec 2017 02:20:13 -0600
Subject: [PATCH 4/6] Fix GT2560 A+ servo pins
---
Marlin/pins_GT2560_REV_A.h | 5 ++++-
Marlin/pins_GT2560_REV_A_PLUS.h | 9 ++++-----
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Marlin/pins_GT2560_REV_A.h b/Marlin/pins_GT2560_REV_A.h
index 125acf8419c..cb4892015ef 100644
--- a/Marlin/pins_GT2560_REV_A.h
+++ b/Marlin/pins_GT2560_REV_A.h
@@ -30,8 +30,11 @@
#error "Oops! Make sure you have 'Arduino Mega' selected from the 'Tools -> Boards' menu."
#endif
-#define BOARD_NAME "GT2560 Rev.A"
+#ifndef BOARD_NAME
+ #define BOARD_NAME "GT2560 Rev.A"
+#endif
#define DEFAULT_MACHINE_NAME "Prusa i3 Pro B"
+
//
// Limit Switches
//
diff --git a/Marlin/pins_GT2560_REV_A_PLUS.h b/Marlin/pins_GT2560_REV_A_PLUS.h
index 16660e0d16d..99399e34ba3 100644
--- a/Marlin/pins_GT2560_REV_A_PLUS.h
+++ b/Marlin/pins_GT2560_REV_A_PLUS.h
@@ -24,13 +24,12 @@
* Geeetech GT2560 Revision A+ board pin assignments
*/
+#define BOARD_NAME "GT2560 Rev.A+"
+
#include "pins_GT2560_REV_A.h"
-#undef BOARD_NAME
-#define BOARD_NAME "GT2560 Rev.A+"
-
#if ENABLED(BLTOUCH)
- #define SERVO0_PIN 32
-#else
#define SERVO0_PIN 11
+#else
+ #define SERVO0_PIN 32
#endif
From e0d487e33937cc1898b65ceeddb76ecfa9118ad4 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 25 Dec 2017 04:03:40 -0600
Subject: [PATCH 5/6] Update TMC2208 config store
---
Marlin/configuration_store.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp
index aed7add63fd..7ca91a73a4d 100644
--- a/Marlin/configuration_store.cpp
+++ b/Marlin/configuration_store.cpp
@@ -141,7 +141,7 @@
* 539 M200 D parser.volumetric_enabled (bool)
* 540 M200 T D planner.filament_size (float x5) (T0..3)
*
- * HAVE_TMC2130 || HAVE_TMC2208: 22 bytes
+ * HAS_TRINAMIC: 22 bytes
* 560 M906 X Stepper X current (uint16_t)
* 562 M906 Y Stepper Y current (uint16_t)
* 564 M906 Z Stepper Z current (uint16_t)
@@ -203,7 +203,7 @@ MarlinSettings settings;
#include "mesh_bed_leveling.h"
#endif
-#if ENABLED(HAVE_TMC2130) || ENABLED(HAVE_TMC2208)
+#if HAS_TRINAMIC
#include "stepper_indirection.h"
#endif
@@ -2062,7 +2062,7 @@ void MarlinSettings::reset() {
/**
* TMC2130 stepper driver current
*/
- #if ENABLED(HAVE_TMC2130)
+ #if HAS_TRINAMIC
if (!forReplay) {
CONFIG_ECHO_START;
SERIAL_ECHOLNPGM("Stepper driver current:");
@@ -2108,7 +2108,7 @@ void MarlinSettings::reset() {
/**
* TMC2130 Sensorless homing thresholds
*/
- #if ENABLED(HAVE_TMC2130) && ENABLED(SENSORLESS_HOMING)
+ #if ENABLED(SENSORLESS_HOMING)
if (!forReplay) {
CONFIG_ECHO_START;
SERIAL_ECHOLNPGM("Sensorless homing threshold:");
From 3c7cdcdc22f43577fbb22e64b115f9d87462b420 Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Mon, 25 Dec 2017 03:42:51 -0600
Subject: [PATCH 6/6] General cleanup of config-store, reset_bed_level
---
Marlin/Marlin_main.cpp | 30 +++++++++++-----------
Marlin/configuration_store.cpp | 46 ++++++++++++++++------------------
Marlin/configuration_store.h | 16 ++++++------
Marlin/ubl_G29.cpp | 9 ++++---
Marlin/ultralcd.cpp | 2 +-
5 files changed, 50 insertions(+), 53 deletions(-)
diff --git a/Marlin/Marlin_main.cpp b/Marlin/Marlin_main.cpp
index c546fc229e4..b58758731ec 100644
--- a/Marlin/Marlin_main.cpp
+++ b/Marlin/Marlin_main.cpp
@@ -2502,27 +2502,25 @@ static void clean_up_after_endstop_or_probe_move() {
* Reset calibration results to zero.
*/
void reset_bed_level() {
+ #if ENABLED(DEBUG_LEVELING_FEATURE)
+ if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("reset_bed_level");
+ #endif
set_bed_leveling_enabled(false);
#if ENABLED(MESH_BED_LEVELING)
if (leveling_is_valid()) {
mbl.reset();
mbl.has_mesh = false;
}
- #else
- #if ENABLED(DEBUG_LEVELING_FEATURE)
- if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("reset_bed_level");
- #endif
- #if ABL_PLANAR
- planner.bed_level_matrix.set_to_identity();
- #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
- bilinear_start[X_AXIS] = bilinear_start[Y_AXIS] =
- bilinear_grid_spacing[X_AXIS] = bilinear_grid_spacing[Y_AXIS] = 0;
- for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
- for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
- z_values[x][y] = NAN;
- #elif ENABLED(AUTO_BED_LEVELING_UBL)
- ubl.reset();
- #endif
+ #elif ENABLED(AUTO_BED_LEVELING_UBL)
+ ubl.reset();
+ #elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
+ bilinear_start[X_AXIS] = bilinear_start[Y_AXIS] =
+ bilinear_grid_spacing[X_AXIS] = bilinear_grid_spacing[Y_AXIS] = 0;
+ for (uint8_t x = 0; x < GRID_MAX_POINTS_X; x++)
+ for (uint8_t y = 0; y < GRID_MAX_POINTS_Y; y++)
+ z_values[x][y] = NAN;
+ #elif ABL_PLANAR
+ planner.bed_level_matrix.set_to_identity();
#endif
}
@@ -9643,7 +9641,7 @@ void quickstop_stepper() {
#if ENABLED(EEPROM_SETTINGS)
const int8_t storage_slot = parser.has_value() ? parser.value_int() : ubl.storage_slot;
- const int16_t a = settings.calc_num_meshes();
+ const uint16_t a = settings.calc_num_meshes();
if (!a) {
SERIAL_PROTOCOLLNPGM("?EEPROM storage not available.");
diff --git a/Marlin/configuration_store.cpp b/Marlin/configuration_store.cpp
index 7ca91a73a4d..2da7cbf62fc 100644
--- a/Marlin/configuration_store.cpp
+++ b/Marlin/configuration_store.cpp
@@ -283,7 +283,7 @@ void MarlinSettings::postprocess() {
bool MarlinSettings::eeprom_error;
#if ENABLED(AUTO_BED_LEVELING_UBL)
- int MarlinSettings::meshes_begin;
+ int16_t MarlinSettings::meshes_begin;
#endif
void MarlinSettings::write_data(int &pos, const uint8_t *value, uint16_t size, uint16_t *crc) {
@@ -383,9 +383,8 @@ void MarlinSettings::postprocess() {
sizeof(mbl.z_values) == GRID_MAX_POINTS * sizeof(mbl.z_values[0][0]),
"MBL Z array is the wrong size."
);
- const bool leveling_is_on = mbl.has_mesh;
const uint8_t mesh_num_x = GRID_MAX_POINTS_X, mesh_num_y = GRID_MAX_POINTS_Y;
- EEPROM_WRITE(leveling_is_on);
+ EEPROM_WRITE(mbl.has_mesh);
EEPROM_WRITE(mbl.z_offset);
EEPROM_WRITE(mesh_num_x);
EEPROM_WRITE(mesh_num_y);
@@ -581,7 +580,7 @@ void MarlinSettings::postprocess() {
EEPROM_WRITE(dummy);
}
- #endif // !NO_VOLUMETRICS
+ #endif
// Save TMC2130 or TMC2208 Configuration, and placeholder values
uint16_t val;
@@ -1282,7 +1281,7 @@ void MarlinSettings::postprocess() {
}
#endif
- int MarlinSettings::calc_num_meshes() {
+ uint16_t MarlinSettings::calc_num_meshes() {
//obviously this will get more sophisticated once we've added an actual MAT
if (meshes_begin <= 0) return 0;
@@ -1290,10 +1289,10 @@ void MarlinSettings::postprocess() {
return (meshes_end - meshes_begin) / sizeof(ubl.z_values);
}
- void MarlinSettings::store_mesh(int8_t slot) {
+ void MarlinSettings::store_mesh(const int8_t slot) {
#if ENABLED(AUTO_BED_LEVELING_UBL)
- const int a = calc_num_meshes();
+ const uint16_t a = calc_num_meshes();
if (!WITHIN(slot, 0, a - 1)) {
#if ENABLED(EEPROM_CHITCHAT)
ubl_invalid_slot(a);
@@ -1323,11 +1322,11 @@ void MarlinSettings::postprocess() {
#endif
}
- void MarlinSettings::load_mesh(int8_t slot, void *into /* = 0 */) {
+ void MarlinSettings::load_mesh(const int8_t slot, void * const into/*=NULL*/) {
#if ENABLED(AUTO_BED_LEVELING_UBL)
- const int16_t a = settings.calc_num_meshes();
+ const uint16_t a = settings.calc_num_meshes();
if (!WITHIN(slot, 0, a - 1)) {
#if ENABLED(EEPROM_CHITCHAT)
@@ -1385,17 +1384,13 @@ void MarlinSettings::reset() {
planner.retract_acceleration = DEFAULT_RETRACT_ACCELERATION;
planner.travel_acceleration = DEFAULT_TRAVEL_ACCELERATION;
planner.min_feedrate_mm_s = DEFAULT_MINIMUMFEEDRATE;
- planner.min_segment_time_us = DEFAULT_MINSEGMENTTIME;
planner.min_travel_feedrate_mm_s = DEFAULT_MINTRAVELFEEDRATE;
+ planner.min_segment_time_us = DEFAULT_MINSEGMENTTIME;
planner.max_jerk[X_AXIS] = DEFAULT_XJERK;
planner.max_jerk[Y_AXIS] = DEFAULT_YJERK;
planner.max_jerk[Z_AXIS] = DEFAULT_ZJERK;
planner.max_jerk[E_AXIS] = DEFAULT_EJERK;
- #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
- new_z_fade_height = 10.0;
- #endif
-
#if HAS_HOME_OFFSET
ZERO(home_offset);
#endif
@@ -1417,7 +1412,14 @@ void MarlinSettings::reset() {
LOOP_XYZ(i) HOTEND_LOOP() hotend_offset[i][e] = tmp4[i][e];
#endif
- // Applies to all MBL and ABL
+ //
+ // Global Leveling
+ //
+
+ #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
+ new_z_fade_height = 0.0;
+ #endif
+
#if HAS_LEVELING
reset_bed_level();
#endif
@@ -1478,10 +1480,6 @@ void MarlinSettings::reset() {
lcd_preheat_fan_speed[1] = PREHEAT_2_FAN_SPEED;
#endif
- #if HAS_LCD_CONTRAST
- lcd_contrast = DEFAULT_LCD_CONTRAST;
- #endif
-
#if ENABLED(PIDTEMP)
#if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1
HOTEND_LOOP()
@@ -1505,6 +1503,10 @@ void MarlinSettings::reset() {
thermalManager.bedKd = scalePID_d(DEFAULT_bedKd);
#endif
+ #if HAS_LCD_CONTRAST
+ lcd_contrast = DEFAULT_LCD_CONTRAST;
+ #endif
+
#if ENABLED(FWRETRACT)
autoretract_enabled = false;
retract_length = RETRACT_LENGTH;
@@ -1599,10 +1601,6 @@ void MarlinSettings::reset() {
stepper.digipot_current(q, (stepper.motor_current_setting[q] = tmp_motor_current_setting[q]));
#endif
- #if ENABLED(AUTO_BED_LEVELING_UBL)
- ubl.reset();
- #endif
-
#if ENABLED(SKEW_CORRECTION_GCODE)
planner.xy_skew_factor = XY_SKEW_FACTOR;
#if ENABLED(SKEW_CORRECTION_FOR_Z)
@@ -1710,7 +1708,7 @@ void MarlinSettings::reset() {
SERIAL_ECHOLNPGM(" M200 D0");
}
- #endif
+ #endif // !NO_VOLUMETRICS
if (!forReplay) {
CONFIG_ECHO_START;
diff --git a/Marlin/configuration_store.h b/Marlin/configuration_store.h
index b20a8d48825..e152e48f761 100644
--- a/Marlin/configuration_store.h
+++ b/Marlin/configuration_store.h
@@ -37,11 +37,11 @@ class MarlinSettings {
#if ENABLED(AUTO_BED_LEVELING_UBL) // Eventually make these available if any leveling system
// That can store is enabled
- FORCE_INLINE static int get_start_of_meshes() { return meshes_begin; }
- FORCE_INLINE static int get_end_of_meshes() { return meshes_end; }
- static int calc_num_meshes();
- static void store_mesh(int8_t slot);
- static void load_mesh(int8_t slot, void *into = 0);
+ FORCE_INLINE static int16_t get_start_of_meshes() { return meshes_begin; }
+ FORCE_INLINE static int16_t get_end_of_meshes() { return meshes_end; }
+ static uint16_t calc_num_meshes();
+ static void store_mesh(const int8_t slot);
+ static void load_mesh(const int8_t slot, void * const into=NULL);
//static void delete_mesh(); // necessary if we have a MAT
//static void defrag_meshes(); // "
@@ -66,9 +66,9 @@ class MarlinSettings {
#if ENABLED(AUTO_BED_LEVELING_UBL) // Eventually make these available if any leveling system
// That can store is enabled
- static int meshes_begin;
- const static int meshes_end = E2END - 128; // 128 is a placeholder for the size of the MAT; the MAT will always
- // live at the very end of the eeprom
+ static int16_t meshes_begin;
+ const static int16_t meshes_end = E2END - 128; // 128 is a placeholder for the size of the MAT; the MAT will always
+ // live at the very end of the eeprom
#endif
diff --git a/Marlin/ubl_G29.cpp b/Marlin/ubl_G29.cpp
index 6b56ffafc59..f3b2707d0db 100644
--- a/Marlin/ubl_G29.cpp
+++ b/Marlin/ubl_G29.cpp
@@ -309,7 +309,8 @@
void unified_bed_leveling::G29() {
if (!settings.calc_num_meshes()) {
- SERIAL_PROTOCOLLNPGM("?Enable EEPROM and init with M502, M500.\n");
+ SERIAL_PROTOCOLLNPGM("?Enable EEPROM and init with");
+ SERIAL_PROTOCOLLNPGM("M502, M500, M501 in that order.\n");
return;
}
@@ -607,7 +608,7 @@
if (parser.seen('L')) { // Load Current Mesh Data
g29_storage_slot = parser.has_value() ? parser.value_int() : storage_slot;
- int16_t a = settings.calc_num_meshes();
+ uint16_t a = settings.calc_num_meshes();
if (!a) {
SERIAL_PROTOCOLLNPGM("?EEPROM storage not available.");
@@ -649,7 +650,7 @@
return;
}
- int16_t a = settings.calc_num_meshes();
+ uint16_t a = settings.calc_num_meshes();
if (!a) {
SERIAL_PROTOCOLLNPGM("?EEPROM storage not available.");
@@ -1326,7 +1327,7 @@
* use cases for the users. So we can wait and see what to do with it.
*/
void unified_bed_leveling::g29_compare_current_mesh_to_stored_mesh() {
- int16_t a = settings.calc_num_meshes();
+ uint16_t a = settings.calc_num_meshes();
if (!a) {
SERIAL_PROTOCOLLNPGM("?EEPROM storage not available.");
diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp
index 8d78d5a503b..35f0342288c 100644
--- a/Marlin/ultralcd.cpp
+++ b/Marlin/ultralcd.cpp
@@ -2279,7 +2279,7 @@ void kill_screen(const char* lcd_msg) {
* Save Bed Mesh
*/
void _lcd_ubl_storage_mesh() {
- int16_t a = settings.calc_num_meshes();
+ uint16_t a = settings.calc_num_meshes();
START_MENU();
MENU_BACK(MSG_UBL_LEVEL_BED);
if (!WITHIN(ubl_storage_slot, 0, a - 1)) {