Skip to content
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

Follow up "Input shaping for Z axis #27073" #27118

Merged
merged 5 commits into from
May 22, 2024
Merged

Follow up "Input shaping for Z axis #27073" #27118

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ba7bbe0
update input_shaping Z
classicrocker883 May 22, 2024
f6bcfd4
Update language_en.h
classicrocker883 May 22, 2024
e03f8ba
remove unused, label some
thinkyhead May 22, 2024
f4200df
no narrow needed
thinkyhead May 22, 2024
2e4725b
Merge branch 'bugfix-2.1.x' into pr/27118
thinkyhead May 22, 2024
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/lcd/e3v2/proui/dwin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3487,7 +3487,7 @@ void drawTuneMenu() {

void drawInputShaping_menu() {
checkkey = ID_Menu;
if (SET_MENU(inputShapingMenu, MSG_INPUT_SHAPING, 5)) {
if (SET_MENU(inputShapingMenu, MSG_INPUT_SHAPING, 1 PLUS_TERN0(INPUT_SHAPING_X, 2) PLUS_TERN0(INPUT_SHAPING_Y, 2) PLUS_TERN0(INPUT_SHAPING_Z, 2))) {
BACK_ITEM(drawMotionMenu);
#if ENABLED(INPUT_SHAPING_X)
MENU_ITEM(ICON_ShapingX, MSG_SHAPING_A_FREQ, onDrawShapingXFreq, setShapingXFreq);
Expand Down
7 changes: 5 additions & 2 deletions Marlin/src/lcd/language/language_en.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,10 +427,13 @@ namespace LanguageNarrow_en {
LSTR MSG_SHAPING_ZETA = _UxGT("@ damping");
LSTR MSG_SHAPING_A_FREQ = STR_A _UxGT(" frequency");
LSTR MSG_SHAPING_B_FREQ = STR_B _UxGT(" frequency");
LSTR MSG_SHAPING_A_ZETA = STR_A _UxGT(" damping ");
LSTR MSG_SHAPING_B_ZETA = STR_B _UxGT(" damping ");
LSTR MSG_SHAPING_C_FREQ = STR_B _UxGT(" frequency");
LSTR MSG_SHAPING_A_ZETA = STR_A _UxGT(" damping");
LSTR MSG_SHAPING_B_ZETA = STR_B _UxGT(" damping");
LSTR MSG_SHAPING_C_ZETA = STR_B _UxGT(" damping");
LSTR MSG_SHAPING_X_ENABLE = _UxGT("Enable X shaping");
LSTR MSG_SHAPING_Y_ENABLE = _UxGT("Enable Y shaping");
LSTR MSG_SHAPING_Z_ENABLE = _UxGT("Enable Y shaping");
thinkyhead marked this conversation as resolved.
Show resolved Hide resolved
LSTR MSG_XY_FREQUENCY_LIMIT = _UxGT("XY Freq Limit");
LSTR MSG_XY_FREQUENCY_FEEDRATE = _UxGT("Min FR Factor");
LSTR MSG_STEPS_PER_MM = _UxGT("Steps/mm");
Expand Down
7 changes: 5 additions & 2 deletions Marlin/src/lcd/language/language_it.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,10 +405,13 @@ namespace LanguageNarrow_it {
LSTR MSG_SHAPING_ZETA = _UxGT("Smorzamento @");
LSTR MSG_SHAPING_A_FREQ = _UxGT("Frequenza ") STR_A;
LSTR MSG_SHAPING_B_FREQ = _UxGT("Frequenza ") STR_B;
LSTR MSG_SHAPING_A_ZETA = _UxGT("Smorzamento ") STR_A _UxGT(" ");
LSTR MSG_SHAPING_B_ZETA = _UxGT("Smorzamento ") STR_B _UxGT(" ");
LSTR MSG_SHAPING_C_FREQ = _UxGT("Frequenza ") STR_C;
LSTR MSG_SHAPING_A_ZETA = _UxGT("Smorzamento ") STR_A;
LSTR MSG_SHAPING_B_ZETA = _UxGT("Smorzamento ") STR_B;
LSTR MSG_SHAPING_C_ZETA = _UxGT("Smorzamento ") STR_C;
LSTR MSG_SHAPING_X_ENABLE = _UxGT("Abilita shaping X");
LSTR MSG_SHAPING_Y_ENABLE = _UxGT("Abilita shaping Y");
LSTR MSG_SHAPING_Z_ENABLE = _UxGT("Abilita shaping Z");
LSTR MSG_XY_FREQUENCY_LIMIT = _UxGT("Frequenza max");
LSTR MSG_XY_FREQUENCY_FEEDRATE = _UxGT("Feed min");
LSTR MSG_STEPS_PER_MM = _UxGT("Passi/mm");
Expand Down
7 changes: 5 additions & 2 deletions Marlin/src/lcd/language/language_tr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -405,10 +405,13 @@ namespace LanguageNarrow_tr {
LSTR MSG_SHAPING_ZETA = _UxGT("@ sönümleme");
LSTR MSG_SHAPING_A_FREQ = STR_A _UxGT(" frekansı");
LSTR MSG_SHAPING_B_FREQ = STR_B _UxGT(" frekansı");
LSTR MSG_SHAPING_A_ZETA = STR_A _UxGT(" sönümleme ");
LSTR MSG_SHAPING_B_ZETA = STR_B _UxGT(" sönümleme ");
LSTR MSG_SHAPING_C_FREQ = STR_C _UxGT(" frekansı");
LSTR MSG_SHAPING_A_ZETA = STR_A _UxGT(" sönümleme");
LSTR MSG_SHAPING_B_ZETA = STR_B _UxGT(" sönümleme");
LSTR MSG_SHAPING_C_ZETA = STR_C _UxGT(" sönümleme");
LSTR MSG_SHAPING_X_ENABLE = _UxGT("X şekilleme etkin");
LSTR MSG_SHAPING_Y_ENABLE = _UxGT("Y şekilleme etkin");
LSTR MSG_SHAPING_Z_ENABLE = _UxGT("Z şekilleme etkin");
LSTR MSG_XY_FREQUENCY_LIMIT = _UxGT("XY Frek. Sınırı");
LSTR MSG_XY_FREQUENCY_FEEDRATE = _UxGT("Min FR Factörü");
LSTR MSG_STEPS_PER_MM = _UxGT("Adım/mm");
Expand Down