Skip to content

Commit 68b7802

Browse files
📝 Update M493 (FT_MOTION) comments (#26620)
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
1 parent 6d40776 commit 68b7802

File tree

2 files changed

+38
-33
lines changed

2 files changed

+38
-33
lines changed

Marlin/src/gcode/feature/ft_motion/M493.cpp

+25-18
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ void say_shaping() {
3838
SERIAL_ECHOPGM(" with ");
3939
switch (ftMotion.cfg.mode) {
4040
default: break;
41-
case ftMotionMode_ZV: SERIAL_ECHOPGM("ZV"); break;
42-
case ftMotionMode_ZVD: SERIAL_ECHOPGM("ZVD"); break;
43-
case ftMotionMode_ZVDD: SERIAL_ECHOPGM("ZVDD"); break;
44-
case ftMotionMode_ZVDDD: SERIAL_ECHOPGM("ZVDDD"); break;
45-
case ftMotionMode_EI: SERIAL_ECHOPGM("EI"); break;
46-
case ftMotionMode_2HEI: SERIAL_ECHOPGM("2 Hump EI"); break;
47-
case ftMotionMode_3HEI: SERIAL_ECHOPGM("3 Hump EI"); break;
48-
case ftMotionMode_MZV: SERIAL_ECHOPGM("MZV"); break;
41+
case ftMotionMode_ZV: SERIAL_ECHOPGM("ZV"); break;
42+
case ftMotionMode_ZVD: SERIAL_ECHOPGM("ZVD"); break;
43+
case ftMotionMode_ZVDD: SERIAL_ECHOPGM("ZVDD"); break;
44+
case ftMotionMode_ZVDDD: SERIAL_ECHOPGM("ZVDDD"); break;
45+
case ftMotionMode_EI: SERIAL_ECHOPGM("EI"); break;
46+
case ftMotionMode_2HEI: SERIAL_ECHOPGM("2 Hump EI"); break;
47+
case ftMotionMode_3HEI: SERIAL_ECHOPGM("3 Hump EI"); break;
48+
case ftMotionMode_MZV: SERIAL_ECHOPGM("MZV"); break;
4949
//case ftMotionMode_DISCTF: SERIAL_ECHOPGM("discrete transfer functions"); break;
5050
//case ftMotionMode_ULENDO_FBS: SERIAL_ECHOPGM("Ulendo FBS."); return;
5151
}
@@ -129,14 +129,17 @@ void GcodeSuite::M493_report(const bool forReplay/*=true*/) {
129129
* M493: Set Fixed-time Motion Control parameters
130130
*
131131
* S<mode> Set the motion / shaping mode. Shaping requires an X axis, at the minimum.
132-
* 0: NORMAL
133-
* 1: FIXED-TIME
134-
* 10: ZV
135-
* 11: ZVD
136-
* 12: EI
137-
* 13: 2HEI
138-
* 14: 3HEI
139-
* 15: MZV
132+
*
133+
* 0: Standard Motion
134+
* 1: Fixed-Time Motion
135+
* 10: ZV : Zero Vibration
136+
* 11: ZVD : Zero Vibration and Derivative
137+
* 12: ZVDD : Zero Vibration, Derivative, and Double Derivative
138+
* 13: ZVDDD : Zero Vibration, Derivative, Double Derivative, and Triple Derivative
139+
* 14: EI : Extra-Intensive
140+
* 15: 2HEI : 2-Hump Extra-Intensive
141+
* 16: 3HEI : 3-Hump Extra-Intensive
142+
* 17: MZV : Mass-based Zero Vibration
140143
*
141144
* P<bool> Enable (1) or Disable (0) Linear Advance pressure control
142145
*
@@ -147,11 +150,15 @@ void GcodeSuite::M493_report(const bool forReplay/*=true*/) {
147150
* 1: Z-based (Requires a Z axis)
148151
* 2: Mass-based (Requires X and E axes)
149152
*
150-
* A<Hz> Set static/base frequency for the X axis
151-
* F<Hz> Set frequency scaling for the X axis
153+
* A<Hz> Set static/base frequency for the X axis
154+
* F<Hz> Set frequency scaling for the X axis
155+
* I 0.0 Set damping ratio for the X axis
156+
* Q 0.00 Set the vibration tolerance for the X axis
152157
*
153158
* B<Hz> Set static/base frequency for the Y axis
154159
* H<Hz> Set frequency scaling for the Y axis
160+
* J 0.0 Set damping ratio for the Y axis
161+
* R 0.00 Set the vibration tolerance for the Y axis
155162
*/
156163
void GcodeSuite::M493() {
157164
struct { bool update_n:1, update_a:1, reset_ft:1, report_h:1; } flag = { false };

Marlin/src/module/ft_types.h

+13-15
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,22 @@
2424
#include "../core/types.h"
2525

2626
typedef enum FXDTICtrlMode : uint8_t {
27-
ftMotionMode_DISABLED = 0U,
28-
ftMotionMode_ENABLED = 1U,
29-
//ftMotionMode_ULENDO_FBS = 2U,
30-
ftMotionMode_ZV = 10U,
31-
ftMotionMode_ZVD = 11U,
32-
ftMotionMode_ZVDD = 12U,
33-
ftMotionMode_ZVDDD = 13U,
34-
ftMotionMode_EI = 14U,
35-
ftMotionMode_2HEI = 15U,
36-
ftMotionMode_3HEI = 16U,
37-
ftMotionMode_MZV = 17U,
38-
//ftMotionMode_DISCTF = 20U
27+
ftMotionMode_DISABLED = 0, // Standard Motion
28+
ftMotionMode_ENABLED = 1, // Time-Based Motion
29+
ftMotionMode_ZV = 10, // Zero Vibration
30+
ftMotionMode_ZVD = 11, // Zero Vibration and Derivative
31+
ftMotionMode_ZVDD = 12, // Zero Vibration, Derivative, and Double Derivative
32+
ftMotionMode_ZVDDD = 13, // Zero Vibration, Derivative, Double Derivative, and Triple Derivative
33+
ftMotionMode_EI = 14, // Extra-Intensive
34+
ftMotionMode_2HEI = 15, // 2-Hump Extra-Intensive
35+
ftMotionMode_3HEI = 16, // 3-Hump Extra-Intensive
36+
ftMotionMode_MZV = 17 // Mass-based Zero Vibration
3937
} ftMotionMode_t;
4038

4139
enum dynFreqMode_t : uint8_t {
42-
dynFreqMode_DISABLED = 0U,
43-
dynFreqMode_Z_BASED = 1U,
44-
dynFreqMode_MASS_BASED = 2U
40+
dynFreqMode_DISABLED = 0,
41+
dynFreqMode_Z_BASED = 1,
42+
dynFreqMode_MASS_BASED = 2
4543
};
4644

4745
#define IS_EI_MODE(N) WITHIN(N, ftMotionMode_EI, ftMotionMode_3HEI)

0 commit comments

Comments
 (0)