Skip to content

Commit e7e77d9

Browse files
thinkyheadthinkyhead
committed
🧑‍💻 FxdTiCtrl => FTMotion
1 parent a7a3abb commit e7e77d9

File tree

12 files changed

+189
-208
lines changed

12 files changed

+189
-208
lines changed

‎Marlin/src/MarlinCore.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -862,7 +862,7 @@ void idle(const bool no_stepper_sleep/*=false*/) {
862862
TERN_(HAS_TFT_LVGL_UI, LV_TASK_HANDLER());
863863

864864
// Manage Fixed-time Motion Control
865-
TERN_(FT_MOTION, fxdTiCtrl.loop());
865+
TERN_(FT_MOTION, ftMotion.loop());
866866

867867
IDLE_DONE:
868868
TERN_(MARLIN_DEV_MODE, idle_depth--);
@@ -1632,7 +1632,7 @@ void setup() {
16321632
#endif
16331633

16341634
#if ENABLED(FT_MOTION)
1635-
SETUP_RUN(fxdTiCtrl.init());
1635+
SETUP_RUN(ftMotion.init());
16361636
#endif
16371637

16381638
marlin_state = MF_RUNNING;

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

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@
2929

3030
void say_shaping() {
3131
// FT Enabled
32-
SERIAL_ECHO_TERNARY(fxdTiCtrl.cfg.mode, "Fixed-Time Motion ", "en", "dis", "abled");
32+
SERIAL_ECHO_TERNARY(ftMotion.cfg.mode, "Fixed-Time Motion ", "en", "dis", "abled");
3333

3434
// FT Shaping
3535
#if HAS_X_AXIS
36-
if (fxdTiCtrl.cfg.mode > ftMotionMode_ENABLED) {
36+
if (ftMotion.cfg.mode > ftMotionMode_ENABLED) {
3737
SERIAL_ECHOPGM(" with ");
38-
switch (fxdTiCtrl.cfg.mode) {
38+
switch (ftMotion.cfg.mode) {
3939
default: break;
4040
case ftMotionMode_ZV: SERIAL_ECHOPGM("ZV"); break;
4141
case ftMotionMode_ZVD: SERIAL_ECHOPGM("ZVD"); break;
@@ -51,15 +51,15 @@ void say_shaping() {
5151
#endif
5252
SERIAL_ECHOLNPGM(".");
5353

54-
const bool z_based = TERN0(HAS_DYNAMIC_FREQ_MM, fxdTiCtrl.cfg.dynFreqMode == dynFreqMode_Z_BASED),
55-
g_based = TERN0(HAS_DYNAMIC_FREQ_G, fxdTiCtrl.cfg.dynFreqMode == dynFreqMode_MASS_BASED),
54+
const bool z_based = TERN0(HAS_DYNAMIC_FREQ_MM, ftMotion.cfg.dynFreqMode == dynFreqMode_Z_BASED),
55+
g_based = TERN0(HAS_DYNAMIC_FREQ_G, ftMotion.cfg.dynFreqMode == dynFreqMode_MASS_BASED),
5656
dynamic = z_based || g_based;
5757

5858
// FT Dynamic Frequency Mode
59-
if (fxdTiCtrl.cfg.modeHasShaper()) {
59+
if (ftMotion.cfg.modeHasShaper()) {
6060
#if HAS_DYNAMIC_FREQ
6161
SERIAL_ECHOPGM("Dynamic Frequency Mode ");
62-
switch (fxdTiCtrl.cfg.dynFreqMode) {
62+
switch (ftMotion.cfg.dynFreqMode) {
6363
default:
6464
case dynFreqMode_DISABLED: SERIAL_ECHOPGM("disabled"); break;
6565
#if HAS_DYNAMIC_FREQ_MM
@@ -74,32 +74,32 @@ void say_shaping() {
7474

7575
#if HAS_X_AXIS
7676
SERIAL_ECHO_TERNARY(dynamic, "X/A ", "base dynamic", "static", " compensator frequency: ");
77-
SERIAL_ECHO(p_float_t(fxdTiCtrl.cfg.baseFreq[X_AXIS], 2), F("Hz"));
77+
SERIAL_ECHO(p_float_t(ftMotion.cfg.baseFreq[X_AXIS], 2), F("Hz"));
7878
#if HAS_DYNAMIC_FREQ
79-
if (dynamic) SERIAL_ECHO(" scaling: ", p_float_t(fxdTiCtrl.cfg.dynFreqK[X_AXIS], 8), F("Hz/"), z_based ? F("mm") : F("g"));
79+
if (dynamic) SERIAL_ECHO(" scaling: ", p_float_t(ftMotion.cfg.dynFreqK[X_AXIS], 8), F("Hz/"), z_based ? F("mm") : F("g"));
8080
#endif
8181
SERIAL_EOL();
8282
#endif
8383

8484
#if HAS_Y_AXIS
8585
SERIAL_ECHO_TERNARY(dynamic, "Y/B ", "base dynamic", "static", " compensator frequency: ");
86-
SERIAL_ECHO(p_float_t(fxdTiCtrl.cfg.baseFreq[Y_AXIS], 2), F(" Hz"));
86+
SERIAL_ECHO(p_float_t(ftMotion.cfg.baseFreq[Y_AXIS], 2), F(" Hz"));
8787
#if HAS_DYNAMIC_FREQ
88-
if (dynamic) SERIAL_ECHO(F(" scaling: "), p_float_t(fxdTiCtrl.cfg.dynFreqK[Y_AXIS], 8), F("Hz/"), z_based ? F("mm") : F("g"));
88+
if (dynamic) SERIAL_ECHO(F(" scaling: "), p_float_t(ftMotion.cfg.dynFreqK[Y_AXIS], 8), F("Hz/"), z_based ? F("mm") : F("g"));
8989
#endif
9090
SERIAL_EOL();
9191
#endif
9292
}
9393

9494
#if HAS_EXTRUDERS
95-
SERIAL_ECHO_TERNARY(fxdTiCtrl.cfg.linearAdvEna, "Linear Advance ", "en", "dis", "abled");
96-
SERIAL_ECHOLN(F(". Gain: "), p_float_t(fxdTiCtrl.cfg.linearAdvK, 5));
95+
SERIAL_ECHO_TERNARY(ftMotion.cfg.linearAdvEna, "Linear Advance ", "en", "dis", "abled");
96+
SERIAL_ECHOLN(F(". Gain: "), p_float_t(ftMotion.cfg.linearAdvK, 5));
9797
#endif
9898
}
9999

100100
void GcodeSuite::M493_report(const bool forReplay/*=true*/) {
101101
report_heading_etc(forReplay, F(STR_FT_MOTION));
102-
const ft_config_t &c = fxdTiCtrl.cfg;
102+
const ft_config_t &c = ftMotion.cfg;
103103
SERIAL_ECHOPGM(" M493 S", c.mode);
104104
#if HAS_X_AXIS
105105
SERIAL_ECHOPGM(" A", c.baseFreq[X_AXIS]);
@@ -160,7 +160,7 @@ void GcodeSuite::M493() {
160160

161161
// Parse 'S' mode parameter.
162162
if (parser.seenval('S')) {
163-
const ftMotionMode_t oldmm = fxdTiCtrl.cfg.mode,
163+
const ftMotionMode_t oldmm = ftMotion.cfg.mode,
164164
newmm = (ftMotionMode_t)parser.value_byte();
165165

166166
if (newmm != oldmm) {
@@ -179,7 +179,7 @@ void GcodeSuite::M493() {
179179
#endif
180180
case ftMotionMode_DISABLED:
181181
case ftMotionMode_ENABLED:
182-
fxdTiCtrl.cfg.mode = newmm;
182+
ftMotion.cfg.mode = newmm;
183183
flag.report_h = true;
184184
if (oldmm == ftMotionMode_DISABLED) flag.reset_ft = true;
185185
break;
@@ -192,15 +192,15 @@ void GcodeSuite::M493() {
192192
// Pressure control (linear advance) parameter.
193193
if (parser.seen('P')) {
194194
const bool val = parser.value_bool();
195-
fxdTiCtrl.cfg.linearAdvEna = val;
195+
ftMotion.cfg.linearAdvEna = val;
196196
SERIAL_ECHO_TERNARY(val, "Linear Advance ", "en", "dis", "abled.\n");
197197
}
198198

199199
// Pressure control (linear advance) gain parameter.
200200
if (parser.seenval('K')) {
201201
const float val = parser.value_float();
202202
if (val >= 0.0f) {
203-
fxdTiCtrl.cfg.linearAdvK = val;
203+
ftMotion.cfg.linearAdvK = val;
204204
flag.report_h = true;
205205
}
206206
else // Value out of range.
@@ -213,22 +213,22 @@ void GcodeSuite::M493() {
213213

214214
// Dynamic frequency mode parameter.
215215
if (parser.seenval('D')) {
216-
if (fxdTiCtrl.cfg.modeHasShaper()) {
216+
if (ftMotion.cfg.modeHasShaper()) {
217217
const dynFreqMode_t val = dynFreqMode_t(parser.value_byte());
218218
switch (val) {
219219
case dynFreqMode_DISABLED:
220-
fxdTiCtrl.cfg.dynFreqMode = val;
220+
ftMotion.cfg.dynFreqMode = val;
221221
flag.report_h = true;
222222
break;
223223
#if HAS_DYNAMIC_FREQ_MM
224224
case dynFreqMode_Z_BASED:
225-
fxdTiCtrl.cfg.dynFreqMode = val;
225+
ftMotion.cfg.dynFreqMode = val;
226226
flag.report_h = true;
227227
break;
228228
#endif
229229
#if HAS_DYNAMIC_FREQ_G
230230
case dynFreqMode_MASS_BASED:
231-
fxdTiCtrl.cfg.dynFreqMode = val;
231+
ftMotion.cfg.dynFreqMode = val;
232232
flag.report_h = true;
233233
break;
234234
#endif
@@ -243,8 +243,8 @@ void GcodeSuite::M493() {
243243
}
244244

245245
const bool modeUsesDynFreq = (
246-
TERN0(HAS_DYNAMIC_FREQ_MM, fxdTiCtrl.cfg.dynFreqMode == dynFreqMode_Z_BASED)
247-
|| TERN0(HAS_DYNAMIC_FREQ_G, fxdTiCtrl.cfg.dynFreqMode == dynFreqMode_MASS_BASED)
246+
TERN0(HAS_DYNAMIC_FREQ_MM, ftMotion.cfg.dynFreqMode == dynFreqMode_Z_BASED)
247+
|| TERN0(HAS_DYNAMIC_FREQ_G, ftMotion.cfg.dynFreqMode == dynFreqMode_MASS_BASED)
248248
);
249249

250250
#endif // HAS_DYNAMIC_FREQ
@@ -253,11 +253,11 @@ void GcodeSuite::M493() {
253253

254254
// Parse frequency parameter (X axis).
255255
if (parser.seenval('A')) {
256-
if (fxdTiCtrl.cfg.modeHasShaper()) {
256+
if (ftMotion.cfg.modeHasShaper()) {
257257
const float val = parser.value_float();
258258
// TODO: Frequency minimum is dependent on the shaper used; the above check isn't always correct.
259259
if (WITHIN(val, FTM_MIN_SHAPE_FREQ, (FTM_FS) / 2)) {
260-
fxdTiCtrl.cfg.baseFreq[X_AXIS] = val;
260+
ftMotion.cfg.baseFreq[X_AXIS] = val;
261261
flag.update_n = flag.reset_ft = flag.report_h = true;
262262
}
263263
else // Frequency out of range.
@@ -271,7 +271,7 @@ void GcodeSuite::M493() {
271271
// Parse frequency scaling parameter (X axis).
272272
if (parser.seenval('F')) {
273273
if (modeUsesDynFreq) {
274-
fxdTiCtrl.cfg.dynFreqK[X_AXIS] = parser.value_float();
274+
ftMotion.cfg.dynFreqK[X_AXIS] = parser.value_float();
275275
flag.report_h = true;
276276
}
277277
else
@@ -285,10 +285,10 @@ void GcodeSuite::M493() {
285285

286286
// Parse frequency parameter (Y axis).
287287
if (parser.seenval('B')) {
288-
if (fxdTiCtrl.cfg.modeHasShaper()) {
288+
if (ftMotion.cfg.modeHasShaper()) {
289289
const float val = parser.value_float();
290290
if (WITHIN(val, FTM_MIN_SHAPE_FREQ, (FTM_FS) / 2)) {
291-
fxdTiCtrl.cfg.baseFreq[Y_AXIS] = val;
291+
ftMotion.cfg.baseFreq[Y_AXIS] = val;
292292
flag.update_n = flag.reset_ft = flag.report_h = true;
293293
}
294294
else // Frequency out of range.
@@ -302,7 +302,7 @@ void GcodeSuite::M493() {
302302
// Parse frequency scaling parameter (Y axis).
303303
if (parser.seenval('H')) {
304304
if (modeUsesDynFreq) {
305-
fxdTiCtrl.cfg.dynFreqK[Y_AXIS] = parser.value_float();
305+
ftMotion.cfg.dynFreqK[Y_AXIS] = parser.value_float();
306306
flag.report_h = true;
307307
}
308308
else
@@ -313,10 +313,10 @@ void GcodeSuite::M493() {
313313
#endif // HAS_Y_AXIS
314314

315315
#if HAS_X_AXIS
316-
if (flag.update_n) fxdTiCtrl.refreshShapingN();
317-
if (flag.update_a) fxdTiCtrl.updateShapingA();
316+
if (flag.update_n) ftMotion.refreshShapingN();
317+
if (flag.update_a) ftMotion.updateShapingA();
318318
#endif
319-
if (flag.reset_ft) fxdTiCtrl.reset();
319+
if (flag.reset_ft) ftMotion.reset();
320320
if (flag.report_h) say_shaping();
321321

322322
}

‎Marlin/src/lcd/menu/menu_motion.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -319,13 +319,13 @@ void menu_move() {
319319
#include "../../gcode/gcode.h"
320320

321321
void ftm_menu_setShaping(const ftMotionMode_t s) {
322-
fxdTiCtrl.cfg.mode = s;
323-
fxdTiCtrl.refreshShapingN();
322+
ftMotion.cfg.mode = s;
323+
ftMotion.refreshShapingN();
324324
ui.go_back();
325325
}
326326

327327
inline void menu_ftm_mode() {
328-
const ftMotionMode_t mode = fxdTiCtrl.cfg.mode;
328+
const ftMotionMode_t mode = ftMotion.cfg.mode;
329329

330330
START_MENU();
331331
BACK_ITEM(MSG_FIXED_TIME_MOTION);
@@ -349,17 +349,17 @@ void menu_move() {
349349
#if HAS_DYNAMIC_FREQ
350350

351351
inline void menu_ftm_dyn_mode() {
352-
const dynFreqMode_t dmode = fxdTiCtrl.cfg.dynFreqMode;
352+
const dynFreqMode_t dmode = ftMotion.cfg.dynFreqMode;
353353

354354
START_MENU();
355355
BACK_ITEM(MSG_FIXED_TIME_MOTION);
356356

357-
if (dmode != dynFreqMode_DISABLED) ACTION_ITEM(MSG_LCD_OFF, []{ fxdTiCtrl.cfg.dynFreqMode = dynFreqMode_DISABLED; ui.go_back(); });
357+
if (dmode != dynFreqMode_DISABLED) ACTION_ITEM(MSG_LCD_OFF, []{ ftMotion.cfg.dynFreqMode = dynFreqMode_DISABLED; ui.go_back(); });
358358
#if HAS_DYNAMIC_FREQ_MM
359-
if (dmode != dynFreqMode_Z_BASED) ACTION_ITEM(MSG_FTM_Z_BASED, []{ fxdTiCtrl.cfg.dynFreqMode = dynFreqMode_Z_BASED; ui.go_back(); });
359+
if (dmode != dynFreqMode_Z_BASED) ACTION_ITEM(MSG_FTM_Z_BASED, []{ ftMotion.cfg.dynFreqMode = dynFreqMode_Z_BASED; ui.go_back(); });
360360
#endif
361361
#if HAS_DYNAMIC_FREQ_G
362-
if (dmode != dynFreqMode_MASS_BASED) ACTION_ITEM(MSG_FTM_MASS_BASED, []{ fxdTiCtrl.cfg.dynFreqMode = dynFreqMode_MASS_BASED; ui.go_back(); });
362+
if (dmode != dynFreqMode_MASS_BASED) ACTION_ITEM(MSG_FTM_MASS_BASED, []{ ftMotion.cfg.dynFreqMode = dynFreqMode_MASS_BASED; ui.go_back(); });
363363
#endif
364364

365365
END_MENU();
@@ -368,7 +368,7 @@ void menu_move() {
368368
#endif // HAS_DYNAMIC_FREQ
369369

370370
void menu_ft_motion() {
371-
ft_config_t &c = fxdTiCtrl.cfg;
371+
ft_config_t &c = ftMotion.cfg;
372372

373373
FSTR_P ftmode;
374374
switch (c.mode) {
@@ -403,16 +403,16 @@ void menu_move() {
403403

404404
if (c.modeHasShaper()) {
405405
#if HAS_X_AXIS
406-
EDIT_ITEM_FAST_N(float42_52, X_AXIS, MSG_FTM_BASE_FREQ_N, &c.baseFreq[X_AXIS], FTM_MIN_SHAPE_FREQ, (FTM_FS) / 2, fxdTiCtrl.refreshShapingN);
406+
EDIT_ITEM_FAST_N(float42_52, X_AXIS, MSG_FTM_BASE_FREQ_N, &c.baseFreq[X_AXIS], FTM_MIN_SHAPE_FREQ, (FTM_FS) / 2, ftMotion.refreshShapingN);
407407
#endif
408408
#if HAS_Y_AXIS
409-
EDIT_ITEM_FAST_N(float42_52, Y_AXIS, MSG_FTM_BASE_FREQ_N, &c.baseFreq[Y_AXIS], FTM_MIN_SHAPE_FREQ, (FTM_FS) / 2, fxdTiCtrl.refreshShapingN);
409+
EDIT_ITEM_FAST_N(float42_52, Y_AXIS, MSG_FTM_BASE_FREQ_N, &c.baseFreq[Y_AXIS], FTM_MIN_SHAPE_FREQ, (FTM_FS) / 2, ftMotion.refreshShapingN);
410410
#endif
411411

412-
EDIT_ITEM_FAST(float42_52, MSG_FTM_ZETA, &c.zeta, 0.0f, 1.0f, fxdTiCtrl.refreshShapingN);
412+
EDIT_ITEM_FAST(float42_52, MSG_FTM_ZETA, &c.zeta, 0.0f, 1.0f, ftMotion.refreshShapingN);
413413

414414
if (WITHIN(c.mode, ftMotionMode_EI, ftMotionMode_3HEI))
415-
EDIT_ITEM_FAST(float42_52, MSG_FTM_VTOL, &c.vtol, 0.0f, 1.0f, fxdTiCtrl.refreshShapingN);
415+
EDIT_ITEM_FAST(float42_52, MSG_FTM_VTOL, &c.vtol, 0.0f, 1.0f, ftMotion.refreshShapingN);
416416

417417
#if HAS_DYNAMIC_FREQ
418418
SUBMENU(MSG_FTM_DYN_MODE, menu_ftm_dyn_mode);

0 commit comments

Comments
 (0)