Skip to content

FTM: fix typo in e_parser.cpp, M496 gcode not processed, fix menu #28261

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thinkyhead merged 3 commits into from
Jan 11, 2026
Merged

FTM: fix typo in e_parser.cpp, M496 gcode not processed, fix menu #28261

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
62eaccd
Update e_parser.cpp
narno2202 Jan 3, 2026
1d914af
Update menu_motion.cpp
narno2202 Jan 5, 2026
569ba8f
update UI for all M496
thinkyhead Jan 10, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Marlin/src/feature/e_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ void EmergencyParser::update(EmergencyParser::State &state, const uint8_t c) {
case EP_M4:
switch (c) {
case '1' :state = EP_M41; break;
#if ENABLED(FT_MOTION_RESONANCE_TEST)
#if ENABLED(FTM_RESONANCE_TEST)
case '9': state = EP_M49; break;
#endif
default: state = EP_IGNORE;
Expand Down
2 changes: 2 additions & 0 deletions Marlin/src/gcode/feature/ft_motion/M495_M496.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
#if ENABLED(FTM_RESONANCE_TEST)

#include "../../gcode.h"
#include "../../../lcd/marlinui.h"
#include "../../../module/ft_motion.h"
#include "../../../module/ft_motion/resonance_generator.h"

Expand Down Expand Up @@ -173,6 +174,7 @@ void GcodeSuite::M496() {
if (ftMotion.rtg.isActive()) {
ftMotion.rtg.abort();
EmergencyParser::rt_stop_by_M496 = false;
ui.refresh();
#if DISABLED(MARLIN_SMALL_BUILD)
SERIAL_ECHOLN(F("Resonance Test"), F(" aborted."));
#endif
Expand Down
14 changes: 10 additions & 4 deletions Marlin/src/lcd/menu/menu_motion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,12 +424,18 @@ void menu_move() {

if (ftMotion.rtg.isActive() && !ftMotion.rtg.isDone()) {
STATIC_ITEM(MSG_FTM_RT_RUNNING);
ACTION_ITEM(MSG_FTM_RT_STOP, []{ ftMotion.rtg.abort(); ui.refresh(); });
GCODES_ITEM(MSG_FTM_RT_STOP, F("M496"));
}
else {
GCODES_ITEM_N(X_AXIS, MSG_FTM_RT_START_N, F("M495 X S"));
GCODES_ITEM_N(Y_AXIS, MSG_FTM_RT_START_N, F("M495 Y S"));
GCODES_ITEM_N(Z_AXIS, MSG_FTM_RT_START_N, F("M495 Z S"));
#if HAS_X_AXIS
GCODES_ITEM_N(X_AXIS, MSG_FTM_RT_START_N, F("M495 X S"));
#endif
#if HAS_Y_AXIS
GCODES_ITEM_N(Y_AXIS, MSG_FTM_RT_START_N, F("M495 Y S"));
#endif
#if HAS_Z_AXIS
GCODES_ITEM_N(Z_AXIS, MSG_FTM_RT_START_N, F("M495 Z S"));
#endif
SUBMENU(MSG_FTM_RETRIEVE_FREQ, menu_ftm_resonance_freq);
}

Expand Down
Loading