Ver código fonte

[2.0.x] Apply feedrate to nozzle movement for kinematic machines (#8778)

Thomas Moore 6 anos atrás
pai
commit
786746404b
41 arquivos alterados com 763 adições e 328 exclusões
  1. 3
    0
      Marlin/src/core/enum.h
  2. 11
    4
      Marlin/src/core/language.h
  3. 1
    0
      Marlin/src/core/macros.h
  4. 18
    6
      Marlin/src/lcd/language/language_an.h
  5. 9
    3
      Marlin/src/lcd/language/language_bg.h
  6. 18
    6
      Marlin/src/lcd/language/language_ca.h
  7. 9
    6
      Marlin/src/lcd/language/language_cn.h
  8. 18
    6
      Marlin/src/lcd/language/language_cz.h
  9. 18
    6
      Marlin/src/lcd/language/language_cz_utf8.h
  10. 18
    6
      Marlin/src/lcd/language/language_da.h
  11. 18
    6
      Marlin/src/lcd/language/language_de.h
  12. 19
    7
      Marlin/src/lcd/language/language_el-gr.h
  13. 19
    7
      Marlin/src/lcd/language/language_el.h
  14. 40
    16
      Marlin/src/lcd/language/language_en.h
  15. 18
    6
      Marlin/src/lcd/language/language_es.h
  16. 18
    6
      Marlin/src/lcd/language/language_eu.h
  17. 18
    6
      Marlin/src/lcd/language/language_fi.h
  18. 24
    12
      Marlin/src/lcd/language/language_fr.h
  19. 24
    12
      Marlin/src/lcd/language/language_fr_utf8.h
  20. 24
    12
      Marlin/src/lcd/language/language_gl.h
  21. 18
    6
      Marlin/src/lcd/language/language_hr.h
  22. 18
    6
      Marlin/src/lcd/language/language_it.h
  23. 51
    26
      Marlin/src/lcd/language/language_kana.h
  24. 9
    3
      Marlin/src/lcd/language/language_kana_utf8.h
  25. 19
    7
      Marlin/src/lcd/language/language_nl.h
  26. 18
    6
      Marlin/src/lcd/language/language_pl-DOGM.h
  27. 18
    6
      Marlin/src/lcd/language/language_pl-HD44780.h
  28. 18
    6
      Marlin/src/lcd/language/language_pt-br.h
  29. 18
    6
      Marlin/src/lcd/language/language_pt-br_utf8.h
  30. 20
    8
      Marlin/src/lcd/language/language_pt.h
  31. 19
    7
      Marlin/src/lcd/language/language_pt_utf8.h
  32. 18
    6
      Marlin/src/lcd/language/language_ru.h
  33. 18
    6
      Marlin/src/lcd/language/language_sk_utf8.h
  34. 19
    7
      Marlin/src/lcd/language/language_tr.h
  35. 18
    6
      Marlin/src/lcd/language/language_uk.h
  36. 18
    6
      Marlin/src/lcd/language/language_zh_CN.h
  37. 18
    6
      Marlin/src/lcd/language/language_zh_TW.h
  38. 13
    13
      Marlin/src/lcd/ultralcd.cpp
  39. 10
    6
      Marlin/src/module/motion.cpp
  40. 43
    39
      Marlin/src/module/planner.cpp
  41. 17
    13
      Marlin/src/module/planner.h

+ 3
- 0
Marlin/src/core/enum.h Ver arquivo

@@ -55,6 +55,9 @@ enum AxisEnum {
55 55
 #define LOOP_XYZ(VAR) LOOP_S_LE_N(VAR, X_AXIS, Z_AXIS)
56 56
 #define LOOP_XYZE(VAR) LOOP_S_LE_N(VAR, X_AXIS, E_AXIS)
57 57
 #define LOOP_XYZE_N(VAR) LOOP_S_L_N(VAR, X_AXIS, XYZE_N)
58
+#define LOOP_ABC(VAR) LOOP_S_LE_N(VAR, A_AXIS, C_AXIS)
59
+#define LOOP_ABCE(VAR) LOOP_S_LE_N(VAR, A_AXIS, E_AXIS)
60
+#define LOOP_ABCE_N(VAR) LOOP_S_L_N(VAR, A_AXIS, XYZE_N)
58 61
 
59 62
 typedef enum {
60 63
   LINEARUNIT_MM,

+ 11
- 4
Marlin/src/core/language.h Ver arquivo

@@ -208,10 +208,10 @@
208 208
 #define MSG_HOTEND_TOO_COLD                 "Hotend too cold"
209 209
 
210 210
 #define MSG_FILAMENT_CHANGE_HEAT            "Press button (or M108) to heat nozzle"
211
-#define MSG_FILAMENT_CHANGE_HEAT_LCD        "Press button to heat nozzle"
212
-#define MSG_FILAMENT_CHANGE_HEAT_M108       "Send M108 to heat nozzle"
213 211
 #define MSG_FILAMENT_CHANGE_INSERT          "Insert filament and press button (or M108)"
212
+#define MSG_FILAMENT_CHANGE_HEAT_LCD        "Press button to heat nozzle"
214 213
 #define MSG_FILAMENT_CHANGE_INSERT_LCD      "Insert filament and press button"
214
+#define MSG_FILAMENT_CHANGE_HEAT_M108       "Send M108 to heat nozzle"
215 215
 #define MSG_FILAMENT_CHANGE_INSERT_M108     "Insert filament and send M108"
216 216
 
217 217
 #define MSG_ERR_EEPROM_WRITE                "Error writing to EEPROM!"
@@ -238,8 +238,6 @@
238 238
 #define MSG_KP                              " Kp: "
239 239
 #define MSG_KI                              " Ki: "
240 240
 #define MSG_KD                              " Kd: "
241
-#define MSG_B                               "B:"
242
-#define MSG_T                               "T:"
243 241
 #define MSG_AT                              " @:"
244 242
 #define MSG_PID_AUTOTUNE_FINISHED           MSG_PID_AUTOTUNE " finished! Put the last Kp, Ki and Kd constants from below into Configuration.h"
245 243
 #define MSG_PID_DEBUG                       " PID_DEBUG "
@@ -280,6 +278,15 @@
280 278
 #define MSG_Y "Y"
281 279
 #define MSG_Z "Z"
282 280
 #define MSG_E "E"
281
+#if IS_KINEMATIC
282
+  #define MSG_A "A"
283
+  #define MSG_B "B"
284
+  #define MSG_C "C"
285
+#else
286
+  #define MSG_A "X"
287
+  #define MSG_B "Y"
288
+  #define MSG_C "Z"
289
+#endif
283 290
 #define MSG_H1 "1"
284 291
 #define MSG_H2 "2"
285 292
 #define MSG_H3 "3"

+ 1
- 0
Marlin/src/core/macros.h Ver arquivo

@@ -24,6 +24,7 @@
24 24
 #define MACROS_H
25 25
 
26 26
 #define NUM_AXIS 4
27
+#define ABCE 4
27 28
 #define XYZE 4
28 29
 #define ABC  3
29 30
 #define XYZ  3

+ 18
- 6
Marlin/src/lcd/language/language_an.h Ver arquivo

@@ -96,9 +96,15 @@
96 96
 #define MSG_SELECT                          _UxGT("Trigar")
97 97
 #define MSG_ACC                             _UxGT("Aceleracion")
98 98
 #define MSG_JERK                            _UxGT("Jerk")
99
-#define MSG_VX_JERK                         _UxGT("Vx-jerk")
100
-#define MSG_VY_JERK                         _UxGT("Vy-jerk")
101
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")
99
+#if IS_KINEMATIC
100
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
101
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
102
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
103
+#else
104
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
105
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
106
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
107
+#endif
102 108
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")
103 109
 #define MSG_VMAX                            _UxGT("Vmax")
104 110
 #define MSG_VMIN                            _UxGT("Vmin")
@@ -108,9 +114,15 @@
108 114
 #define MSG_A_RETRACT                       _UxGT("Acel. retrac.")
109 115
 #define MSG_A_TRAVEL                        _UxGT("Acel. Viaje")
110 116
 #define MSG_STEPS_PER_MM                    _UxGT("Trangos/mm")
111
-#define MSG_XSTEPS                          _UxGT("X trangos/mm")
112
-#define MSG_YSTEPS                          _UxGT("Y trangos/mm")
113
-#define MSG_ZSTEPS                          _UxGT("Z trangos/mm")
117
+#if IS_KINEMATIC
118
+  #define MSG_ASTEPS                        _UxGT("A trangos/mm")
119
+  #define MSG_BSTEPS                        _UxGT("B trangos/mm")
120
+  #define MSG_CSTEPS                        _UxGT("C trangos/mm")
121
+#else
122
+  #define MSG_ASTEPS                        _UxGT("X trangos/mm")
123
+  #define MSG_BSTEPS                        _UxGT("Y trangos/mm")
124
+  #define MSG_CSTEPS                        _UxGT("Z trangos/mm")
125
+#endif
114 126
 #define MSG_ESTEPS                          _UxGT("E trangos/mm")
115 127
 #define MSG_E1STEPS                         _UxGT("E1 trangos/mm")
116 128
 #define MSG_E2STEPS                         _UxGT("E2 trangos/mm")

+ 9
- 3
Marlin/src/lcd/language/language_bg.h Ver arquivo

@@ -83,9 +83,15 @@
83 83
 #define MSG_A_RETRACT                       _UxGT("A-откат")
84 84
 #define MSG_A_TRAVEL                        _UxGT("A-travel")
85 85
 #define MSG_STEPS_PER_MM                    _UxGT("Стъпки/mm")
86
-#define MSG_XSTEPS                          _UxGT("X стъпки/mm")
87
-#define MSG_YSTEPS                          _UxGT("Y стъпки/mm")
88
-#define MSG_ZSTEPS                          _UxGT("Z стъпки/mm")
86
+#if IS_KINEMATIC
87
+  #define MSG_ASTEPS                        _UxGT("Aстъпки/mm")
88
+  #define MSG_BSTEPS                        _UxGT("Bстъпки/mm")
89
+  #define MSG_CSTEPS                        _UxGT("Cстъпки/mm")
90
+#else
91
+  #define MSG_ASTEPS                        _UxGT("Xстъпки/mm")
92
+  #define MSG_BSTEPS                        _UxGT("Yстъпки/mm")
93
+  #define MSG_CSTEPS                        _UxGT("Zстъпки/mm")
94
+#endif
89 95
 #define MSG_ESTEPS                          _UxGT("E стъпки/mm")
90 96
 #define MSG_E1STEPS                         _UxGT("E1 стъпки/mm")
91 97
 #define MSG_E2STEPS                         _UxGT("E2 стъпки/mm")

+ 18
- 6
Marlin/src/lcd/language/language_ca.h Ver arquivo

@@ -100,9 +100,15 @@
100 100
 #define MSG_SELECT                          _UxGT("Select")
101 101
 #define MSG_ACC                             _UxGT("Accel")
102 102
 #define MSG_JERK                            _UxGT("Jerk")
103
-#define MSG_VX_JERK                         _UxGT("Vx-jerk")
104
-#define MSG_VY_JERK                         _UxGT("Vy-jerk")
105
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")
103
+#if IS_KINEMATIC
104
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
105
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
106
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
107
+#else
108
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
109
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
110
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
111
+#endif
106 112
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")
107 113
 #define MSG_VMAX                            _UxGT("Vmax ")
108 114
 #define MSG_VMIN                            _UxGT("Vmin")
@@ -111,9 +117,15 @@
111 117
 #define MSG_A_RETRACT                       _UxGT("Accel. retracc")
112 118
 #define MSG_A_TRAVEL                        _UxGT("Accel. Viatge")
113 119
 #define MSG_STEPS_PER_MM                    _UxGT("Passos/mm")
114
-#define MSG_XSTEPS                          _UxGT("Xpassos/mm")
115
-#define MSG_YSTEPS                          _UxGT("Ypassos/mm")
116
-#define MSG_ZSTEPS                          _UxGT("Zpassos/mm")
120
+#if IS_KINEMATIC
121
+  #define MSG_ASTEPS                        _UxGT("Apassos/mm")
122
+  #define MSG_BSTEPS                        _UxGT("Bpassos/mm")
123
+  #define MSG_CSTEPS                        _UxGT("Cpassos/mm")
124
+#else
125
+  #define MSG_ASTEPS                        _UxGT("Xpassos/mm")
126
+  #define MSG_BSTEPS                        _UxGT("Ypassos/mm")
127
+  #define MSG_CSTEPS                        _UxGT("Zpassos/mm")
128
+#endif
117 129
 #define MSG_ESTEPS                          _UxGT("Epassos/mm")
118 130
 #define MSG_E1STEPS                         _UxGT("E1passos/mm")
119 131
 #define MSG_E2STEPS                         _UxGT("E2passos/mm")

+ 9
- 6
Marlin/src/lcd/language/language_cn.h Ver arquivo

@@ -88,9 +88,15 @@
88 88
 #define MSG_PID_C                           "PID-C"
89 89
 #define MSG_ACC                             "Accel"
90 90
 #define MSG_JERK                            "Jerk"
91
-#define MSG_VX_JERK                         "Vx-jerk"
92
-#define MSG_VY_JERK                         "Vy-jerk"
93
-#define MSG_VZ_JERK                         "Vz-jerk"
91
+#if IS_KINEMATIC
92
+  #define MSG_VA_JERK                       "Va-jerk"
93
+  #define MSG_VB_JERK                       "Vb-jerk"
94
+  #define MSG_VC_JERK                       "Vc-jerk"
95
+#else
96
+  #define MSG_VA_JERK                       "Vx-jerk"
97
+  #define MSG_VB_JERK                       "Vy-jerk"
98
+  #define MSG_VC_JERK                       "Vz-jerk"
99
+#endif
94 100
 #define MSG_VE_JERK                         "Ve-jerk"
95 101
 #define MSG_VMAX                            "Vmax "
96 102
 #define MSG_VMIN                            "Vmin"
@@ -99,9 +105,6 @@
99 105
 #define MSG_A_RETRACT                       "A-retract"
100 106
 #define MSG_A_TRAVEL                        "A-travel"
101 107
 #define MSG_STEPS_PER_MM                    "Steps/mm"
102
-#define MSG_XSTEPS                          "Xsteps/mm"
103
-#define MSG_YSTEPS                          "Ysteps/mm"
104
-#define MSG_ZSTEPS                          "Zsteps/mm"
105 108
 #define MSG_ESTEPS                          "Esteps/mm"
106 109
 #define MSG_E1STEPS                         "E1steps/mm"
107 110
 #define MSG_E2STEPS                         "E2steps/mm"

+ 18
- 6
Marlin/src/lcd/language/language_cz.h Ver arquivo

@@ -196,9 +196,15 @@
196 196
 #define MSG_SELECT                          _UxGT("Vybrat")
197 197
 #define MSG_ACC                             _UxGT("Zrychl")
198 198
 #define MSG_JERK                            _UxGT("Jerk")
199
-#define MSG_VX_JERK                         _UxGT("Vx-jerk")
200
-#define MSG_VY_JERK                         _UxGT("Vy-jerk")
201
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")
199
+#if IS_KINEMATIC
200
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
201
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
202
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
203
+#else
204
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
205
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
206
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
207
+#endif
202 208
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")
203 209
 #define MSG_VELOCITY                        _UxGT("Rychlost")
204 210
 #define MSG_VMAX                            _UxGT("Vmax ")
@@ -209,9 +215,15 @@
209 215
 #define MSG_A_RETRACT                       _UxGT("A-retrakt")
210 216
 #define MSG_A_TRAVEL                        _UxGT("A-prejezd")
211 217
 #define MSG_STEPS_PER_MM                    _UxGT("Kroku/mm")
212
-#define MSG_XSTEPS                          _UxGT("Xkroku/mm")
213
-#define MSG_YSTEPS                          _UxGT("Ykroku/mm")
214
-#define MSG_ZSTEPS                          _UxGT("Zkroku/mm")
218
+#if IS_KINEMATIC
219
+  #define MSG_ASTEPS                        _UxGT("Akroku/mm")
220
+  #define MSG_BSTEPS                        _UxGT("Bkroku/mm")
221
+  #define MSG_CSTEPS                        _UxGT("Ckroku/mm")
222
+#else
223
+  #define MSG_ASTEPS                        _UxGT("Xkroku/mm")
224
+  #define MSG_BSTEPS                        _UxGT("Ykroku/mm")
225
+  #define MSG_CSTEPS                        _UxGT("Zkroku/mm")
226
+#endif
215 227
 #define MSG_ESTEPS                          _UxGT("Ekroku/mm")
216 228
 #define MSG_E1STEPS                         _UxGT("E1kroku/mm")
217 229
 #define MSG_E2STEPS                         _UxGT("E2kroku/mm")

+ 18
- 6
Marlin/src/lcd/language/language_cz_utf8.h Ver arquivo

@@ -198,9 +198,15 @@
198 198
 #define MSG_SELECT                          _UxGT("Vybrat")
199 199
 #define MSG_ACC                             _UxGT("Zrychl")
200 200
 #define MSG_JERK                            _UxGT("Jerk")
201
-#define MSG_VX_JERK                         _UxGT("Vx-jerk")
202
-#define MSG_VY_JERK                         _UxGT("Vy-jerk")
203
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")
201
+#if IS_KINEMATIC
202
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
203
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
204
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
205
+#else
206
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
207
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
208
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
209
+#endif
204 210
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")
205 211
 #define MSG_VELOCITY                        _UxGT("Rychlost")
206 212
 #define MSG_VMAX                            _UxGT("Vmax ")
@@ -211,9 +217,15 @@
211 217
 #define MSG_A_RETRACT                       _UxGT("A-retrakt")
212 218
 #define MSG_A_TRAVEL                        _UxGT("A-přejezd")
213 219
 #define MSG_STEPS_PER_MM                    _UxGT("Kroků/mm")
214
-#define MSG_XSTEPS                          _UxGT("Xkroků/mm")
215
-#define MSG_YSTEPS                          _UxGT("Ykroků/mm")
216
-#define MSG_ZSTEPS                          _UxGT("Zkroků/mm")
220
+#if IS_KINEMATIC
221
+  #define MSG_ASTEPS                        _UxGT("Akroků/mm")
222
+  #define MSG_BSTEPS                        _UxGT("Bkroků/mm")
223
+  #define MSG_CSTEPS                        _UxGT("Ckroků/mm")
224
+#else
225
+  #define MSG_ASTEPS                        _UxGT("Xkroků/mm")
226
+  #define MSG_BSTEPS                        _UxGT("Ykroků/mm")
227
+  #define MSG_CSTEPS                        _UxGT("Zkroků/mm")
228
+#endif
217 229
 #define MSG_ESTEPS                          _UxGT("Ekroků/mm")
218 230
 #define MSG_E1STEPS                         _UxGT("E1kroků/mm")
219 231
 #define MSG_E2STEPS                         _UxGT("E2kroků/mm")

+ 18
- 6
Marlin/src/lcd/language/language_da.h Ver arquivo

@@ -97,9 +97,15 @@
97 97
 #define MSG_SELECT                          _UxGT("Vælg")
98 98
 #define MSG_ACC                             _UxGT("Accel")
99 99
 #define MSG_JERK                            _UxGT("Jerk")
100
-#define MSG_VX_JERK                         _UxGT("Vx-jerk")
101
-#define MSG_VY_JERK                         _UxGT("Vy-jerk")
102
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")
100
+#if IS_KINEMATIC
101
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
102
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
103
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
104
+#else
105
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
106
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
107
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
108
+#endif
103 109
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")
104 110
 #define MSG_VMAX                            _UxGT("Vmax ")
105 111
 #define MSG_VMIN                            _UxGT("Vmin")
@@ -108,9 +114,15 @@
108 114
 #define MSG_A_RETRACT                       _UxGT("A-retract")
109 115
 #define MSG_A_TRAVEL                        _UxGT("A-rejse")
110 116
 #define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")
111
-#define MSG_XSTEPS                          _UxGT("Xsteps/mm")
112
-#define MSG_YSTEPS                          _UxGT("Ysteps/mm")
113
-#define MSG_ZSTEPS                          _UxGT("Zsteps/mm")
117
+#if IS_KINEMATIC
118
+  #define MSG_ASTEPS                        _UxGT("Asteps/mm")
119
+  #define MSG_BSTEPS                        _UxGT("Bsteps/mm")
120
+  #define MSG_CSTEPS                        _UxGT("Csteps/mm")
121
+#else
122
+  #define MSG_ASTEPS                        _UxGT("Xsteps/mm")
123
+  #define MSG_BSTEPS                        _UxGT("Ysteps/mm")
124
+  #define MSG_CSTEPS                        _UxGT("Zsteps/mm")
125
+#endif
114 126
 #define MSG_ESTEPS                          _UxGT("Esteps/mm")
115 127
 #define MSG_E1STEPS                         _UxGT("E1steps/mm")
116 128
 #define MSG_E2STEPS                         _UxGT("E2steps/mm")

+ 18
- 6
Marlin/src/lcd/language/language_de.h Ver arquivo

@@ -110,9 +110,15 @@
110 110
 #define MSG_SELECT                          _UxGT("Auswählen")
111 111
 #define MSG_ACC                             _UxGT("A")
112 112
 #define MSG_JERK                            _UxGT("Jerk")
113
-#define MSG_VX_JERK                         _UxGT("V X Jerk")
114
-#define MSG_VY_JERK                         _UxGT("V Y Jerk")
115
-#define MSG_VZ_JERK                         _UxGT("V Z Jerk")
113
+#if IS_KINEMATIC
114
+  #define MSG_VA_JERK                       _UxGT("V A Jerk")
115
+  #define MSG_VB_JERK                       _UxGT("V B Jerk")
116
+  #define MSG_VC_JERK                       _UxGT("V C Jerk")
117
+#else
118
+  #define MSG_VA_JERK                       _UxGT("V X Jerk")
119
+  #define MSG_VB_JERK                       _UxGT("V Y Jerk")
120
+  #define MSG_VC_JERK                       _UxGT("V Z Jerk")
121
+#endif
116 122
 #define MSG_VE_JERK                         _UxGT("V E Jerk")
117 123
 #define MSG_VELOCITY                        _UxGT("Geschwindigkeit")
118 124
 #define MSG_VMAX                            _UxGT("V max ") // space by purpose
@@ -123,9 +129,15 @@
123 129
 #define MSG_A_RETRACT                       _UxGT("A Retract")
124 130
 #define MSG_A_TRAVEL                        _UxGT("A Leerfahrt")
125 131
 #define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")
126
-#define MSG_XSTEPS                          _UxGT("X Steps/mm")
127
-#define MSG_YSTEPS                          _UxGT("Y Steps/mm")
128
-#define MSG_ZSTEPS                          _UxGT("Z Steps/mm")
132
+#if IS_KINEMATIC
133
+  #define MSG_ASTEPS                        _UxGT("A Steps/mm")
134
+  #define MSG_BSTEPS                        _UxGT("B Steps/mm")
135
+  #define MSG_CSTEPS                        _UxGT("C Steps/mm")
136
+#else
137
+  #define MSG_ASTEPS                        _UxGT("X Steps/mm")
138
+  #define MSG_BSTEPS                        _UxGT("Y Steps/mm")
139
+  #define MSG_CSTEPS                        _UxGT("Z Steps/mm")
140
+#endif
129 141
 #define MSG_ESTEPS                          _UxGT("E Steps/mm")
130 142
 #define MSG_E1STEPS                         _UxGT("E1 Steps/mm")
131 143
 #define MSG_E2STEPS                         _UxGT("E2 Steps/mm")

+ 19
- 7
Marlin/src/lcd/language/language_el-gr.h Ver arquivo

@@ -95,10 +95,16 @@
95 95
 #define MSG_PID_C                           _UxGT("PID-C")
96 96
 #define MSG_ACC                             _UxGT("Επιτάχυνση")
97 97
 #define MSG_JERK                            _UxGT("Vαντίδραση")
98
-#define MSG_VX_JERK                         _UxGT("Vαντίδραση x")
99
-#define MSG_VY_JERK                         _UxGT("Vαντίδραση y")
100
-#define MSG_VZ_JERK                         _UxGT("Vαντίδραση z")
101
-#define MSG_VE_JERK                         _UxGT("Vαντίδραση e")
98
+#if IS_KINEMATIC
99
+  #define MSG_VA_JERK                       _UxGT("Vαντίδραση A")
100
+  #define MSG_VB_JERK                       _UxGT("Vαντίδραση B")
101
+  #define MSG_VC_JERK                       _UxGT("Vαντίδραση C")
102
+#else
103
+  #define MSG_VA_JERK                       _UxGT("Vαντίδραση X")
104
+  #define MSG_VB_JERK                       _UxGT("Vαντίδραση Y")
105
+  #define MSG_VC_JERK                       _UxGT("Vαντίδραση Z")
106
+#endif
107
+#define MSG_VE_JERK                         _UxGT("Vαντίδραση E")
102 108
 #define MSG_VMAX                            _UxGT("Vμεγ ")
103 109
 #define MSG_VMIN                            _UxGT("Vελαχ")
104 110
 #define MSG_VTRAV_MIN                       _UxGT("Vελάχ. μετατόπιση")
@@ -107,9 +113,15 @@
107 113
 #define MSG_A_RETRACT                       _UxGT("Α-ανάσυρση")
108 114
 #define MSG_A_TRAVEL                        _UxGT("Α-μετατόπιση")
109 115
 #define MSG_STEPS_PER_MM                    _UxGT("Bήματα ανά μμ")
110
-#define MSG_XSTEPS                          _UxGT("Bήματα X ανά μμ")
111
-#define MSG_YSTEPS                          _UxGT("Bήματα Υ ανά μμ")
112
-#define MSG_ZSTEPS                          _UxGT("Bήματα Ζ ανά μμ")
116
+#if IS_KINEMATIC
117
+  #define MSG_ASTEPS                        _UxGT("Bήματα A ανά μμ")
118
+  #define MSG_BSTEPS                        _UxGT("Bήματα B ανά μμ")
119
+  #define MSG_CSTEPS                        _UxGT("Bήματα C ανά μμ")
120
+#else
121
+  #define MSG_ASTEPS                        _UxGT("Bήματα X ανά μμ")
122
+  #define MSG_BSTEPS                        _UxGT("Bήματα Y ανά μμ")
123
+  #define MSG_CSTEPS                        _UxGT("Bήματα Z ανά μμ")
124
+#endif
113 125
 #define MSG_ESTEPS                          _UxGT("Bήματα Ε ανά μμ")
114 126
 #define MSG_E1STEPS                         _UxGT("Bήματα Ε1 ανά μμ")
115 127
 #define MSG_E2STEPS                         _UxGT("Bήματα Ε2 ανά μμ")

+ 19
- 7
Marlin/src/lcd/language/language_el.h Ver arquivo

@@ -95,10 +95,16 @@
95 95
 #define MSG_PID_C                           _UxGT("PID-C")
96 96
 #define MSG_ACC                             _UxGT("Επιτάχυνση")
97 97
 #define MSG_JERK                            _UxGT("Jerk")
98
-#define MSG_VX_JERK                         _UxGT("Vαντίδραση x")
99
-#define MSG_VY_JERK                         _UxGT("Vαντίδραση y")
100
-#define MSG_VZ_JERK                         _UxGT("Vαντίδραση z")
101
-#define MSG_VE_JERK                         _UxGT("Vαντίδραση e")
98
+#if IS_KINEMATIC
99
+  #define MSG_VA_JERK                       _UxGT("Vαντίδραση A")
100
+  #define MSG_VB_JERK                       _UxGT("Vαντίδραση B")
101
+  #define MSG_VC_JERK                       _UxGT("Vαντίδραση C")
102
+#else
103
+  #define MSG_VA_JERK                       _UxGT("Vαντίδραση X")
104
+  #define MSG_VB_JERK                       _UxGT("Vαντίδραση Y")
105
+  #define MSG_VC_JERK                       _UxGT("Vαντίδραση Z")
106
+#endif
107
+#define MSG_VE_JERK                         _UxGT("Vαντίδραση E")
102 108
 #define MSG_VMAX                            _UxGT("V Μέγιστο")
103 109
 #define MSG_VMIN                            _UxGT("V Ελάχιστο")
104 110
 #define MSG_VTRAV_MIN                       _UxGT("Vελάχ. μετατόπιση")
@@ -107,9 +113,15 @@
107 113
 #define MSG_A_RETRACT                       _UxGT("Α-ανάσυρση")
108 114
 #define MSG_A_TRAVEL                        _UxGT("Α-μετατόπιση")
109 115
 #define MSG_STEPS_PER_MM                    _UxGT("Bήματα ανά μμ")
110
-#define MSG_XSTEPS                          _UxGT("Bήματα X ανά μμ")
111
-#define MSG_YSTEPS                          _UxGT("Bήματα Υ ανά μμ")
112
-#define MSG_ZSTEPS                          _UxGT("Bήματα Ζ ανά μμ")
116
+#if IS_KINEMATIC
117
+  #define MSG_ASTEPS                        _UxGT("Bήματα A ανά μμ")
118
+  #define MSG_BSTEPS                        _UxGT("Bήματα B ανά μμ")
119
+  #define MSG_CSTEPS                        _UxGT("Bήματα C ανά μμ")
120
+#else
121
+  #define MSG_ASTEPS                        _UxGT("Bήματα X ανά μμ")
122
+  #define MSG_BSTEPS                        _UxGT("Bήματα Y ανά μμ")
123
+  #define MSG_CSTEPS                        _UxGT("Bήματα Z ανά μμ")
124
+#endif
113 125
 #define MSG_ESTEPS                          _UxGT("Bήματα Ε ανά μμ")
114 126
 #define MSG_E1STEPS                         _UxGT("Bήματα Ε1 ανά μμ")
115 127
 #define MSG_E2STEPS                         _UxGT("Bήματα Ε2 ανά μμ")

+ 40
- 16
Marlin/src/lcd/language/language_en.h Ver arquivo

@@ -509,14 +509,26 @@
509 509
 #ifndef MSG_JERK
510 510
   #define MSG_JERK                            _UxGT("Jerk")
511 511
 #endif
512
-#ifndef MSG_VX_JERK
513
-  #define MSG_VX_JERK                         _UxGT("Vx-jerk")
514
-#endif
515
-#ifndef MSG_VY_JERK
516
-  #define MSG_VY_JERK                         _UxGT("Vy-jerk")
517
-#endif
518
-#ifndef MSG_VZ_JERK
519
-  #define MSG_VZ_JERK                         _UxGT("Vz-jerk")
512
+#if IS_KINEMATIC
513
+  #ifndef MSG_VA_JERK
514
+    #define MSG_VA_JERK                       _UxGT("Va-jerk")
515
+  #endif
516
+  #ifndef MSG_VB_JERK
517
+    #define MSG_VB_JERK                       _UxGT("Vb-jerk")
518
+  #endif
519
+  #ifndef MSG_VC_JERK
520
+    #define MSG_VC_JERK                       _UxGT("Vc-jerk")
521
+  #endif
522
+#else
523
+  #ifndef MSG_VA_JERK
524
+    #define MSG_VA_JERK                       _UxGT("Vx-jerk")
525
+  #endif
526
+  #ifndef MSG_VB_JERK
527
+    #define MSG_VB_JERK                       _UxGT("Vy-jerk")
528
+  #endif
529
+  #ifndef MSG_VC_JERK
530
+    #define MSG_VC_JERK                       _UxGT("Vz-jerk")
531
+  #endif
520 532
 #endif
521 533
 #ifndef MSG_VE_JERK
522 534
   #define MSG_VE_JERK                         _UxGT("Ve-jerk")
@@ -548,14 +560,26 @@
548 560
 #ifndef MSG_STEPS_PER_MM
549 561
   #define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")
550 562
 #endif
551
-#ifndef MSG_XSTEPS
552
-  #define MSG_XSTEPS                          _UxGT("Xsteps/mm")
553
-#endif
554
-#ifndef MSG_YSTEPS
555
-  #define MSG_YSTEPS                          _UxGT("Ysteps/mm")
556
-#endif
557
-#ifndef MSG_ZSTEPS
558
-  #define MSG_ZSTEPS                          _UxGT("Zsteps/mm")
563
+#if IS_KINEMATIC
564
+  #ifndef MSG_ASTEPS
565
+    #define MSG_ASTEPS                        _UxGT("Asteps/mm")
566
+  #endif
567
+  #ifndef MSG_BSTEPS
568
+    #define MSG_BSTEPS                        _UxGT("Bsteps/mm")
569
+  #endif
570
+  #ifndef MSG_CSTEPS
571
+    #define MSG_CSTEPS                        _UxGT("Csteps/mm")
572
+  #endif
573
+#else
574
+  #ifndef MSG_ASTEPS
575
+    #define MSG_ASTEPS                        _UxGT("Xsteps/mm")
576
+  #endif
577
+  #ifndef MSG_BSTEPS
578
+    #define MSG_BSTEPS                        _UxGT("Ysteps/mm")
579
+  #endif
580
+  #ifndef MSG_CSTEPS
581
+    #define MSG_CSTEPS                        _UxGT("Zsteps/mm")
582
+  #endif
559 583
 #endif
560 584
 #ifndef MSG_ESTEPS
561 585
   #define MSG_ESTEPS                          _UxGT("Esteps/mm")

+ 18
- 6
Marlin/src/lcd/language/language_es.h Ver arquivo

@@ -103,9 +103,15 @@
103 103
 #define MSG_SELECT                          _UxGT("Seleccionar")
104 104
 #define MSG_ACC                             _UxGT("Aceleracion")
105 105
 #define MSG_JERK                            _UxGT("Jerk")
106
-#define MSG_VX_JERK                         _UxGT("Vx-jerk")
107
-#define MSG_VY_JERK                         _UxGT("Vy-jerk")
108
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")
106
+#if IS_KINEMATIC
107
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
108
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
109
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
110
+#else
111
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
112
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
113
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
114
+#endif
109 115
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")
110 116
 #define MSG_VMAX                            _UxGT("Vmax")
111 117
 #define MSG_VMIN                            _UxGT("Vmin")
@@ -115,9 +121,15 @@
115 121
 #define MSG_A_RETRACT                       _UxGT("Acel. retrac.")
116 122
 #define MSG_A_TRAVEL                        _UxGT("Acel. Viaje")
117 123
 #define MSG_STEPS_PER_MM                    _UxGT("Pasos/mm")
118
-#define MSG_XSTEPS                          _UxGT("X pasos/mm")
119
-#define MSG_YSTEPS                          _UxGT("Y pasos/mm")
120
-#define MSG_ZSTEPS                          _UxGT("Z pasos/mm")
124
+#if IS_KINEMATIC
125
+  #define MSG_ASTEPS                        _UxGT("A pasos/mm")
126
+  #define MSG_BSTEPS                        _UxGT("B pasos/mm")
127
+  #define MSG_CSTEPS                        _UxGT("C pasos/mm")
128
+#else
129
+  #define MSG_ASTEPS                        _UxGT("X pasos/mm")
130
+  #define MSG_BSTEPS                        _UxGT("Y pasos/mm")
131
+  #define MSG_CSTEPS                        _UxGT("Z pasos/mm")
132
+#endif
121 133
 #define MSG_ESTEPS                          _UxGT("E pasos/mm")
122 134
 #define MSG_E1STEPS                         _UxGT("E1 pasos/mm")
123 135
 #define MSG_E2STEPS                         _UxGT("E2 pasos/mm")

+ 18
- 6
Marlin/src/lcd/language/language_eu.h Ver arquivo

@@ -103,9 +103,15 @@
103 103
 #define MSG_SELECT                          _UxGT("Aukeratu")
104 104
 #define MSG_ACC                             _UxGT("Azelerazioa")
105 105
 #define MSG_JERK                            _UxGT("Astindua")
106
-#define MSG_VX_JERK                         _UxGT("Vx-astindua")
107
-#define MSG_VY_JERK                         _UxGT("Vy-astindua")
108
-#define MSG_VZ_JERK                         _UxGT("Vz-astindua")
106
+#if IS_KINEMATIC
107
+  #define MSG_VA_JERK                       _UxGT("Va-astindua")
108
+  #define MSG_VB_JERK                       _UxGT("Vb-astindua")
109
+  #define MSG_VC_JERK                       _UxGT("Vc-astindua")
110
+#else
111
+  #define MSG_VA_JERK                       _UxGT("Vx-astindua")
112
+  #define MSG_VB_JERK                       _UxGT("Vy-astindua")
113
+  #define MSG_VC_JERK                       _UxGT("Vz-astindua")
114
+#endif
109 115
 #define MSG_VE_JERK                         _UxGT("Ve-astindua")
110 116
 #define MSG_VMAX                            _UxGT("Vmax ")
111 117
 #define MSG_VMIN                            _UxGT("Vmin")
@@ -115,9 +121,15 @@
115 121
 #define MSG_A_RETRACT                       _UxGT("A-retrakt")
116 122
 #define MSG_A_TRAVEL                        _UxGT("A-bidaia")
117 123
 #define MSG_STEPS_PER_MM                    _UxGT("Pausoak/mm")
118
-#define MSG_XSTEPS                          _UxGT("X pausoak/mm")
119
-#define MSG_YSTEPS                          _UxGT("Y pausoak/mm")
120
-#define MSG_ZSTEPS                          _UxGT("Z pausoak/mm")
124
+#if IS_KINEMATIC
125
+  #define MSG_ASTEPS                        _UxGT("A pausoak/mm")
126
+  #define MSG_BSTEPS                        _UxGT("B pausoak/mm")
127
+  #define MSG_CSTEPS                        _UxGT("C pausoak/mm")
128
+#else
129
+  #define MSG_ASTEPS                        _UxGT("X pausoak/mm")
130
+  #define MSG_BSTEPS                        _UxGT("Y pausoak/mm")
131
+  #define MSG_CSTEPS                        _UxGT("Z pausoak/mm")
132
+#endif
121 133
 #define MSG_ESTEPS                          _UxGT("E pausoak/mm")
122 134
 #define MSG_E1STEPS                         _UxGT("E1 pausoak/mm")
123 135
 #define MSG_E2STEPS                         _UxGT("E2 pausoak/mm")

+ 18
- 6
Marlin/src/lcd/language/language_fi.h Ver arquivo

@@ -87,9 +87,15 @@
87 87
 #define MSG_PID_C                           _UxGT("PID-C")
88 88
 #define MSG_ACC                             _UxGT("Kiihtyv")
89 89
 #define MSG_JERK                            _UxGT("Jerk")
90
-#define MSG_VX_JERK                         _UxGT("Vx-jerk")
91
-#define MSG_VY_JERK                         _UxGT("Vy-jerk")
92
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")
90
+#if IS_KINEMATIC
91
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
92
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
93
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
94
+#else
95
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
96
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
97
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
98
+#endif
93 99
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")
94 100
 #define MSG_VMAX                            _UxGT("Vmax ")
95 101
 #define MSG_VMIN                            _UxGT("Vmin")
@@ -98,9 +104,15 @@
98 104
 #define MSG_AMAX                            _UxGT("Amax ")
99 105
 #define MSG_A_RETRACT                       _UxGT("A-peruuta")
100 106
 #define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")
101
-#define MSG_XSTEPS                          _UxGT("Xsteps/mm")
102
-#define MSG_YSTEPS                          _UxGT("Ysteps/mm")
103
-#define MSG_ZSTEPS                          _UxGT("Zsteps/mm")
107
+#if IS_KINEMATIC
108
+  #define MSG_ASTEPS                        _UxGT("Asteps/mm")
109
+  #define MSG_BSTEPS                        _UxGT("Bsteps/mm")
110
+  #define MSG_CSTEPS                        _UxGT("Csteps/mm")
111
+#else
112
+  #define MSG_ASTEPS                        _UxGT("Xsteps/mm")
113
+  #define MSG_BSTEPS                        _UxGT("Ysteps/mm")
114
+  #define MSG_CSTEPS                        _UxGT("Zsteps/mm")
115
+#endif
104 116
 #define MSG_ESTEPS                          _UxGT("Esteps/mm")
105 117
 #define MSG_E1STEPS                         _UxGT("E1steps/mm")
106 118
 #define MSG_E2STEPS                         _UxGT("E2steps/mm")

+ 24
- 12
Marlin/src/lcd/language/language_fr.h Ver arquivo

@@ -166,9 +166,15 @@
166 166
 #define MSG_SELECT                          _UxGT("Selectionner")
167 167
 #define MSG_ACC                             _UxGT("Acceleration")
168 168
 #define MSG_JERK                            _UxGT("Jerk")
169
-#define MSG_VX_JERK                         _UxGT("Vx-jerk")
170
-#define MSG_VY_JERK                         _UxGT("Vy-jerk")
171
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")
169
+#if IS_KINEMATIC
170
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
171
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
172
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
173
+#else
174
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
175
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
176
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
177
+#endif
172 178
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")
173 179
 #define MSG_VELOCITY                        _UxGT("Velocite")
174 180
 #define MSG_VMAX                            _UxGT("Vmax")
@@ -179,15 +185,21 @@
179 185
 #define MSG_A_RETRACT                       _UxGT("A-retract")
180 186
 #define MSG_A_TRAVEL                        _UxGT("A-Depl.")
181 187
 #define MSG_STEPS_PER_MM                    _UxGT("Pas/mm")
182
-#define MSG_XSTEPS                          _UxGT("Xpas/mm")
183
-#define MSG_YSTEPS                          _UxGT("Ypas/mm")
184
-#define MSG_ZSTEPS                          _UxGT("Zpas/mm")
185
-#define MSG_ESTEPS                          _UxGT("Epas/mm")
186
-#define MSG_E1STEPS                         _UxGT("E1pas/mm")
187
-#define MSG_E2STEPS                         _UxGT("E2pas/mm")
188
-#define MSG_E3STEPS                         _UxGT("E3pas/mm")
189
-#define MSG_E4STEPS                         _UxGT("E4pas/mm")
190
-#define MSG_E5STEPS                         _UxGT("E5pas/mm")
188
+#if IS_KINEMATIC
189
+  #define MSG_ASTEPS                        _UxGT("A pas/mm")
190
+  #define MSG_BSTEPS                        _UxGT("B pas/mm")
191
+  #define MSG_CSTEPS                        _UxGT("C pas/mm")
192
+#else
193
+  #define MSG_ASTEPS                        _UxGT("X pas/mm")
194
+  #define MSG_BSTEPS                        _UxGT("Y pas/mm")
195
+  #define MSG_CSTEPS                        _UxGT("Z pas/mm")
196
+#endif
197
+#define MSG_ESTEPS                          _UxGT("E pas/mm")
198
+#define MSG_E1STEPS                         _UxGT("E1 pas/mm")
199
+#define MSG_E2STEPS                         _UxGT("E2 pas/mm")
200
+#define MSG_E3STEPS                         _UxGT("E3 pas/mm")
201
+#define MSG_E4STEPS                         _UxGT("E4 pas/mm")
202
+#define MSG_E5STEPS                         _UxGT("E5 pas/mm")
191 203
 #define MSG_TEMPERATURE                     _UxGT("Temperature")
192 204
 #define MSG_MOTION                          _UxGT("Mouvement")
193 205
 #define MSG_FILAMENT                        _UxGT("Filament")

+ 24
- 12
Marlin/src/lcd/language/language_fr_utf8.h Ver arquivo

@@ -166,9 +166,15 @@
166 166
 #define MSG_SELECT                          _UxGT("Sélectionner")
167 167
 #define MSG_ACC                             _UxGT("Accélération")
168 168
 #define MSG_JERK                            _UxGT("Jerk")
169
-#define MSG_VX_JERK                         _UxGT("Vx-jerk")
170
-#define MSG_VY_JERK                         _UxGT("Vy-jerk")
171
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")
169
+#if IS_KINEMATIC
170
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
171
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
172
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
173
+#else
174
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
175
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
176
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
177
+#endif
172 178
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")
173 179
 #define MSG_VELOCITY                        _UxGT("Vélocité")
174 180
 #define MSG_VMAX                            _UxGT("Vmax")
@@ -179,15 +185,21 @@
179 185
 #define MSG_A_RETRACT                       _UxGT("A-retract")
180 186
 #define MSG_A_TRAVEL                        _UxGT("A-Dépl.")
181 187
 #define MSG_STEPS_PER_MM                    _UxGT("Pas/mm")
182
-#define MSG_XSTEPS                          _UxGT("Xpas/mm")
183
-#define MSG_YSTEPS                          _UxGT("Ypas/mm")
184
-#define MSG_ZSTEPS                          _UxGT("Zpas/mm")
185
-#define MSG_ESTEPS                          _UxGT("Epas/mm")
186
-#define MSG_E1STEPS                         _UxGT("E1pas/mm")
187
-#define MSG_E2STEPS                         _UxGT("E2pas/mm")
188
-#define MSG_E3STEPS                         _UxGT("E3pas/mm")
189
-#define MSG_E4STEPS                         _UxGT("E4pas/mm")
190
-#define MSG_E5STEPS                         _UxGT("E5pas/mm")
188
+#if IS_KINEMATIC
189
+  #define MSG_ASTEPS                        _UxGT("A pas/mm")
190
+  #define MSG_BSTEPS                        _UxGT("B pas/mm")
191
+  #define MSG_CSTEPS                        _UxGT("C pas/mm")
192
+#else
193
+  #define MSG_ASTEPS                        _UxGT("X pas/mm")
194
+  #define MSG_BSTEPS                        _UxGT("Y pas/mm")
195
+  #define MSG_CSTEPS                        _UxGT("Z pas/mm")
196
+#endif
197
+#define MSG_ESTEPS                          _UxGT("E pas/mm")
198
+#define MSG_E1STEPS                         _UxGT("E1 pas/mm")
199
+#define MSG_E2STEPS                         _UxGT("E2 pas/mm")
200
+#define MSG_E3STEPS                         _UxGT("E3 pas/mm")
201
+#define MSG_E4STEPS                         _UxGT("E4 pas/mm")
202
+#define MSG_E5STEPS                         _UxGT("E5 pas/mm")
191 203
 #define MSG_TEMPERATURE                     _UxGT("Température")
192 204
 #define MSG_MOTION                          _UxGT("Mouvement")
193 205
 #define MSG_FILAMENT                        _UxGT("Filament")

+ 24
- 12
Marlin/src/lcd/language/language_gl.h Ver arquivo

@@ -97,9 +97,15 @@
97 97
 #define MSG_SELECT                          _UxGT("Escolla")
98 98
 #define MSG_ACC                             _UxGT("Acel")
99 99
 #define MSG_JERK                            _UxGT("Jerk")
100
-#define MSG_VX_JERK                         _UxGT("Vx-jerk")
101
-#define MSG_VY_JERK                         _UxGT("Vy-jerk")
102
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")
100
+#if IS_KINEMATIC
101
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
102
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
103
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
104
+#else
105
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
106
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
107
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
108
+#endif
103 109
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")
104 110
 #define MSG_VMAX                            _UxGT("Vmax ")
105 111
 #define MSG_VMIN                            _UxGT("Vmin")
@@ -108,15 +114,21 @@
108 114
 #define MSG_A_RETRACT                       _UxGT("A-retract")
109 115
 #define MSG_A_TRAVEL                        _UxGT("A-travel")
110 116
 #define MSG_STEPS_PER_MM                    _UxGT("Pasos/mm")
111
-#define MSG_XSTEPS                          _UxGT("Xpasos/mm")
112
-#define MSG_YSTEPS                          _UxGT("Ypasos/mm")
113
-#define MSG_ZSTEPS                          _UxGT("Zpasos/mm")
114
-#define MSG_ESTEPS                          _UxGT("Epasos/mm")
115
-#define MSG_E1STEPS                         _UxGT("E1pasos/mm")
116
-#define MSG_E2STEPS                         _UxGT("E2pasos/mm")
117
-#define MSG_E3STEPS                         _UxGT("E3pasos/mm")
118
-#define MSG_E4STEPS                         _UxGT("E4pasos/mm")
119
-#define MSG_E5STEPS                         _UxGT("E5pasos/mm")
117
+#if IS_KINEMATIC
118
+  #define MSG_ASTEPS                        _UxGT("A pasos/mm")
119
+  #define MSG_BSTEPS                        _UxGT("B pasos/mm")
120
+  #define MSG_CSTEPS                        _UxGT("C pasos/mm")
121
+#else
122
+  #define MSG_ASTEPS                        _UxGT("X pasos/mm")
123
+  #define MSG_BSTEPS                        _UxGT("Y pasos/mm")
124
+  #define MSG_CSTEPS                        _UxGT("Z pasos/mm")
125
+#endif
126
+#define MSG_ESTEPS                          _UxGT("E pasos/mm")
127
+#define MSG_E1STEPS                         _UxGT("E1 pasos/mm")
128
+#define MSG_E2STEPS                         _UxGT("E2 pasos/mm")
129
+#define MSG_E3STEPS                         _UxGT("E3 pasos/mm")
130
+#define MSG_E4STEPS                         _UxGT("E4 pasos/mm")
131
+#define MSG_E5STEPS                         _UxGT("E5 pasos/mm")
120 132
 #define MSG_TEMPERATURE                     _UxGT("Temperatura")
121 133
 #define MSG_MOTION                          _UxGT("Movemento")
122 134
 #define MSG_FILAMENT                        _UxGT("Filamento")

+ 18
- 6
Marlin/src/lcd/language/language_hr.h Ver arquivo

@@ -95,9 +95,15 @@
95 95
 #define MSG_SELECT                          _UxGT("Odaberi")
96 96
 #define MSG_ACC                             _UxGT("Accel")
97 97
 #define MSG_JERK                            _UxGT("Jerk")
98
-#define MSG_VX_JERK                         _UxGT("Vx-jerk")
99
-#define MSG_VY_JERK                         _UxGT("Vy-jerk")
100
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")
98
+#if IS_KINEMATIC
99
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
100
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
101
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
102
+#else
103
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
104
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
105
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
106
+#endif
101 107
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")
102 108
 #define MSG_VMAX                            _UxGT("Vmax ")
103 109
 #define MSG_VMIN                            _UxGT("Vmin")
@@ -106,9 +112,15 @@
106 112
 #define MSG_A_RETRACT                       _UxGT("A-retract")
107 113
 #define MSG_A_TRAVEL                        _UxGT("A-travel")
108 114
 #define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")
109
-#define MSG_XSTEPS                          _UxGT("Xsteps/mm")
110
-#define MSG_YSTEPS                          _UxGT("Ysteps/mm")
111
-#define MSG_ZSTEPS                          _UxGT("Zsteps/mm")
115
+#if IS_KINEMATIC
116
+  #define MSG_ASTEPS                        _UxGT("Asteps/mm")
117
+  #define MSG_BSTEPS                        _UxGT("Bsteps/mm")
118
+  #define MSG_CSTEPS                        _UxGT("Csteps/mm")
119
+#else
120
+  #define MSG_ASTEPS                        _UxGT("Xsteps/mm")
121
+  #define MSG_BSTEPS                        _UxGT("Ysteps/mm")
122
+  #define MSG_CSTEPS                        _UxGT("Zsteps/mm")
123
+#endif
112 124
 #define MSG_ESTEPS                          _UxGT("Esteps/mm")
113 125
 #define MSG_E1STEPS                         _UxGT("E1steps/mm")
114 126
 #define MSG_E2STEPS                         _UxGT("E2steps/mm")

+ 18
- 6
Marlin/src/lcd/language/language_it.h Ver arquivo

@@ -166,9 +166,15 @@
166 166
 #define MSG_SELECT                          _UxGT("Seleziona")
167 167
 #define MSG_ACC                             _UxGT("Accel")
168 168
 #define MSG_JERK                            _UxGT("Jerk")
169
-#define MSG_VX_JERK                         _UxGT("Vx-jerk")
170
-#define MSG_VY_JERK                         _UxGT("Vy-jerk")
171
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")
169
+#if IS_KINEMATIC
170
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
171
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
172
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
173
+#else
174
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
175
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
176
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
177
+#endif
172 178
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")
173 179
 #define MSG_VELOCITY                        _UxGT("Velocità")
174 180
 #define MSG_VMAX                            _UxGT("Vmax ")
@@ -179,9 +185,15 @@
179 185
 #define MSG_A_RETRACT                       _UxGT("A-retract")
180 186
 #define MSG_A_TRAVEL                        _UxGT("A-Spostamento")
181 187
 #define MSG_STEPS_PER_MM                    _UxGT("Passi/mm")
182
-#define MSG_XSTEPS                          _UxGT("Xpassi/mm")
183
-#define MSG_YSTEPS                          _UxGT("Ypassi/mm")
184
-#define MSG_ZSTEPS                          _UxGT("Zpassi/mm")
188
+#if IS_KINEMATIC
189
+  #define MSG_ASTEPS                        _UxGT("Apassi/mm")
190
+  #define MSG_BSTEPS                        _UxGT("Bpassi/mm")
191
+  #define MSG_CSTEPS                        _UxGT("Cpassi/mm")
192
+#else
193
+  #define MSG_ASTEPS                        _UxGT("Xpassi/mm")
194
+  #define MSG_BSTEPS                        _UxGT("Ypassi/mm")
195
+  #define MSG_CSTEPS                        _UxGT("Zpassi/mm")
196
+#endif
185 197
 #define MSG_ESTEPS                          _UxGT("Epassi/mm")
186 198
 #define MSG_E1STEPS                         _UxGT("E1passi/mm")
187 199
 #define MSG_E2STEPS                         _UxGT("E2passi/mm")

+ 51
- 26
Marlin/src/lcd/language/language_kana.h Ver arquivo

@@ -105,11 +105,18 @@
105 105
 #define MSG_PID_D                           "PID-D"
106 106
 #define MSG_PID_C                           "PID-C"
107 107
 #define MSG_SELECT                          "\xbe\xdd\xc0\xb8"                                                 // "センタク" ("Select")
108
+#define MSG_JERK                            "\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s"                            // ヤクド mm/s ("Jerk")
108 109
 #if LCD_WIDTH >= 20
109 110
   #define MSG_ACC                           "\xb6\xbf\xb8\xc4\xde mm/s2"                                       // "カソクド mm/s2" ("Accel")
110
-  #define MSG_VX_JERK                       "X\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s"                           // "Xジク ヤクド mm/s" ("Vx-jerk")
111
-  #define MSG_VY_JERK                       "Y\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s"                           // "Yジク ヤクド mm/s" ("Vy-jerk")
112
-  #define MSG_VZ_JERK                       "Z\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s"                           // "Zジク ヤクド mm/s" ("Vz-jerk")
111
+  #if IS_KINEMATIC
112
+    #define MSG_VA_JERK                     "A\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s"                           // "Aジク ヤクド mm/s" ("Va-jerk")
113
+    #define MSG_VB_JERK                     "B\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s"                           // "Bジク ヤクド mm/s" ("Vb-jerk")
114
+    #define MSG_VC_JERK                     "C\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s"                           // "Cジク ヤクド mm/s" ("Vc-jerk")
115
+  #else
116
+    #define MSG_VA_JERK                     "X\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s"                           // "Xジク ヤクド mm/s" ("Vx-jerk")
117
+    #define MSG_VB_JERK                     "Y\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s"                           // "Yジク ヤクド mm/s" ("Vy-jerk")
118
+    #define MSG_VC_JERK                     "Z\xbc\xde\xb8\x20\xd4\xb8\xc4\xde mm/s"                           // "Zジク ヤクド mm/s" ("Vz-jerk")
119
+  #endif
113 120
   #define MSG_VE_JERK                       "\xb4\xb8\xbd\xc4\xd9\xb0\xc0\xde\xb0\x20\xd4\xb8\xc4\xde"         // "エクストルーダー ヤクド" ("Ve-jerk")
114 121
   #define MSG_VMAX                          "\xbb\xb2\xc0\xde\xb2\xb5\xb8\xd8\xbf\xb8\xc4\xde "                // "サイダイオクリソクド " ("Vmax ")
115 122
   #define MSG_VMIN                          "\xbb\xb2\xbc\xae\xb3\xb5\xb8\xd8\xbf\xb8\xc4\xde"                 // "サイショウオクリソクド" ("Vmin")
@@ -117,9 +124,15 @@
117 124
   #define MSG_AMAX                          "\xbb\xb2\xc0\xde\xb2\xb6\xbf\xb8\xc4\xde "                        // "サイダイカソクド " ("Amax ")
118 125
 #else
119 126
   #define MSG_ACC                           "\xb6\xbf\xb8\xc4\xde"                                             // "カソクド" ("Accel")
120
-  #define MSG_VX_JERK                       "X\xbc\xde\xb8\x20\xd4\xb8\xc4\xde"                                // "XYジク ヤクド" ("Vx-jerk")
121
-  #define MSG_VY_JERK                       "Y\xbc\xde\xb8\x20\xd4\xb8\xc4\xde"                                // "XYジク ヤクド" ("Vy-jerk")
122
-  #define MSG_VZ_JERK                       "Z\xbc\xde\xb8\x20\xd4\xb8\xc4\xde"                                // "Zジク ヤクド" ("Vz-jerk")
127
+  #if IS_KINEMATIC
128
+    #define MSG_VA_JERK                     "A\x20\xd4\xb8\xc4\xde"                                            // "Aジク ヤクド" ("Va-jerk")
129
+    #define MSG_VB_JERK                     "B\x20\xd4\xb8\xc4\xde"                                            // "Bジク ヤクド" ("Vb-jerk")
130
+    #define MSG_VC_JERK                     "C\x20\xd4\xb8\xc4\xde"                                            // "Cジク ヤクド" ("Vc-jerk")
131
+  #else
132
+    #define MSG_VA_JERK                     "X\x20\xd4\xb8\xc4\xde"                                            // "Xジク ヤクド" ("Vx-jerk")
133
+    #define MSG_VB_JERK                     "Y\x20\xd4\xb8\xc4\xde"                                            // "Yジク ヤクド" ("Vy-jerk")
134
+    #define MSG_VC_JERK                     "Z\x20\xd4\xb8\xc4\xde"                                            // "Zジク ヤクド" ("Vz-jerk")
135
+  #endif
123 136
   #define MSG_VE_JERK                       "E\x20\xd4\xb8\xc4\xde"                                            // "E ヤクド" ("Ve-jerk")
124 137
   #define MSG_VMAX                          "max\xb5\xb8\xd8\xbf\xb8\xc4\xde "                                 // "maxオクリソクド" ("Vmax ")
125 138
   #define MSG_VMIN                          "min\xb5\xb8\xd8\xbf\xb8\xc4\xde"                                  // "minオクリソクド" ("Vmin")
@@ -129,27 +142,39 @@
129 142
 #define MSG_A_RETRACT                       "\xcb\xb7\xba\xd0\xb6\xbf\xb8\xc4\xde"                             // "ヒキコミカソクド" ("A-retract")
130 143
 #define MSG_A_TRAVEL                        "\xb2\xc4\xde\xb3\xb6\xbf\xb8\xc4\xde"                             // "イドウカソクド" ("A-travel")
131 144
 #if LCD_WIDTH >= 20
132
-  #define MSG_STEPS_PER_MM                    "Steps/mm"
133
-  #define MSG_XSTEPS                          "Xsteps/mm"
134
-  #define MSG_YSTEPS                          "Ysteps/mm"
135
-  #define MSG_ZSTEPS                          "Zsteps/mm"
136
-  #define MSG_ESTEPS                          "Esteps/mm"
137
-  #define MSG_E1STEPS                         "E1steps/mm"
138
-  #define MSG_E2STEPS                         "E2steps/mm"
139
-  #define MSG_E3STEPS                         "E3steps/mm"
140
-  #define MSG_E4STEPS                         "E4steps/mm"
141
-  #define MSG_E5STEPS                         "E5steps/mm"
145
+  #define MSG_STEPS_PER_MM                  "Steps/mm"
146
+  #if IS_KINEMATIC
147
+    #define MSG_ASTEPS                      "Asteps/mm"
148
+    #define MSG_BSTEPS                      "Bsteps/mm"
149
+    #define MSG_CSTEPS                      "Csteps/mm"
150
+  #else
151
+    #define MSG_ASTEPS                      "Xsteps/mm"
152
+    #define MSG_BSTEPS                      "Ysteps/mm"
153
+    #define MSG_CSTEPS                      "Zsteps/mm"
154
+  #endif
155
+  #define MSG_ESTEPS                        "Esteps/mm"
156
+  #define MSG_E1STEPS                       "E1steps/mm"
157
+  #define MSG_E2STEPS                       "E2steps/mm"
158
+  #define MSG_E3STEPS                       "E3steps/mm"
159
+  #define MSG_E4STEPS                       "E4steps/mm"
160
+  #define MSG_E5STEPS                       "E5steps/mm"
142 161
 #else
143
-  #define MSG_STEPS_PER_MM                    "Steps"
144
-  #define MSG_XSTEPS                          "Xsteps"
145
-  #define MSG_YSTEPS                          "Ysteps"
146
-  #define MSG_ZSTEPS                          "Zsteps"
147
-  #define MSG_ESTEPS                          "Esteps"
148
-  #define MSG_E1STEPS                         "E1steps"
149
-  #define MSG_E2STEPS                         "E2steps"
150
-  #define MSG_E3STEPS                         "E3steps"
151
-  #define MSG_E4STEPS                         "E4steps"
152
-  #define MSG_E5STEPS                         "E5steps"
162
+  #define MSG_STEPS_PER_MM                  "Steps"
163
+  #if IS_KINEMATIC
164
+    #define MSG_ASTEPS                      "Asteps"
165
+    #define MSG_BSTEPS                      "Bsteps"
166
+    #define MSG_CSTEPS                      "Csteps"
167
+  #else
168
+    #define MSG_ASTEPS                      "Xsteps"
169
+    #define MSG_BSTEPS                      "Ysteps"
170
+    #define MSG_CSTEPS                      "Zsteps"
171
+  #endif
172
+  #define MSG_ESTEPS                        "Esteps"
173
+  #define MSG_E1STEPS                       "E1steps"
174
+  #define MSG_E2STEPS                       "E2steps"
175
+  #define MSG_E3STEPS                       "E3steps"
176
+  #define MSG_E4STEPS                       "E4steps"
177
+  #define MSG_E5STEPS                       "E5steps"
153 178
 #endif
154 179
 #define MSG_TEMPERATURE                     "\xb5\xdd\xc4\xde"                                                 // "オンド" ("Temperature")
155 180
 #define MSG_MOTION                          "\xb3\xba\xde\xb7\xbe\xaf\xc3\xb2"                                 // "ウゴキセッテイ" ("Motion")

+ 9
- 3
Marlin/src/lcd/language/language_kana_utf8.h Ver arquivo

@@ -106,9 +106,15 @@
106 106
 #define MSG_SELECT                          _UxGT("センタク")                     // "Select"
107 107
 #define MSG_ACC                             _UxGT("カソクド mm/s2")               // "Accel"
108 108
 #define MSG_JERK                            _UxGT("ヤクド mm/s")                  // "Jerk"
109
-#define MSG_VX_JERK                         _UxGT("Xジク ヤクド mm/s")             // "Vx-jerk"
110
-#define MSG_VY_JERK                         _UxGT("Yジク ヤクド mm/s")             // "Vy-jerk"
111
-#define MSG_VZ_JERK                         _UxGT("Zジク ヤクド mm/s")             // "Vz-jerk"
109
+#if IS_KINEMATIC
110
+  #define MSG_VA_JERK                       _UxGT("Aジク ヤクド mm/s")             // "Va-jerk"
111
+  #define MSG_VB_JERK                       _UxGT("Bジク ヤクド mm/s")             // "Vb-jerk"
112
+  #define MSG_VC_JERK                       _UxGT("Cジク ヤクド mm/s")             // "Vc-jerk"
113
+#else
114
+  #define MSG_VA_JERK                       _UxGT("Xジク ヤクド mm/s")             // "Vx-jerk"
115
+  #define MSG_VB_JERK                       _UxGT("Yジク ヤクド mm/s")             // "Vy-jerk"
116
+  #define MSG_VC_JERK                       _UxGT("Zジク ヤクド mm/s")             // "Vz-jerk"
117
+#endif
112 118
 #define MSG_VE_JERK                         _UxGT("エクストルーダー ヤクド")          // "Ve-jerk"
113 119
 #define MSG_VMAX                            _UxGT("サイダイオクリソクド ")            // "Vmax "
114 120
 #define MSG_VMIN                            _UxGT("サイショウオクリソクド")           // "Vmin"

+ 19
- 7
Marlin/src/lcd/language/language_nl.h Ver arquivo

@@ -103,9 +103,15 @@
103 103
 #define MSG_SELECT                          _UxGT("Selecteer")
104 104
 #define MSG_ACC                             _UxGT("Versn")
105 105
 #define MSG_JERK                            _UxGT("Jerk")
106
-#define MSG_VX_JERK                         _UxGT("Vx-jerk")
107
-#define MSG_VY_JERK                         _UxGT("Vy-jerk")
108
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")
106
+#if IS_KINEMATIC
107
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
108
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
109
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
110
+#else
111
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
112
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
113
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
114
+#endif
109 115
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")
110 116
 #define MSG_VMAX                            _UxGT("Vmax ")
111 117
 #define MSG_VMIN                            _UxGT("Vmin")
@@ -114,9 +120,15 @@
114 120
 #define MSG_A_RETRACT                       _UxGT("A-retract")
115 121
 #define MSG_A_TRAVEL                        _UxGT("A-travel")
116 122
 #define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")
117
-#define MSG_XSTEPS                          _UxGT("Xsteps/mm")
118
-#define MSG_YSTEPS                          _UxGT("Ysteps/mm")
119
-#define MSG_ZSTEPS                          _UxGT("Zsteps/mm")
123
+#if IS_KINEMATIC
124
+  #define MSG_ASTEPS                        _UxGT("Asteps/mm")
125
+  #define MSG_BSTEPS                        _UxGT("Bsteps/mm")
126
+  #define MSG_CSTEPS                        _UxGT("Csteps/mm")
127
+#else
128
+  #define MSG_ASTEPS                        _UxGT("Xsteps/mm")
129
+  #define MSG_BSTEPS                        _UxGT("Ysteps/mm")
130
+  #define MSG_CSTEPS                        _UxGT("Zsteps/mm")
131
+#endif
120 132
 #define MSG_ESTEPS                          _UxGT("Esteps/mm")
121 133
 #define MSG_E1STEPS                         _UxGT("E1steps/mm")
122 134
 #define MSG_E2STEPS                         _UxGT("E2steps/mm")
@@ -250,7 +262,7 @@
250 262
   #define MSG_FILAMENT_CHANGE_LOAD_1          _UxGT("Wacht voor")
251 263
   #define MSG_FILAMENT_CHANGE_LOAD_2          _UxGT("filament te")
252 264
   #define MSG_FILAMENT_CHANGE_LOAD_3          _UxGT("laden")
253
-        #define MSG_FILAMENT_CHANGE_RESUME_1        _UxGT("Wacht voor print")
265
+  #define MSG_FILAMENT_CHANGE_RESUME_1        _UxGT("Wacht voor print")
254 266
   #define MSG_FILAMENT_CHANGE_RESUME_2        _UxGT("om verder")
255 267
   #define MSG_FILAMENT_CHANGE_RESUME_3        _UxGT("te gaan")
256 268
 #else // LCD_HEIGHT < 4

+ 18
- 6
Marlin/src/lcd/language/language_pl-DOGM.h Ver arquivo

@@ -91,9 +91,15 @@
91 91
 #define MSG_SELECT                          _UxGT("Select")
92 92
 #define MSG_ACC                             _UxGT("Przyśpieszenie")
93 93
 #define MSG_JERK                            _UxGT("Zryw")
94
-#define MSG_VX_JERK                         _UxGT("Zryw Vx")
95
-#define MSG_VY_JERK                         _UxGT("Zryw Vy")
96
-#define MSG_VZ_JERK                         _UxGT("Zryw Vz")
94
+#if IS_KINEMATIC
95
+  #define MSG_VA_JERK                       _UxGT("Zryw Va")
96
+  #define MSG_VB_JERK                       _UxGT("Zryw Vb")
97
+  #define MSG_VC_JERK                       _UxGT("Zryw Vc")
98
+#else
99
+  #define MSG_VA_JERK                       _UxGT("Zryw Vx")
100
+  #define MSG_VB_JERK                       _UxGT("Zryw Vy")
101
+  #define MSG_VC_JERK                       _UxGT("Zryw Vz")
102
+#endif
97 103
 #define MSG_VE_JERK                         _UxGT("Zryw Ve")
98 104
 #define MSG_VMAX                            _UxGT("Vmax ")
99 105
 #define MSG_VMIN                            _UxGT("Vmin")
@@ -103,9 +109,15 @@
103 109
 #define MSG_A_RETRACT                       _UxGT("A-wycofanie")
104 110
 #define MSG_A_TRAVEL                        _UxGT("A-przesuń.")
105 111
 #define MSG_STEPS_PER_MM                    _UxGT("kroki/mm")
106
-#define MSG_XSTEPS                          _UxGT("krokiX/mm")
107
-#define MSG_YSTEPS                          _UxGT("krokiY/mm")
108
-#define MSG_ZSTEPS                          _UxGT("krokiZ/mm")
112
+#if IS_KINEMATIC
113
+  #define MSG_ASTEPS                        _UxGT("krokiA/mm")
114
+  #define MSG_BSTEPS                        _UxGT("krokiB/mm")
115
+  #define MSG_CSTEPS                        _UxGT("krokiC/mm")
116
+#else
117
+  #define MSG_ASTEPS                        _UxGT("krokiX/mm")
118
+  #define MSG_BSTEPS                        _UxGT("krokiY/mm")
119
+  #define MSG_CSTEPS                        _UxGT("krokiZ/mm")
120
+#endif
109 121
 #define MSG_ESTEPS                          _UxGT("krokiE/mm")
110 122
 #define MSG_E1STEPS                         _UxGT("krokiE1/mm")
111 123
 #define MSG_E2STEPS                         _UxGT("krokiE2/mm")

+ 18
- 6
Marlin/src/lcd/language/language_pl-HD44780.h Ver arquivo

@@ -93,9 +93,15 @@
93 93
 #define MSG_SELECT                          _UxGT("Select")
94 94
 #define MSG_ACC                             _UxGT("Przyspieszenie")
95 95
 #define MSG_JERK                            _UxGT("Zryw")
96
-#define MSG_VX_JERK                         _UxGT("Zryw Vx")
97
-#define MSG_VY_JERK                         _UxGT("Zryw Vy")
98
-#define MSG_VZ_JERK                         _UxGT("Zryw Vz")
96
+#if IS_KINEMATIC
97
+  #define MSG_VA_JERK                       _UxGT("Zryw Va")
98
+  #define MSG_VB_JERK                       _UxGT("Zryw Vb")
99
+  #define MSG_VC_JERK                       _UxGT("Zryw Vc")
100
+#else
101
+  #define MSG_VA_JERK                       _UxGT("Zryw Vx")
102
+  #define MSG_VB_JERK                       _UxGT("Zryw Vy")
103
+  #define MSG_VC_JERK                       _UxGT("Zryw Vz")
104
+#endif
99 105
 #define MSG_VE_JERK                         _UxGT("Zryw Ve")
100 106
 #define MSG_VMAX                            _UxGT("Vmax ")
101 107
 #define MSG_VMIN                            _UxGT("Vmin")
@@ -105,9 +111,15 @@
105 111
 #define MSG_A_RETRACT                       _UxGT("A-wycofanie")
106 112
 #define MSG_A_TRAVEL                        _UxGT("A-przesun.")
107 113
 #define MSG_STEPS_PER_MM                    _UxGT("kroki/mm")
108
-#define MSG_XSTEPS                          _UxGT("krokiX/mm")
109
-#define MSG_YSTEPS                          _UxGT("krokiY/mm")
110
-#define MSG_ZSTEPS                          _UxGT("krokiZ/mm")
114
+#if IS_KINEMATIC
115
+  #define MSG_ASTEPS                        _UxGT("krokiA/mm")
116
+  #define MSG_BSTEPS                        _UxGT("krokiB/mm")
117
+  #define MSG_CSTEPS                        _UxGT("krokiC/mm")
118
+#else
119
+  #define MSG_ASTEPS                        _UxGT("krokiX/mm")
120
+  #define MSG_BSTEPS                        _UxGT("krokiY/mm")
121
+  #define MSG_CSTEPS                        _UxGT("krokiZ/mm")
122
+#endif
111 123
 #define MSG_ESTEPS                          _UxGT("krokiE/mm")
112 124
 #define MSG_E1STEPS                         _UxGT("krokiE1/mm")
113 125
 #define MSG_E2STEPS                         _UxGT("krokiE2/mm")

+ 18
- 6
Marlin/src/lcd/language/language_pt-br.h Ver arquivo

@@ -88,9 +88,15 @@
88 88
 #define MSG_PID_C                           "PID-C"
89 89
 #define MSG_ACC                             "Acc"
90 90
 #define MSG_JERK                            "Jogo"
91
-#define MSG_VX_JERK                         "jogo VX"
92
-#define MSG_VY_JERK                         "jogo VY"
93
-#define MSG_VZ_JERK                         "jogo VZ"
91
+#if IS_KINEMATIC
92
+  #define MSG_VA_JERK                       "jogo VA"
93
+  #define MSG_VB_JERK                       "jogo VB"
94
+  #define MSG_VC_JERK                       "jogo VC"
95
+#else
96
+  #define MSG_VA_JERK                       "jogo VX"
97
+  #define MSG_VB_JERK                       "jogo VY"
98
+  #define MSG_VC_JERK                       "jogo VZ"
99
+#endif
94 100
 #define MSG_VE_JERK                         "jogo VE"
95 101
 #define MSG_VMAX                            " Vmax "
96 102
 #define MSG_VMIN                            "Vmin"
@@ -99,9 +105,15 @@
99 105
 #define MSG_A_RETRACT                       "Retrair A"
100 106
 #define MSG_A_TRAVEL                        "A-movimento"
101 107
 #define MSG_STEPS_PER_MM                    "Passo/mm"
102
-#define MSG_XSTEPS                          "Passo X/mm"
103
-#define MSG_YSTEPS                          "Passo Y/mm"
104
-#define MSG_ZSTEPS                          "Passo Z/mm"
108
+#if IS_KINEMATIC
109
+  #define MSG_ASTEPS                        "A/mm"
110
+  #define MSG_BSTEPS                        "B/mm"
111
+  #define MSG_CSTEPS                        "C/mm"
112
+#else
113
+  #define MSG_ASTEPS                        "X/mm"
114
+  #define MSG_BSTEPS                        "Y/mm"
115
+  #define MSG_CSTEPS                        "Z/mm"
116
+#endif
105 117
 #define MSG_ESTEPS                          "E/mm"
106 118
 #define MSG_E1STEPS                         "E1/mm"
107 119
 #define MSG_E2STEPS                         "E2/mm"

+ 18
- 6
Marlin/src/lcd/language/language_pt-br_utf8.h Ver arquivo

@@ -88,9 +88,15 @@
88 88
 #define MSG_PID_C                           _UxGT("PID-C")
89 89
 #define MSG_ACC                             _UxGT("Acc")
90 90
 #define MSG_JERK                            _UxGT("Jogo")
91
-#define MSG_VX_JERK                         _UxGT("jogo VX")
92
-#define MSG_VY_JERK                         _UxGT("jogo VY")
93
-#define MSG_VZ_JERK                         _UxGT("jogo VZ")
91
+#if IS_KINEMATIC
92
+  #define MSG_VA_JERK                       _UxGT("jogo VA")
93
+  #define MSG_VB_JERK                       _UxGT("jogo VB")
94
+  #define MSG_VC_JERK                       _UxGT("jogo VC")
95
+#else
96
+  #define MSG_VA_JERK                       _UxGT("jogo VX")
97
+  #define MSG_VB_JERK                       _UxGT("jogo VY")
98
+  #define MSG_VC_JERK                       _UxGT("jogo VZ")
99
+#endif
94 100
 #define MSG_VE_JERK                         _UxGT("jogo VE")
95 101
 #define MSG_VMAX                            _UxGT(" Vmax ")
96 102
 #define MSG_VMIN                            _UxGT("Vmin")
@@ -99,9 +105,15 @@
99 105
 #define MSG_A_RETRACT                       _UxGT("Retrair A")
100 106
 #define MSG_A_TRAVEL                        _UxGT("A-movimento")
101 107
 #define MSG_STEPS_PER_MM                    _UxGT("Passo/mm")
102
-#define MSG_XSTEPS                          _UxGT("Passo X/mm")
103
-#define MSG_YSTEPS                          _UxGT("Passo Y/mm")
104
-#define MSG_ZSTEPS                          _UxGT("Passo Z/mm")
108
+#if IS_KINEMATIC
109
+  #define MSG_ASTEPS                        _UxGT("A/mm")
110
+  #define MSG_BSTEPS                        _UxGT("B/mm")
111
+  #define MSG_CSTEPS                        _UxGT("C/mm")
112
+#else
113
+  #define MSG_ASTEPS                        _UxGT("X/mm")
114
+  #define MSG_BSTEPS                        _UxGT("Y/mm")
115
+  #define MSG_CSTEPS                        _UxGT("Z/mm")
116
+#endif
105 117
 #define MSG_ESTEPS                          _UxGT("E/mm")
106 118
 #define MSG_E1STEPS                         _UxGT("E1/mm")
107 119
 #define MSG_E2STEPS                         _UxGT("E2/mm")

+ 20
- 8
Marlin/src/lcd/language/language_pt.h Ver arquivo

@@ -33,7 +33,7 @@
33 33
 #define DISPLAY_CHARSET_ISO10646_1
34 34
 #define NOT_EXTENDED_ISO10646_1_5X7
35 35
 
36
-#define WELCOME_MSG                         MACHINE_NAME " pronto."
36
+#define WELCOME_MSG                         MACHINE_NAME " pronta."
37 37
 #define MSG_SD_INSERTED                     "Cartao inserido"
38 38
 #define MSG_SD_REMOVED                      "Cartao removido"
39 39
 #define MSG_MAIN                            "Menu principal"
@@ -91,10 +91,16 @@
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")
95
-#define MSG_VX_JERK                         "Vx-jerk"
96
-#define MSG_VY_JERK                         "Vy-jerk"
97
-#define MSG_VZ_JERK                         "Vz-jerk"
94
+#define MSG_JERK                            "Jerk"
95
+#if IS_KINEMATIC
96
+  #define MSG_VA_JERK                       "Va-jerk"
97
+  #define MSG_VB_JERK                       "Vb-jerk"
98
+  #define MSG_VC_JERK                       "Vc-jerk"
99
+#else
100
+  #define MSG_VA_JERK                       "Vx-jerk"
101
+  #define MSG_VB_JERK                       "Vy-jerk"
102
+  #define MSG_VC_JERK                       "Vz-jerk"
103
+#endif
98 104
 #define MSG_VE_JERK                         "Ve-jerk"
99 105
 #define MSG_VMAX                            " Vmax "
100 106
 #define MSG_VMIN                            "Vmin"
@@ -103,9 +109,15 @@
103 109
 #define MSG_A_RETRACT                       "A-retraccao"
104 110
 #define MSG_A_TRAVEL                        "A-movimento"
105 111
 #define MSG_STEPS_PER_MM                    "Passo/mm"
106
-#define MSG_XSTEPS                          "X passo/mm"
107
-#define MSG_YSTEPS                          "Y passo/mm"
108
-#define MSG_ZSTEPS                          "Z passo/mm"
112
+#if IS_KINEMATIC
113
+  #define MSG_ASTEPS                        "A passo/mm"
114
+  #define MSG_BSTEPS                        "B passo/mm"
115
+  #define MSG_CSTEPS                        "C passo/mm"
116
+#else
117
+  #define MSG_ASTEPS                        "X passo/mm"
118
+  #define MSG_BSTEPS                        "Y passo/mm"
119
+  #define MSG_CSTEPS                        "Z passo/mm"
120
+#endif
109 121
 #define MSG_ESTEPS                          "E passo/mm"
110 122
 #define MSG_E1STEPS                         "E1 passo/mm"
111 123
 #define MSG_E2STEPS                         "E2 passo/mm"

+ 19
- 7
Marlin/src/lcd/language/language_pt_utf8.h Ver arquivo

@@ -33,7 +33,7 @@
33 33
 
34 34
 #define DISPLAY_CHARSET_ISO10646_1
35 35
 
36
-#define WELCOME_MSG                         MACHINE_NAME _UxGT(" pronto.")
36
+#define WELCOME_MSG                         MACHINE_NAME _UxGT(" pronta.")
37 37
 #define MSG_SD_INSERTED                     _UxGT("Cartão inserido")
38 38
 #define MSG_SD_REMOVED                      _UxGT("Cartão removido")
39 39
 #define MSG_MAIN                            _UxGT("Menu principal")
@@ -92,9 +92,15 @@
92 92
 #define MSG_PID_C                           _UxGT("PID-C")
93 93
 #define MSG_ACC                             _UxGT("Acc")
94 94
 #define MSG_JERK                            _UxGT("Jerk")
95
-#define MSG_VX_JERK                         _UxGT("Vx-jerk")
96
-#define MSG_VY_JERK                         _UxGT("Vy-jerk")
97
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")
95
+#if IS_KINEMATIC
96
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
97
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
98
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
99
+#else
100
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
101
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
102
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
103
+#endif
98 104
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")
99 105
 #define MSG_VMAX                            _UxGT(" Vmax ")
100 106
 #define MSG_VMIN                            _UxGT("Vmin")
@@ -103,9 +109,15 @@
103 109
 #define MSG_A_RETRACT                       _UxGT("A-retracção")
104 110
 #define MSG_A_TRAVEL                        _UxGT("A-movimento")
105 111
 #define MSG_STEPS_PER_MM                    _UxGT("Passo/mm")
106
-#define MSG_XSTEPS                          _UxGT("X passo/mm")
107
-#define MSG_YSTEPS                          _UxGT("Y passo/mm")
108
-#define MSG_ZSTEPS                          _UxGT("Z passo/mm")
112
+#if IS_KINEMATIC
113
+  #define MSG_ASTEPS                        _UxGT("A passo/mm")
114
+  #define MSG_BSTEPS                        _UxGT("B passo/mm")
115
+  #define MSG_CSTEPS                        _UxGT("C passo/mm")
116
+#else
117
+  #define MSG_ASTEPS                        _UxGT("X passo/mm")
118
+  #define MSG_BSTEPS                        _UxGT("Y passo/mm")
119
+  #define MSG_CSTEPS                        _UxGT("Z passo/mm")
120
+#endif
109 121
 #define MSG_ESTEPS                          _UxGT("E passo/mm")
110 122
 #define MSG_E1STEPS                         _UxGT("E1 passo/mm")
111 123
 #define MSG_E2STEPS                         _UxGT("E2 passo/mm")

+ 18
- 6
Marlin/src/lcd/language/language_ru.h Ver arquivo

@@ -165,9 +165,15 @@
165 165
 #define MSG_SELECT                          _UxGT("Выбор")
166 166
 #define MSG_ACC                             _UxGT("Ускорение")
167 167
 #define MSG_JERK                            _UxGT("Рывок")
168
-#define MSG_VX_JERK                         _UxGT("Vx-рывок")
169
-#define MSG_VY_JERK                         _UxGT("Vy-рывок")
170
-#define MSG_VZ_JERK                         _UxGT("Vz-рывок")
168
+#if IS_KINEMATIC
169
+  #define MSG_VA_JERK                       _UxGT("Va-рывок")
170
+  #define MSG_VB_JERK                       _UxGT("Vb-рывок")
171
+  #define MSG_VC_JERK                       _UxGT("Vc-рывок")
172
+#else
173
+  #define MSG_VA_JERK                       _UxGT("Vx-рывок")
174
+  #define MSG_VB_JERK                       _UxGT("Vy-рывок")
175
+  #define MSG_VC_JERK                       _UxGT("Vz-рывок")
176
+#endif
171 177
 #define MSG_VE_JERK                         _UxGT("Ve-рывок")
172 178
 #define MSG_VELOCITY                        _UxGT("Скорость")
173 179
 #define MSG_VMAX                            _UxGT("Vмакс ")
@@ -178,9 +184,15 @@
178 184
 #define MSG_A_RETRACT                       _UxGT("A-втягивание")
179 185
 #define MSG_A_TRAVEL                        _UxGT("A-путеш.")
180 186
 #define MSG_STEPS_PER_MM                    _UxGT("Шаг/мм")
181
-#define MSG_XSTEPS                          _UxGT("X шаг/мм")
182
-#define MSG_YSTEPS                          _UxGT("Y шаг/мм")
183
-#define MSG_ZSTEPS                          _UxGT("Z шаг/мм")
187
+#if IS_KINEMATIC
188
+  #define MSG_ASTEPS                        _UxGT("A шаг/мм")
189
+  #define MSG_BSTEPS                        _UxGT("B шаг/мм")
190
+  #define MSG_CSTEPS                        _UxGT("C шаг/мм")
191
+#else
192
+  #define MSG_ASTEPS                        _UxGT("X шаг/мм")
193
+  #define MSG_BSTEPS                        _UxGT("Y шаг/мм")
194
+  #define MSG_CSTEPS                        _UxGT("Z шаг/мм")
195
+#endif
184 196
 #define MSG_ESTEPS                          _UxGT("E шаг/мм")
185 197
 #define MSG_E1STEPS                         _UxGT("E1 шаг/мм")
186 198
 #define MSG_E2STEPS                         _UxGT("E2 шаг/мм")

+ 18
- 6
Marlin/src/lcd/language/language_sk_utf8.h Ver arquivo

@@ -170,9 +170,15 @@
170 170
 #define MSG_SELECT                          _UxGT("Vybrať")
171 171
 #define MSG_ACC                             _UxGT("Zrýchl")
172 172
 #define MSG_JERK                            _UxGT("Skok")
173
-#define MSG_VX_JERK                         _UxGT("Vx-skok")
174
-#define MSG_VY_JERK                         _UxGT("Vy-skok")
175
-#define MSG_VZ_JERK                         _UxGT("Vz-skok")
173
+#if IS_KINEMATIC
174
+  #define MSG_VA_JERK                       _UxGT("Va-skok")
175
+  #define MSG_VB_JERK                       _UxGT("Vb-skok")
176
+  #define MSG_VC_JERK                       _UxGT("Vc-skok")
177
+#else
178
+  #define MSG_VA_JERK                       _UxGT("Vx-skok")
179
+  #define MSG_VB_JERK                       _UxGT("Vy-skok")
180
+  #define MSG_VC_JERK                       _UxGT("Vz-skok")
181
+#endif
176 182
 #define MSG_VE_JERK                         _UxGT("Ve-skok")
177 183
 #define MSG_VELOCITY                        _UxGT("Rýchlosť")
178 184
 #define MSG_VMAX                            _UxGT("Vmax ")
@@ -183,9 +189,15 @@
183 189
 #define MSG_A_RETRACT                       _UxGT("A-retrakt")
184 190
 #define MSG_A_TRAVEL                        _UxGT("A-prejazd")
185 191
 #define MSG_STEPS_PER_MM                    _UxGT("Krokov/mm")
186
-#define MSG_XSTEPS                          _UxGT("Xkrokov/mm")
187
-#define MSG_YSTEPS                          _UxGT("Ykrokov/mm")
188
-#define MSG_ZSTEPS                          _UxGT("Zkrokov/mm")
192
+#if IS_KINEMATIC
193
+  #define MSG_ASTEPS                        _UxGT("Akrokov/mm")
194
+  #define MSG_BSTEPS                        _UxGT("Bkrokov/mm")
195
+  #define MSG_CSTEPS                        _UxGT("Ckrokov/mm")
196
+#else
197
+  #define MSG_ASTEPS                        _UxGT("Xkrokov/mm")
198
+  #define MSG_BSTEPS                        _UxGT("Ykrokov/mm")
199
+  #define MSG_CSTEPS                        _UxGT("Zkrokov/mm")
200
+#endif
189 201
 #define MSG_ESTEPS                          _UxGT("Ekrokov/mm")
190 202
 #define MSG_E1STEPS                         _UxGT("E1krokov/mm")
191 203
 #define MSG_E2STEPS                         _UxGT("E2krokov/mm")

+ 19
- 7
Marlin/src/lcd/language/language_tr.h Ver arquivo

@@ -107,9 +107,15 @@
107 107
 #define MSG_SELECT                          _UxGT("Seç")                                                // Seç
108 108
 #define MSG_ACC                             _UxGT("İvme")                                               // İvme
109 109
 #define MSG_JERK                            _UxGT("Jerk")
110
-#define MSG_VX_JERK                         _UxGT("Vx-Jerk")                                            // Vx-Jerk
111
-#define MSG_VY_JERK                         _UxGT("Vy-Jerk")                                            // Vy-Jerk
112
-#define MSG_VZ_JERK                         _UxGT("Vz-jerk")                                            // Vz-Jerk
110
+#if IS_KINEMATIC
111
+  #define MSG_VA_JERK                       _UxGT("Va-jerk")
112
+  #define MSG_VB_JERK                       _UxGT("Vb-jerk")
113
+  #define MSG_VC_JERK                       _UxGT("Vc-jerk")
114
+#else
115
+  #define MSG_VA_JERK                       _UxGT("Vx-jerk")
116
+  #define MSG_VB_JERK                       _UxGT("Vy-jerk")
117
+  #define MSG_VC_JERK                       _UxGT("Vz-jerk")
118
+#endif
113 119
 #define MSG_VE_JERK                         _UxGT("Ve-jerk")                                            // Ve-Jerk
114 120
 #define MSG_VMAX                            _UxGT("Vmax ")                                              // Vmax
115 121
 #define MSG_VMIN                            _UxGT("Vmin")                                               // Vmin
@@ -117,10 +123,16 @@
117 123
 #define MSG_AMAX                            _UxGT("Amax ")                                              // Amax
118 124
 #define MSG_A_RETRACT                       _UxGT("A-retract")                                          // A-retract
119 125
 #define MSG_A_TRAVEL                        _UxGT("A-travel")                                           // A-travel
120
-#define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")                                           // Xsteps/mm
121
-#define MSG_XSTEPS                          _UxGT("Xsteps/mm")                                          // Xsteps/mm
122
-#define MSG_YSTEPS                          _UxGT("Ysteps/mm")                                          // Ysteps/mm
123
-#define MSG_ZSTEPS                          _UxGT("Zsteps/mm")                                          // Zsteps/mm
126
+#define MSG_STEPS_PER_MM                    _UxGT("Steps/mm")                                           // Steps/mm
127
+#if IS_KINEMATIC
128
+  #define MSG_ASTEPS                        _UxGT("Asteps/mm")
129
+  #define MSG_BSTEPS                        _UxGT("Bsteps/mm")
130
+  #define MSG_CSTEPS                        _UxGT("Csteps/mm")
131
+#else
132
+  #define MSG_ASTEPS                        _UxGT("Xsteps/mm")
133
+  #define MSG_BSTEPS                        _UxGT("Ysteps/mm")
134
+  #define MSG_CSTEPS                        _UxGT("Zsteps/mm")
135
+#endif
124 136
 #define MSG_ESTEPS                          _UxGT("Esteps/mm")                                          // Esteps/mm
125 137
 #define MSG_E1STEPS                         _UxGT("E1steps/mm")                                         // E1steps/mm
126 138
 #define MSG_E2STEPS                         _UxGT("E2steps/mm")                                         // E2steps/mm

+ 18
- 6
Marlin/src/lcd/language/language_uk.h Ver arquivo

@@ -96,9 +96,15 @@
96 96
 #define MSG_SELECT                          _UxGT("Вибрати")
97 97
 #define MSG_ACC                             _UxGT("Приск.")
98 98
 #define MSG_JERK                            _UxGT("Ривок")
99
-#define MSG_VX_JERK                         _UxGT("Vx-ривок")
100
-#define MSG_VY_JERK                         _UxGT("Vy-ривок")
101
-#define MSG_VZ_JERK                         _UxGT("Vz-ривок")
99
+#if IS_KINEMATIC
100
+  #define MSG_VA_JERK                       _UxGT("Va-ривок")
101
+  #define MSG_VB_JERK                       _UxGT("Vb-ривок")
102
+  #define MSG_VC_JERK                       _UxGT("Vc-ривок")
103
+#else
104
+  #define MSG_VA_JERK                       _UxGT("Vx-ривок")
105
+  #define MSG_VB_JERK                       _UxGT("Vy-ривок")
106
+  #define MSG_VC_JERK                       _UxGT("Vz-ривок")
107
+#endif
102 108
 #define MSG_VE_JERK                         _UxGT("Ve-ривок")
103 109
 #define MSG_VMAX                            _UxGT("Vмакс")
104 110
 #define MSG_VMIN                            _UxGT("Vмін")
@@ -107,9 +113,15 @@
107 113
 #define MSG_A_RETRACT                       _UxGT("A-втягув.")
108 114
 #define MSG_A_TRAVEL                        _UxGT("A-руху")
109 115
 #define MSG_STEPS_PER_MM                    _UxGT("Кроків/мм")
110
-#define MSG_XSTEPS                          _UxGT("Xкроків/мм")
111
-#define MSG_YSTEPS                          _UxGT("Yкроків/мм")
112
-#define MSG_ZSTEPS                          _UxGT("Zкроків/мм")
116
+#if IS_KINEMATIC
117
+  #define MSG_ASTEPS                        _UxGT("Aкроків/мм")
118
+  #define MSG_BSTEPS                        _UxGT("Bкроків/мм")
119
+  #define MSG_CSTEPS                        _UxGT("Cкроків/мм")
120
+#else
121
+  #define MSG_ASTEPS                        _UxGT("Xкроків/мм")
122
+  #define MSG_BSTEPS                        _UxGT("Yкроків/мм")
123
+  #define MSG_CSTEPS                        _UxGT("Zкроків/мм")
124
+#endif
113 125
 #define MSG_ESTEPS                          _UxGT("Eкроків/мм")
114 126
 #define MSG_E1STEPS                         _UxGT("E1кроків/мм")
115 127
 #define MSG_E2STEPS                         _UxGT("E2кроків/мм")

+ 18
- 6
Marlin/src/lcd/language/language_zh_CN.h Ver arquivo

@@ -93,9 +93,15 @@
93 93
 #define MSG_SELECT                          _UxGT("选择")  //"Select"
94 94
 #define MSG_ACC                             _UxGT("加速度")  //"Accel" acceleration
95 95
 #define MSG_JERK                            _UxGT("抖动速率")  // "Jerk"
96
-#define MSG_VX_JERK                         _UxGT("X轴抖动速率")  //"Vx-jerk"
97
-#define MSG_VY_JERK                         _UxGT("Y轴抖动速率")  //"Vy-jerk"
98
-#define MSG_VZ_JERK                         _UxGT("Z轴抖动速率")  //"Vz-jerk"
96
+#if IS_KINEMATIC
97
+  #define MSG_VA_JERK                       _UxGT("A轴抖动速率")  //"Va-jerk"
98
+  #define MSG_VB_JERK                       _UxGT("B轴抖动速率")  //"Vb-jerk"
99
+  #define MSG_VC_JERK                       _UxGT("C轴抖动速率")  //"Vc-jerk"
100
+#else
101
+  #define MSG_VA_JERK                       _UxGT("X轴抖动速率")  //"Vx-jerk"
102
+  #define MSG_VB_JERK                       _UxGT("Y轴抖动速率")  //"Vy-jerk"
103
+  #define MSG_VC_JERK                       _UxGT("Z轴抖动速率")  //"Vz-jerk"
104
+#endif
99 105
 #define MSG_VE_JERK                         _UxGT("挤出机抖动速率")  //"Ve-jerk"
100 106
 #define MSG_VMAX                            _UxGT("最大进料速率")  //"Vmax " max_feedrate_mm_s
101 107
 #define MSG_VMIN                            _UxGT("最小进料速率")  //"Vmin"  min_feedrate_mm_s
@@ -104,9 +110,15 @@
104 110
 #define MSG_A_RETRACT                       _UxGT("收进加速度")  //"A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
105 111
 #define MSG_A_TRAVEL                        _UxGT("非打印移动加速度")  //"A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
106 112
 #define MSG_STEPS_PER_MM                    _UxGT("轴步数/mm")  //"Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
107
-#define MSG_XSTEPS                          _UxGT("X轴步数/mm")  //"Xsteps/mm" axis_steps_per_mm, axis steps-per-unit G92
108
-#define MSG_YSTEPS                          _UxGT("Y轴步数/mm")  //"Ysteps/mm"
109
-#define MSG_ZSTEPS                          _UxGT("Z轴步数/mm")  //"Zsteps/mm"
113
+#if IS_KINEMATIC
114
+  #define MSG_ASTEPS                        _UxGT("A轴步数/mm")  //"Asteps/mm"
115
+  #define MSG_BSTEPS                        _UxGT("B轴步数/mm")  //"Bsteps/mm"
116
+  #define MSG_CSTEPS                        _UxGT("C轴步数/mm")  //"Csteps/mm"
117
+#else
118
+  #define MSG_ASTEPS                        _UxGT("X轴步数/mm")  //"Xsteps/mm"
119
+  #define MSG_BSTEPS                        _UxGT("Y轴步数/mm")  //"Ysteps/mm"
120
+  #define MSG_CSTEPS                        _UxGT("Z轴步数/mm")  //"Zsteps/mm"
121
+#endif
110 122
 #define MSG_ESTEPS                          _UxGT("挤出机步数/mm")  //"Esteps/mm"
111 123
 #define MSG_TEMPERATURE                     _UxGT("温度")  //"Temperature"
112 124
 #define MSG_MOTION                          _UxGT("运动")  //"Motion"

+ 18
- 6
Marlin/src/lcd/language/language_zh_TW.h Ver arquivo

@@ -93,9 +93,15 @@
93 93
 #define MSG_SELECT                          _UxGT("選擇")  //"Select"
94 94
 #define MSG_ACC                             _UxGT("加速度")  //"Accel" acceleration
95 95
 #define MSG_JERK                            _UxGT("抖動速率")  //"Jerk"
96
-#define MSG_VX_JERK                         _UxGT("X軸抖動速率")  //"Vx-jerk"
97
-#define MSG_VY_JERK                         _UxGT("Y軸抖動速率")  //"Vy-jerk"
98
-#define MSG_VZ_JERK                         _UxGT("Z軸抖動速率")  //"Vz-jerk"
96
+#if IS_KINEMATIC
97
+  #define MSG_VA_JERK                       _UxGT("A軸抖動速率")  //"Va-jerk"
98
+  #define MSG_VB_JERK                       _UxGT("B軸抖動速率")  //"Vb-jerk"
99
+  #define MSG_VC_JERK                       _UxGT("C軸抖動速率")  //"Vc-jerk"
100
+#else
101
+  #define MSG_VA_JERK                       _UxGT("X軸抖動速率")  //"Vx-jerk"
102
+  #define MSG_VB_JERK                       _UxGT("Y軸抖動速率")  //"Vy-jerk"
103
+  #define MSG_VC_JERK                       _UxGT("Z軸抖動速率")  //"Vz-jerk"
104
+#endif
99 105
 #define MSG_VE_JERK                         _UxGT("擠出機抖動速率")  //"Ve-jerk"
100 106
 #define MSG_VMAX                            _UxGT("最大進料速率")  //"Vmax " max_feedrate_mm_s
101 107
 #define MSG_VMIN                            _UxGT("最小進料速率")  //"Vmin"  min_feedrate_mm_s
@@ -104,9 +110,15 @@
104 110
 #define MSG_A_RETRACT                       _UxGT("回縮加速度")  //"A-retract" retract_acceleration, E acceleration in mm/s^2 for retracts
105 111
 #define MSG_A_TRAVEL                        _UxGT("非列印移動加速度")  //"A-travel" travel_acceleration, X, Y, Z acceleration in mm/s^2 for travel (non printing) moves
106 112
 #define MSG_STEPS_PER_MM                    _UxGT("軸步數/mm")  //"Steps/mm" axis_steps_per_mm, axis steps-per-unit G92
107
-#define MSG_XSTEPS                          _UxGT("X軸步數/mm")  //"Xsteps/mm" axis_steps_per_mm, axis steps-per-unit G92
108
-#define MSG_YSTEPS                          _UxGT("Y軸步數/mm")  //"Ysteps/mm"
109
-#define MSG_ZSTEPS                          _UxGT("Z軸步數/mm")  //"Zsteps/mm"
113
+#if IS_KINEMATIC
114
+  #define MSG_ASTEPS                        _UxGT("A軸步數/mm")  //"Asteps/mm" axis_steps_per_mm, axis steps-per-unit G92
115
+  #define MSG_BSTEPS                        _UxGT("B軸步數/mm")  //"Bsteps/mm"
116
+  #define MSG_CSTEPS                        _UxGT("C軸步數/mm")  //"Csteps/mm"
117
+#else
118
+  #define MSG_ASTEPS                        _UxGT("X軸步數/mm")  //"Xsteps/mm" axis_steps_per_mm, axis steps-per-unit G92
119
+  #define MSG_BSTEPS                        _UxGT("Y軸步數/mm")  //"Ysteps/mm"
120
+  #define MSG_CSTEPS                        _UxGT("Z軸步數/mm")  //"Zsteps/mm"
121
+#endif
110 122
 #define MSG_ESTEPS                          _UxGT("擠出機步數/mm")  //"Esteps/mm"
111 123
 #define MSG_TEMPERATURE                     _UxGT("溫度")  //"Temperature"
112 124
 #define MSG_MOTION                          _UxGT("運作")  //"Motion"

+ 13
- 13
Marlin/src/lcd/ultralcd.cpp Ver arquivo

@@ -3511,9 +3511,9 @@ void kill_screen(const char* lcd_msg) {
3511 3511
       MENU_BACK(MSG_MOTION);
3512 3512
 
3513 3513
       // M203 Max Feedrate
3514
-      MENU_ITEM_EDIT(float3, MSG_VMAX MSG_X, &planner.max_feedrate_mm_s[X_AXIS], 1, 999);
3515
-      MENU_ITEM_EDIT(float3, MSG_VMAX MSG_Y, &planner.max_feedrate_mm_s[Y_AXIS], 1, 999);
3516
-      MENU_ITEM_EDIT(float3, MSG_VMAX MSG_Z, &planner.max_feedrate_mm_s[Z_AXIS], 1, 999);
3514
+      MENU_ITEM_EDIT(float3, MSG_VMAX MSG_A, &planner.max_feedrate_mm_s[A_AXIS], 1, 999);
3515
+      MENU_ITEM_EDIT(float3, MSG_VMAX MSG_B, &planner.max_feedrate_mm_s[B_AXIS], 1, 999);
3516
+      MENU_ITEM_EDIT(float3, MSG_VMAX MSG_C, &planner.max_feedrate_mm_s[C_AXIS], 1, 999);
3517 3517
 
3518 3518
       #if ENABLED(DISTINCT_E_FACTORS)
3519 3519
         MENU_ITEM_EDIT(float3, MSG_VMAX MSG_E, &planner.max_feedrate_mm_s[E_AXIS + active_extruder], 1, 999);
@@ -3556,9 +3556,9 @@ void kill_screen(const char* lcd_msg) {
3556 3556
       MENU_ITEM_EDIT(float5, MSG_A_TRAVEL, &planner.travel_acceleration, 100, 99000);
3557 3557
 
3558 3558
       // M201 settings
3559
-      MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_X, &planner.max_acceleration_mm_per_s2[X_AXIS], 100, 99000, _reset_acceleration_rates);
3560
-      MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_Y, &planner.max_acceleration_mm_per_s2[Y_AXIS], 100, 99000, _reset_acceleration_rates);
3561
-      MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_Z, &planner.max_acceleration_mm_per_s2[Z_AXIS], 10, 99000, _reset_acceleration_rates);
3559
+      MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_A, &planner.max_acceleration_mm_per_s2[A_AXIS], 100, 99000, _reset_acceleration_rates);
3560
+      MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_B, &planner.max_acceleration_mm_per_s2[B_AXIS], 100, 99000, _reset_acceleration_rates);
3561
+      MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_C, &planner.max_acceleration_mm_per_s2[C_AXIS], 10, 99000, _reset_acceleration_rates);
3562 3562
 
3563 3563
       #if ENABLED(DISTINCT_E_FACTORS)
3564 3564
         MENU_ITEM_EDIT_CALLBACK(long5, MSG_AMAX MSG_E, &planner.max_acceleration_mm_per_s2[E_AXIS + active_extruder], 100, 99000, _reset_acceleration_rates);
@@ -3585,12 +3585,12 @@ void kill_screen(const char* lcd_msg) {
3585 3585
       START_MENU();
3586 3586
       MENU_BACK(MSG_MOTION);
3587 3587
 
3588
-      MENU_ITEM_EDIT(float3, MSG_VX_JERK, &planner.max_jerk[X_AXIS], 1, 990);
3589
-      MENU_ITEM_EDIT(float3, MSG_VY_JERK, &planner.max_jerk[Y_AXIS], 1, 990);
3588
+      MENU_ITEM_EDIT(float3, MSG_VA_JERK, &planner.max_jerk[A_AXIS], 1, 990);
3589
+      MENU_ITEM_EDIT(float3, MSG_VB_JERK, &planner.max_jerk[B_AXIS], 1, 990);
3590 3590
       #if ENABLED(DELTA)
3591
-        MENU_ITEM_EDIT(float3, MSG_VZ_JERK, &planner.max_jerk[Z_AXIS], 1, 990);
3591
+        MENU_ITEM_EDIT(float3, MSG_VC_JERK, &planner.max_jerk[C_AXIS], 1, 990);
3592 3592
       #else
3593
-        MENU_ITEM_EDIT(float52, MSG_VZ_JERK, &planner.max_jerk[Z_AXIS], 0.1, 990);
3593
+        MENU_ITEM_EDIT(float52, MSG_VC_JERK, &planner.max_jerk[C_AXIS], 0.1, 990);
3594 3594
       #endif
3595 3595
       MENU_ITEM_EDIT(float3, MSG_VE_JERK, &planner.max_jerk[E_AXIS], 1, 990);
3596 3596
 
@@ -3602,9 +3602,9 @@ void kill_screen(const char* lcd_msg) {
3602 3602
       START_MENU();
3603 3603
       MENU_BACK(MSG_MOTION);
3604 3604
 
3605
-      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_XSTEPS, &planner.axis_steps_per_mm[X_AXIS], 5, 9999, _planner_refresh_positioning);
3606
-      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_YSTEPS, &planner.axis_steps_per_mm[Y_AXIS], 5, 9999, _planner_refresh_positioning);
3607
-      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_ZSTEPS, &planner.axis_steps_per_mm[Z_AXIS], 5, 9999, _planner_refresh_positioning);
3605
+      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_ASTEPS, &planner.axis_steps_per_mm[A_AXIS], 5, 9999, _planner_refresh_positioning);
3606
+      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_BSTEPS, &planner.axis_steps_per_mm[B_AXIS], 5, 9999, _planner_refresh_positioning);
3607
+      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_CSTEPS, &planner.axis_steps_per_mm[C_AXIS], 5, 9999, _planner_refresh_positioning);
3608 3608
 
3609 3609
       #if ENABLED(DISTINCT_E_FACTORS)
3610 3610
         MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS, &planner.axis_steps_per_mm[E_AXIS + active_extruder], 5, 9999, _planner_refresh_positioning);

+ 10
- 6
Marlin/src/module/motion.cpp Ver arquivo

@@ -580,6 +580,7 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
580 580
 
581 581
     // The approximate length of each segment
582 582
     const float inv_segments = 1.0 / float(segments),
583
+                cartesian_segment_mm = cartesian_mm * inv_segments,
583 584
                 segment_distance[XYZE] = {
584 585
                   xdiff * inv_segments,
585 586
                   ydiff * inv_segments,
@@ -590,6 +591,7 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
590 591
     // SERIAL_ECHOPAIR("mm=", cartesian_mm);
591 592
     // SERIAL_ECHOPAIR(" seconds=", seconds);
592 593
     // SERIAL_ECHOLNPAIR(" segments=", segments);
594
+    // SERIAL_ECHOLNPAIR(" segment_mm=", cartesian_segment_mm);
593 595
 
594 596
     #if ENABLED(SCARA_FEEDRATE_SCALING)
595 597
       // SCARA needs to scale the feed rate from mm/s to degrees/s
@@ -626,10 +628,10 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
626 628
       #if ENABLED(SCARA_FEEDRATE_SCALING)
627 629
         // For SCARA scale the feed rate from mm/s to degrees/s
628 630
         // i.e., Complete the angular vector in the given time.
629
-        planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], raw[Z_AXIS], raw[E_AXIS], HYPOT(delta[A_AXIS] - oldA, delta[B_AXIS] - oldB) * inverse_secs, active_extruder);
631
+        planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], raw[Z_AXIS], raw[E_AXIS], HYPOT(delta[A_AXIS] - oldA, delta[B_AXIS] - oldB) * inverse_secs, active_extruder, cartesian_segment_mm);
630 632
         oldA = delta[A_AXIS]; oldB = delta[B_AXIS];
631 633
       #else
632
-        planner.buffer_line(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], _feedrate_mm_s, active_extruder);
634
+        planner.buffer_line(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], raw[E_AXIS], _feedrate_mm_s, active_extruder, cartesian_segment_mm);
633 635
       #endif
634 636
     }
635 637
 
@@ -637,9 +639,9 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
637 639
     #if ENABLED(SCARA_FEEDRATE_SCALING)
638 640
       inverse_kinematics(rtarget);
639 641
       ADJUST_DELTA(rtarget);
640
-      planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], rtarget[Z_AXIS], rtarget[E_AXIS], HYPOT(delta[A_AXIS] - oldA, delta[B_AXIS] - oldB) * inverse_secs, active_extruder);
642
+      planner.buffer_segment(delta[A_AXIS], delta[B_AXIS], rtarget[Z_AXIS], rtarget[E_AXIS], HYPOT(delta[A_AXIS] - oldA, delta[B_AXIS] - oldB) * inverse_secs, active_extruder, cartesian_segment_mm);
641 643
     #else
642
-      planner.buffer_line_kinematic(rtarget, _feedrate_mm_s, active_extruder);
644
+      planner.buffer_line_kinematic(rtarget, _feedrate_mm_s, active_extruder, cartesian_segment_mm);
643 645
     #endif
644 646
 
645 647
     return false; // caller will update current_position
@@ -685,6 +687,7 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
685 687
 
686 688
       // The approximate length of each segment
687 689
       const float inv_segments = 1.0 / float(segments),
690
+                  cartesian_segment_mm = cartesian_mm * inv_segments,
688 691
                   segment_distance[XYZE] = {
689 692
                     xdiff * inv_segments,
690 693
                     ydiff * inv_segments,
@@ -694,6 +697,7 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
694 697
 
695 698
       // SERIAL_ECHOPAIR("mm=", cartesian_mm);
696 699
       // SERIAL_ECHOLNPAIR(" segments=", segments);
700
+      // SERIAL_ECHOLNPAIR(" segment_mm=", cartesian_segment_mm);
697 701
 
698 702
       // Get the raw current position as starting point
699 703
       float raw[XYZE];
@@ -708,12 +712,12 @@ float soft_endstop_min[XYZ] = { X_MIN_BED, Y_MIN_BED, Z_MIN_POS },
708 712
           idle();
709 713
         }
710 714
         LOOP_XYZE(i) raw[i] += segment_distance[i];
711
-        planner.buffer_line_kinematic(raw, fr_mm_s, active_extruder);
715
+        planner.buffer_line_kinematic(raw, fr_mm_s, active_extruder, cartesian_segment_mm);
712 716
       }
713 717
 
714 718
       // Since segment_distance is only approximate,
715 719
       // the final move must be to the exact destination.
716
-      planner.buffer_line_kinematic(destination, fr_mm_s, active_extruder);
720
+      planner.buffer_line_kinematic(destination, fr_mm_s, active_extruder, cartesian_segment_mm);
717 721
     }
718 722
 
719 723
   #endif // SEGMENT_LEVELED_MOVES

+ 43
- 39
Marlin/src/module/planner.cpp Ver arquivo

@@ -726,11 +726,11 @@ void Planner::check_axes_activity() {
726 726
  *  fr_mm_s     - (target) speed of the move
727 727
  *  extruder    - target extruder
728 728
  */
729
-void Planner::_buffer_steps(const int32_t (&target)[XYZE], float fr_mm_s, const uint8_t extruder) {
729
+void Planner::_buffer_steps(const int32_t (&target)[ABCE], float fr_mm_s, const uint8_t extruder, const float &millimeters /*= 0.0*/) {
730 730
 
731
-  const int32_t da = target[X_AXIS] - position[X_AXIS],
732
-                db = target[Y_AXIS] - position[Y_AXIS],
733
-                dc = target[Z_AXIS] - position[Z_AXIS];
731
+  const int32_t da = target[A_AXIS] - position[A_AXIS],
732
+                db = target[B_AXIS] - position[B_AXIS],
733
+                dc = target[C_AXIS] - position[C_AXIS];
734 734
 
735 735
   int32_t de = target[E_AXIS] - position[E_AXIS];
736 736
 
@@ -832,13 +832,13 @@ void Planner::_buffer_steps(const int32_t (&target)[XYZE], float fr_mm_s, const
832 832
     block->steps[C_AXIS] = labs(db - dc);
833 833
   #else
834 834
     // default non-h-bot planning
835
-    block->steps[X_AXIS] = labs(da);
836
-    block->steps[Y_AXIS] = labs(db);
837
-    block->steps[Z_AXIS] = labs(dc);
835
+    block->steps[A_AXIS] = labs(da);
836
+    block->steps[B_AXIS] = labs(db);
837
+    block->steps[C_AXIS] = labs(dc);
838 838
   #endif
839 839
 
840 840
   block->steps[E_AXIS] = esteps;
841
-  block->step_event_count = MAX4(block->steps[X_AXIS], block->steps[Y_AXIS], block->steps[Z_AXIS], esteps);
841
+  block->step_event_count = MAX4(block->steps[A_AXIS], block->steps[B_AXIS], block->steps[C_AXIS], esteps);
842 842
 
843 843
   // Bail if this is a zero-length block
844 844
   if (block->step_event_count < MIN_STEPS_PER_SEGMENT) return;
@@ -1019,17 +1019,17 @@ void Planner::_buffer_steps(const int32_t (&target)[XYZE], float fr_mm_s, const
1019 1019
       delta_mm[C_AXIS] = CORESIGN(db - dc) * steps_to_mm[C_AXIS];
1020 1020
     #endif
1021 1021
   #else
1022
-    float delta_mm[XYZE];
1023
-    delta_mm[X_AXIS] = da * steps_to_mm[X_AXIS];
1024
-    delta_mm[Y_AXIS] = db * steps_to_mm[Y_AXIS];
1025
-    delta_mm[Z_AXIS] = dc * steps_to_mm[Z_AXIS];
1022
+    float delta_mm[ABCE];
1023
+    delta_mm[A_AXIS] = da * steps_to_mm[A_AXIS];
1024
+    delta_mm[B_AXIS] = db * steps_to_mm[B_AXIS];
1025
+    delta_mm[C_AXIS] = dc * steps_to_mm[C_AXIS];
1026 1026
   #endif
1027 1027
   delta_mm[E_AXIS] = esteps_float * steps_to_mm[E_AXIS_N];
1028 1028
 
1029
-  if (block->steps[X_AXIS] < MIN_STEPS_PER_SEGMENT && block->steps[Y_AXIS] < MIN_STEPS_PER_SEGMENT && block->steps[Z_AXIS] < MIN_STEPS_PER_SEGMENT) {
1029
+  if (block->steps[A_AXIS] < MIN_STEPS_PER_SEGMENT && block->steps[B_AXIS] < MIN_STEPS_PER_SEGMENT && block->steps[C_AXIS] < MIN_STEPS_PER_SEGMENT) {
1030 1030
     block->millimeters = FABS(delta_mm[E_AXIS]);
1031 1031
   }
1032
-  else {
1032
+  else if (!millimeters) {
1033 1033
     block->millimeters = SQRT(
1034 1034
       #if CORE_IS_XY
1035 1035
         sq(delta_mm[X_HEAD]) + sq(delta_mm[Y_HEAD]) + sq(delta_mm[Z_AXIS])
@@ -1042,6 +1042,9 @@ void Planner::_buffer_steps(const int32_t (&target)[XYZE], float fr_mm_s, const
1042 1042
       #endif
1043 1043
     );
1044 1044
   }
1045
+  else
1046
+    block->millimeters = millimeters;
1047
+
1045 1048
   const float inverse_millimeters = 1.0 / block->millimeters;  // Inverse millimeters to remove multiple divides
1046 1049
 
1047 1050
   // Calculate inverse time for this move. No divide by zero due to previous checks.
@@ -1170,7 +1173,7 @@ void Planner::_buffer_steps(const int32_t (&target)[XYZE], float fr_mm_s, const
1170 1173
   // Compute and limit the acceleration rate for the trapezoid generator.
1171 1174
   const float steps_per_mm = block->step_event_count * inverse_millimeters;
1172 1175
   uint32_t accel;
1173
-  if (!block->steps[X_AXIS] && !block->steps[Y_AXIS] && !block->steps[Z_AXIS]) {
1176
+  if (!block->steps[A_AXIS] && !block->steps[B_AXIS] && !block->steps[C_AXIS]) {
1174 1177
     // convert to: acceleration steps/sec^2
1175 1178
     accel = CEIL(retract_acceleration * steps_per_mm);
1176 1179
   }
@@ -1200,15 +1203,15 @@ void Planner::_buffer_steps(const int32_t (&target)[XYZE], float fr_mm_s, const
1200 1203
 
1201 1204
     // Limit acceleration per axis
1202 1205
     if (block->step_event_count <= cutoff_long) {
1203
-      LIMIT_ACCEL_LONG(X_AXIS, 0);
1204
-      LIMIT_ACCEL_LONG(Y_AXIS, 0);
1205
-      LIMIT_ACCEL_LONG(Z_AXIS, 0);
1206
+      LIMIT_ACCEL_LONG(A_AXIS, 0);
1207
+      LIMIT_ACCEL_LONG(B_AXIS, 0);
1208
+      LIMIT_ACCEL_LONG(C_AXIS, 0);
1206 1209
       LIMIT_ACCEL_LONG(E_AXIS, ACCEL_IDX);
1207 1210
     }
1208 1211
     else {
1209
-      LIMIT_ACCEL_FLOAT(X_AXIS, 0);
1210
-      LIMIT_ACCEL_FLOAT(Y_AXIS, 0);
1211
-      LIMIT_ACCEL_FLOAT(Z_AXIS, 0);
1212
+      LIMIT_ACCEL_FLOAT(A_AXIS, 0);
1213
+      LIMIT_ACCEL_FLOAT(B_AXIS, 0);
1214
+      LIMIT_ACCEL_FLOAT(C_AXIS, 0);
1212 1215
       LIMIT_ACCEL_FLOAT(E_AXIS, ACCEL_IDX);
1213 1216
     }
1214 1217
   }
@@ -1225,9 +1228,9 @@ void Planner::_buffer_steps(const int32_t (&target)[XYZE], float fr_mm_s, const
1225 1228
 
1226 1229
     // Compute path unit vector
1227 1230
     double unit_vec[XYZ] = {
1228
-      delta_mm[X_AXIS] * inverse_millimeters,
1229
-      delta_mm[Y_AXIS] * inverse_millimeters,
1230
-      delta_mm[Z_AXIS] * inverse_millimeters
1231
+      delta_mm[A_AXIS] * inverse_millimeters,
1232
+      delta_mm[B_AXIS] * inverse_millimeters,
1233
+      delta_mm[C_AXIS] * inverse_millimeters
1231 1234
     };
1232 1235
 
1233 1236
     /*
@@ -1417,11 +1420,12 @@ void Planner::_buffer_steps(const int32_t (&target)[XYZE], float fr_mm_s, const
1417 1420
  *
1418 1421
  * Leveling and kinematics should be applied ahead of calling this.
1419 1422
  *
1420
- *  a,b,c,e   - target positions in mm and/or degrees
1421
- *  fr_mm_s   - (target) speed of the move
1422
- *  extruder  - target extruder
1423
+ *  a,b,c,e     - target positions in mm and/or degrees
1424
+ *  fr_mm_s     - (target) speed of the move
1425
+ *  extruder    - target extruder
1426
+ *  millimeters - the length of the movement, if known
1423 1427
  */
1424
-void Planner::buffer_segment(const float &a, const float &b, const float &c, const float &e, const float &fr_mm_s, const uint8_t extruder) {
1428
+void Planner::buffer_segment(const float &a, const float &b, const float &c, const float &e, const float &fr_mm_s, const uint8_t extruder, const float &millimeters /*= 0.0*/) {
1425 1429
   // When changing extruders recalculate steps corresponding to the E position
1426 1430
   #if ENABLED(DISTINCT_E_FACTORS)
1427 1431
     if (last_extruder != extruder && axis_steps_per_mm[E_AXIS_N] != axis_steps_per_mm[E_AXIS + last_extruder]) {
@@ -1432,10 +1436,10 @@ void Planner::buffer_segment(const float &a, const float &b, const float &c, con
1432 1436
 
1433 1437
   // The target position of the tool in absolute steps
1434 1438
   // Calculate target position in absolute steps
1435
-  const int32_t target[XYZE] = {
1436
-    LROUND(a * axis_steps_per_mm[X_AXIS]),
1437
-    LROUND(b * axis_steps_per_mm[Y_AXIS]),
1438
-    LROUND(c * axis_steps_per_mm[Z_AXIS]),
1439
+  const int32_t target[ABCE] = {
1440
+    LROUND(a * axis_steps_per_mm[A_AXIS]),
1441
+    LROUND(b * axis_steps_per_mm[B_AXIS]),
1442
+    LROUND(c * axis_steps_per_mm[C_AXIS]),
1439 1443
     LROUND(e * axis_steps_per_mm[E_AXIS_N])
1440 1444
   };
1441 1445
 
@@ -1513,7 +1517,7 @@ void Planner::buffer_segment(const float &a, const float &b, const float &c, con
1513 1517
   if (!blocks_queued()) {
1514 1518
 
1515 1519
     #define _BETWEEN(A) (position[A##_AXIS] + target[A##_AXIS]) >> 1
1516
-    const int32_t between[XYZE] = { _BETWEEN(X), _BETWEEN(Y), _BETWEEN(Z), _BETWEEN(E) };
1520
+    const int32_t between[ABCE] = { _BETWEEN(A), _BETWEEN(B), _BETWEEN(C), _BETWEEN(E) };
1517 1521
     DISABLE_STEPPER_DRIVER_INTERRUPT();
1518 1522
 
1519 1523
     #if ENABLED(LIN_ADVANCE)
@@ -1521,7 +1525,7 @@ void Planner::buffer_segment(const float &a, const float &b, const float &c, con
1521 1525
       lin_dist_e *= 0.5;
1522 1526
     #endif
1523 1527
 
1524
-    _buffer_steps(between, fr_mm_s, extruder);
1528
+    _buffer_steps(between, fr_mm_s, extruder, millimeters * 0.5);
1525 1529
 
1526 1530
     #if ENABLED(LIN_ADVANCE)
1527 1531
       position_float[X_AXIS] = (position_float[X_AXIS] + a) * 0.5;
@@ -1531,12 +1535,12 @@ void Planner::buffer_segment(const float &a, const float &b, const float &c, con
1531 1535
     #endif
1532 1536
 
1533 1537
     const uint8_t next = block_buffer_head;
1534
-    _buffer_steps(target, fr_mm_s, extruder);
1538
+    _buffer_steps(target, fr_mm_s, extruder, millimeters * 0.5);
1535 1539
     SBI(block_buffer[next].flag, BLOCK_BIT_CONTINUED);
1536 1540
     ENABLE_STEPPER_DRIVER_INTERRUPT();
1537 1541
   }
1538 1542
   else
1539
-    _buffer_steps(target, fr_mm_s, extruder);
1543
+    _buffer_steps(target, fr_mm_s, extruder, millimeters);
1540 1544
 
1541 1545
   stepper.wake_up();
1542 1546
 
@@ -1562,9 +1566,9 @@ void Planner::_set_position_mm(const float &a, const float &b, const float &c, c
1562 1566
   #else
1563 1567
     #define _EINDEX E_AXIS
1564 1568
   #endif
1565
-  const int32_t na = position[X_AXIS] = LROUND(a * axis_steps_per_mm[X_AXIS]),
1566
-                nb = position[Y_AXIS] = LROUND(b * axis_steps_per_mm[Y_AXIS]),
1567
-                nc = position[Z_AXIS] = LROUND(c * axis_steps_per_mm[Z_AXIS]),
1569
+  const int32_t na = position[A_AXIS] = LROUND(a * axis_steps_per_mm[A_AXIS]),
1570
+                nb = position[B_AXIS] = LROUND(b * axis_steps_per_mm[B_AXIS]),
1571
+                nc = position[C_AXIS] = LROUND(c * axis_steps_per_mm[C_AXIS]),
1568 1572
                 ne = position[E_AXIS] = LROUND(e * axis_steps_per_mm[_EINDEX]);
1569 1573
   #if ENABLED(LIN_ADVANCE)
1570 1574
     position_float[X_AXIS] = a;

+ 17
- 13
Marlin/src/module/planner.h Ver arquivo

@@ -416,8 +416,9 @@ class Planner {
416 416
      *  target      - target position in steps units
417 417
      *  fr_mm_s     - (target) speed of the move
418 418
      *  extruder    - target extruder
419
+     *  millimeters - the length of the movement, if known
419 420
      */
420
-    static void _buffer_steps(const int32_t (&target)[XYZE], float fr_mm_s, const uint8_t extruder);
421
+    static void _buffer_steps(const int32_t (&target)[XYZE], float fr_mm_s, const uint8_t extruder, const float &millimeters = 0.0);
421 422
 
422 423
     /**
423 424
      * Planner::buffer_segment
@@ -426,11 +427,12 @@ class Planner {
426 427
      *
427 428
      * Leveling and kinematics should be applied ahead of calling this.
428 429
      *
429
-     *  a,b,c,e   - target positions in mm and/or degrees
430
-     *  fr_mm_s   - (target) speed of the move
431
-     *  extruder  - target extruder
430
+     *  a,b,c,e     - target positions in mm and/or degrees
431
+     *  fr_mm_s     - (target) speed of the move
432
+     *  extruder    - target extruder
433
+     *  millimeters - the length of the movement, if known
432 434
      */
433
-    static void buffer_segment(const float &a, const float &b, const float &c, const float &e, const float &fr_mm_s, const uint8_t extruder);
435
+    static void buffer_segment(const float &a, const float &b, const float &c, const float &e, const float &fr_mm_s, const uint8_t extruder, const float &millimeters = 0.0);
434 436
 
435 437
     static void _set_position_mm(const float &a, const float &b, const float &c, const float &e);
436 438
 
@@ -445,12 +447,13 @@ class Planner {
445 447
      *  rx,ry,rz,e   - target position in mm or degrees
446 448
      *  fr_mm_s      - (target) speed of the move (mm/s)
447 449
      *  extruder     - target extruder
450
+     *  millimeters  - the length of the movement, if known
448 451
      */
449
-    FORCE_INLINE static void buffer_line(ARG_X, ARG_Y, ARG_Z, const float &e, const float &fr_mm_s, const uint8_t extruder) {
452
+    FORCE_INLINE static void buffer_line(ARG_X, ARG_Y, ARG_Z, const float &e, const float &fr_mm_s, const uint8_t extruder, const float millimeters = 0.0) {
450 453
       #if PLANNER_LEVELING && IS_CARTESIAN
451 454
         apply_leveling(rx, ry, rz);
452 455
       #endif
453
-      buffer_segment(rx, ry, rz, e, fr_mm_s, extruder);
456
+      buffer_segment(rx, ry, rz, e, fr_mm_s, extruder, millimeters);
454 457
     }
455 458
 
456 459
     /**
@@ -458,11 +461,12 @@ class Planner {
458 461
      * The target is cartesian, it's translated to delta/scara if
459 462
      * needed.
460 463
      *
461
-     *  cart     - x,y,z,e CARTESIAN target in mm
462
-     *  fr_mm_s  - (target) speed of the move (mm/s)
463
-     *  extruder - target extruder
464
+     *  cart         - x,y,z,e CARTESIAN target in mm
465
+     *  fr_mm_s      - (target) speed of the move (mm/s)
466
+     *  extruder     - target extruder
467
+     *  millimeters  - the length of the movement, if known
464 468
      */
465
-    FORCE_INLINE static void buffer_line_kinematic(const float (&cart)[XYZE], const float &fr_mm_s, const uint8_t extruder) {
469
+    FORCE_INLINE static void buffer_line_kinematic(const float (&cart)[XYZE], const float &fr_mm_s, const uint8_t extruder, const float millimeters = 0.0) {
466 470
       #if PLANNER_LEVELING
467 471
         float raw[XYZ] = { cart[X_AXIS], cart[Y_AXIS], cart[Z_AXIS] };
468 472
         apply_leveling(raw);
@@ -471,9 +475,9 @@ class Planner {
471 475
       #endif
472 476
       #if IS_KINEMATIC
473 477
         inverse_kinematics(raw);
474
-        buffer_segment(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], cart[E_AXIS], fr_mm_s, extruder);
478
+        buffer_segment(delta[A_AXIS], delta[B_AXIS], delta[C_AXIS], cart[E_AXIS], fr_mm_s, extruder, millimeters);
475 479
       #else
476
-        buffer_segment(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS], cart[E_AXIS], fr_mm_s, extruder);
480
+        buffer_segment(raw[X_AXIS], raw[Y_AXIS], raw[Z_AXIS], cart[E_AXIS], fr_mm_s, extruder, millimeters);
477 481
       #endif
478 482
     }
479 483
 

Carregando…
Cancelar
Salvar