Browse Source

Split up Control > Motion submenu

Scott Lahteine 8 years ago
parent
commit
0cbe448edf

+ 3
- 0
Marlin/language_an.h View File

@@ -94,6 +94,7 @@
94 94
 #define MSG_PID_C                           _UxGT("PID-C")
95 95
 #define MSG_SELECT                          _UxGT("Trigar")
96 96
 #define MSG_ACC                             _UxGT("Aceleracion")
97
+#define MSG_JERK                            _UxGT("Jerk")
97 98
 #define MSG_VX_JERK                         _UxGT("Vx-jerk")
98 99
 #define MSG_VY_JERK                         _UxGT("Vy-jerk")
99 100
 #define MSG_VZ_JERK                         _UxGT("Vz-jerk")
@@ -101,9 +102,11 @@
101 102
 #define MSG_VMAX                            _UxGT("Vmax")
102 103
 #define MSG_VMIN                            _UxGT("Vmin")
103 104
 #define MSG_VTRAV_MIN                       _UxGT("Vel. viache min")
105
+#define MSG_ACCELERATION                    MSG_ACC
104 106
 #define MSG_AMAX                            _UxGT("Acel. max")
105 107
 #define MSG_A_RETRACT                       _UxGT("Acel. retrac.")
106 108
 #define MSG_A_TRAVEL                        _UxGT("Acel. Viaje")
109
+#define MSG_STEPS_PER_MM                    _UxGT("Trangos/mm")
107 110
 #define MSG_XSTEPS                          _UxGT("X trangos/mm")
108 111
 #define MSG_YSTEPS                          _UxGT("Y trangos/mm")
109 112
 #define MSG_ZSTEPS                          _UxGT("Z trangos/mm")

+ 2
- 0
Marlin/language_bg.h View File

@@ -95,6 +95,7 @@
95 95
 #define MSG_PID_C                           _UxGT("PID-C")
96 96
 #define MSG_SELECT                          _UxGT("Select")
97 97
 #define MSG_ACC                             _UxGT("Acc")
98
+#define MSG_JERK                            _UxGT("Jerk")
98 99
 #define MSG_VX_JERK                         _UxGT("Vx-jerk")
99 100
 #define MSG_VY_JERK                         _UxGT("Vy-jerk")
100 101
 #define MSG_VZ_JERK                         _UxGT("Vz-jerk")
@@ -105,6 +106,7 @@
105 106
 #define MSG_AMAX                            _UxGT("Amax ")
106 107
 #define MSG_A_RETRACT                       _UxGT("A-откат")
107 108
 #define MSG_A_TRAVEL                        _UxGT("A-travel")
109
+#define MSG_STEPS_PER_MM                    _UxGT("Стъпки/mm")
108 110
 #define MSG_XSTEPS                          _UxGT("X стъпки/mm")
109 111
 #define MSG_YSTEPS                          _UxGT("Y стъпки/mm")
110 112
 #define MSG_ZSTEPS                          _UxGT("Z стъпки/mm")

+ 2
- 0
Marlin/language_ca.h View File

@@ -99,6 +99,7 @@
99 99
 #define MSG_PID_C                           _UxGT("PID-C")
100 100
 #define MSG_SELECT                          _UxGT("Select")
101 101
 #define MSG_ACC                             _UxGT("Accel")
102
+#define MSG_JERK                            _UxGT("Jerk")
102 103
 #define MSG_VX_JERK                         _UxGT("Vx-jerk")
103 104
 #define MSG_VY_JERK                         _UxGT("Vy-jerk")
104 105
 #define MSG_VZ_JERK                         _UxGT("Vz-jerk")
@@ -109,6 +110,7 @@
109 110
 #define MSG_AMAX                            _UxGT("Accel. max ")
110 111
 #define MSG_A_RETRACT                       _UxGT("Accel. retracc")
111 112
 #define MSG_A_TRAVEL                        _UxGT("Accel. Viatge")
113
+#define MSG_STEPS_PER_MM                    _UxGT("Passos/mm")
112 114
 #define MSG_XSTEPS                          _UxGT("Xpassos/mm")
113 115
 #define MSG_YSTEPS                          _UxGT("Ypassos/mm")
114 116
 #define MSG_ZSTEPS                          _UxGT("Zpassos/mm")

+ 2
- 0
Marlin/language_cn.h View File

@@ -87,6 +87,7 @@
87 87
 #define MSG_PID_D                           "PID-D"
88 88
 #define MSG_PID_C                           "PID-C"
89 89
 #define MSG_ACC                             "Accel"
90
+#define MSG_JERK                            "Jerk"
90 91
 #define MSG_VX_JERK                         "Vx-jerk"
91 92
 #define MSG_VY_JERK                         "Vy-jerk"
92 93
 #define MSG_VZ_JERK                         "Vz-jerk"
@@ -97,6 +98,7 @@
97 98
 #define MSG_AMAX                            "Amax "
98 99
 #define MSG_A_RETRACT                       "A-retract"
99 100
 #define MSG_A_TRAVEL                        "A-travel"
101
+#define MSG_STEPS_PER_MM                    "Steps/mm"
100 102
 #define MSG_XSTEPS                          "Xsteps/mm"
101 103
 #define MSG_YSTEPS                          "Ysteps/mm"
102 104
 #define MSG_ZSTEPS                          "Zsteps/mm"

+ 2
- 0
Marlin/language_cz.h View File

@@ -105,6 +105,7 @@
105 105
 #define MSG_PID_C                           _UxGT("PID-C")
106 106
 #define MSG_SELECT                          _UxGT("Vybrat")
107 107
 #define MSG_ACC                             _UxGT("Zrychl")
108
+#define MSG_JERK                            _UxGT("Jerk")
108 109
 #define MSG_VX_JERK                         _UxGT("Vx-jerk")
109 110
 #define MSG_VY_JERK                         _UxGT("Vy-jerk")
110 111
 #define MSG_VZ_JERK                         _UxGT("Vz-jerk")
@@ -115,6 +116,7 @@
115 116
 #define MSG_AMAX                            _UxGT("Amax ")
116 117
 #define MSG_A_RETRACT                       _UxGT("A-retrakt")
117 118
 #define MSG_A_TRAVEL                        _UxGT("A-prejezd")
119
+#define MSG_STEPS_PER_MM                    _UxGT("Kroku/mm")
118 120
 #define MSG_XSTEPS                          _UxGT("Xkroku/mm")
119 121
 #define MSG_YSTEPS                          _UxGT("Ykroku/mm")
120 122
 #define MSG_ZSTEPS                          _UxGT("Zkroku/mm")

+ 2
- 0
Marlin/language_da.h View File

@@ -96,6 +96,7 @@
96 96
 #define MSG_PID_C                           _UxGT("PID-C")
97 97
 #define MSG_SELECT                          _UxGT("Vælg")
98 98
 #define MSG_ACC                             _UxGT("Accel")
99
+#define MSG_JERK                            _UxGT("Jerk")
99 100
 #define MSG_VX_JERK                         _UxGT("Vx-jerk")
100 101
 #define MSG_VY_JERK                         _UxGT("Vy-jerk")
101 102
 #define MSG_VZ_JERK                         _UxGT("Vz-jerk")
@@ -106,6 +107,7 @@
106 107
 #define MSG_AMAX                            _UxGT("Amax ")
107 108
 #define MSG_A_RETRACT                       _UxGT("A-retract")
108 109
 #define MSG_A_TRAVEL                        _UxGT("A-rejse")
110
+#define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")
109 111
 #define MSG_XSTEPS                          _UxGT("Xsteps/mm")
110 112
 #define MSG_YSTEPS                          _UxGT("Ysteps/mm")
111 113
 #define MSG_ZSTEPS                          _UxGT("Zsteps/mm")

+ 2
- 0
Marlin/language_de.h View File

@@ -102,6 +102,7 @@
102 102
 #define MSG_PID_C                           _UxGT("PID C")
103 103
 #define MSG_SELECT                          _UxGT("Auswählen")
104 104
 #define MSG_ACC                             _UxGT("A")
105
+#define MSG_JERK                            _UxGT("Jerk")
105 106
 #define MSG_VX_JERK                         _UxGT("V X Jerk")
106 107
 #define MSG_VY_JERK                         _UxGT("V Y Jerk")
107 108
 #define MSG_VZ_JERK                         _UxGT("V Z Jerk")
@@ -112,6 +113,7 @@
112 113
 #define MSG_AMAX                            _UxGT("A max ") // space by purpose
113 114
 #define MSG_A_RETRACT                       _UxGT("A Retract")
114 115
 #define MSG_A_TRAVEL                        _UxGT("A Leerfahrt")
116
+#define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")
115 117
 #define MSG_XSTEPS                          _UxGT("X Steps/mm")
116 118
 #define MSG_YSTEPS                          _UxGT("Y Steps/mm")
117 119
 #define MSG_ZSTEPS                          _UxGT("Z Steps/mm")

+ 3
- 0
Marlin/language_el-gr.h View File

@@ -94,6 +94,7 @@
94 94
 #define MSG_PID_D                           _UxGT("PID-D")
95 95
 #define MSG_PID_C                           _UxGT("PID-C")
96 96
 #define MSG_ACC                             _UxGT("Επιτάχυνση")
97
+#define MSG_JERK                            _UxGT("Vαντίδραση")
97 98
 #define MSG_VX_JERK                         _UxGT("Vαντίδραση x")
98 99
 #define MSG_VY_JERK                         _UxGT("Vαντίδραση y")
99 100
 #define MSG_VZ_JERK                         _UxGT("Vαντίδραση z")
@@ -101,9 +102,11 @@
101 102
 #define MSG_VMAX                            _UxGT("Vμεγ ")
102 103
 #define MSG_VMIN                            _UxGT("Vελαχ")
103 104
 #define MSG_VTRAV_MIN                       _UxGT("Vελάχ. μετατόπιση")
105
+#define MSG_ACCELERATION                    MSG_ACC
104 106
 #define MSG_AMAX                            _UxGT("Aμεγ ")
105 107
 #define MSG_A_RETRACT                       _UxGT("Α-ανάσυρση")
106 108
 #define MSG_A_TRAVEL                        _UxGT("Α-μετατόπιση")
109
+#define MSG_STEPS_PER_MM                    _UxGT("Bήματα ανά μμ")
107 110
 #define MSG_XSTEPS                          _UxGT("Bήματα X ανά μμ")
108 111
 #define MSG_YSTEPS                          _UxGT("Bήματα Υ ανά μμ")
109 112
 #define MSG_ZSTEPS                          _UxGT("Bήματα Ζ ανά μμ")

+ 3
- 0
Marlin/language_el.h View File

@@ -94,6 +94,7 @@
94 94
 #define MSG_PID_D                           _UxGT("PID-D")
95 95
 #define MSG_PID_C                           _UxGT("PID-C")
96 96
 #define MSG_ACC                             _UxGT("Επιτάχυνση")
97
+#define MSG_JERK                            _UxGT("Jerk")
97 98
 #define MSG_VX_JERK                         _UxGT("Vαντίδραση x")
98 99
 #define MSG_VY_JERK                         _UxGT("Vαντίδραση y")
99 100
 #define MSG_VZ_JERK                         _UxGT("Vαντίδραση z")
@@ -101,9 +102,11 @@
101 102
 #define MSG_VMAX                            _UxGT("V Μέγιστο")
102 103
 #define MSG_VMIN                            _UxGT("V Ελάχιστο")
103 104
 #define MSG_VTRAV_MIN                       _UxGT("Vελάχ. μετατόπιση")
105
+#define MSG_ACCELERATION                    MSG_ACC
104 106
 #define MSG_AMAX                            _UxGT("Aμεγ ")
105 107
 #define MSG_A_RETRACT                       _UxGT("Α-ανάσυρση")
106 108
 #define MSG_A_TRAVEL                        _UxGT("Α-μετατόπιση")
109
+#define MSG_STEPS_PER_MM                    _UxGT("Bήματα ανά μμ")
107 110
 #define MSG_XSTEPS                          _UxGT("Bήματα X ανά μμ")
108 111
 #define MSG_YSTEPS                          _UxGT("Bήματα Υ ανά μμ")
109 112
 #define MSG_ZSTEPS                          _UxGT("Bήματα Ζ ανά μμ")

+ 12
- 0
Marlin/language_en.h View File

@@ -376,6 +376,9 @@
376 376
 #ifndef MSG_ACC
377 377
   #define MSG_ACC                             _UxGT("Accel")
378 378
 #endif
379
+#ifndef MSG_JERK
380
+  #define MSG_JERK                            _UxGT("Jerk")
381
+#endif
379 382
 #ifndef MSG_VX_JERK
380 383
   #define MSG_VX_JERK                         _UxGT("Vx-jerk")
381 384
 #endif
@@ -388,6 +391,9 @@
388 391
 #ifndef MSG_VE_JERK
389 392
   #define MSG_VE_JERK                         _UxGT("Ve-jerk")
390 393
 #endif
394
+#ifndef MSG_FEEDRATE
395
+  #define MSG_FEEDRATE                        _UxGT("Feedrate")
396
+#endif
391 397
 #ifndef MSG_VMAX
392 398
   #define MSG_VMAX                            _UxGT("Vmax ")
393 399
 #endif
@@ -397,6 +403,9 @@
397 403
 #ifndef MSG_VTRAV_MIN
398 404
   #define MSG_VTRAV_MIN                       _UxGT("VTrav min")
399 405
 #endif
406
+#ifndef MSG_ACCELERATION
407
+  #define MSG_ACCELERATION                    _UxGT("Acceleration")
408
+#endif
400 409
 #ifndef MSG_AMAX
401 410
   #define MSG_AMAX                            _UxGT("Amax ")
402 411
 #endif
@@ -406,6 +415,9 @@
406 415
 #ifndef MSG_A_TRAVEL
407 416
   #define MSG_A_TRAVEL                        _UxGT("A-travel")
408 417
 #endif
418
+#ifndef MSG_STEPS_PER_MM
419
+  #define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")
420
+#endif
409 421
 #ifndef MSG_XSTEPS
410 422
   #define MSG_XSTEPS                          _UxGT("Xsteps/mm")
411 423
 #endif

+ 3
- 0
Marlin/language_es.h View File

@@ -101,6 +101,7 @@
101 101
 #define MSG_PID_C                           _UxGT("PID-C")
102 102
 #define MSG_SELECT                          _UxGT("Seleccionar")
103 103
 #define MSG_ACC                             _UxGT("Aceleracion")
104
+#define MSG_JERK                            _UxGT("Jerk")
104 105
 #define MSG_VX_JERK                         _UxGT("Vx-jerk")
105 106
 #define MSG_VY_JERK                         _UxGT("Vy-jerk")
106 107
 #define MSG_VZ_JERK                         _UxGT("Vz-jerk")
@@ -108,9 +109,11 @@
108 109
 #define MSG_VMAX                            _UxGT("Vmax")
109 110
 #define MSG_VMIN                            _UxGT("Vmin")
110 111
 #define MSG_VTRAV_MIN                       _UxGT("Vel. viaje min")
112
+#define MSG_ACCELERATION                    MSG_ACC
111 113
 #define MSG_AMAX                            _UxGT("Acel. max")
112 114
 #define MSG_A_RETRACT                       _UxGT("Acel. retrac.")
113 115
 #define MSG_A_TRAVEL                        _UxGT("Acel. Viaje")
116
+#define MSG_STEPS_PER_MM                    _UxGT("Pasos/mm")
114 117
 #define MSG_XSTEPS                          _UxGT("X pasos/mm")
115 118
 #define MSG_YSTEPS                          _UxGT("Y pasos/mm")
116 119
 #define MSG_ZSTEPS                          _UxGT("Z pasos/mm")

+ 3
- 0
Marlin/language_eu.h View File

@@ -101,6 +101,7 @@
101 101
 #define MSG_PID_C                           _UxGT("PID-C")
102 102
 #define MSG_SELECT                          _UxGT("Aukeratu")
103 103
 #define MSG_ACC                             _UxGT("Azelerazioa")
104
+#define MSG_JERK                            _UxGT("Astindua")
104 105
 #define MSG_VX_JERK                         _UxGT("Vx-astindua")
105 106
 #define MSG_VY_JERK                         _UxGT("Vy-astindua")
106 107
 #define MSG_VZ_JERK                         _UxGT("Vz-astindua")
@@ -108,9 +109,11 @@
108 109
 #define MSG_VMAX                            _UxGT("Vmax ")
109 110
 #define MSG_VMIN                            _UxGT("Vmin")
110 111
 #define MSG_VTRAV_MIN                       _UxGT("VBidaia min")
112
+#define MSG_ACCELERATION                    MSG_ACC
111 113
 #define MSG_AMAX                            _UxGT("Amax ")
112 114
 #define MSG_A_RETRACT                       _UxGT("A-retrakt")
113 115
 #define MSG_A_TRAVEL                        _UxGT("A-bidaia")
116
+#define MSG_STEPS_PER_MM                    _UxGT("Pausoak/mm")
114 117
 #define MSG_XSTEPS                          _UxGT("X pausoak/mm")
115 118
 #define MSG_YSTEPS                          _UxGT("Y pausoak/mm")
116 119
 #define MSG_ZSTEPS                          _UxGT("Z pausoak/mm")

+ 3
- 0
Marlin/language_fi.h View File

@@ -87,6 +87,7 @@
87 87
 #define MSG_PID_D                           _UxGT("PID-D")
88 88
 #define MSG_PID_C                           _UxGT("PID-C")
89 89
 #define MSG_ACC                             _UxGT("Kiihtyv")
90
+#define MSG_JERK                            _UxGT("Jerk")
90 91
 #define MSG_VX_JERK                         _UxGT("Vx-jerk")
91 92
 #define MSG_VY_JERK                         _UxGT("Vy-jerk")
92 93
 #define MSG_VZ_JERK                         _UxGT("Vz-jerk")
@@ -94,8 +95,10 @@
94 95
 #define MSG_VMAX                            _UxGT("Vmax ")
95 96
 #define MSG_VMIN                            _UxGT("Vmin")
96 97
 #define MSG_VTRAV_MIN                       _UxGT("VLiike min")
98
+#define MSG_ACCELERATION                    MSG_ACC
97 99
 #define MSG_AMAX                            _UxGT("Amax ")
98 100
 #define MSG_A_RETRACT                       _UxGT("A-peruuta")
101
+#define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")
99 102
 #define MSG_XSTEPS                          _UxGT("Xsteps/mm")
100 103
 #define MSG_YSTEPS                          _UxGT("Ysteps/mm")
101 104
 #define MSG_ZSTEPS                          _UxGT("Zsteps/mm")

+ 2
- 0
Marlin/language_fr.h View File

@@ -102,6 +102,7 @@
102 102
 #define MSG_PID_C                           _UxGT("PID-C")
103 103
 #define MSG_SELECT                          _UxGT("Sélectionner")
104 104
 #define MSG_ACC                             _UxGT("Accélération")
105
+#define MSG_JERK                            _UxGT("Jerk")
105 106
 #define MSG_VX_JERK                         _UxGT("Vx-jerk")
106 107
 #define MSG_VY_JERK                         _UxGT("Vy-jerk")
107 108
 #define MSG_VZ_JERK                         _UxGT("Vz-jerk")
@@ -112,6 +113,7 @@
112 113
 #define MSG_AMAX                            _UxGT("Amax ")
113 114
 #define MSG_A_RETRACT                       _UxGT("A-retract")
114 115
 #define MSG_A_TRAVEL                        _UxGT("A-Dépl.")
116
+#define MSG_STEPS_PER_MM                    _UxGT("Pas/mm")
115 117
 #define MSG_XSTEPS                          _UxGT("Xpas/mm")
116 118
 #define MSG_YSTEPS                          _UxGT("Ypas/mm")
117 119
 #define MSG_ZSTEPS                          _UxGT("Zpas/mm")

+ 2
- 0
Marlin/language_gl.h View File

@@ -95,6 +95,7 @@
95 95
 #define MSG_PID_C                           _UxGT("PID-C")
96 96
 #define MSG_SELECT                          _UxGT("Escolla")
97 97
 #define MSG_ACC                             _UxGT("Acel")
98
+#define MSG_JERK                            _UxGT("Jerk")
98 99
 #define MSG_VX_JERK                         _UxGT("Vx-jerk")
99 100
 #define MSG_VY_JERK                         _UxGT("Vy-jerk")
100 101
 #define MSG_VZ_JERK                         _UxGT("Vz-jerk")
@@ -105,6 +106,7 @@
105 106
 #define MSG_AMAX                            _UxGT("Amax ")
106 107
 #define MSG_A_RETRACT                       _UxGT("A-retract")
107 108
 #define MSG_A_TRAVEL                        _UxGT("A-travel")
109
+#define MSG_STEPS_PER_MM                    _UxGT("Pasos/mm")
108 110
 #define MSG_XSTEPS                          _UxGT("Xpasos/mm")
109 111
 #define MSG_YSTEPS                          _UxGT("Ypasos/mm")
110 112
 #define MSG_ZSTEPS                          _UxGT("Zpasos/mm")

+ 2
- 0
Marlin/language_hr.h View File

@@ -94,6 +94,7 @@
94 94
 #define MSG_PID_C                           _UxGT("PID-C")
95 95
 #define MSG_SELECT                          _UxGT("Odaberi")
96 96
 #define MSG_ACC                             _UxGT("Accel")
97
+#define MSG_JERK                            _UxGT("Jerk")
97 98
 #define MSG_VX_JERK                         _UxGT("Vx-jerk")
98 99
 #define MSG_VY_JERK                         _UxGT("Vy-jerk")
99 100
 #define MSG_VZ_JERK                         _UxGT("Vz-jerk")
@@ -104,6 +105,7 @@
104 105
 #define MSG_AMAX                            _UxGT("Amax ")
105 106
 #define MSG_A_RETRACT                       _UxGT("A-retract")
106 107
 #define MSG_A_TRAVEL                        _UxGT("A-travel")
108
+#define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")
107 109
 #define MSG_XSTEPS                          _UxGT("Xsteps/mm")
108 110
 #define MSG_YSTEPS                          _UxGT("Ysteps/mm")
109 111
 #define MSG_ZSTEPS                          _UxGT("Zsteps/mm")

+ 2
- 0
Marlin/language_it.h View File

@@ -109,6 +109,7 @@
109 109
 #define MSG_PID_C                           _UxGT("PID-C")
110 110
 #define MSG_SELECT                          _UxGT("Seleziona")
111 111
 #define MSG_ACC                             _UxGT("Accel")
112
+#define MSG_JERK                            _UxGT("Jerk")
112 113
 #define MSG_VX_JERK                         _UxGT("Vx-jerk")
113 114
 #define MSG_VY_JERK                         _UxGT("Vy-jerk")
114 115
 #define MSG_VZ_JERK                         _UxGT("Vz-jerk")
@@ -119,6 +120,7 @@
119 120
 #define MSG_AMAX                            _UxGT("Amax ")
120 121
 #define MSG_A_RETRACT                       _UxGT("A-retract")
121 122
 #define MSG_A_TRAVEL                        _UxGT("A-Spostamento")
123
+#define MSG_STEPS_PER_MM                    _UxGT("Passi/mm")
122 124
 #define MSG_XSTEPS                          _UxGT("Xpassi/mm")
123 125
 #define MSG_YSTEPS                          _UxGT("Ypassi/mm")
124 126
 #define MSG_ZSTEPS                          _UxGT("Zpassi/mm")

+ 2
- 0
Marlin/language_kana.h View File

@@ -129,6 +129,7 @@
129 129
 #define MSG_A_RETRACT                       "\xcb\xb7\xba\xd0\xb6\xbf\xb8\xc4\xde"                             // "ヒキコミカソクド" ("A-retract")
130 130
 #define MSG_A_TRAVEL                        "\xb2\xc4\xde\xb3\xb6\xbf\xb8\xc4\xde"                             // "イドウカソクド" ("A-travel")
131 131
 #if LCD_WIDTH >= 20
132
+  #define MSG_STEPS_PER_MM                    "Steps/mm"
132 133
   #define MSG_XSTEPS                          "Xsteps/mm"
133 134
   #define MSG_YSTEPS                          "Ysteps/mm"
134 135
   #define MSG_ZSTEPS                          "Zsteps/mm"
@@ -139,6 +140,7 @@
139 140
   #define MSG_E4STEPS                         "E4steps/mm"
140 141
   #define MSG_E5STEPS                         "E5steps/mm"
141 142
 #else
143
+  #define MSG_STEPS_PER_MM                    "Steps"
142 144
   #define MSG_XSTEPS                          "Xsteps"
143 145
   #define MSG_YSTEPS                          "Ysteps"
144 146
   #define MSG_ZSTEPS                          "Zsteps"

+ 2
- 9
Marlin/language_kana_utf8.h View File

@@ -104,6 +104,7 @@
104 104
 #define MSG_PID_C                           _UxGT("PID-C")
105 105
 #define MSG_SELECT                          _UxGT("センタク")                     // "Select"
106 106
 #define MSG_ACC                             _UxGT("カソクド mm/s2")               // "Accel"
107
+#define MSG_JERK                            _UxGT("ヤクド mm/s")                  // "Jerk"
107 108
 #define MSG_VX_JERK                         _UxGT("Xジク ヤクド mm/s")             // "Vx-jerk"
108 109
 #define MSG_VY_JERK                         _UxGT("Yジク ヤクド mm/s")             // "Vy-jerk"
109 110
 #define MSG_VZ_JERK                         _UxGT("Zジク ヤクド mm/s")             // "Vz-jerk"
@@ -111,18 +112,10 @@
111 112
 #define MSG_VMAX                            _UxGT("サイダイオクリソクド ")            // "Vmax "
112 113
 #define MSG_VMIN                            _UxGT("サイショウオクリソクド")           // "Vmin"
113 114
 #define MSG_VTRAV_MIN                       _UxGT("サイショウイドウソクド")           // "VTrav min"
115
+#define MSG_ACCELERATION                    MSG_ACC
114 116
 #define MSG_AMAX                            _UxGT("サイダイカソクド ")              // "Amax "
115 117
 #define MSG_A_RETRACT                       _UxGT("ヒキコミカソクド")               // "A-retract"
116 118
 #define MSG_A_TRAVEL                        _UxGT("イドウカソクド")                // "A-travel"
117
-#define MSG_XSTEPS                          _UxGT("Xsteps/mm")
118
-#define MSG_YSTEPS                          _UxGT("Ysteps/mm")
119
-#define MSG_ZSTEPS                          _UxGT("Zsteps/mm")
120
-#define MSG_ESTEPS                          _UxGT("Esteps/mm")
121
-#define MSG_E1STEPS                         _UxGT("E1steps/mm")
122
-#define MSG_E2STEPS                         _UxGT("E2steps/mm")
123
-#define MSG_E3STEPS                         _UxGT("E3steps/mm")
124
-#define MSG_E4STEPS                         _UxGT("E4steps/mm")
125
-#define MSG_E5STEPS                         _UxGT("E5steps/mm")
126 119
 #define MSG_TEMPERATURE                     _UxGT("オンド")                      // "Temperature"
127 120
 #define MSG_MOTION                          _UxGT("ウゴキセッテイ")                // "Motion"
128 121
 #define MSG_FILAMENT                        _UxGT("フィラメント")                   // "Filament"

+ 2
- 0
Marlin/language_nl.h View File

@@ -101,6 +101,7 @@
101 101
 #define MSG_PID_C                           _UxGT("PID-C")
102 102
 #define MSG_SELECT                          _UxGT("Selecteer")
103 103
 #define MSG_ACC                             _UxGT("Versn")
104
+#define MSG_JERK                            _UxGT("Jerk")
104 105
 #define MSG_VX_JERK                         _UxGT("Vx-jerk")
105 106
 #define MSG_VY_JERK                         _UxGT("Vy-jerk")
106 107
 #define MSG_VZ_JERK                         _UxGT("Vz-jerk")
@@ -111,6 +112,7 @@
111 112
 #define MSG_AMAX                            _UxGT("Amax ")
112 113
 #define MSG_A_RETRACT                       _UxGT("A-retract")
113 114
 #define MSG_A_TRAVEL                        _UxGT("A-travel")
115
+#define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")
114 116
 #define MSG_XSTEPS                          _UxGT("Xsteps/mm")
115 117
 #define MSG_YSTEPS                          _UxGT("Ysteps/mm")
116 118
 #define MSG_ZSTEPS                          _UxGT("Zsteps/mm")

+ 6
- 0
Marlin/language_pl.h View File

@@ -97,6 +97,7 @@
97 97
 #define MSG_PID_C                           _UxGT("PID-C")
98 98
 #define MSG_SELECT                          _UxGT("Select")
99 99
 #define MSG_ACC                             _UxGT("Przyśpieszenie")
100
+#define MSG_JERK                            _UxGT("Zryw")
100 101
 #define MSG_VX_JERK                         _UxGT("Zryw Vx")
101 102
 #define MSG_VY_JERK                         _UxGT("Zryw Vy")
102 103
 #define MSG_VZ_JERK                         _UxGT("Zryw Vz")
@@ -104,9 +105,11 @@
104 105
 #define MSG_VMAX                            _UxGT("Vmax ")
105 106
 #define MSG_VMIN                            _UxGT("Vmin")
106 107
 #define MSG_VTRAV_MIN                       _UxGT("Vskok min")
108
+#define MSG_ACCELERATION                    MSG_ACC
107 109
 #define MSG_AMAX                            _UxGT("Amax")
108 110
 #define MSG_A_RETRACT                       _UxGT("A-wycofanie")
109 111
 #define MSG_A_TRAVEL                        _UxGT("A-przesuń.")
112
+#define MSG_STEPS_PER_MM                    _UxGT("kroki/mm")
110 113
 #define MSG_XSTEPS                          _UxGT("krokiX/mm")
111 114
 #define MSG_YSTEPS                          _UxGT("krokiY/mm")
112 115
 #define MSG_ZSTEPS                          _UxGT("krokiZ/mm")
@@ -312,6 +315,7 @@
312 315
 #define MSG_PID_C                           _UxGT("PID-C")
313 316
 #define MSG_SELECT                          _UxGT("Select")
314 317
 #define MSG_ACC                             _UxGT("Przyspieszenie")
318
+#define MSG_JERK                            _UxGT("Zryw")
315 319
 #define MSG_VX_JERK                         _UxGT("Zryw Vx")
316 320
 #define MSG_VY_JERK                         _UxGT("Zryw Vy")
317 321
 #define MSG_VZ_JERK                         _UxGT("Zryw Vz")
@@ -319,9 +323,11 @@
319 323
 #define MSG_VMAX                            _UxGT("Vmax ")
320 324
 #define MSG_VMIN                            _UxGT("Vmin")
321 325
 #define MSG_VTRAV_MIN                       _UxGT("Vskok min")
326
+#define MSG_ACCELERATION                    MSG_ACC
322 327
 #define MSG_AMAX                            _UxGT("Amax")
323 328
 #define MSG_A_RETRACT                       _UxGT("A-wycofanie")
324 329
 #define MSG_A_TRAVEL                        _UxGT("A-przesun.")
330
+#define MSG_STEPS_PER_MM                    _UxGT("kroki/mm")
325 331
 #define MSG_XSTEPS                          _UxGT("krokiX/mm")
326 332
 #define MSG_YSTEPS                          _UxGT("krokiY/mm")
327 333
 #define MSG_ZSTEPS                          _UxGT("krokiZ/mm")

+ 2
- 0
Marlin/language_pt-br.h View File

@@ -87,6 +87,7 @@
87 87
 #define MSG_PID_D                           "PID-D"
88 88
 #define MSG_PID_C                           "PID-C"
89 89
 #define MSG_ACC                             "Acc"
90
+#define MSG_JERK                            "Jogo"
90 91
 #define MSG_VX_JERK                         "jogo VX"
91 92
 #define MSG_VY_JERK                         "jogo VY"
92 93
 #define MSG_VZ_JERK                         "jogo VZ"
@@ -97,6 +98,7 @@
97 98
 #define MSG_AMAX                            "Amax "
98 99
 #define MSG_A_RETRACT                       "Retrair A"
99 100
 #define MSG_A_TRAVEL                        "A-movimento"
101
+#define MSG_STEPS_PER_MM                    "Passo/mm"
100 102
 #define MSG_XSTEPS                          "Passo X/mm"
101 103
 #define MSG_YSTEPS                          "Passo Y/mm"
102 104
 #define MSG_ZSTEPS                          "Passo Z/mm"

+ 2
- 0
Marlin/language_pt-br_utf8.h View File

@@ -87,6 +87,7 @@
87 87
 #define MSG_PID_D                           _UxGT("PID-D")
88 88
 #define MSG_PID_C                           _UxGT("PID-C")
89 89
 #define MSG_ACC                             _UxGT("Acc")
90
+#define MSG_JERK                            _UxGT("Jogo")
90 91
 #define MSG_VX_JERK                         _UxGT("jogo VX")
91 92
 #define MSG_VY_JERK                         _UxGT("jogo VY")
92 93
 #define MSG_VZ_JERK                         _UxGT("jogo VZ")
@@ -97,6 +98,7 @@
97 98
 #define MSG_AMAX                            _UxGT("Amax ")
98 99
 #define MSG_A_RETRACT                       _UxGT("Retrair A")
99 100
 #define MSG_A_TRAVEL                        _UxGT("A-movimento")
101
+#define MSG_STEPS_PER_MM                    _UxGT("Passo/mm")
100 102
 #define MSG_XSTEPS                          _UxGT("Passo X/mm")
101 103
 #define MSG_YSTEPS                          _UxGT("Passo Y/mm")
102 104
 #define MSG_ZSTEPS                          _UxGT("Passo Z/mm")

+ 2
- 0
Marlin/language_pt.h View File

@@ -91,6 +91,7 @@
91 91
 #define MSG_PID_D                           "PID-D"
92 92
 #define MSG_PID_C                           "PID-C"
93 93
 #define MSG_ACC                             "Acc"
94
+#define MSG_JERK                            _UxGT("Jerk")
94 95
 #define MSG_VX_JERK                         "Vx-jerk"
95 96
 #define MSG_VY_JERK                         "Vy-jerk"
96 97
 #define MSG_VZ_JERK                         "Vz-jerk"
@@ -101,6 +102,7 @@
101 102
 #define MSG_AMAX                            "Amax "
102 103
 #define MSG_A_RETRACT                       "A-retraccao"
103 104
 #define MSG_A_TRAVEL                        "A-movimento"
105
+#define MSG_STEPS_PER_MM                    "Passo/mm"
104 106
 #define MSG_XSTEPS                          "X passo/mm"
105 107
 #define MSG_YSTEPS                          "Y passo/mm"
106 108
 #define MSG_ZSTEPS                          "Z passo/mm"

+ 2
- 0
Marlin/language_pt_utf8.h View File

@@ -91,6 +91,7 @@
91 91
 #define MSG_PID_D                           _UxGT("PID-D")
92 92
 #define MSG_PID_C                           _UxGT("PID-C")
93 93
 #define MSG_ACC                             _UxGT("Acc")
94
+#define MSG_JERK                            _UxGT("Jerk")
94 95
 #define MSG_VX_JERK                         _UxGT("Vx-jerk")
95 96
 #define MSG_VY_JERK                         _UxGT("Vy-jerk")
96 97
 #define MSG_VZ_JERK                         _UxGT("Vz-jerk")
@@ -101,6 +102,7 @@
101 102
 #define MSG_AMAX                            _UxGT("Amax ")
102 103
 #define MSG_A_RETRACT                       _UxGT("A-retracção")
103 104
 #define MSG_A_TRAVEL                        _UxGT("A-movimento")
105
+#define MSG_STEPS_PER_MM                    _UxGT("Passo/mm")
104 106
 #define MSG_XSTEPS                          _UxGT("X passo/mm")
105 107
 #define MSG_YSTEPS                          _UxGT("Y passo/mm")
106 108
 #define MSG_ZSTEPS                          _UxGT("Z passo/mm")

+ 2
- 0
Marlin/language_ru.h View File

@@ -91,6 +91,7 @@
91 91
 #define MSG_PID_D                           _UxGT("PID-D")
92 92
 #define MSG_PID_C                           _UxGT("PID-C")
93 93
 #define MSG_ACC                             _UxGT("Acc")
94
+#define MSG_JERK                            _UxGT("Рывок")
94 95
 #define MSG_VX_JERK                         _UxGT("Vx-рывок")
95 96
 #define MSG_VY_JERK                         _UxGT("Vy-рывок")
96 97
 #define MSG_VZ_JERK                         _UxGT("Vz-рывок")
@@ -101,6 +102,7 @@
101 102
 #define MSG_AMAX                            _UxGT("Aмакс")
102 103
 #define MSG_A_RETRACT                       _UxGT("A-втягивание")
103 104
 #define MSG_A_TRAVEL                        _UxGT("A-путеш.")
105
+#define MSG_STEPS_PER_MM                    _UxGT("Шаг/мм")
104 106
 #define MSG_XSTEPS                          _UxGT("X шаг/мм")
105 107
 #define MSG_YSTEPS                          _UxGT("Y шаг/мм")
106 108
 #define MSG_ZSTEPS                          _UxGT("Z шаг/мм")

+ 2
- 0
Marlin/language_tr.h View File

@@ -106,6 +106,7 @@
106 106
 #define MSG_PID_C                           _UxGT("PID-C")                                              // PID-C
107 107
 #define MSG_SELECT                          _UxGT("Seç")                                                // Seç
108 108
 #define MSG_ACC                             _UxGT("İvme")                                               // İvme
109
+#define MSG_JERK                            _UxGT("Jerk")
109 110
 #define MSG_VX_JERK                         _UxGT("Vx-Jerk")                                            // Vx-Jerk
110 111
 #define MSG_VY_JERK                         _UxGT("Vy-Jerk")                                            // Vy-Jerk
111 112
 #define MSG_VZ_JERK                         _UxGT("Vz-jerk")                                            // Vz-Jerk
@@ -116,6 +117,7 @@
116 117
 #define MSG_AMAX                            _UxGT("Amax ")                                              // Amax
117 118
 #define MSG_A_RETRACT                       _UxGT("A-retract")                                          // A-retract
118 119
 #define MSG_A_TRAVEL                        _UxGT("A-travel")                                           // A-travel
120
+#define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")                                           // Xsteps/mm
119 121
 #define MSG_XSTEPS                          _UxGT("Xsteps/mm")                                          // Xsteps/mm
120 122
 #define MSG_YSTEPS                          _UxGT("Ysteps/mm")                                          // Ysteps/mm
121 123
 #define MSG_ZSTEPS                          _UxGT("Zsteps/mm")                                          // Zsteps/mm

+ 2
- 0
Marlin/language_uk.h View File

@@ -95,6 +95,7 @@
95 95
 #define MSG_PID_C                           _UxGT("PID-C")
96 96
 #define MSG_SELECT                          _UxGT("Вибрати")
97 97
 #define MSG_ACC                             _UxGT("Приск.")
98
+#define MSG_JERK                            _UxGT("Ривок")
98 99
 #define MSG_VX_JERK                         _UxGT("Vx-ривок")
99 100
 #define MSG_VY_JERK                         _UxGT("Vy-ривок")
100 101
 #define MSG_VZ_JERK                         _UxGT("Vz-ривок")
@@ -105,6 +106,7 @@
105 106
 #define MSG_AMAX                            _UxGT("Aмакс ")
106 107
 #define MSG_A_RETRACT                       _UxGT("A-втягув.")
107 108
 #define MSG_A_TRAVEL                        _UxGT("A-руху")
109
+#define MSG_STEPS_PER_MM                    _UxGT("Кроків/мм")
108 110
 #define MSG_XSTEPS                          _UxGT("Xкроків/мм")
109 111
 #define MSG_YSTEPS                          _UxGT("Yкроків/мм")
110 112
 #define MSG_ZSTEPS                          _UxGT("Zкроків/мм")

+ 2
- 0
Marlin/language_zh_CN.h View File

@@ -92,6 +92,7 @@
92 92
 #define MSG_PID_C                           _UxGT("PID-C")  //"PID-C"
93 93
 #define MSG_SELECT                          _UxGT("选择")  //"Select"
94 94
 #define MSG_ACC                             _UxGT("加速度")  //"Accel" acceleration
95
+#define MSG_JERK                            _UxGT("抖动速率")  // "Jerk"
95 96
 #define MSG_VX_JERK                         _UxGT("X轴抖动速率")  //"Vx-jerk"
96 97
 #define MSG_VY_JERK                         _UxGT("Y轴抖动速率")  //"Vy-jerk"
97 98
 #define MSG_VZ_JERK                         _UxGT("Z轴抖动速率")  //"Vz-jerk"
@@ -102,6 +103,7 @@
102 103
 #define MSG_AMAX                            _UxGT("最大打印加速度")  //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
103 104
 #define MSG_A_RETRACT                       _UxGT("收进加速度")  //"A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
104 105
 #define MSG_A_TRAVEL                        _UxGT("非打印移动加速度")  //"A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
106
+#define MSG_STEPS_PER_MM                    _UxGT("轴步数/mm")  //"Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
105 107
 #define MSG_XSTEPS                          _UxGT("X轴步数/mm")  //"Xsteps/mm" axis_steps_per_mm, axis steps-per-unit G92
106 108
 #define MSG_YSTEPS                          _UxGT("Y轴步数/mm")  //"Ysteps/mm"
107 109
 #define MSG_ZSTEPS                          _UxGT("Z轴步数/mm")  //"Zsteps/mm"

+ 2
- 0
Marlin/language_zh_TW.h View File

@@ -92,6 +92,7 @@
92 92
 #define MSG_PID_C                           _UxGT("PID-C")  //"PID-C"
93 93
 #define MSG_SELECT                          _UxGT("選擇")  //"Select"
94 94
 #define MSG_ACC                             _UxGT("加速度")  //"Accel" acceleration
95
+#define MSG_JERK                            _UxGT("抖動速率")  //"Jerk"
95 96
 #define MSG_VX_JERK                         _UxGT("X軸抖動速率")  //"Vx-jerk"
96 97
 #define MSG_VY_JERK                         _UxGT("Y軸抖動速率")  //"Vy-jerk"
97 98
 #define MSG_VZ_JERK                         _UxGT("Z軸抖動速率")  //"Vz-jerk"
@@ -102,6 +103,7 @@
102 103
 #define MSG_AMAX                            _UxGT("最大列印加速度")  //"Amax " max_acceleration_mm_per_s2, acceleration in units/s^2 for print moves
103 104
 #define MSG_A_RETRACT                       _UxGT("收進加速度")  //"A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
104 105
 #define MSG_A_TRAVEL                        _UxGT("非列印移動加速度")  //"A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
106
+#define MSG_STEPS_PER_MM                    _UxGT("軸步數/mm")  //"Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
105 107
 #define MSG_XSTEPS                          _UxGT("X軸步數/mm")  //"Xsteps/mm" axis_steps_per_mm, axis steps-per-unit G92
106 108
 #define MSG_YSTEPS                          _UxGT("Y軸步數/mm")  //"Ysteps/mm"
107 109
 #define MSG_ZSTEPS                          _UxGT("Z軸步數/mm")  //"Zsteps/mm"

+ 87
- 36
Marlin/ultralcd.cpp View File

@@ -2746,6 +2746,13 @@ void kill_screen(const char* lcd_msg) {
2746 2746
    */
2747 2747
   void lcd_control_temperature_preheat_material2_settings_menu() { _lcd_control_temperature_preheat_settings_menu(1); }
2748 2748
 
2749
+
2750
+  /**
2751
+   *
2752
+   * "Control" > "Motion" submenu
2753
+   *
2754
+   */
2755
+
2749 2756
   void _reset_acceleration_rates() { planner.reset_acceleration_rates(); }
2750 2757
   #if ENABLED(DISTINCT_E_FACTORS)
2751 2758
     void _reset_e_acceleration_rate(const uint8_t e) { if (e == active_extruder) _reset_acceleration_rates(); }
@@ -2783,40 +2790,16 @@ void kill_screen(const char* lcd_msg) {
2783 2790
     #endif // E_STEPPERS > 2
2784 2791
   #endif
2785 2792
 
2786
-  /**
2787
-   *
2788
-   * "Control" > "Motion" submenu
2789
-   *
2790
-   */
2791 2793
   #if HAS_BED_PROBE && DISABLED(BABYSTEP_ZPROBE_OFFSET)
2792 2794
     static void lcd_refresh_zprobe_zoffset() { refresh_zprobe_zoffset(); }
2793 2795
   #endif
2794 2796
 
2795
-  void lcd_control_motion_menu() {
2797
+  // M203 / M205 Feedrates
2798
+  void lcd_control_motion_feedrate_menu() {
2796 2799
     START_MENU();
2797
-    MENU_BACK(MSG_CONTROL);
2798
-    #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
2799
-      MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
2800
-    #elif HAS_BED_PROBE
2801
-      MENU_ITEM_EDIT_CALLBACK(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX, lcd_refresh_zprobe_zoffset);
2802
-    #endif
2803
-    // Manual bed leveling, Bed Z:
2804
-    #if ENABLED(MESH_BED_LEVELING) && ENABLED(LCD_BED_LEVELING)
2805
-      MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
2806
-    #endif
2807
-    MENU_ITEM_EDIT(float5, MSG_ACC, &planner.acceleration, 10, 99000);
2808
-    MENU_ITEM_EDIT(float3, MSG_VX_JERK, &planner.max_jerk[X_AXIS], 1, 990);
2809
-    MENU_ITEM_EDIT(float3, MSG_VY_JERK, &planner.max_jerk[Y_AXIS], 1, 990);
2810
-    #if ENABLED(DELTA)
2811
-      MENU_ITEM_EDIT(float3, MSG_VZ_JERK, &planner.max_jerk[Z_AXIS], 1, 990);
2812
-    #else
2813
-      MENU_ITEM_EDIT(float52, MSG_VZ_JERK, &planner.max_jerk[Z_AXIS], 0.1, 990);
2814
-    #endif
2815
-    MENU_ITEM_EDIT(float3, MSG_VE_JERK, &planner.max_jerk[E_AXIS], 1, 990);
2800
+    MENU_BACK(MSG_MOTION);
2816 2801
 
2817
-    //
2818
-    // M203 Settings
2819
-    //
2802
+    // M203 Max Feedrate
2820 2803
     MENU_ITEM_EDIT(float3, MSG_VMAX MSG_X, &planner.max_feedrate_mm_s[X_AXIS], 1, 999);
2821 2804
     MENU_ITEM_EDIT(float3, MSG_VMAX MSG_Y, &planner.max_feedrate_mm_s[Y_AXIS], 1, 999);
2822 2805
     MENU_ITEM_EDIT(float3, MSG_VMAX MSG_Z, &planner.max_feedrate_mm_s[Z_AXIS], 1, 999);
@@ -2838,12 +2821,30 @@ void kill_screen(const char* lcd_msg) {
2838 2821
       MENU_ITEM_EDIT(float3, MSG_VMAX MSG_E, &planner.max_feedrate_mm_s[E_AXIS], 1, 999);
2839 2822
     #endif
2840 2823
 
2824
+    // M205 S Min Feedrate
2841 2825
     MENU_ITEM_EDIT(float3, MSG_VMIN, &planner.min_feedrate_mm_s, 0, 999);
2826
+
2827
+    // M205 T Min Travel Feedrate
2842 2828
     MENU_ITEM_EDIT(float3, MSG_VTRAV_MIN, &planner.min_travel_feedrate_mm_s, 0, 999);
2843 2829
 
2844
-    //
2845
-    // M201 Settings
2846
-    //
2830
+    END_MENU();
2831
+  }
2832
+
2833
+  // M201 / M204 Accelerations
2834
+  void lcd_control_motion_acceleration_menu() {
2835
+    START_MENU();
2836
+    MENU_BACK(MSG_MOTION);
2837
+
2838
+    // M204 P Acceleration
2839
+    MENU_ITEM_EDIT(float5, MSG_ACC, &planner.acceleration, 10, 99000);
2840
+
2841
+    // M204 R Retract Acceleration
2842
+    MENU_ITEM_EDIT(float5, MSG_A_RETRACT, &planner.retract_acceleration, 100, 99000);
2843
+
2844
+    // M204 T Travel Acceleration
2845
+    MENU_ITEM_EDIT(float5, MSG_A_TRAVEL, &planner.travel_acceleration, 100, 99000);
2846
+
2847
+    // M201 settings
2847 2848
     MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_X, &planner.max_acceleration_mm_per_s2[X_AXIS], 100, 99000, _reset_acceleration_rates);
2848 2849
     MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_Y, &planner.max_acceleration_mm_per_s2[Y_AXIS], 100, 99000, _reset_acceleration_rates);
2849 2850
     MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_Z, &planner.max_acceleration_mm_per_s2[Z_AXIS], 10, 99000, _reset_acceleration_rates);
@@ -2865,12 +2866,31 @@ void kill_screen(const char* lcd_msg) {
2865 2866
       MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_E, &planner.max_acceleration_mm_per_s2[E_AXIS], 100, 99000, _reset_acceleration_rates);
2866 2867
     #endif
2867 2868
 
2868
-    MENU_ITEM_EDIT(float5, MSG_A_RETRACT, &planner.retract_acceleration, 100, 99000);
2869
-    MENU_ITEM_EDIT(float5, MSG_A_TRAVEL, &planner.travel_acceleration, 100, 99000);
2869
+    END_MENU();
2870
+  }
2871
+
2872
+  // M205 Jerk
2873
+  void lcd_control_motion_jerk_menu() {
2874
+    START_MENU();
2875
+    MENU_BACK(MSG_MOTION);
2876
+
2877
+    MENU_ITEM_EDIT(float3, MSG_VX_JERK, &planner.max_jerk[X_AXIS], 1, 990);
2878
+    MENU_ITEM_EDIT(float3, MSG_VY_JERK, &planner.max_jerk[Y_AXIS], 1, 990);
2879
+    #if ENABLED(DELTA)
2880
+      MENU_ITEM_EDIT(float3, MSG_VZ_JERK, &planner.max_jerk[Z_AXIS], 1, 990);
2881
+    #else
2882
+      MENU_ITEM_EDIT(float52, MSG_VZ_JERK, &planner.max_jerk[Z_AXIS], 0.1, 990);
2883
+    #endif
2884
+    MENU_ITEM_EDIT(float3, MSG_VE_JERK, &planner.max_jerk[E_AXIS], 1, 990);
2885
+
2886
+    END_MENU();
2887
+  }
2888
+
2889
+  // M92 Steps-per-mm
2890
+  void lcd_control_motion_steps_per_mm_menu() {
2891
+    START_MENU();
2892
+    MENU_BACK(MSG_MOTION);
2870 2893
 
2871
-    //
2872
-    // M92 Settings
2873
-    //
2874 2894
     MENU_ITEM_EDIT_CALLBACK(float62, MSG_XSTEPS, &planner.axis_steps_per_mm[X_AXIS], 5, 9999, _planner_refresh_positioning);
2875 2895
     MENU_ITEM_EDIT_CALLBACK(float62, MSG_YSTEPS, &planner.axis_steps_per_mm[Y_AXIS], 5, 9999, _planner_refresh_positioning);
2876 2896
     MENU_ITEM_EDIT_CALLBACK(float62, MSG_ZSTEPS, &planner.axis_steps_per_mm[Z_AXIS], 5, 9999, _planner_refresh_positioning);
@@ -2892,9 +2912,40 @@ void kill_screen(const char* lcd_msg) {
2892 2912
       MENU_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS, &planner.axis_steps_per_mm[E_AXIS], 5, 9999, _planner_refresh_positioning);
2893 2913
     #endif
2894 2914
 
2915
+    END_MENU();
2916
+  }
2917
+
2918
+  void lcd_control_motion_menu() {
2919
+    START_MENU();
2920
+    MENU_BACK(MSG_CONTROL);
2921
+
2922
+    #if ENABLED(BABYSTEP_ZPROBE_OFFSET)
2923
+      MENU_ITEM(submenu, MSG_ZPROBE_ZOFFSET, lcd_babystep_zoffset);
2924
+    #elif HAS_BED_PROBE
2925
+      MENU_ITEM_EDIT_CALLBACK(float32, MSG_ZPROBE_ZOFFSET, &zprobe_zoffset, Z_PROBE_OFFSET_RANGE_MIN, Z_PROBE_OFFSET_RANGE_MAX, lcd_refresh_zprobe_zoffset);
2926
+    #endif
2927
+
2928
+    // Manual bed leveling, Bed Z:
2929
+    #if ENABLED(MESH_BED_LEVELING) && ENABLED(LCD_BED_LEVELING)
2930
+      MENU_ITEM_EDIT(float43, MSG_BED_Z, &mbl.z_offset, -1, 1);
2931
+    #endif
2932
+
2933
+    // M203 / M205 Feedrate items
2934
+    MENU_ITEM(submenu, MSG_FEEDRATE, lcd_control_motion_feedrate_menu);
2935
+
2936
+    // M201 Acceleration items
2937
+    MENU_ITEM(submenu, MSG_ACCELERATION, lcd_control_motion_acceleration_menu);
2938
+
2939
+    // M205 Max Jerk
2940
+    MENU_ITEM(submenu, MSG_JERK, lcd_control_motion_jerk_menu);
2941
+
2942
+    // M92 Steps Per mm
2943
+    MENU_ITEM(submenu, MSG_STEPS_PER_MM, lcd_control_motion_steps_per_mm_menu);
2944
+
2895 2945
     #if ENABLED(ABORT_ON_ENDSTOP_HIT_FEATURE_ENABLED)
2896 2946
       MENU_ITEM_EDIT(bool, MSG_ENDSTOP_ABORT, &stepper.abort_on_endstop_hit);
2897 2947
     #endif
2948
+
2898 2949
     END_MENU();
2899 2950
   }
2900 2951
 

Loading…
Cancel
Save