andrey
/
Marlin_FB4S
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Add 0.025mm Manual Move for Z (#14456)

pull/1/head
Tanguy Pruvot 6 years ago
committed by Scott Lahteine
parent
56c4a96180
commit
ca7f56e60b
29 changed files with 39 additions and 6 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      Marlin/src/lcd/language/language_an.h
  2. 1
      Marlin/src/lcd/language/language_bg.h
  3. 1
      Marlin/src/lcd/language/language_ca.h
  4. 1
      Marlin/src/lcd/language/language_cz.h
  5. 1
      Marlin/src/lcd/language/language_da.h
  6. 1
      Marlin/src/lcd/language/language_de.h
  7. 1
      Marlin/src/lcd/language/language_el-gr.h
  8. 7
      Marlin/src/lcd/language/language_el.h
  9. 3
      Marlin/src/lcd/language/language_en.h
  10. 1
      Marlin/src/lcd/language/language_es.h
  11. 1
      Marlin/src/lcd/language/language_eu.h
  12. 1
      Marlin/src/lcd/language/language_fi.h
  13. 1
      Marlin/src/lcd/language/language_fr.h
  14. 1
      Marlin/src/lcd/language/language_gl.h
  15. 1
      Marlin/src/lcd/language/language_hr.h
  16. 1
      Marlin/src/lcd/language/language_it.h
  17. 1
      Marlin/src/lcd/language/language_jp-kana.h
  18. 1
      Marlin/src/lcd/language/language_ko_KR.h
  19. 1
      Marlin/src/lcd/language/language_nl.h
  20. 1
      Marlin/src/lcd/language/language_pl.h
  21. 1
      Marlin/src/lcd/language/language_pt-br.h
  22. 1
      Marlin/src/lcd/language/language_pt.h
  23. 1
      Marlin/src/lcd/language/language_ru.h
  24. 1
      Marlin/src/lcd/language/language_sk.h
  25. 1
      Marlin/src/lcd/language/language_tr.h
  26. 1
      Marlin/src/lcd/language/language_uk.h
  27. 1
      Marlin/src/lcd/language/language_zh_CN.h
  28. 1
      Marlin/src/lcd/language/language_zh_TW.h
  29. 9
      Marlin/src/lcd/menu/menu_motion.cpp

1
Marlin/src/lcd/language/language_an.h
View File

@ -72,6 +72,7 @@
#define MSG_MOVE_Y _UxGT("Mover Y")
#define MSG_MOVE_Z _UxGT("Mover Z")
#define MSG_MOVE_E _UxGT("Extrusor")
#define MSG_MOVE_0025MM _UxGT("Mover 0.025mm")
#define MSG_MOVE_01MM _UxGT("Mover 0.1mm")
#define MSG_MOVE_1MM _UxGT("Mover 1mm")
#define MSG_MOVE_10MM _UxGT("Mover 10mm")

1
Marlin/src/lcd/language/language_bg.h
View File

@ -62,6 +62,7 @@
#define MSG_MOVE_Y _UxGT("Движение по Y")
#define MSG_MOVE_Z _UxGT("Движение по Z")
#define MSG_MOVE_E _UxGT("Екструдер")
#define MSG_MOVE_0025MM _UxGT("Премести с 0.025mm")
#define MSG_MOVE_01MM _UxGT("Премести с 0.1mm")
#define MSG_MOVE_1MM _UxGT("Премести с 1mm")
#define MSG_MOVE_10MM _UxGT("Премести с 10mm")

1
Marlin/src/lcd/language/language_ca.h
View File

@ -76,6 +76,7 @@
#define MSG_MOVE_Y _UxGT("Mou Y")
#define MSG_MOVE_Z _UxGT("Mou Z")
#define MSG_MOVE_E _UxGT("Extrusor")
#define MSG_MOVE_0025MM _UxGT("Mou 0.025mm")
#define MSG_MOVE_01MM _UxGT("Mou 0.1mm")
#define MSG_MOVE_1MM _UxGT("Mou 1mm")
#define MSG_MOVE_10MM _UxGT("Mou 10mm")

1
Marlin/src/lcd/language/language_cz.h
View File

@ -202,6 +202,7 @@
#define MSG_MOVE_Z _UxGT("Posunout Z")
#define MSG_MOVE_E _UxGT("Extrudér")
#define MSG_HOTEND_TOO_COLD _UxGT("Hotend je studený")
#define MSG_MOVE_0025MM _UxGT("Posunout o 0,025mm")
#define MSG_MOVE_01MM _UxGT("Posunout o 0,1mm")
#define MSG_MOVE_1MM _UxGT("Posunout o 1mm")
#define MSG_MOVE_10MM _UxGT("Posunout o 10mm")

1
Marlin/src/lcd/language/language_da.h
View File

@ -72,6 +72,7 @@
#define MSG_MOVE_Y _UxGT("Flyt Y")
#define MSG_MOVE_Z _UxGT("Flyt Z")
#define MSG_MOVE_E _UxGT("Extruder")
#define MSG_MOVE_0025MM _UxGT("Flyt 0.025mm")
#define MSG_MOVE_01MM _UxGT("Flyt 0.1mm")
#define MSG_MOVE_1MM _UxGT("Flyt 1mm")
#define MSG_MOVE_10MM _UxGT("Flyt 10mm")

1
Marlin/src/lcd/language/language_de.h
View File

@ -195,6 +195,7 @@
#define MSG_MOVE_Z _UxGT("Bewege Z")
#define MSG_MOVE_E _UxGT("Bewege Extruder")
#define MSG_HOTEND_TOO_COLD _UxGT("Hotend zu kalt")
#define MSG_MOVE_0025MM _UxGT(" 0,025 mm")
#define MSG_MOVE_01MM _UxGT(" 0,1 mm")
#define MSG_MOVE_1MM _UxGT(" 1,0 mm")
#define MSG_MOVE_10MM _UxGT("10,0 mm")

1
Marlin/src/lcd/language/language_el-gr.h
View File

@ -72,6 +72,7 @@
#define MSG_MOVE_Y _UxGT("Μετακίνηση Y")
#define MSG_MOVE_Z _UxGT("Μετακίνηση Z")
#define MSG_MOVE_E _UxGT("Εξωθητήρας")
#define MSG_MOVE_0025MM _UxGT("Μετακίνηση 0,025 μμ")
#define MSG_MOVE_01MM _UxGT("Μετακίνηση 0,1 μμ")
#define MSG_MOVE_1MM _UxGT("Μετακίνηση 1 μμ")
#define MSG_MOVE_10MM _UxGT("Μετακίνηση 10 μμ")

7
Marlin/src/lcd/language/language_el.h
View File

@ -72,9 +72,10 @@
#define MSG_MOVE_Y _UxGT("Μετακίνηση Y")
#define MSG_MOVE_Z _UxGT("Μετακίνηση Z")
#define MSG_MOVE_E _UxGT("Εξωθητήρας")
#define MSG_MOVE_01MM _UxGT("Μετακίνηση 0,1μμ")
#define MSG_MOVE_1MM _UxGT("Μετακίνηση 1μμ")
#define MSG_MOVE_10MM _UxGT("Μετακίνηση 10μμ")
#define MSG_MOVE_0025MM _UxGT("Μετακίνηση 0,025 μμ")
#define MSG_MOVE_01MM _UxGT("Μετακίνηση 0,1 μμ")
#define MSG_MOVE_1MM _UxGT("Μετακίνηση 1 μμ")
#define MSG_MOVE_10MM _UxGT("Μετακίνηση 10 μμ")
#define MSG_SPEED _UxGT("Ταχύτητα")
#define MSG_BED_Z _UxGT("Επ. Εκτύπωσης Z")
#define MSG_NOZZLE _UxGT("Ακροφύσιο")

3
Marlin/src/lcd/language/language_en.h
View File

@ -543,6 +543,9 @@
#ifndef MSG_HOTEND_TOO_COLD
#define MSG_HOTEND_TOO_COLD _UxGT("Hotend too cold")
#endif
#ifndef MSG_MOVE_0025MM
#define MSG_MOVE_0025MM _UxGT("Move 0.025mm")
#endif
#ifndef MSG_MOVE_01MM
#define MSG_MOVE_01MM _UxGT("Move 0.1mm")
#endif

1
Marlin/src/lcd/language/language_es.h
View File

@ -80,6 +80,7 @@
#define MSG_MOVE_Y _UxGT("Mover Y")
#define MSG_MOVE_Z _UxGT("Mover Z")
#define MSG_MOVE_E _UxGT("Extrusor")
#define MSG_MOVE_0025MM _UxGT("Mover 0.025mm")
#define MSG_MOVE_01MM _UxGT("Mover 0.1mm")
#define MSG_MOVE_1MM _UxGT("Mover 1mm")
#define MSG_MOVE_10MM _UxGT("Mover 10mm")

1
Marlin/src/lcd/language/language_eu.h
View File

@ -166,6 +166,7 @@
#define MSG_MOVE_Y _UxGT("Mugitu Y")
#define MSG_MOVE_Z _UxGT("Mugitu Z")
#define MSG_MOVE_E _UxGT("Estrusorea")
#define MSG_MOVE_0025MM _UxGT("Mugitu 0.025mm")
#define MSG_MOVE_01MM _UxGT("Mugitu 0.1mm")
#define MSG_MOVE_1MM _UxGT("Mugitu 1mm")
#define MSG_MOVE_10MM _UxGT("Mugitu 10mm")

1
Marlin/src/lcd/language/language_fi.h
View File

@ -65,6 +65,7 @@
#define MSG_MOVE_Y _UxGT("Liikuta Y")
#define MSG_MOVE_Z _UxGT("Liikuta Z")
#define MSG_MOVE_E _UxGT("Extruder")
#define MSG_MOVE_0025MM _UxGT("Liikuta 0.025mm")
#define MSG_MOVE_01MM _UxGT("Liikuta 0.1mm")
#define MSG_MOVE_1MM _UxGT("Liikuta 1mm")
#define MSG_MOVE_10MM _UxGT("Liikuta 10mm")

1
Marlin/src/lcd/language/language_fr.h
View File

@ -195,6 +195,7 @@
#define MSG_MOVE_Z _UxGT("Déplacer Z")
#define MSG_MOVE_E _UxGT("Extrudeur")
#define MSG_HOTEND_TOO_COLD _UxGT("Buse trop froide")
#define MSG_MOVE_0025MM _UxGT("Déplacer 0.025mm")
#define MSG_MOVE_01MM _UxGT("Déplacer 0.1mm")
#define MSG_MOVE_1MM _UxGT("Déplacer 1mm")
#define MSG_MOVE_10MM _UxGT("Déplacer 10mm")

1
Marlin/src/lcd/language/language_gl.h
View File

@ -72,6 +72,7 @@
#define MSG_MOVE_Y _UxGT("Mover Y")
#define MSG_MOVE_Z _UxGT("Mover Z")
#define MSG_MOVE_E _UxGT("Extrusor")
#define MSG_MOVE_0025MM _UxGT("Mover 0.025mm")
#define MSG_MOVE_01MM _UxGT("Mover 0.1mm")
#define MSG_MOVE_1MM _UxGT("Mover 1mm")
#define MSG_MOVE_10MM _UxGT("Mover 10mm")

1
Marlin/src/lcd/language/language_hr.h
View File

@ -72,6 +72,7 @@
#define MSG_MOVE_Y _UxGT("Miči Y")
#define MSG_MOVE_Z _UxGT("Miči Z")
#define MSG_MOVE_E _UxGT("Extruder")
#define MSG_MOVE_0025MM _UxGT("Miči 0.025mm")
#define MSG_MOVE_01MM _UxGT("Miči 0.1mm")
#define MSG_MOVE_1MM _UxGT("Miči 1mm")
#define MSG_MOVE_10MM _UxGT("Miči 10mm")

1
Marlin/src/lcd/language/language_it.h
View File

@ -197,6 +197,7 @@
#define MSG_MOVE_Z _UxGT("Muovi Z")
#define MSG_MOVE_E _UxGT("Estrusore")
#define MSG_HOTEND_TOO_COLD _UxGT("Ugello freddo")
#define MSG_MOVE_0025MM _UxGT("Muovi di 0.025mm")
#define MSG_MOVE_01MM _UxGT("Muovi di 0.1mm")
#define MSG_MOVE_1MM _UxGT("Muovi di 1mm")
#define MSG_MOVE_10MM _UxGT("Muovi di 10mm")

1
Marlin/src/lcd/language/language_jp-kana.h
View File

@ -82,6 +82,7 @@
#define MSG_MOVE_Y _UxGT("Yジク イドウ") // "Move Y"
#define MSG_MOVE_Z _UxGT("Zジク イドウ") // "Move Z"
#define MSG_MOVE_E _UxGT("エクストルーダー") // "Extruder"
#define MSG_MOVE_0025MM _UxGT("0.025mm イドウ") // "Move 0.025mm"
#define MSG_MOVE_01MM _UxGT("0.1mm イドウ") // "Move 0.1mm"
#define MSG_MOVE_1MM _UxGT(" 1mm イドウ") // "Move 1mm"
#define MSG_MOVE_10MM _UxGT(" 10mm イドウ") // "Move 10mm"

1
Marlin/src/lcd/language/language_ko_KR.h
View File

@ -177,6 +177,7 @@
#define MSG_MOVE_Y _UxGT("Move Y")
#define MSG_MOVE_Z _UxGT("Move Z")
#define MSG_MOVE_E _UxGT("Extruder")
#define MSG_MOVE_0025MM _UxGT("Move 0.025mm")
#define MSG_MOVE_01MM _UxGT("Move 0.1mm")
#define MSG_MOVE_1MM _UxGT("Move 1mm")
#define MSG_MOVE_10MM _UxGT("Move 10mm")

1
Marlin/src/lcd/language/language_nl.h
View File

@ -80,6 +80,7 @@
#define MSG_MOVE_Y _UxGT("Verplaats Y")
#define MSG_MOVE_Z _UxGT("Verplaats Z")
#define MSG_MOVE_E _UxGT("Extruder")
#define MSG_MOVE_0025MM _UxGT("Verplaats 0.025mm")
#define MSG_MOVE_01MM _UxGT("Verplaats 0.1mm")
#define MSG_MOVE_1MM _UxGT("Verplaats 1mm")
#define MSG_MOVE_10MM _UxGT("Verplaats 10mm")

1
Marlin/src/lcd/language/language_pl.h
View File

@ -70,6 +70,7 @@
#define MSG_MOVE_Y _UxGT("Przesuń w Y")
#define MSG_MOVE_Z _UxGT("Przesuń w Z")
#define MSG_MOVE_E _UxGT("Ekstruzja (os E)")
#define MSG_MOVE_0025MM _UxGT("Przesuń co .025mm")
#define MSG_MOVE_01MM _UxGT("Przesuń co .1mm")
#define MSG_MOVE_1MM _UxGT("Przesuń co 1mm")
#define MSG_MOVE_10MM _UxGT("Przesuń co 10mm")

1
Marlin/src/lcd/language/language_pt-br.h
View File

@ -189,6 +189,7 @@
#define MSG_MOVE_Z _UxGT("Mover Z")
#define MSG_MOVE_E _UxGT("Mover Extrusor")
#define MSG_HOTEND_TOO_COLD _UxGT("Extrus. mto fria")
#define MSG_MOVE_0025MM _UxGT("Mover 0.025mm")
#define MSG_MOVE_01MM _UxGT("Mover 0.1mm")
#define MSG_MOVE_1MM _UxGT("Mover 1mm")
#define MSG_MOVE_10MM _UxGT("Mover 10mm")

1
Marlin/src/lcd/language/language_pt.h
View File

@ -70,6 +70,7 @@
#define MSG_MOVE_Y _UxGT("Mover Y")
#define MSG_MOVE_Z _UxGT("Mover Z")
#define MSG_MOVE_E _UxGT("Mover Extrusor")
#define MSG_MOVE_0025MM _UxGT("Mover 0.025mm")
#define MSG_MOVE_01MM _UxGT("Mover 0.1mm")
#define MSG_MOVE_1MM _UxGT("Mover 1mm")
#define MSG_MOVE_10MM _UxGT("Mover 10mm")

1
Marlin/src/lcd/language/language_ru.h
View File

@ -168,6 +168,7 @@
#define MSG_MOVE_Y _UxGT("Движение по Y")
#define MSG_MOVE_Z _UxGT("Движение по Z")
#define MSG_MOVE_E _UxGT("Экструдер")
#define MSG_MOVE_0025MM _UxGT("Движение 0.025мм")
#define MSG_MOVE_01MM _UxGT("Движение 0.1мм")
#define MSG_MOVE_1MM _UxGT("Движение 1мм")
#define MSG_MOVE_10MM _UxGT("Движение 10мм")

1
Marlin/src/lcd/language/language_sk.h
View File

@ -206,6 +206,7 @@
#define MSG_MOVE_Z _UxGT("Posunúť Z")
#define MSG_MOVE_E _UxGT("Extrudér")
#define MSG_HOTEND_TOO_COLD _UxGT("Hotend je studený")
#define MSG_MOVE_0025MM _UxGT("Posunúť o 0,025mm")
#define MSG_MOVE_01MM _UxGT("Posunúť o 0,1mm")
#define MSG_MOVE_1MM _UxGT("Posunúť o 1mm")
#define MSG_MOVE_10MM _UxGT("Posunúť o 10mm")

1
Marlin/src/lcd/language/language_tr.h
View File

@ -186,6 +186,7 @@
#define MSG_MOVE_Z _UxGT("Z Hareketi")
#define MSG_MOVE_E _UxGT("Ekstruder")
#define MSG_HOTEND_TOO_COLD _UxGT("Nozul Çok Soğuk")
#define MSG_MOVE_0025MM _UxGT("0.025mm")
#define MSG_MOVE_01MM _UxGT("0.1mm")
#define MSG_MOVE_1MM _UxGT("1mm")
#define MSG_MOVE_10MM _UxGT("10mm")

1
Marlin/src/lcd/language/language_uk.h
View File

@ -72,6 +72,7 @@
#define MSG_MOVE_Y _UxGT("Рух по Y")
#define MSG_MOVE_Z _UxGT("Рух по Z")
#define MSG_MOVE_E _UxGT("Екструдер")
#define MSG_MOVE_0025MM _UxGT("Рух по 0.025mm")
#define MSG_MOVE_01MM _UxGT("Рух по 0.1mm")
#define MSG_MOVE_1MM _UxGT("Рух по 1mm")
#define MSG_MOVE_10MM _UxGT("Рух по 10mm")

1
Marlin/src/lcd/language/language_zh_CN.h
View File

@ -164,6 +164,7 @@
#define MSG_MOVE_Y _UxGT("移动Y") //"Move Y"
#define MSG_MOVE_Z _UxGT("移动Z") //"Move Z"
#define MSG_MOVE_E _UxGT("挤出机") //"Extruder"
#define MSG_MOVE_0025MM _UxGT("移动 0.025 mm") //"Move 0.025mm"
#define MSG_MOVE_01MM _UxGT("移动 0.1 mm") //"Move 0.1mm"
#define MSG_MOVE_1MM _UxGT("移动 1 mm") //"Move 1mm"
#define MSG_MOVE_10MM _UxGT("移动 10 mm") //"Move 10mm"

1
Marlin/src/lcd/language/language_zh_TW.h
View File

@ -164,6 +164,7 @@
#define MSG_MOVE_Y _UxGT("移動Y") //"Move Y"
#define MSG_MOVE_Z _UxGT("移動Z") //"Move Z"
#define MSG_MOVE_E _UxGT("擠出機") //"Extruder"
#define MSG_MOVE_0025MM _UxGT("移動 0.025 mm") //"Move 0.025mm"
#define MSG_MOVE_01MM _UxGT("移動 0.1 mm") //"Move 0.1mm"
#define MSG_MOVE_1MM _UxGT("移動 1 mm") //"Move 1mm"
#define MSG_MOVE_10MM _UxGT("移動 10 mm") //"Move 10mm"

9
Marlin/src/lcd/menu/menu_motion.cpp
View File

@ -239,9 +239,10 @@ void _goto_manual_move(const float scale) {
move_menu_scale = scale;
ui.goto_screen(_manual_move_func_ptr);
}
void menu_move_10mm() { _goto_manual_move(10); }
void menu_move_1mm() { _goto_manual_move( 1); }
void menu_move_01mm() { _goto_manual_move( 0.1f); }
void menu_move_10mm() { _goto_manual_move(10); }
void menu_move_1mm() { _goto_manual_move( 1); }
void menu_move_01mm() { _goto_manual_move( 0.1f); }
void menu_move_0025mm() { _goto_manual_move( 0.025f); }
void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int8_t eindex=-1) {
_manual_move_func_ptr = func;
@ -269,6 +270,8 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
MENU_ITEM(submenu, MSG_MOVE_10MM, menu_move_10mm);
MENU_ITEM(submenu, MSG_MOVE_1MM, menu_move_1mm);
MENU_ITEM(submenu, MSG_MOVE_01MM, menu_move_01mm);
if (axis == Z_AXIS)
MENU_ITEM(submenu, MSG_MOVE_0025MM, menu_move_0025mm);
}
END_MENU();
}

Write Preview
Loading…
Cancel
Save