Ver código fonte

Merge pull request #5436 from esenapaj/Remove-redundant-E,-etc-plan-B

Remove redundant "E", etc plan B
Scott Lahteine 8 anos atrás
pai
commit
a1e0842c8b

+ 4
- 4
Marlin/language.h Ver arquivo

@@ -262,10 +262,10 @@
262 262
 #define MSG_N2 " 2"
263 263
 #define MSG_N3 " 3"
264 264
 #define MSG_N4 " 4"
265
-#define MSG_E1 " E1"
266
-#define MSG_E2 " E2"
267
-#define MSG_E3 " E3"
268
-#define MSG_E4 " E4"
265
+#define MSG_E1 "E1"
266
+#define MSG_E2 "E2"
267
+#define MSG_E3 "E3"
268
+#define MSG_E4 "E4"
269 269
 #define MSG_MOVE_E1 "1"
270 270
 #define MSG_MOVE_E2 "2"
271 271
 #define MSG_MOVE_E3 "3"

+ 4
- 0
Marlin/language_an.h Ver arquivo

@@ -99,6 +99,10 @@
99 99
 #define MSG_YSTEPS                          "Y trangos/mm"
100 100
 #define MSG_ZSTEPS                          "Z trangos/mm"
101 101
 #define MSG_ESTEPS                          "E trangos/mm"
102
+#define MSG_E1STEPS                         "E1 trangos/mm"
103
+#define MSG_E2STEPS                         "E2 trangos/mm"
104
+#define MSG_E3STEPS                         "E3 trangos/mm"
105
+#define MSG_E4STEPS                         "E4 trangos/mm"
102 106
 #define MSG_TEMPERATURE                     "Temperatura"
103 107
 #define MSG_MOTION                          "Movimiento"
104 108
 #define MSG_VOLUMETRIC                      "Filament"

+ 4
- 0
Marlin/language_bg.h Ver arquivo

@@ -109,6 +109,10 @@
109 109
 #define MSG_YSTEPS                          "Y стъпки/mm"
110 110
 #define MSG_ZSTEPS                          "Z стъпки/mm"
111 111
 #define MSG_ESTEPS                          "E стъпки/mm"
112
+#define MSG_E1STEPS                         "E1 стъпки/mm"
113
+#define MSG_E2STEPS                         "E2 стъпки/mm"
114
+#define MSG_E3STEPS                         "E3 стъпки/mm"
115
+#define MSG_E4STEPS                         "E4 стъпки/mm"
112 116
 #define MSG_TEMPERATURE                     "Температура"
113 117
 #define MSG_MOTION                          "Движение"
114 118
 #define MSG_VOLUMETRIC                      "Нишка"

+ 4
- 0
Marlin/language_ca.h Ver arquivo

@@ -100,6 +100,10 @@
100 100
 #define MSG_YSTEPS                          "Ypassos/mm"
101 101
 #define MSG_ZSTEPS                          "Zpassos/mm"
102 102
 #define MSG_ESTEPS                          "Epassos/mm"
103
+#define MSG_E1STEPS                         "E1passos/mm"
104
+#define MSG_E2STEPS                         "E2passos/mm"
105
+#define MSG_E3STEPS                         "E3passos/mm"
106
+#define MSG_E4STEPS                         "E4passos/mm"
103 107
 #define MSG_TEMPERATURE                     "Temperatura"
104 108
 #define MSG_MOTION                          "Moviment"
105 109
 #define MSG_VOLUMETRIC                      "Filament"

+ 4
- 0
Marlin/language_cn.h Ver arquivo

@@ -101,6 +101,10 @@
101 101
 #define MSG_YSTEPS                          "Ysteps/mm"
102 102
 #define MSG_ZSTEPS                          "Zsteps/mm"
103 103
 #define MSG_ESTEPS                          "Esteps/mm"
104
+#define MSG_E1STEPS                         "E1steps/mm"
105
+#define MSG_E2STEPS                         "E2steps/mm"
106
+#define MSG_E3STEPS                         "E3steps/mm"
107
+#define MSG_E4STEPS                         "E4steps/mm"
104 108
 #define MSG_TEMPERATURE                     "\xc9\xd2"
105 109
 #define MSG_MOTION                          "\xdf\xb2"
106 110
 #define MSG_VOLUMETRIC                      "Filament"

+ 4
- 0
Marlin/language_cz.h Ver arquivo

@@ -112,6 +112,10 @@
112 112
 #define MSG_YSTEPS                          "Ykroku/mm"
113 113
 #define MSG_ZSTEPS                          "Zkroku/mm"
114 114
 #define MSG_ESTEPS                          "Ekroku/mm"
115
+#define MSG_E1STEPS                         "E1kroku/mm"
116
+#define MSG_E2STEPS                         "E2kroku/mm"
117
+#define MSG_E3STEPS                         "E3kroku/mm"
118
+#define MSG_E4STEPS                         "E4kroku/mm"
115 119
 #define MSG_TEMPERATURE                     "Teplota"
116 120
 #define MSG_MOTION                          "Pohyb"
117 121
 #define MSG_VOLUMETRIC                      "Filament"

+ 4
- 0
Marlin/language_da.h Ver arquivo

@@ -110,6 +110,10 @@
110 110
 #define MSG_YSTEPS                          "Ysteps/mm"
111 111
 #define MSG_ZSTEPS                          "Zsteps/mm"
112 112
 #define MSG_ESTEPS                          "Esteps/mm"
113
+#define MSG_E1STEPS                         "E1steps/mm"
114
+#define MSG_E2STEPS                         "E2steps/mm"
115
+#define MSG_E3STEPS                         "E3steps/mm"
116
+#define MSG_E4STEPS                         "E4steps/mm"
113 117
 #define MSG_TEMPERATURE                     "Temperatur"
114 118
 #define MSG_MOTION                          "Bevægelse"
115 119
 #define MSG_VOLUMETRIC                      "Filament"

+ 4
- 0
Marlin/language_de.h Ver arquivo

@@ -109,6 +109,10 @@
109 109
 #define MSG_YSTEPS                          "Y Steps/mm"
110 110
 #define MSG_ZSTEPS                          "Z Steps/mm"
111 111
 #define MSG_ESTEPS                          "E Steps/mm"
112
+#define MSG_E1STEPS                         "E1 Steps/mm"
113
+#define MSG_E2STEPS                         "E2 Steps/mm"
114
+#define MSG_E3STEPS                         "E3 Steps/mm"
115
+#define MSG_E4STEPS                         "E4 Steps/mm"
112 116
 #define MSG_TEMPERATURE                     "Temperatur"
113 117
 #define MSG_MOTION                          "Bewegung"
114 118
 #define MSG_VOLUMETRIC                      "Filament"

+ 4
- 0
Marlin/language_el-gr.h Ver arquivo

@@ -108,6 +108,10 @@
108 108
 #define MSG_YSTEPS                          "Bήματα Υ ανά μμ"
109 109
 #define MSG_ZSTEPS                          "Bήματα Ζ ανά μμ"
110 110
 #define MSG_ESTEPS                          "Bήματα Ε ανά μμ"
111
+#define MSG_E1STEPS                         "Bήματα Ε1 ανά μμ"
112
+#define MSG_E2STEPS                         "Bήματα Ε2 ανά μμ"
113
+#define MSG_E3STEPS                         "Bήματα Ε3 ανά μμ"
114
+#define MSG_E4STEPS                         "Bήματα Ε4 ανά μμ"
111 115
 #define MSG_TEMPERATURE                     "Θερμοκρασία"
112 116
 #define MSG_MOTION                          "Κίνηση"
113 117
 #define MSG_VOLUMETRIC                      "Νήμα"

+ 4
- 0
Marlin/language_el.h Ver arquivo

@@ -108,6 +108,10 @@
108 108
 #define MSG_YSTEPS                          "Bήματα Υ ανά μμ"
109 109
 #define MSG_ZSTEPS                          "Bήματα Ζ ανά μμ"
110 110
 #define MSG_ESTEPS                          "Bήματα Ε ανά μμ"
111
+#define MSG_E1STEPS                         "Bήματα Ε1 ανά μμ"
112
+#define MSG_E2STEPS                         "Bήματα Ε2 ανά μμ"
113
+#define MSG_E3STEPS                         "Bήματα Ε3 ανά μμ"
114
+#define MSG_E4STEPS                         "Bήματα Ε4 ανά μμ"
111 115
 #define MSG_TEMPERATURE                     "Θερμοκρασία"
112 116
 #define MSG_MOTION                          "Κίνηση"
113 117
 #define MSG_VOLUMETRIC                      "Νήμα"

+ 12
- 0
Marlin/language_en.h Ver arquivo

@@ -258,6 +258,18 @@
258 258
 #ifndef MSG_ESTEPS
259 259
   #define MSG_ESTEPS                          "Esteps/mm"
260 260
 #endif
261
+#ifndef MSG_E1STEPS
262
+  #define MSG_E1STEPS                         "E1steps/mm"
263
+#endif
264
+#ifndef MSG_E2STEPS
265
+  #define MSG_E2STEPS                         "E2steps/mm"
266
+#endif
267
+#ifndef MSG_E3STEPS
268
+  #define MSG_E3STEPS                         "E3steps/mm"
269
+#endif
270
+#ifndef MSG_E4STEPS
271
+  #define MSG_E4STEPS                         "E4steps/mm"
272
+#endif
261 273
 #ifndef MSG_TEMPERATURE
262 274
   #define MSG_TEMPERATURE                     "Temperature"
263 275
 #endif

+ 4
- 0
Marlin/language_es.h Ver arquivo

@@ -106,6 +106,10 @@
106 106
 #define MSG_YSTEPS                          "Y pasos/mm"
107 107
 #define MSG_ZSTEPS                          "Z pasos/mm"
108 108
 #define MSG_ESTEPS                          "E pasos/mm"
109
+#define MSG_E1STEPS                         "E1 pasos/mm"
110
+#define MSG_E2STEPS                         "E2 pasos/mm"
111
+#define MSG_E3STEPS                         "E3 pasos/mm"
112
+#define MSG_E4STEPS                         "E4 pasos/mm"
109 113
 #define MSG_TEMPERATURE                     "Temperatura"
110 114
 #define MSG_MOTION                          "Movimiento"
111 115
 #define MSG_VOLUMETRIC                      "Filamento"

+ 4
- 0
Marlin/language_eu.h Ver arquivo

@@ -99,6 +99,10 @@
99 99
 #define MSG_YSTEPS                          "Y pausoak/mm"
100 100
 #define MSG_ZSTEPS                          "Z pausoak/mm"
101 101
 #define MSG_ESTEPS                          "E pausoak/mm"
102
+#define MSG_E1STEPS                         "E1 pausoak/mm"
103
+#define MSG_E2STEPS                         "E2 pausoak/mm"
104
+#define MSG_E3STEPS                         "E3 pausoak/mm"
105
+#define MSG_E4STEPS                         "E4 pausoak/mm"
102 106
 #define MSG_TEMPERATURE                     "Tenperatura"
103 107
 #define MSG_MOTION                          "Mugimendua"
104 108
 #define MSG_VOLUMETRIC                      "Filament"

+ 4
- 0
Marlin/language_fi.h Ver arquivo

@@ -100,6 +100,10 @@
100 100
 #define MSG_YSTEPS                          "Ysteps/mm"
101 101
 #define MSG_ZSTEPS                          "Zsteps/mm"
102 102
 #define MSG_ESTEPS                          "Esteps/mm"
103
+#define MSG_E1STEPS                         "E1steps/mm"
104
+#define MSG_E2STEPS                         "E2steps/mm"
105
+#define MSG_E3STEPS                         "E3steps/mm"
106
+#define MSG_E4STEPS                         "E4steps/mm"
103 107
 #define MSG_TEMPERATURE                     "Lämpötila"
104 108
 #define MSG_MOTION                          "Liike"
105 109
 #define MSG_VOLUMETRIC                      "Filament"

+ 4
- 0
Marlin/language_fr.h Ver arquivo

@@ -108,6 +108,10 @@
108 108
 #define MSG_YSTEPS                          "Ypas/mm"
109 109
 #define MSG_ZSTEPS                          "Zpas/mm"
110 110
 #define MSG_ESTEPS                          "Epas/mm"
111
+#define MSG_E1STEPS                         "E1pas/mm"
112
+#define MSG_E2STEPS                         "E2pas/mm"
113
+#define MSG_E3STEPS                         "E3pas/mm"
114
+#define MSG_E4STEPS                         "E4pas/mm"
111 115
 #define MSG_TEMPERATURE                     "Temperature"
112 116
 #define MSG_MOTION                          "Mouvement"
113 117
 #define MSG_VOLUMETRIC                      "Filament"

+ 4
- 0
Marlin/language_gl.h Ver arquivo

@@ -109,6 +109,10 @@
109 109
 #define MSG_YSTEPS                          "Ypasos/mm"
110 110
 #define MSG_ZSTEPS                          "Zpasos/mm"
111 111
 #define MSG_ESTEPS                          "Epasos/mm"
112
+#define MSG_E1STEPS                         "E1pasos/mm"
113
+#define MSG_E2STEPS                         "E2pasos/mm"
114
+#define MSG_E3STEPS                         "E3pasos/mm"
115
+#define MSG_E4STEPS                         "E4pasos/mm"
112 116
 #define MSG_TEMPERATURE                     "Temperatura"
113 117
 #define MSG_MOTION                          "Movemento"
114 118
 #define MSG_VOLUMETRIC                      "Filamento"

+ 4
- 0
Marlin/language_hr.h Ver arquivo

@@ -108,6 +108,10 @@
108 108
 #define MSG_YSTEPS                          "Ysteps/mm"
109 109
 #define MSG_ZSTEPS                          "Zsteps/mm"
110 110
 #define MSG_ESTEPS                          "Esteps/mm"
111
+#define MSG_E1STEPS                         "E1steps/mm"
112
+#define MSG_E2STEPS                         "E2steps/mm"
113
+#define MSG_E3STEPS                         "E3steps/mm"
114
+#define MSG_E4STEPS                         "E4steps/mm"
111 115
 #define MSG_TEMPERATURE                     "Temperature"
112 116
 #define MSG_MOTION                          "Gibanje"
113 117
 #define MSG_VOLUMETRIC                      "Filament"

+ 4
- 0
Marlin/language_it.h Ver arquivo

@@ -116,6 +116,10 @@
116 116
 #define MSG_YSTEPS                          "Ypassi/mm"
117 117
 #define MSG_ZSTEPS                          "Zpassi/mm"
118 118
 #define MSG_ESTEPS                          "Epassi/mm"
119
+#define MSG_E1STEPS                         "E1passi/mm"
120
+#define MSG_E2STEPS                         "E2passi/mm"
121
+#define MSG_E3STEPS                         "E3passi/mm"
122
+#define MSG_E4STEPS                         "E4passi/mm"
119 123
 #define MSG_TEMPERATURE                     "Temperatura"
120 124
 #define MSG_MOTION                          "Movimento"
121 125
 #define MSG_VOLUMETRIC                      "Filamento"

+ 8
- 0
Marlin/language_kana.h Ver arquivo

@@ -129,11 +129,19 @@
129 129
   #define MSG_YSTEPS                          "Ysteps/mm"
130 130
   #define MSG_ZSTEPS                          "Zsteps/mm"
131 131
   #define MSG_ESTEPS                          "Esteps/mm"
132
+  #define MSG_E1STEPS                         "E1steps/mm"
133
+  #define MSG_E2STEPS                         "E2steps/mm"
134
+  #define MSG_E3STEPS                         "E3steps/mm"
135
+  #define MSG_E4STEPS                         "E4steps/mm"
132 136
 #else
133 137
   #define MSG_XSTEPS                          "Xsteps"
134 138
   #define MSG_YSTEPS                          "Ysteps"
135 139
   #define MSG_ZSTEPS                          "Zsteps"
136 140
   #define MSG_ESTEPS                          "Esteps"
141
+  #define MSG_E1STEPS                         "E1steps"
142
+  #define MSG_E2STEPS                         "E2steps"
143
+  #define MSG_E3STEPS                         "E3steps"
144
+  #define MSG_E4STEPS                         "E4steps"
137 145
 #endif
138 146
 #define MSG_TEMPERATURE                     "\xb5\xdd\xc4\xde"                                                 // "オンド" ("Temperature")
139 147
 #define MSG_MOTION                          "\xb3\xba\xde\xb7\xbe\xaf\xc3\xb2"                                 // "ウゴキセッテイ" ("Motion")

+ 4
- 0
Marlin/language_kana_utf8.h Ver arquivo

@@ -114,6 +114,10 @@
114 114
 #define MSG_YSTEPS                          "Ysteps/mm"
115 115
 #define MSG_ZSTEPS                          "Zsteps/mm"
116 116
 #define MSG_ESTEPS                          "Esteps/mm"
117
+#define MSG_E1STEPS                         "E1steps/mm"
118
+#define MSG_E2STEPS                         "E2steps/mm"
119
+#define MSG_E3STEPS                         "E3steps/mm"
120
+#define MSG_E4STEPS                         "E4steps/mm"
117 121
 #define MSG_TEMPERATURE                     "オンド"                      // "Temperature"
118 122
 #define MSG_MOTION                          "ウゴキセッテイ"                // "Motion"
119 123
 #define MSG_VOLUMETRIC                      "フィラメント"                   // "Filament"

+ 4
- 0
Marlin/language_nl.h Ver arquivo

@@ -101,6 +101,10 @@
101 101
 #define MSG_YSTEPS                          "Ysteps/mm"
102 102
 #define MSG_ZSTEPS                          "Zsteps/mm"
103 103
 #define MSG_ESTEPS                          "Esteps/mm"
104
+#define MSG_E1STEPS                         "E1steps/mm"
105
+#define MSG_E2STEPS                         "E2steps/mm"
106
+#define MSG_E3STEPS                         "E3steps/mm"
107
+#define MSG_E4STEPS                         "E4steps/mm"
104 108
 #define MSG_TEMPERATURE                     "Temperatuur"
105 109
 #define MSG_MOTION                          "Beweging"
106 110
 #define MSG_VOLUMETRIC                      "Filament"

+ 4
- 0
Marlin/language_pl.h Ver arquivo

@@ -108,6 +108,10 @@
108 108
 #define MSG_YSTEPS                          "krokiY/mm"
109 109
 #define MSG_ZSTEPS                          "krokiZ/mm"
110 110
 #define MSG_ESTEPS                          "krokiE/mm"
111
+#define MSG_E1STEPS                         "krokiE1/mm"
112
+#define MSG_E2STEPS                         "krokiE2/mm"
113
+#define MSG_E3STEPS                         "krokiE3/mm"
114
+#define MSG_E4STEPS                         "krokiE4/mm"
111 115
 #define MSG_TEMPERATURE                     "Temperatura"
112 116
 #define MSG_MOTION                          "Ruch"
113 117
 #define MSG_VOLUMETRIC                      "Filament"

+ 4
- 0
Marlin/language_pt-br.h Ver arquivo

@@ -101,6 +101,10 @@
101 101
 #define MSG_YSTEPS                          "Passo Y/mm"
102 102
 #define MSG_ZSTEPS                          "Passo Z/mm"
103 103
 #define MSG_ESTEPS                          "E/mm"
104
+#define MSG_E1STEPS                         "E1/mm"
105
+#define MSG_E2STEPS                         "E2/mm"
106
+#define MSG_E3STEPS                         "E3/mm"
107
+#define MSG_E4STEPS                         "E4/mm"
104 108
 #define MSG_TEMPERATURE                     "Temperatura"
105 109
 #define MSG_MOTION                          "Movimento"
106 110
 #define MSG_VOLUMETRIC                      "Filamento"

+ 4
- 0
Marlin/language_pt-br_utf8.h Ver arquivo

@@ -101,6 +101,10 @@
101 101
 #define MSG_YSTEPS                          "Passo Y/mm"
102 102
 #define MSG_ZSTEPS                          "Passo Z/mm"
103 103
 #define MSG_ESTEPS                          "E/mm"
104
+#define MSG_E1STEPS                         "E1/mm"
105
+#define MSG_E2STEPS                         "E2/mm"
106
+#define MSG_E3STEPS                         "E3/mm"
107
+#define MSG_E4STEPS                         "E4/mm"
104 108
 #define MSG_TEMPERATURE                     "Temperatura"
105 109
 #define MSG_MOTION                          "Movimento"
106 110
 #define MSG_VOLUMETRIC                      "Filamento"

+ 4
- 0
Marlin/language_pt.h Ver arquivo

@@ -105,6 +105,10 @@
105 105
 #define MSG_YSTEPS                          "Y passo/mm"
106 106
 #define MSG_ZSTEPS                          "Z passo/mm"
107 107
 #define MSG_ESTEPS                          "E passo/mm"
108
+#define MSG_E1STEPS                         "E1 passo/mm"
109
+#define MSG_E2STEPS                         "E2 passo/mm"
110
+#define MSG_E3STEPS                         "E3 passo/mm"
111
+#define MSG_E4STEPS                         "E4 passo/mm"
108 112
 #define MSG_TEMPERATURE                     "Temperatura"
109 113
 #define MSG_MOTION                          "Movimento"
110 114
 #define MSG_VOLUMETRIC                      "Filamento"

+ 4
- 0
Marlin/language_pt_utf8.h Ver arquivo

@@ -105,6 +105,10 @@
105 105
 #define MSG_YSTEPS                          "Y passo/mm"
106 106
 #define MSG_ZSTEPS                          "Z passo/mm"
107 107
 #define MSG_ESTEPS                          "E passo/mm"
108
+#define MSG_E1STEPS                         "E1 passo/mm"
109
+#define MSG_E2STEPS                         "E2 passo/mm"
110
+#define MSG_E3STEPS                         "E3 passo/mm"
111
+#define MSG_E4STEPS                         "E4 passo/mm"
108 112
 #define MSG_TEMPERATURE                     "Temperatura"
109 113
 #define MSG_MOTION                          "Movimento"
110 114
 #define MSG_VOLUMETRIC                      "Filamento"

+ 4
- 0
Marlin/language_ru.h Ver arquivo

@@ -105,6 +105,10 @@
105 105
 #define MSG_YSTEPS                          "Y шаг/мм"
106 106
 #define MSG_ZSTEPS                          "Z шаг/мм"
107 107
 #define MSG_ESTEPS                          "E шаг/мм"
108
+#define MSG_E1STEPS                         "E1 шаг/мм"
109
+#define MSG_E2STEPS                         "E2 шаг/мм"
110
+#define MSG_E3STEPS                         "E3 шаг/мм"
111
+#define MSG_E4STEPS                         "E4 шаг/мм"
108 112
 #define MSG_TEMPERATURE                     "Температура"
109 113
 #define MSG_MOTION                          "Механика"
110 114
 #define MSG_VOLUMETRIC                      "Пруток"

+ 4
- 0
Marlin/language_tr.h Ver arquivo

@@ -109,6 +109,10 @@
109 109
 #define MSG_YSTEPS                          "Ysteps/mm"                                                  //Ysteps/mm
110 110
 #define MSG_ZSTEPS                          "Zsteps/mm"                                                  //Zsteps/mm
111 111
 #define MSG_ESTEPS                          "Esteps/mm"                                                  //Esteps/mm
112
+#define MSG_E1STEPS                         "E1steps/mm"                                                 //E1steps/mm
113
+#define MSG_E2STEPS                         "E2steps/mm"                                                 //E2steps/mm
114
+#define MSG_E3STEPS                         "E3steps/mm"                                                 //E3steps/mm
115
+#define MSG_E4STEPS                         "E4steps/mm"                                                 //E4steps/mm
112 116
 #define MSG_TEMPERATURE                     "S\xfd\x63\x61kl\xfdk"                                       //Sıcaklık
113 117
 #define MSG_MOTION                          "Hareket"                                                    //Hareket
114 118
 #define MSG_VOLUMETRIC                      "Filaman"                                                    //Filaman

+ 4
- 0
Marlin/language_tr_utf8.h Ver arquivo

@@ -109,6 +109,10 @@
109 109
 #define MSG_YSTEPS                          "Ysteps/mm"                                                  //Ysteps/mm
110 110
 #define MSG_ZSTEPS                          "Zsteps/mm"                                                  //Zsteps/mm
111 111
 #define MSG_ESTEPS                          "Esteps/mm"                                                  //Esteps/mm
112
+#define MSG_E1STEPS                         "E1steps/mm"                                                 //E1steps/mm
113
+#define MSG_E2STEPS                         "E2steps/mm"                                                 //E2steps/mm
114
+#define MSG_E3STEPS                         "E3steps/mm"                                                 //E3steps/mm
115
+#define MSG_E4STEPS                         "E4steps/mm"                                                 //E4steps/mm
112 116
 #define MSG_TEMPERATURE                     "Sıcaklık"                                                   //Sıcaklık
113 117
 #define MSG_MOTION                          "Hareket"                                                    //Hareket
114 118
 #define MSG_VOLUMETRIC                      "Filaman"                                                    //Filaman

+ 4
- 0
Marlin/language_uk.h Ver arquivo

@@ -109,6 +109,10 @@
109 109
 #define MSG_YSTEPS                          "Yкроків/мм"
110 110
 #define MSG_ZSTEPS                          "Zкроків/мм"
111 111
 #define MSG_ESTEPS                          "Eкроків/мм"
112
+#define MSG_E1STEPS                         "E1кроків/мм"
113
+#define MSG_E2STEPS                         "E2кроків/мм"
114
+#define MSG_E3STEPS                         "E3кроків/мм"
115
+#define MSG_E4STEPS                         "E4кроків/мм"
112 116
 #define MSG_TEMPERATURE                     "Температура"
113 117
 #define MSG_MOTION                          "Рух"
114 118
 #define MSG_VOLUMETRIC                      "Волокно"

+ 10
- 10
Marlin/ultralcd.cpp Ver arquivo

@@ -1515,9 +1515,9 @@ void kill_screen(const char* lcd_msg) {
1515 1515
 
1516 1516
       #if ENABLED(SWITCHING_EXTRUDER)
1517 1517
         if (active_extruder)
1518
-          MENU_ITEM(gcode, MSG_SELECT MSG_E1, PSTR("T0"));
1518
+          MENU_ITEM(gcode, MSG_SELECT " " MSG_E1, PSTR("T0"));
1519 1519
         else
1520
-          MENU_ITEM(gcode, MSG_SELECT MSG_E2, PSTR("T1"));
1520
+          MENU_ITEM(gcode, MSG_SELECT " " MSG_E2, PSTR("T1"));
1521 1521
       #endif
1522 1522
 
1523 1523
       MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e);
@@ -1786,12 +1786,12 @@ void kill_screen(const char* lcd_msg) {
1786 1786
       #endif
1787 1787
 
1788 1788
       #if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1
1789
-        PID_MENU_ITEMS(MSG_E1, 0);
1790
-        PID_MENU_ITEMS(MSG_E2, 1);
1789
+        PID_MENU_ITEMS(" " MSG_E1, 0);
1790
+        PID_MENU_ITEMS(" " MSG_E2, 1);
1791 1791
         #if HOTENDS > 2
1792
-          PID_MENU_ITEMS(MSG_E3, 2);
1792
+          PID_MENU_ITEMS(" " MSG_E3, 2);
1793 1793
           #if HOTENDS > 3
1794
-            PID_MENU_ITEMS(MSG_E4, 3);
1794
+            PID_MENU_ITEMS(" " MSG_E4, 3);
1795 1795
           #endif //HOTENDS > 3
1796 1796
         #endif //HOTENDS > 2
1797 1797
       #else //!PID_PARAMS_PER_HOTEND || HOTENDS == 1
@@ -1968,12 +1968,12 @@ void kill_screen(const char* lcd_msg) {
1968 1968
 
1969 1969
     #if ENABLED(DISTINCT_E_FACTORS)
1970 1970
       MENU_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS, &planner.axis_steps_per_mm[E_AXIS + active_extruder], 5, 9999, _planner_refresh_positioning);
1971
-      MENU_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS MSG_E1, &planner.axis_steps_per_mm[E_AXIS], 5, 9999, _planner_refresh_e0_positioning);
1972
-      MENU_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS MSG_E2, &planner.axis_steps_per_mm[E_AXIS + 1], 5, 9999, _planner_refresh_e1_positioning);
1971
+      MENU_ITEM_EDIT_CALLBACK(float62, MSG_E1STEPS, &planner.axis_steps_per_mm[E_AXIS], 5, 9999, _planner_refresh_e0_positioning);
1972
+      MENU_ITEM_EDIT_CALLBACK(float62, MSG_E2STEPS, &planner.axis_steps_per_mm[E_AXIS + 1], 5, 9999, _planner_refresh_e1_positioning);
1973 1973
       #if E_STEPPERS > 2
1974
-        MENU_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS MSG_E3, &planner.axis_steps_per_mm[E_AXIS + 2], 5, 9999, _planner_refresh_e2_positioning);
1974
+        MENU_ITEM_EDIT_CALLBACK(float62, MSG_E3STEPS, &planner.axis_steps_per_mm[E_AXIS + 2], 5, 9999, _planner_refresh_e2_positioning);
1975 1975
         #if E_STEPPERS > 3
1976
-          MENU_ITEM_EDIT_CALLBACK(float62, MSG_ESTEPS MSG_E4, &planner.axis_steps_per_mm[E_AXIS + 3], 5, 9999, _planner_refresh_e3_positioning);
1976
+          MENU_ITEM_EDIT_CALLBACK(float62, MSG_E4STEPS, &planner.axis_steps_per_mm[E_AXIS + 3], 5, 9999, _planner_refresh_e3_positioning);
1977 1977
         #endif
1978 1978
       #endif
1979 1979
     #else

Carregando…
Cancelar
Salvar