3D-printing/Marlin
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2026-01-06 14:47:42 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

🚸 FT Motion menu fix, neaten

Browse source
This commit is contained in:
Scott Lahteine 2025-04-13 00:55:58 -05:00
parent 6d2dfcaa1c
commit a55355d088
6 changed files with 15 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/lcd/language/language_en.h
View file

@ -894,7 +894,7 @@ namespace LanguageNarrow_en {
LSTR MSG_BACKLASH_SMOOTHING = _UxGT("Smoothing");
LSTR MSG_FIXED_TIME_MOTION = _UxGT("Fixed-Time Motion");
LSTR MSG_FTM_CMPN_MODE = _UxGT("@ Comp. Mode:");
LSTR MSG_FTM_CMPN_MODE = _UxGT("@ Comp. Mode: $");
LSTR MSG_FTM_ZV = _UxGT("ZV");
LSTR MSG_FTM_ZVD = _UxGT("ZVD");
LSTR MSG_FTM_ZVDD = _UxGT("ZVDD");
@ -905,7 +905,7 @@ namespace LanguageNarrow_en {
LSTR MSG_FTM_MZV = _UxGT("MZV");
//LSTR MSG_FTM_ULENDO_FBS = _UxGT("Ulendo FBS");
//LSTR MSG_FTM_DISCTF = _UxGT("DISCTF");
LSTR MSG_FTM_DYN_MODE = _UxGT("DF Mode:");
LSTR MSG_FTM_DYN_MODE = _UxGT("DF Mode: $");
LSTR MSG_FTM_Z_BASED = _UxGT("Z-based");
LSTR MSG_FTM_MASS_BASED = _UxGT("Mass-based");
LSTR MSG_FTM_BASE_FREQ_N = _UxGT("@ Base Freq.");

4
Marlin/src/lcd/language/language_it.h
View file

@ -861,8 +861,8 @@ namespace LanguageNarrow_it {
LSTR MSG_BACKLASH_SMOOTHING = _UxGT("Appianamento");
LSTR MSG_FIXED_TIME_MOTION = _UxGT("Movimento a Tempo-Fisso");
LSTR MSG_FTM_CMPN_MODE = _UxGT("@ Modo Comp:");
LSTR MSG_FTM_DYN_MODE = _UxGT("Modo DF:");
LSTR MSG_FTM_CMPN_MODE = _UxGT("@ Modo Comp: $");
LSTR MSG_FTM_DYN_MODE = _UxGT("Modo DF: $");
LSTR MSG_FTM_Z_BASED = _UxGT("Base-Z");
LSTR MSG_FTM_MASS_BASED = _UxGT("Base-Massa");
LSTR MSG_FTM_BASE_FREQ_N = _UxGT("@ Freq. base");

4
Marlin/src/lcd/language/language_ru.h
View file

@ -811,7 +811,7 @@ namespace LanguageNarrow_ru {
// did not translate as there is no local terms/slang yet
LSTR MSG_FIXED_TIME_MOTION = _UxGT("FT Motion");
LSTR MSG_FTM_CMPN_MODE = _UxGT("@ Режим комп.:");
LSTR MSG_FTM_CMPN_MODE = _UxGT("@ Режим комп.: $");
LSTR MSG_FTM_ZV = _UxGT("ZV");
LSTR MSG_FTM_ZVD = _UxGT("ZVD");
LSTR MSG_FTM_EI = _UxGT("EI");
@ -820,7 +820,7 @@ namespace LanguageNarrow_ru {
LSTR MSG_FTM_MZV = _UxGT("MZV");
//LSTR MSG_FTM_ULENDO_FBS = _UxGT("Ulendo ФBС");
//LSTR MSG_FTM_DISCTF = _UxGT("DISCTF");
LSTR MSG_FTM_DYN_MODE = _UxGT("DF Mode:");
LSTR MSG_FTM_DYN_MODE = _UxGT("DF Mode: $");
LSTR MSG_FTM_Z_BASED = _UxGT("Z-based");
LSTR MSG_FTM_MASS_BASED = _UxGT("Mass-based");
LSTR MSG_FTM_BASE_FREQ_N = _UxGT("@ Base Freq.");

4
Marlin/src/lcd/language/language_tr.h
View file

@ -796,7 +796,7 @@ namespace LanguageNarrow_tr {
LSTR MSG_BACKLASH_SMOOTHING = _UxGT("Yumuşatma");
LSTR MSG_FIXED_TIME_MOTION = _UxGT("Sabit Zamanlı Hareket");
LSTR MSG_FTM_CMPN_MODE = _UxGT("@ Telafi Modu:");
LSTR MSG_FTM_CMPN_MODE = _UxGT("@ Telafi Modu: $");
LSTR MSG_FTM_ZV = _UxGT("ZV");
LSTR MSG_FTM_ZVD = _UxGT("ZVD");
LSTR MSG_FTM_ZVDD = _UxGT("ZVDD");
@ -807,7 +807,7 @@ namespace LanguageNarrow_tr {
LSTR MSG_FTM_MZV = _UxGT("MZV");
//LSTR MSG_FTM_ULENDO_FBS = _UxGT("Ulendo FBS");
//LSTR MSG_FTM_DISCTF = _UxGT("DISCTF");
LSTR MSG_FTM_DYN_MODE = _UxGT("DF Modu:");
LSTR MSG_FTM_DYN_MODE = _UxGT("DF Modu: $");
LSTR MSG_FTM_Z_BASED = _UxGT("Z-based");
LSTR MSG_FTM_MASS_BASED = _UxGT("Mass-based");
LSTR MSG_FTM_BASE_FREQ_N = _UxGT("@ Base Freq.");

18
Marlin/src/lcd/menu/menu_motion.cpp
View file

@ -426,8 +426,7 @@ void menu_move() {
// Show only when FT Motion is active (or optionally always show)
if (c.active || ENABLED(FT_MOTION_NO_MENU_TOGGLE)) {
#if HAS_X_AXIS
SUBMENU_N(X_AXIS, MSG_FTM_CMPN_MODE, menu_ftm_shaper_x);
MENU_ITEM_ADDON_START_RJ(5); lcd_put_u8str(shaper_name[X_AXIS]); MENU_ITEM_ADDON_END();
SUBMENU_N_S(X_AXIS, shaper_name[X_AXIS], MSG_FTM_CMPN_MODE, menu_ftm_shaper_x);
if (AXIS_HAS_SHAPER(X)) {
EDIT_ITEM_FAST_N(float42_52, X_AXIS, MSG_FTM_BASE_FREQ_N, &c.baseFreq.x, FTM_MIN_SHAPE_FREQ, (FTM_FS) / 2, ftMotion.update_shaping_params);
@ -437,8 +436,7 @@ void menu_move() {
}
#endif
#if HAS_Y_AXIS
SUBMENU_N(Y_AXIS, MSG_FTM_CMPN_MODE, menu_ftm_shaper_y);
MENU_ITEM_ADDON_START_RJ(5); lcd_put_u8str(shaper_name[Y_AXIS]); MENU_ITEM_ADDON_END();
SUBMENU_N_S(Y_AXIS, shaper_name[Y_AXIS], MSG_FTM_CMPN_MODE, menu_ftm_shaper_y);
if (AXIS_HAS_SHAPER(Y)) {
EDIT_ITEM_FAST_N(float42_52, Y_AXIS, MSG_FTM_BASE_FREQ_N, &c.baseFreq.y, FTM_MIN_SHAPE_FREQ, (FTM_FS) / 2, ftMotion.update_shaping_params);
@ -449,8 +447,7 @@ void menu_move() {
#endif
#if HAS_DYNAMIC_FREQ
SUBMENU(MSG_FTM_DYN_MODE, menu_ftm_dyn_mode);
MENU_ITEM_ADDON_START_RJ(11); lcd_put_u8str(dmode); MENU_ITEM_ADDON_END();
SUBMENU_S(dmode, MSG_FTM_DYN_MODE, menu_ftm_dyn_mode);
if (c.dynFreqMode != dynFreqMode_DISABLED) {
#if HAS_X_AXIS
EDIT_ITEM_FAST_N(float42_52, X_AXIS, MSG_FTM_DFREQ_K_N, &c.dynFreqK.x, 0.0f, 20.0f);
@ -489,16 +486,13 @@ void menu_move() {
BACK_ITEM(MSG_TUNE);
#if HAS_X_AXIS
SUBMENU_N(X_AXIS, MSG_FTM_CMPN_MODE, menu_ftm_shaper_x);
MENU_ITEM_ADDON_START_RJ(5); lcd_put_u8str(shaper_name[X_AXIS]); MENU_ITEM_ADDON_END();
SUBMENU_N_S(X_AXIS, shaper_name[X_AXIS], MSG_FTM_CMPN_MODE, menu_ftm_shaper_x);
#endif
#if HAS_Y_AXIS
SUBMENU_N(Y_AXIS, MSG_FTM_CMPN_MODE, menu_ftm_shaper_y);
MENU_ITEM_ADDON_START_RJ(5); lcd_put_u8str(shaper_name[Y_AXIS]); MENU_ITEM_ADDON_END();
SUBMENU_N_S(Y_AXIS, shaper_name[Y_AXIS], MSG_FTM_CMPN_MODE, menu_ftm_shaper_y);
#endif
#if HAS_DYNAMIC_FREQ
SUBMENU(MSG_FTM_DYN_MODE, menu_ftm_dyn_mode);
MENU_ITEM_ADDON_START_RJ(dmode.length()); lcd_put_u8str(dmode); MENU_ITEM_ADDON_END();
SUBMENU_S(dmode, MSG_FTM_DYN_MODE, menu_ftm_dyn_mode);
#endif
#if HAS_EXTRUDERS
EDIT_ITEM(bool, MSG_LINEAR_ADVANCE, &c.linearAdvEna);

2
Marlin/src/libs/numtostr.cpp
View file

@ -406,8 +406,8 @@ inline const char* ftostrX2rj(const_float_t f, const int index=1) {
case 1: conv[1] = RJDIGIT(i, 100000);
case 2: conv[2] = RJDIGIT(i, 10000);
case 3: conv[3] = RJDIGIT(i, 1000);
case 4: conv[4] = RJDIGIT(i, 100);
}
conv[4] = DIGIMOD(i, 100);
conv[5] = '.';
conv[6] = DIGIMOD(i, 10);
conv[7] = DIGIMOD(i, 1);