diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
index 51af621f9552af3a8e13f5a215c67ea7912d68ac..0ceef8b3934d9ab6a76170035eb092df1ea351e3 100644
--- a/Marlin/Configuration.h
+++ b/Marlin/Configuration.h
@@ -1947,9 +1947,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/default/Configuration.h b/Marlin/src/config/default/Configuration.h
index 3aaff5fe23d62d2c772f5f3bd1d97480685b4d8a..a0bb172cf4d8cf5fd987f5e2f1b62137399e4265 100644
--- a/Marlin/src/config/default/Configuration.h
+++ b/Marlin/src/config/default/Configuration.h
@@ -1946,9 +1946,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
index a8a248a8621aa8abd5ec509193a430b5bf4a9ea8..99250cc4dc18ba52b749001283dc6162f1cd38e0 100644
--- a/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
+++ b/Marlin/src/config/examples/AlephObjects/TAZ4/Configuration.h
@@ -1966,9 +1966,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
index 4be1966c80e451a19363d1c238ccab230de59b43..11aa98ac05eaa0ceb923274d3f2c21cb3864e8ed 100644
--- a/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
+++ b/Marlin/src/config/examples/AliExpress/CL-260/Configuration.h
@@ -1946,9 +1946,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Anet/A6/Configuration.h b/Marlin/src/config/examples/Anet/A6/Configuration.h
index f7c01a3b22732d5bef31b29d0051b477c9491a96..60d0f116527ce92cb94bef13948576c3363ea8cd 100644
--- a/Marlin/src/config/examples/Anet/A6/Configuration.h
+++ b/Marlin/src/config/examples/Anet/A6/Configuration.h
@@ -2101,9 +2101,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Anet/A8/Configuration.h b/Marlin/src/config/examples/Anet/A8/Configuration.h
index 843dfcc0a78527c4196da2cbd0f66fcdcd40577b..a2483b6879cac558fe8618de03bf4d554653096d 100644
--- a/Marlin/src/config/examples/Anet/A8/Configuration.h
+++ b/Marlin/src/config/examples/Anet/A8/Configuration.h
@@ -1955,9 +1955,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
index 546da031e91375505c1e3f6efb3c2a4fe99a21fb..84f8ba7bbecd5b4350dfe3f078adebb897c90e9a 100644
--- a/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
+++ b/Marlin/src/config/examples/Azteeg/X5GT/Configuration.h
@@ -1966,9 +1966,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
index 690a05123094a35e8085a69a5bedfcb959a89cfe..9569815c4ab3c6b1d082566ebe6544ac04b7ba99 100644
--- a/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
+++ b/Marlin/src/config/examples/BIBO/TouchX/cyclops/Configuration.h
@@ -1920,9 +1920,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
index 075abee0ca64e3948d0262a48c70c8c3793ccd02..c6b79222226945c5f65cd2ae0d6a30c8830bda7f 100644
--- a/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
+++ b/Marlin/src/config/examples/BIBO/TouchX/default/Configuration.h
@@ -1920,9 +1920,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h
index b82f5433f83b92a97dee548d2eb2744a2dbe2f01..36b1ea50a52fcbd069be8c4f46ccf1f85fb94b2a 100644
--- a/Marlin/src/config/examples/BQ/Hephestos/Configuration.h
+++ b/Marlin/src/config/examples/BQ/Hephestos/Configuration.h
@@ -1934,9 +1934,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
index 651c337f84df4fb28158e5b349b470aa735a2753..d687a298e7fc22127ef858341638a823f0b8927e 100644
--- a/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
+++ b/Marlin/src/config/examples/BQ/Hephestos_2/Configuration.h
@@ -1946,9 +1946,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h
index e3c3c2d0274d11da4ec4091b61d4c3df5ed0f1ac..604890fa7ab5fe319435d8851e4b8da5d3fdfdc3 100644
--- a/Marlin/src/config/examples/BQ/WITBOX/Configuration.h
+++ b/Marlin/src/config/examples/BQ/WITBOX/Configuration.h
@@ -1934,9 +1934,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Cartesio/Configuration.h b/Marlin/src/config/examples/Cartesio/Configuration.h
index 30195cfc281a5d84c56ad9397750ae64bb468121..5dcefaef91f6e0c156cb3b2786c6bc94a110d135 100644
--- a/Marlin/src/config/examples/Cartesio/Configuration.h
+++ b/Marlin/src/config/examples/Cartesio/Configuration.h
@@ -1945,9 +1945,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Creality/CR-10/Configuration.h b/Marlin/src/config/examples/Creality/CR-10/Configuration.h
index f2af5c0a880d3622896fb92bde9706f63456d7e8..af931b36475b900ad48d860d4620c7ffde64097c 100755
--- a/Marlin/src/config/examples/Creality/CR-10/Configuration.h
+++ b/Marlin/src/config/examples/Creality/CR-10/Configuration.h
@@ -1956,9 +1956,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h
index a025b4ea816bbb1d5780bf88702d7fea1ddf1ed7..cddc06f2af856d2e110c019d51f2746adece3803 100644
--- a/Marlin/src/config/examples/Creality/CR-10S/Configuration.h
+++ b/Marlin/src/config/examples/Creality/CR-10S/Configuration.h
@@ -1951,9 +1951,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
index 66438613168cc497f8947ec1d97bcefcdffff558..f654ab0e03a416820bd24a705f07e6ec581990cb 100644
--- a/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
+++ b/Marlin/src/config/examples/Creality/CR-10mini/Configuration.h
@@ -1965,9 +1965,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Creality/CR-8/Configuration.h b/Marlin/src/config/examples/Creality/CR-8/Configuration.h
index 90f42f48a3328ba2f631e116d1735a343aab38ca..db0b62e174c58ee79da1affbe428ef3b74fe7bcf 100644
--- a/Marlin/src/config/examples/Creality/CR-8/Configuration.h
+++ b/Marlin/src/config/examples/Creality/CR-8/Configuration.h
@@ -1956,9 +1956,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h
index 36198868c630db543fde2a92c7365c9b38d5b5ad..e7c1303f85c7242e68dbc1893738d69bd589e4eb 100644
--- a/Marlin/src/config/examples/Creality/Ender-2/Configuration.h
+++ b/Marlin/src/config/examples/Creality/Ender-2/Configuration.h
@@ -1950,9 +1950,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h
index 760d5ce5c29141940ef43b5d555182f3d74ee162..da1db3f10fb66e094791535e6ac8a3ac9c5e750e 100644
--- a/Marlin/src/config/examples/Creality/Ender-3/Configuration.h
+++ b/Marlin/src/config/examples/Creality/Ender-3/Configuration.h
@@ -1950,9 +1950,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h
index 084c82ccae6d795cf3fe95a0f25b0bcdf009f905..4561497df80a9bdd8679558a163efad1a51ef331 100644
--- a/Marlin/src/config/examples/Creality/Ender-4/Configuration.h
+++ b/Marlin/src/config/examples/Creality/Ender-4/Configuration.h
@@ -1956,9 +1956,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Einstart-S/Configuration.h b/Marlin/src/config/examples/Einstart-S/Configuration.h
index 896e4a108af44842c290ec30d426b9401343a7a2..59bf8a4a606f3844887dc4dfffd1d1c7808292d3 100644
--- a/Marlin/src/config/examples/Einstart-S/Configuration.h
+++ b/Marlin/src/config/examples/Einstart-S/Configuration.h
@@ -1935,9 +1935,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Felix/Configuration.h b/Marlin/src/config/examples/Felix/Configuration.h
index 70dea0836a5eb91627b8a94bee936333e80f3ad6..8b0b40229b52228ddf6fd443487e4b72c66d3736 100644
--- a/Marlin/src/config/examples/Felix/Configuration.h
+++ b/Marlin/src/config/examples/Felix/Configuration.h
@@ -1928,9 +1928,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Felix/DUAL/Configuration.h b/Marlin/src/config/examples/Felix/DUAL/Configuration.h
index 3d02326ba14d781f19eab89890f43b50261576b7..45e9084c58e6b080023d0b3aa760477e17931f9a 100644
--- a/Marlin/src/config/examples/Felix/DUAL/Configuration.h
+++ b/Marlin/src/config/examples/Felix/DUAL/Configuration.h
@@ -1928,9 +1928,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
index b4bc4d8753c4cf30e5066ebe294025bf8e9eabbb..db7112ba3d3e6487983c821bd5772c0f86455e0d 100644
--- a/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
+++ b/Marlin/src/config/examples/FolgerTech/i3-2020/Configuration.h
@@ -1952,9 +1952,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 500, 500 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
index a12c6a3ae961ef6b74670316ca422d45d9243121..3dc6dfe1e934d055d9a870e08804792c981802a7 100644
--- a/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/GT2560/Configuration.h
@@ -1961,9 +1961,7 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
/**
@@ -1975,4 +1973,7 @@
#define LCD_WIDTH_OVERRIDE 20 // Default is 22. For this Geeetech use 20.
#endif
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
index 9822d0ad7fb7df46aa85379a3bc9d7ea527cf429..3bacd21a6d83336c6061000be8b336031ffa0def 100644
--- a/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/I3_Pro_X-GT2560/Configuration.h
@@ -1946,9 +1946,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
index 54b3aea36cc66596010cb901007a6285beec2943..b9a5d72dc09aa7a7e0125f725f9a82ebb5d279ec 100644
--- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/bltouch/Configuration.h
@@ -1962,9 +1962,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
index 221f7d085845c167c4db15e8ff9c327c9da8018d..3de17cd1bb174006a690b558bfd77f0f64e23427 100644
--- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro B/noprobe/Configuration.h
@@ -1961,9 +1961,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
index 661db6fd0f124563ac2855c2bb4021ac5863c76c..6f44657a8c4297e66ba67de0cc3cee6172c7ab0b 100644
--- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro C/Configuration.h
@@ -1946,9 +1946,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
index bd6ad10ed17e66a2b519ef0f504e345644d4092d..db2df210e5def8b52954ea071ba3ac547944ce69 100644
--- a/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
+++ b/Marlin/src/config/examples/Geeetech/Prusa i3 Pro W/Configuration.h
@@ -1946,9 +1946,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
index 5449e5c708879eb2df93e141d4745e531f7895da..ba8af959273e82ebe673d0263234cbbc6c8ad959 100644
--- a/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
+++ b/Marlin/src/config/examples/Infitary/i3-M508/Configuration.h
@@ -1950,9 +1950,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/JGAurora/A5/Configuration.h b/Marlin/src/config/examples/JGAurora/A5/Configuration.h
index 10a758c3827374f7adfda95c33a459bd51e6fe36..1f5f9d48a855521c74cfcd4618587dee8d2fb8ce 100644
--- a/Marlin/src/config/examples/JGAurora/A5/Configuration.h
+++ b/Marlin/src/config/examples/JGAurora/A5/Configuration.h
@@ -1957,9 +1957,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/MakerParts/Configuration.h b/Marlin/src/config/examples/MakerParts/Configuration.h
index 6a8fe2dc4dce396c5b492e8fceb6c5b52946d8d2..b5267e8745085f0962f2aff74baceba108eaf0c2 100644
--- a/Marlin/src/config/examples/MakerParts/Configuration.h
+++ b/Marlin/src/config/examples/MakerParts/Configuration.h
@@ -1966,9 +1966,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Malyan/M150/Configuration.h b/Marlin/src/config/examples/Malyan/M150/Configuration.h
index 33e604a5462cd2fc753c59c95ca7a23f62b45dc8..9fb4863de9d404bc80a4832d4cb4b2d58f0161b7 100644
--- a/Marlin/src/config/examples/Malyan/M150/Configuration.h
+++ b/Marlin/src/config/examples/Malyan/M150/Configuration.h
@@ -1948,9 +1948,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Malyan/M200/Configuration.h b/Marlin/src/config/examples/Malyan/M200/Configuration.h
index 749a09054fb4c2bd02f66f89ae4debee79ab194a..1505df13b8a3e518709c1288783aa7426b4c0d41 100644
--- a/Marlin/src/config/examples/Malyan/M200/Configuration.h
+++ b/Marlin/src/config/examples/Malyan/M200/Configuration.h
@@ -1945,9 +1945,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
index 5cbe0e1c3369f6d98a69386feea139250dba999f..1857b6daa5b905d7cc049c6a5df0ff0ded8a30b9 100644
--- a/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
+++ b/Marlin/src/config/examples/Micromake/C1/basic/Configuration.h
@@ -1950,9 +1950,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
index ec042aecd4597ad179be3312bf53eeb0508a7453..5e59c01c9b24b296090afbe24ffec774939a2edd 100644
--- a/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
+++ b/Marlin/src/config/examples/Micromake/C1/enhanced/Configuration.h
@@ -1950,9 +1950,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration.h b/Marlin/src/config/examples/Mks/Sbase/Configuration.h
index a2c870641d80a051fbda53b4fed1a2bbea6bf80d..52c3a270deaeb13e71393518a5f9ab0515e2408a 100644
--- a/Marlin/src/config/examples/Mks/Sbase/Configuration.h
+++ b/Marlin/src/config/examples/Mks/Sbase/Configuration.h
@@ -1946,9 +1946,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h
index df24fe6a0ed6bc4988d66e3d24a653018c308457..b3c5759170a6a0c6f4cd0056ec339d4edba7a6c9 100644
--- a/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h
+++ b/Marlin/src/config/examples/RepRapPro/Huxley/Configuration.h
@@ -1995,9 +1995,10 @@ Black rubber belt(MXL), 18 - tooth aluminium pulley : 87.489 step per mm (Huxley
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
index 56766b703456d1af532cdda8fcf886f3eef262e9..a3233d5addf76a6d0e91fda120bf69b197e5c02d 100644
--- a/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
+++ b/Marlin/src/config/examples/RepRapWorld/Megatronics/Configuration.h
@@ -1946,9 +1946,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/RigidBot/Configuration.h b/Marlin/src/config/examples/RigidBot/Configuration.h
index 3c07df0359686a3c315a0d03e92f6441819230cf..5ae32c64315f90a12899a6b0ec3a8dc6e53280ab 100644
--- a/Marlin/src/config/examples/RigidBot/Configuration.h
+++ b/Marlin/src/config/examples/RigidBot/Configuration.h
@@ -1946,9 +1946,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/SCARA/Configuration.h b/Marlin/src/config/examples/SCARA/Configuration.h
index 33369c030090ff13af620190dff3bf694d490819..3c87f55d89b335766508a767cd886144cbdce5ce 100644
--- a/Marlin/src/config/examples/SCARA/Configuration.h
+++ b/Marlin/src/config/examples/SCARA/Configuration.h
@@ -1959,9 +1959,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/STM32F10/Configuration.h b/Marlin/src/config/examples/STM32F10/Configuration.h
index 629adc0a76c9b323779c380f8816dbe40406b228..0c45dd68b3ed96ee2403adc967ea842acd59e0e8 100644
--- a/Marlin/src/config/examples/STM32F10/Configuration.h
+++ b/Marlin/src/config/examples/STM32F10/Configuration.h
@@ -1948,9 +1948,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/STM32F4/Configuration.h b/Marlin/src/config/examples/STM32F4/Configuration.h
index 8ef33bb741a2b16aa82625eb96a5fc39c2522c4f..034044a6964447e7aeb627018ad4a3b5d4289cb7 100644
--- a/Marlin/src/config/examples/STM32F4/Configuration.h
+++ b/Marlin/src/config/examples/STM32F4/Configuration.h
@@ -1946,9 +1946,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Sanguinololu/Configuration.h b/Marlin/src/config/examples/Sanguinololu/Configuration.h
index ae313566c087952bd6f1fd27eb76e7164b994ef2..92c0fe42deb67e41b848add1c926109c26593bc5 100644
--- a/Marlin/src/config/examples/Sanguinololu/Configuration.h
+++ b/Marlin/src/config/examples/Sanguinololu/Configuration.h
@@ -1977,9 +1977,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/TheBorg/Configuration.h b/Marlin/src/config/examples/TheBorg/Configuration.h
index 4e1119ef44a0c5eb850b41e20af4b504109cd0cb..d9b1608991bf96f940060fd5c4acd6ec38ed9c45 100644
--- a/Marlin/src/config/examples/TheBorg/Configuration.h
+++ b/Marlin/src/config/examples/TheBorg/Configuration.h
@@ -1946,9 +1946,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/TinyBoy2/Configuration.h b/Marlin/src/config/examples/TinyBoy2/Configuration.h
index f205da2b0e89ba93a11c27b5bdf065f80bdef304..f371e555b60030987fa427b2dfefe0b20b3d3a2a 100644
--- a/Marlin/src/config/examples/TinyBoy2/Configuration.h
+++ b/Marlin/src/config/examples/TinyBoy2/Configuration.h
@@ -2002,9 +2002,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Tronxy/X1/Configuration.h b/Marlin/src/config/examples/Tronxy/X1/Configuration.h
index 40143d2f85476b977ee1bd0e36e8fdc82191aac0..115ba6d9ec5be10c34eec1e539e6f67ef9d1c922 100644
--- a/Marlin/src/config/examples/Tronxy/X1/Configuration.h
+++ b/Marlin/src/config/examples/Tronxy/X1/Configuration.h
@@ -1946,9 +1946,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h
index 2bfac79cad1c8d6a25066ccbc34df018ba67fb21..077522e1bb799b2be0eeb03b133a5a337f8df186 100644
--- a/Marlin/src/config/examples/Tronxy/X3A/Configuration.h
+++ b/Marlin/src/config/examples/Tronxy/X3A/Configuration.h
@@ -1951,9 +1951,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h
index 122724423899d2c935bc25a16d48394d462f094e..f857dc93fe3631657442d9651d14ff0ad79e5223 100644
--- a/Marlin/src/config/examples/Tronxy/X5S/Configuration.h
+++ b/Marlin/src/config/examples/Tronxy/X5S/Configuration.h
@@ -1946,9 +1946,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h
index b3fde900b6dc97ff24e3011df6eae1823258e987..a99b0e7efe1409f45e32379720427e50e5b4ae88 100644
--- a/Marlin/src/config/examples/Tronxy/XY100/Configuration.h
+++ b/Marlin/src/config/examples/Tronxy/XY100/Configuration.h
@@ -1957,9 +1957,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
index b09f19c322ca0bf3a47b9ca940ef96ee266e857f..effb6fa2e24934c57833e736ebfc2cac10c1f032 100644
--- a/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
+++ b/Marlin/src/config/examples/UltiMachine/Archim2/Configuration.h
@@ -1946,9 +1946,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Velleman/K8200/Configuration.h b/Marlin/src/config/examples/Velleman/K8200/Configuration.h
index b6555f876ec139ed876ded63dd620072ccb0b737..b1b4d8bb61a85031885e9db3346d560bed313d28 100644
--- a/Marlin/src/config/examples/Velleman/K8200/Configuration.h
+++ b/Marlin/src/config/examples/Velleman/K8200/Configuration.h
@@ -1981,9 +1981,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Velleman/K8400/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Configuration.h
index 33491027c5b8b5bd567eda1dd8ed5ab780ae1397..e086dda509e09320d7117977c24c21691737fe19 100644
--- a/Marlin/src/config/examples/Velleman/K8400/Configuration.h
+++ b/Marlin/src/config/examples/Velleman/K8400/Configuration.h
@@ -1947,9 +1947,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
index a3988893582a05898831886a7b53824b12215cf6..29e735f59a7e446546d66699b6f0e493b583ba21 100644
--- a/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
+++ b/Marlin/src/config/examples/Velleman/K8400/Dual-head/Configuration.h
@@ -1947,9 +1947,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
index d870ecfa5b0d55520696979db4f210b260ddc47f..ef20500e55ff04a276c72b80d8d4269c181bf4e4 100644
--- a/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
+++ b/Marlin/src/config/examples/Wanhao/Duplicator 6/Configuration.h
@@ -1959,9 +1959,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h
index 36295a73fa83de844b313fbfdd013cd06b82cc2a..7ff104b9b6836c97be0f94a73d3512244335be05 100644
--- a/Marlin/src/config/examples/adafruit/ST7565/Configuration.h
+++ b/Marlin/src/config/examples/adafruit/ST7565/Configuration.h
@@ -1952,9 +1952,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
index 895469e97083eaf121f94d92988cdc0848b23386..d068962a6d35da25746bb20adc068ac45c970506 100644
--- a/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
@@ -2082,9 +2082,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
index 94e05ede816085714292e013e7b66e066a04b600..6daa1e50736a9a76f0b9b8c8f8f2369d68425b04 100644
--- a/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
@@ -2081,9 +2081,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
index b8231b94e1fc16ef84b67f363646bfc0bc417452..e5f31bc56bb8df4300534d4350af8eff2cfebd29 100644
--- a/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
+++ b/Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
@@ -2080,9 +2080,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
index 9fe06cc2d3eed71339b478ffbc46f0a5976db00e..71633e774750958cde649dda6ef7a19d873826c1 100644
--- a/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
+++ b/Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
@@ -2083,9 +2083,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/delta/generic/Configuration.h b/Marlin/src/config/examples/delta/generic/Configuration.h
index 47b9a23d56b6d89b85315cc6b7f3ea8c809a1a4e..c146dc9889b4a105881198cfee4d926813600a9a 100644
--- a/Marlin/src/config/examples/delta/generic/Configuration.h
+++ b/Marlin/src/config/examples/delta/generic/Configuration.h
@@ -2068,9 +2068,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
index 709213f0e8934f9138b418d496c7aa2bee289b91..72480bb3a5d4721380cc9b5f81a36ab2614d1791 100644
--- a/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_mini/Configuration.h
@@ -2070,9 +2070,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
index 88100ff9e1f83599f792b73c3ea7a6650e8ec36f..a390163a0451c6f69dcbce6525329374ba3a395a 100644
--- a/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_pro/Configuration.h
@@ -2071,9 +2071,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
index 4f7dbedcc79ac180ed64d036c025a8cac243b64e..871d2f5c63c53a730fe414e40217e5cc99dc2771 100644
--- a/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
+++ b/Marlin/src/config/examples/delta/kossel_xl/Configuration.h
@@ -2071,9 +2071,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
index a60f8f83f07d3ac34bc7c2b7c2a58a26cda387db..42c75712cd8def5fafd1cab1dd2b224e5bbb842a 100644
--- a/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
+++ b/Marlin/src/config/examples/gCreate/gMax1.5+/Configuration.h
@@ -1960,9 +1960,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300, 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/makibox/Configuration.h b/Marlin/src/config/examples/makibox/Configuration.h
index 0529b2058e6174f9ae76b586ed42f0772c319771..07f02391ecf610fffc214c963be816033d6dd555 100644
--- a/Marlin/src/config/examples/makibox/Configuration.h
+++ b/Marlin/src/config/examples/makibox/Configuration.h
@@ -1949,9 +1949,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/stm32f103ret6/Configuration.h b/Marlin/src/config/examples/stm32f103ret6/Configuration.h
index 0f4554d756d52df7fd7b9b252b83213c4064dad5..19606944a375840dda00abc5e4aff035f22646ca 100644
--- a/Marlin/src/config/examples/stm32f103ret6/Configuration.h
+++ b/Marlin/src/config/examples/stm32f103ret6/Configuration.h
@@ -1948,9 +1948,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h
index fa419f10f63b2da898d1c2a7c6fd345922048d54..79be5f84fcac6e1554c67b671716b0a011586bd0 100644
--- a/Marlin/src/config/examples/tvrrug/Round2/Configuration.h
+++ b/Marlin/src/config/examples/tvrrug/Round2/Configuration.h
@@ -1941,9 +1941,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/config/examples/wt150/Configuration.h b/Marlin/src/config/examples/wt150/Configuration.h
index bbbeb7a0819229e09a71e33b3af74363e692bce4..391f8e6611b04d30d704ed388a4147df738ff6f9 100644
--- a/Marlin/src/config/examples/wt150/Configuration.h
+++ b/Marlin/src/config/examples/wt150/Configuration.h
@@ -1951,9 +1951,10 @@
// If the servo can't reach the requested position, increase it.
#define SERVO_DELAY { 300 }
-// Servo deactivation
-//
-// With this option servos are powered only during movement, then turned off to prevent jitter.
+// Only power servos during movement, otherwise leave off to prevent jitter
//#define DEACTIVATE_SERVOS_AFTER_MOVE
+// Allow servo angle to be edited and saved to EEPROM
+//#define EDITABLE_SERVO_ANGLES
+
#endif // CONFIGURATION_H
diff --git a/Marlin/src/gcode/config/M281.cpp b/Marlin/src/gcode/config/M281.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..08e6f5633428365d05db52caecf5692bf6971f84
--- /dev/null
+++ b/Marlin/src/gcode/config/M281.cpp
@@ -0,0 +1,56 @@
+/**
+ * Marlin 3D Printer Firmware
+ * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
+ *
+ * Based on Sprinter and grbl.
+ * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#include "../../inc/MarlinConfig.h"
+
+#if HAS_SERVOS && ENABLED(EDITABLE_SERVO_ANGLES)
+
+#include "../gcode.h"
+#include "../../module/servo.h"
+
+void GcodeSuite::M281() {
+ if (!parser.seenval('P')) return;
+ const int servo_index = parser.value_int();
+ if (WITHIN(servo_index, 0, NUM_SERVOS - 1)) {
+ bool angle_change = false;
+ if (parser.seen('L')) {
+ servo_angles[servo_index][0] = parser.value_int();
+ angle_change = true;
+ }
+ if (parser.seen('U')) {
+ servo_angles[servo_index][1] = parser.value_int();
+ angle_change = true;
+ }
+ if (!angle_change) {
+ SERIAL_ECHO_START();
+ SERIAL_ECHOPAIR(" Servo ", servo_index);
+ SERIAL_ECHOPAIR(" L", servo_angles[servo_index][0]);
+ SERIAL_ECHOLNPAIR(" U", servo_angles[servo_index][1]);
+ }
+ }
+ else {
+ SERIAL_ERROR_START();
+ SERIAL_ECHOPAIR("Servo ", servo_index);
+ SERIAL_ECHOLNPGM(" out of range");
+ }
+}
+
+#endif // HAS_SERVOS && EDITABLE_SERVO_ANGLES
diff --git a/Marlin/src/gcode/config/M43.cpp b/Marlin/src/gcode/config/M43.cpp
index e9d36efd678316bd86cb984002b9ad4c802196dc..62863e0028946cc2d9a5dd50c609323d7d9f1565 100644
--- a/Marlin/src/gcode/config/M43.cpp
+++ b/Marlin/src/gcode/config/M43.cpp
@@ -103,8 +103,8 @@ inline void servo_probe_test() {
SERIAL_PROTOCOLLNPGM("Servo probe test");
SERIAL_PROTOCOLLNPAIR(". using index: ", probe_index);
- SERIAL_PROTOCOLLNPAIR(". deploy angle: ", z_servo_angle[0]);
- SERIAL_PROTOCOLLNPAIR(". stow angle: ", z_servo_angle[1]);
+ SERIAL_PROTOCOLLNPAIR(". deploy angle: ", servo_angles[probe_index][0]);
+ SERIAL_PROTOCOLLNPAIR(". stow angle: ", servo_angles[probe_index][1]);
bool probe_inverting;
@@ -146,10 +146,10 @@ inline void servo_probe_test() {
uint8_t i = 0;
bool deploy_state, stow_state;
do {
- MOVE_SERVO(probe_index, z_servo_angle[0]); //deploy
+ MOVE_SERVO(probe_index, servo_angles[Z_PROBE_SERVO_NR][0]); // Deploy
safe_delay(500);
deploy_state = READ(PROBE_TEST_PIN);
- MOVE_SERVO(probe_index, z_servo_angle[1]); //stow
+ MOVE_SERVO(probe_index, servo_angles[Z_PROBE_SERVO_NR][1]); // Stow
safe_delay(500);
stow_state = READ(PROBE_TEST_PIN);
} while (++i < 4);
@@ -170,7 +170,7 @@ inline void servo_probe_test() {
#endif
}
else { // measure active signal length
- MOVE_SERVO(probe_index, z_servo_angle[0]); // deploy
+ MOVE_SERVO(probe_index, servo_angles[Z_PROBE_SERVO_NR][0]); // Deploy
safe_delay(500);
SERIAL_PROTOCOLLNPGM("please trigger probe");
uint16_t probe_counter = 0;
@@ -194,7 +194,7 @@ inline void servo_probe_test() {
else
SERIAL_PROTOCOLLNPGM("noise detected - please re-run test"); // less than 2mS pulse
- MOVE_SERVO(probe_index, z_servo_angle[1]); //stow
+ MOVE_SERVO(probe_index, servo_angles[Z_PROBE_SERVO_NR][1]); // Stow
} // pulse detected
diff --git a/Marlin/src/gcode/gcode.cpp b/Marlin/src/gcode/gcode.cpp
index ef282add0a27889189fb186489b74b1504a6dc63..6682cfbeb94a072fcb71ddbea2492a132e7d5b96 100644
--- a/Marlin/src/gcode/gcode.cpp
+++ b/Marlin/src/gcode/gcode.cpp
@@ -487,6 +487,9 @@ void GcodeSuite::process_parsed_command(
#if HAS_SERVOS
case 280: M280(); break; // M280: Set servo position absolute
+ #if ENABLED(EDITABLE_SERVO_ANGLES)
+ case 281: M281(); break; // M281: Set servo angles
+ #endif
#endif
#if ENABLED(BABYSTEPPING)
diff --git a/Marlin/src/gcode/gcode.h b/Marlin/src/gcode/gcode.h
index 2130b1636e192c4a32716d52bf7970933649298b..cb9e03b58f49794bfe1a3741a230853c9e9c375e 100644
--- a/Marlin/src/gcode/gcode.h
+++ b/Marlin/src/gcode/gcode.h
@@ -172,6 +172,7 @@
* M260 - i2c Send Data (Requires EXPERIMENTAL_I2CBUS)
* M261 - i2c Request Data (Requires EXPERIMENTAL_I2CBUS)
* M280 - Set servo position absolute: "M280 P<index> S<angle|µs>". (Requires servos)
+ * M281 - Set servo min|max position: "M281 P<index> L<min> U<max>". (Requires EDITABLE_SERVO_ANGLES)
* M290 - Babystepping (Requires BABYSTEPPING)
* M300 - Play beep sound S<frequency Hz> P<duration ms>
* M301 - Set PID parameters P I and D. (Requires PIDTEMP)
@@ -627,6 +628,9 @@ private:
#if HAS_SERVOS
static void M280();
+ #if ENABLED(EDITABLE_SERVO_ANGLES)
+ static void M281();
+ #endif
#endif
#if ENABLED(BABYSTEPPING)
diff --git a/Marlin/src/inc/SanityCheck.h b/Marlin/src/inc/SanityCheck.h
index 5348a1d516e32316c2d6a54da46525bebe6f7b11..7d5843b7d33bf403fc53479788d9ba9229c8e47d 100644
--- a/Marlin/src/inc/SanityCheck.h
+++ b/Marlin/src/inc/SanityCheck.h
@@ -720,8 +720,8 @@ static_assert(X_MAX_LENGTH >= X_BED_SIZE && Y_MAX_LENGTH >= Y_BED_SIZE,
/**
* Limited number of servos
*/
-#if NUM_SERVOS > 4
- #error "The maximum number of SERVOS in Marlin is 4."
+#if NUM_SERVOS > MAX_SERVOS
+ #error "The selected board doesn't support enough servos for your configuration. Reduce NUM_SERVOS."
#endif
/**
diff --git a/Marlin/src/module/configuration_store.cpp b/Marlin/src/module/configuration_store.cpp
index a97dbb73c59c00b76cbcc20ea87f57c74ce9e334..9028df8a26e7b6dbf4fa8c366cc8604647564736 100644
--- a/Marlin/src/module/configuration_store.cpp
+++ b/Marlin/src/module/configuration_store.cpp
@@ -37,7 +37,7 @@
*/
// Change EEPROM version if the structure changes
-#define EEPROM_VERSION "V55"
+#define EEPROM_VERSION "V56"
#define EEPROM_OFFSET 100
// Check the integrity of data offsets.
@@ -70,6 +70,10 @@
#include "../feature/bedlevel/bedlevel.h"
#endif
+#if HAS_SERVOS
+ #include "servo.h"
+#endif
+
#if HAS_BED_PROBE
#include "../module/probe.h"
#endif
@@ -174,6 +178,11 @@ typedef struct SettingsDataStruct {
bool planner_leveling_active; // M420 S planner.leveling_active
int8_t ubl_storage_slot; // ubl.storage_slot
+ //
+ // SERVO_ANGLES
+ //
+ uint16_t servo_angles[MAX_SERVOS][2]; // M281 P L U
+
//
// DELTA / [XYZ]_DUAL_ENDSTOPS
//
@@ -532,6 +541,26 @@ void MarlinSettings::postprocess() {
EEPROM_WRITE(storage_slot);
#endif // AUTO_BED_LEVELING_UBL
+ #if !HAS_SERVOS || DISABLED(EDITABLE_SERVO_ANGLES)
+ #if ENABLED(SWITCHING_EXTRUDER)
+ constexpr uint16_t sesa[][2] = SWITCHING_EXTRUDER_SERVO_ANGLES;
+ #endif
+ constexpr uint16_t servo_angles[MAX_SERVOS][2] = {
+ #if ENABLED(SWITCHING_EXTRUDER)
+ [SWITCHING_EXTRUDER_SERVO_NR] = { sesa[0], sesa[1] }
+ #if EXTRUDERS > 3
+ , [SWITCHING_EXTRUDER_E23_SERVO_NR] = { sesa[2], sesa[3] }
+ #endif
+ #elif ENABLED(SWITCHING_NOZZLE)
+ [SWITCHING_NOZZLE_SERVO_NR] = SWITCHING_NOZZLE_SERVO_ANGLES
+ #elif defined(Z_SERVO_ANGLES) && defined(Z_PROBE_SERVO_NR)
+ [Z_PROBE_SERVO_NR] = Z_SERVO_ANGLES
+ #endif
+ };
+ #endif
+
+ EEPROM_WRITE(servo_angles);
+
// 11 floats for DELTA / [XYZ]_DUAL_ENDSTOPS
#if ENABLED(DELTA)
@@ -1135,6 +1164,14 @@ void MarlinSettings::postprocess() {
EEPROM_READ(dummyui8);
#endif // AUTO_BED_LEVELING_UBL
+ //
+ // SERVO_ANGLES
+ //
+ #if !HAS_SERVOS || DISABLED(EDITABLE_SERVO_ANGLES)
+ uint16_t servo_angles[MAX_SERVOS][2];
+ #endif
+ EEPROM_READ(servo_angles);
+
//
// DELTA Geometry or Dual Endstops offsets
//
@@ -1774,6 +1811,44 @@ void MarlinSettings::reset(PORTARG_SOLO) {
zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER;
#endif
+ //
+ // Servo Angles
+ //
+
+ #if HAS_SERVOS && ENABLED(EDITABLE_SERVO_ANGLES)
+
+ #if ENABLED(SWITCHING_EXTRUDER)
+
+ #if EXTRUDERS > 3
+ #define REQ_ANGLES 4
+ #else
+ #define REQ_ANGLES 2
+ #endif
+ constexpr uint16_t extruder_angles[] = SWITCHING_EXTRUDER_SERVO_ANGLES;
+ static_assert(COUNT(extruder_angles) == REQ_ANGLES, "SWITCHING_EXTRUDER_SERVO_ANGLES needs " STRINGIFY(REQ_ANGLES) " angles.");
+ servo_angles[SWITCHING_EXTRUDER_SERVO_NR][0] = extruder_angles[0];
+ servo_angles[SWITCHING_EXTRUDER_SERVO_NR][1] = extruder_angles[1];
+ #if EXTRUDERS > 3
+ servo_angles[SWITCHING_EXTRUDER_E23_SERVO_NR][0] = extruder_angles[2];
+ servo_angles[SWITCHING_EXTRUDER_E23_SERVO_NR][1] = extruder_angles[3];
+ #endif
+
+ #elif ENABLED(SWITCHING_NOZZLE)
+
+ constexpr uint16_t nozzle_angles[2] = SWITCHING_NOZZLE_SERVO_ANGLES;
+ servo_angles[SWITCHING_NOZZLE_SERVO_NR][0] = nozzle_angles[0];
+ servo_angles[SWITCHING_NOZZLE_SERVO_NR][1] = nozzle_angles[1];
+
+ #elif defined(Z_SERVO_ANGLES) && defined(Z_PROBE_SERVO_NR)
+
+ constexpr uint16_t z_probe_angles[2] = Z_SERVO_ANGLES;
+ servo_angles[Z_PROBE_SERVO_NR][0] = z_probe_angles[0];
+ servo_angles[Z_PROBE_SERVO_NR][1] = z_probe_angles[1];
+
+ #endif
+
+ #endif // HAS_SERVOS && EDITABLE_SERVO_ANGLES
+
#if ENABLED(DELTA)
const float adj[ABC] = DELTA_ENDSTOP_ADJ,
dta[ABC] = DELTA_TOWER_ANGLE_TRIM;
@@ -2253,6 +2328,35 @@ void MarlinSettings::reset(PORTARG_SOLO) {
#endif // HAS_LEVELING
+ #if HAS_SERVOS && ENABLED(EDITABLE_SERVO_ANGLES)
+
+ if (!forReplay) {
+ CONFIG_ECHO_START;
+ SERIAL_ECHOLNPGM_P(port, "Servo Angles:");
+ }
+ for (uint8_t i = 0; i < NUM_SERVOS; i++) {
+ switch (i) {
+ #if ENABLED(SWITCHING_EXTRUDER)
+ case SWITCHING_EXTRUDER_SERVO_NR:
+ #if EXTRUDERS > 3
+ case SWITCHING_EXTRUDER_E23_SERVO_NR:
+ #endif
+ #elif ENABLED(SWITCHING_NOZZLE)
+ case SWITCHING_NOZZLE_SERVO_NR:
+ #elif defined(Z_SERVO_ANGLES) && defined(Z_PROBE_SERVO_NR)
+ case Z_PROBE_SERVO_NR:
+ #endif
+ CONFIG_ECHO_START;
+ SERIAL_ECHOPAIR_P(port, " M281 P", int(i));
+ SERIAL_ECHOPAIR_P(port, " L", servo_angles[i][0]);
+ SERIAL_ECHOPAIR_P(port, " U", servo_angles[i][1]);
+ SERIAL_EOL_P(port);
+ default: break;
+ }
+ }
+
+ #endif // HAS_SERVOS && EDITABLE_SERVO_ANGLES
+
#if ENABLED(DELTA)
if (!forReplay) {
diff --git a/Marlin/src/module/probe.cpp b/Marlin/src/module/probe.cpp
index 1b9cd39cda2f75f9be45194ace453269f63171d7..ed2ff0b9aa453581ccb6585987a286e8373a149e 100644
--- a/Marlin/src/module/probe.cpp
+++ b/Marlin/src/module/probe.cpp
@@ -54,7 +54,6 @@ float zprobe_zoffset; // Initialized by settings.load()
#if HAS_Z_SERVO_PROBE
#include "../module/servo.h"
- const int z_servo_angle[2] = Z_SERVO_ANGLES;
#endif
#if ENABLED(Z_PROBE_SLED)
@@ -435,7 +434,7 @@ bool set_probe_deployed(const bool deploy) {
#elif HAS_Z_SERVO_PROBE && DISABLED(BLTOUCH)
- MOVE_SERVO(Z_PROBE_SERVO_NR, z_servo_angle[deploy ? 0 : 1]);
+ MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][deploy ? 0 : 1]);
#elif ENABLED(Z_PROBE_ALLEN_KEY)
diff --git a/Marlin/src/module/probe.h b/Marlin/src/module/probe.h
index fe4c17b79e3c417a1da4da2bbe6667965f7daa40..f81482dcece8d3b241eef2263ff7c32c39b8979b 100644
--- a/Marlin/src/module/probe.h
+++ b/Marlin/src/module/probe.h
@@ -53,7 +53,6 @@
#endif
#if HAS_Z_SERVO_PROBE
- extern const int z_servo_angle[2];
void servo_probe_init();
#endif
diff --git a/Marlin/src/module/servo.cpp b/Marlin/src/module/servo.cpp
index a1f9633f78f54c54bde0d95849a3f1554a2b5a37..fbb3e6a764f0f53f227a35005b4cc30dab650fc7 100644
--- a/Marlin/src/module/servo.cpp
+++ b/Marlin/src/module/servo.cpp
@@ -31,6 +31,7 @@
#include "servo.h"
HAL_SERVO_LIB servo[NUM_SERVOS];
+uint16_t servo_angles[NUM_SERVOS][2];
void servo_init() {
#if NUM_SERVOS >= 1 && HAS_SERVO_0
diff --git a/Marlin/src/module/servo.h b/Marlin/src/module/servo.h
index 05f4d6f4ef355143fc793ece65cbdc9939761b8b..bd7e2acf5c77771373272887d32cf288d247591b 100644
--- a/Marlin/src/module/servo.h
+++ b/Marlin/src/module/servo.h
@@ -30,6 +30,7 @@
#include "../HAL/shared/servo.h"
extern HAL_SERVO_LIB servo[NUM_SERVOS];
+extern uint16_t servo_angles[NUM_SERVOS][2];
extern void servo_init();
#define MOVE_SERVO(I, P) servo[I].move(P)
@@ -37,8 +38,8 @@ extern void servo_init();
#include "../inc/MarlinConfig.h"
#if HAS_Z_SERVO_PROBE
- #define DEPLOY_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, z_servo_angle[0])
- #define STOW_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, z_servo_angle[1])
+ #define DEPLOY_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][0])
+ #define STOW_Z_SERVO() MOVE_SERVO(Z_PROBE_SERVO_NR, servo_angles[Z_PROBE_SERVO_NR][1])
#endif
#endif // _SERVO_H_
diff --git a/Marlin/src/module/tool_change.cpp b/Marlin/src/module/tool_change.cpp
index 48d12726258730c22f1c13be06a4fc94016daf9f..6539e8ec98cd5c9af96d747b69786ffd73d4caf2 100644
--- a/Marlin/src/module/tool_change.cpp
+++ b/Marlin/src/module/tool_change.cpp
@@ -60,22 +60,18 @@
#if DO_SWITCH_EXTRUDER
#if EXTRUDERS > 3
- #define REQ_ANGLES 4
- #define _SERVO_NR (e < 2 ? SWITCHING_EXTRUDER_SERVO_NR : SWITCHING_EXTRUDER_E23_SERVO_NR)
+ #define _SERVO_NR(E) ((E) < 2 ? SWITCHING_EXTRUDER_SERVO_NR : SWITCHING_EXTRUDER_E23_SERVO_NR)
#else
- #define REQ_ANGLES 2
- #define _SERVO_NR SWITCHING_EXTRUDER_SERVO_NR
+ #define _SERVO_NR(E) SWITCHING_EXTRUDER_SERVO_NR
#endif
void move_extruder_servo(const uint8_t e) {
- constexpr int16_t angles[] = SWITCHING_EXTRUDER_SERVO_ANGLES;
- static_assert(COUNT(angles) == REQ_ANGLES, "SWITCHING_EXTRUDER_SERVO_ANGLES needs " STRINGIFY(REQ_ANGLES) " angles.");
planner.synchronize();
#if EXTRUDERS & 1
if (e < EXTRUDERS - 1)
#endif
{
- MOVE_SERVO(_SERVO_NR, angles[e]);
+ MOVE_SERVO(_SERVO_NR(e), servo_angles[_SERVO_NR(e)][e]);
safe_delay(500);
}
}
@@ -85,9 +81,8 @@
#if ENABLED(SWITCHING_NOZZLE)
void move_nozzle_servo(const uint8_t e) {
- const int16_t angles[2] = SWITCHING_NOZZLE_SERVO_ANGLES;
planner.synchronize();
- MOVE_SERVO(SWITCHING_NOZZLE_SERVO_NR, angles[e]);
+ MOVE_SERVO(SWITCHING_NOZZLE_SERVO_NR, servo_angles[SWITCHING_NOZZLE_SERVO_NR][e]);
safe_delay(500);
}
diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h
index 19f34d58971a3a75fcfda9386e082208152138d8..90ad0382ccb3433e80295f9573bbc58e3831c6e6 100644
--- a/Marlin/src/pins/pins.h
+++ b/Marlin/src/pins/pins.h
@@ -625,6 +625,10 @@
#define MAX_EXTRUDERS 5
#endif
+#ifndef MAX_SERVOS
+ #define MAX_SERVOS 4
+#endif
+
//
// Assign auto fan pins if needed
//