thomas
/
marlin
Segui 1
Vota 0
Forka 0
Codice Problemi 0 Pull Requests 0 Rilasci 0 Wiki Attività
Sfoglia il codice sorgente

Show nozzles, heaters, and extruders numbered 1-4

Scott Lahteine 9 anni fa
parent
5bc480fee8
commit
7ac7ddbf20
21 ha cambiato i file con 128 aggiunte e 205 eliminazioni
Visualizzazione separata Mostra Diff Stats
  1. 1
    3
      Marlin/language_an.h
  2. 1
    3
      Marlin/language_bg.h
  3. 1
    3
      Marlin/language_ca.h
  4. 1
    16
      Marlin/language_cn.h
  5. 2
    20
      Marlin/language_cz.h
  6. 1
    8
      Marlin/language_da.h
  7. 1
    3
      Marlin/language_de.h
  8. 26
    26
      Marlin/language_en.h
  9. 1
    3
      Marlin/language_es.h
  10. 1
    3
      Marlin/language_eu.h
  11. 1
    3
      Marlin/language_fi.h
  12. 1
    3
      Marlin/language_fr.h
  13. 1
    4
      Marlin/language_it.h
  14. 1
    4
      Marlin/language_kana.h
  15. 1
    4
      Marlin/language_kana_utf8.h
  16. 1
    3
      Marlin/language_nl.h
  17. 1
    3
      Marlin/language_pl.h
  18. 1
    3
      Marlin/language_pt-br.h
  19. 1
    3
      Marlin/language_pt.h
  20. 1
    3
      Marlin/language_ru.h
  21. 82
    84
      Marlin/ultralcd.cpp

+ 1
- 3
Marlin/language_an.h Vedi File 

@@ -82,9 +82,7 @@
82 82 
 #define MSG_MOTION                          "Movimiento"
83 83 
 #define MSG_VOLUMETRIC                      "Filament"
84 84 
 #define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
85 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
86 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
87 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
85 
+#define MSG_FILAMENT_DIAM                   "Fil. Dia."
88 86 
 #define MSG_CONTRAST                        "Contrast"
89 87 
 #define MSG_STORE_EPROM                     "Alzar Memoria"
90 88 
 #define MSG_LOAD_EPROM                      "Cargar Memoria"

+ 1
- 3
Marlin/language_bg.h Vedi File 

@@ -83,9 +83,7 @@
83 83 
 #define MSG_MOTION                          "Движение"
84 84 
 #define MSG_VOLUMETRIC                      "Нишка"
85 85 
 #define MSG_VOLUMETRIC_ENABLED              "E in mm3"
86 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Диам. нишка 1"
87 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Диам. нишка 2"
88 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Диам. нишка 3"
86 
+#define MSG_FILAMENT_DIAM                   "Диам. нишка"
89 87 
 #define MSG_CONTRAST                        "LCD контраст"
90 88 
 #define MSG_STORE_EPROM                     "Запази в EPROM"
91 89 
 #define MSG_LOAD_EPROM                      "Зареди от EPROM"

+ 1
- 3
Marlin/language_ca.h Vedi File 

@@ -83,9 +83,7 @@
83 83 
 #define MSG_MOTION                          "Moviment"
84 84 
 #define MSG_VOLUMETRIC                      "Filament"
85 85 
 #define MSG_VOLUMETRIC_ENABLED              "E in mm3"
86 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
87 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
88 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
86 
+#define MSG_FILAMENT_DIAM                   "Fil. Dia."
89 87 
 #define MSG_CONTRAST                        "Contrast de LCD"
90 88 
 #define MSG_STORE_EPROM                     "Desar a memoria"
91 89 
 #define MSG_LOAD_EPROM                      "Carregar de mem."

+ 1
- 16
Marlin/language_cn.h Vedi File 

@@ -30,10 +30,6 @@
30 30 
   #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " \xc5\xc6"
31 31 
   #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " \xbe\xc6"
32 32 
   #define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS " \xbe\xbf"
33 
-  #define MSG_H1                              "1"
34 
-  #define MSG_H2                              "2"
35 
-  #define MSG_H3                              "3"
36 
-  #define MSG_H4                              "4"
37 33 
   #define MSG_COOLDOWN                        "\xc8\xc9"
38 34 
   #define MSG_SWITCH_PS_ON                    "\xb9\xcb\xca\xb3"
39 35 
   #define MSG_SWITCH_PS_OFF                   "\xb9\xcb\xb5\xb6"
 
@@ -50,11 +46,6 @@
50 46 
   #define MSG_MOVE_10MM                       "\xc1\xb2 10mm"
51 47 
   #define MSG_SPEED                           "\xd1\xd2"
52 48 
   #define MSG_NOZZLE                          "\xd3\xd4"
53 
-  #define MSG_N0                              " 0"
54 
-  #define MSG_N1                              " 1"
55 
-  #define MSG_N2                              " 2"
56 
-  #define MSG_N3                              " 3"
57 
-  #define MSG_N4                              " 4"
58 49 
   #define MSG_BED                             "\xc4\xc7"
59 50 
   #define MSG_FAN_SPEED                       "\xd5\xd6\xd1\xd2"
60 51 
   #define MSG_FLOW                            "\xcc\xad\xd1\xd2"
 
@@ -69,9 +60,6 @@
69 60 
   #define MSG_PID_I                           "PID-I"
70 61 
   #define MSG_PID_D                           "PID-D"
71 62 
   #define MSG_PID_C                           "PID-C"
72 
-  #define MSG_E2                              " E2"
73 
-  #define MSG_E3                              " E3"
74 
-  #define MSG_E4                              " E4"
75 63 
   #define MSG_ACC                             "Accel"
76 64 
   #define MSG_VXY_JERK                        "Vxy-jerk"
77 65 
   #define MSG_VZ_JERK                         "Vz-jerk"
 
@@ -94,10 +82,7 @@
94 82 
   #define MSG_MOTION                          "\xdf\xb2"
95 83 
   #define MSG_VOLUMETRIC                      "Filament"
96 84 
   #define MSG_VOLUMETRIC_ENABLED              "E in mm3"
97 
-  #define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
98 
-  #define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
99 
-  #define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
100 
-  #define MSG_FILAMENT_SIZE_EXTRUDER_3        "Fil. Dia. 4"
85 
+  #define MSG_FILAMENT_DIAM                   "Fil. Dia."
101 86 
   #define MSG_CONTRAST                        "LCD contrast"
102 87 
   #define MSG_STORE_EPROM                     "Store memory"
103 88 
   #define MSG_LOAD_EPROM                      "Load memory"

+ 2
- 20
Marlin/language_cz.h Vedi File 

@@ -2,7 +2,7 @@
2 2 
  * Czech
3 3 
  *
4 4 
  * LCD Menu Messages
5 
- * Se also documentation/LCDLanguageFont.md
5 
+ * See also documentation/LCDLanguageFont.md
6 6 
  *
7 7 
  * Translated by Petr Zahradnik, Computer Laboratory
8 8 
  * Blog and video blog Zahradnik se bavi
 
@@ -36,10 +36,6 @@
36 36 
 #define MSG_PREHEAT_ABS_ALL                 MSG_PREHEAT_ABS " Vse"
37 37 
 #define MSG_PREHEAT_ABS_BEDONLY             MSG_PREHEAT_ABS " Podloz"
38 38 
 #define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS " Nast"
39 
-#define MSG_H1                              "1"
40 
-#define MSG_H2                              "2"
41 
-#define MSG_H3                              "3"
42 
-#define MSG_H4                              "4"
43 39 
 #define MSG_COOLDOWN                        "Zchladit"
44 40 
 #define MSG_SWITCH_PS_ON                    "Zapnout napajeni"
45 41 
 #define MSG_SWITCH_PS_OFF                   "Vypnout napajeni"
 
@@ -51,19 +47,11 @@
51 47 
 #define MSG_MOVE_Y                          "Posunout Y"
52 48 
 #define MSG_MOVE_Z                          "Posunout Z"
53 49 
 #define MSG_MOVE_E                          "Extruder"
54 
-#define MSG_MOVE_E1                         "Extruder1"
55 
-#define MSG_MOVE_E2                         "Extruder2"
56 
-#define MSG_MOVE_E3                         "Extruder3"
57 50 
 #define MSG_MOVE_01MM                       "Posunout o 0,1mm"
58 51 
 #define MSG_MOVE_1MM                        "Posunout o 1mm"
59 52 
 #define MSG_MOVE_10MM                       "Posunout o 10mm"
60 53 
 #define MSG_SPEED                           "Rychlost"
61 54 
 #define MSG_NOZZLE                          "Tryska"
62 
-#define MSG_N0                              " 0"
63 
-#define MSG_N1                              " 1"
64 
-#define MSG_N2                              " 2"
65 
-#define MSG_N3                              " 3"
66 
-#define MSG_N4                              " 4"
67 55 
 #define MSG_BED                             "Podlozka"
68 56 
 #define MSG_FAN_SPEED                       "Rychlost vent."
69 57 
 #define MSG_FLOW                            "Prutok"
 
@@ -78,9 +66,6 @@
78 66 
 #define MSG_PID_I                           "PID-I"
79 67 
 #define MSG_PID_D                           "PID-D"
80 68 
 #define MSG_PID_C                           "PID-C"
81 
-#define MSG_E2                              " E2"
82 
-#define MSG_E3                              " E3"
83 
-#define MSG_E4                              " E4"
84 69 
 #define MSG_ACC                             "Zrychl"
85 70 
 #define MSG_VXY_JERK                        "Vxy-jerk"
86 71 
 #define MSG_VZ_JERK                         "Vz-jerk"
 
@@ -103,10 +88,7 @@
103 88 
 #define MSG_MOTION                          "Pohyb"
104 89 
 #define MSG_VOLUMETRIC                      "Filament"
105 90 
 #define MSG_VOLUMETRIC_ENABLED              "E na mm3"
106 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Prum. 1"
107 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Prum. 2"
108 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Prum. 3"
109 
-#define MSG_FILAMENT_SIZE_EXTRUDER_3        "Fil. Prum. 4"
91 
+#define MSG_FILAMENT_DIAM                   "Fil. Prum."
110 92 
 #define MSG_CONTRAST                        "Kontrast LCD"
111 93 
 #define MSG_STORE_EPROM                     "Ulozit nastaveni"
112 94 
 #define MSG_LOAD_EPROM                      "Nacist nastaveni"

+ 1
- 8
Marlin/language_da.h Vedi File 

@@ -42,8 +42,6 @@
42 42 
 #define MSG_MOVE_Y                          "Flyt Y"
43 43 
 #define MSG_MOVE_Z                          "Flyt Z"
44 44 
 #define MSG_MOVE_E                          "Extruder"
45 
-#define MSG_MOVE_E1                         "Extruder2"
46 
-#define MSG_MOVE_E2                         "Extruder3"
47 45 
 #define MSG_MOVE_01MM                       "Flyt 0.1mm"
48 46 
 #define MSG_MOVE_1MM                        "Flyt 1mm"
49 47 
 #define MSG_MOVE_10MM                       "Flyt 10mm"
 
@@ -54,9 +52,6 @@
54 52 
 #define MSG_BED                             "Plade"
55 53 
 #define MSG_FAN_SPEED                       "Blæser hastighed"
56 54 
 #define MSG_FLOW                            "Flow"
57 
-#define MSG_FLOW0                           "Flow 0"
58 
-#define MSG_FLOW1                           "Flow 1"
59 
-#define MSG_FLOW2                           "Flow 2"
60 55 
 #define MSG_CONTROL                         "Kontrol"
61 56 
 #define MSG_MIN                             " \002 Min"
62 57 
 #define MSG_MAX                             " \002 Max"
 
@@ -89,9 +84,7 @@
89 84 
 #define MSG_MOTION                          "Motion"
90 85 
 #define MSG_VOLUMETRIC                      "Filament"
91 86 
 #define MSG_VOLUMETRIC_ENABLED              "E in mm3"
92 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
93 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
94 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
87 
+#define MSG_FILAMENT_DIAM                   "Fil. Dia."
95 88 
 #define MSG_CONTRAST                        "LCD kontrast"
96 89 
 #define MSG_STORE_EPROM                     "Gem i EEPROM"
97 90 
 #define MSG_LOAD_EPROM                      "Hent fra EEPROM"

+ 1
- 3
Marlin/language_de.h Vedi File 

@@ -81,9 +81,7 @@
81 81 
 #define MSG_MOTION                          "Bewegung"
82 82 
 #define MSG_VOLUMETRIC                      "Filament"
83 83 
 #define MSG_VOLUMETRIC_ENABLED              "E in mm³"
84 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Filament D 1"
85 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Filament D 2"
86 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Filament D 3"
84 
+#define MSG_FILAMENT_DIAM                   "Filament D"
87 85 
 #define MSG_CONTRAST                        "LCD Kontrast"
88 86 
 #define MSG_STORE_EPROM                     "EPROM speichern"
89 87 
 #define MSG_LOAD_EPROM                      "EPROM laden"

+ 26
- 26
Marlin/language_en.h Vedi File 

@@ -120,21 +120,18 @@
120 120 
 #ifndef MSG_MOVE_E
121 121 
 #define MSG_MOVE_E                          "Extruder"
122 122 
 #endif
123 
-#if EXTRUDERS > 1
124 
-  #ifndef MSG_MOVE_E1
125 
-  #define MSG_MOVE_E1                       "Extruder1"
126 
-  #endif
127 
-  #if EXTRUDERS > 2
128 
-    #ifndef MSG_MOVE_E2
129 
-    #define MSG_MOVE_E2                     "Extruder2"
130 
-    #endif
131 
-    #if EXTRUDERS > 3
132 
-      #ifndef MSG_MOVE_E3
133 
-      #define MSG_MOVE_E3                   "Extruder3"
134 
-      #endif
135 
-    #endif
136 
-  #endif // EXTRUDERS > 2
137 
-#endif // EXTRUDERS > 1
123 
+#ifndef MSG_MOVE_E1
124 
+#define MSG_MOVE_E1                         "1"
125 
+#endif
126 
+#ifndef MSG_MOVE_E2
127 
+#define MSG_MOVE_E2                         "2"
128 
+#endif
129 
+#ifndef MSG_MOVE_E3
130 
+#define MSG_MOVE_E3                         "3"
131 
+#endif
132 
+#ifndef MSG_MOVE_E4
133 
+#define MSG_MOVE_E4                         "4"
134 
+#endif
138 135 
 #ifndef MSG_MOVE_01MM
139 136 
 #define MSG_MOVE_01MM                       "Move 0.1mm"
140 137 
 #endif
 
@@ -150,9 +147,6 @@
150 147 
 #ifndef MSG_NOZZLE
151 148 
 #define MSG_NOZZLE                          "Nozzle"
152 149 
 #endif
153 
-#ifndef MSG_N0
154 
-#define MSG_N0                              " 0"
155 
-#endif
156 150 
 #ifndef MSG_N1
157 151 
 #define MSG_N1                              " 1"
158 152 
 #endif
 
@@ -207,6 +201,9 @@
207 201 
 #ifndef MSG_PID_C
208 202 
 #define MSG_PID_C                           "PID-C"
209 203 
 #endif
204 
+#ifndef MSG_E1
205 
+#define MSG_E1                              " E1"
206 
+#endif
210 207 
 #ifndef MSG_E2
211 208 
 #define MSG_E2                              " E2"
212 209 
 #endif
 
@@ -282,17 +279,20 @@
282 279 
 #ifndef MSG_VOLUMETRIC_ENABLED
283 280 
 #define MSG_VOLUMETRIC_ENABLED              "E in mm3"
284 281 
 #endif
285 
-#ifndef MSG_FILAMENT_SIZE_EXTRUDER_0
286 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
282 
+#ifndef MSG_FILAMENT_DIAM
283 
+#define MSG_FILAMENT_DIAM                   "Fil. Dia."
284 
+#endif
285 
+#ifndef MSG_DIAM_E1
286 
+#define MSG_DIAM_E1                         " 1"
287 287 
 #endif
288 
-#ifndef MSG_FILAMENT_SIZE_EXTRUDER_1
289 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
288 
+#ifndef MSG_DIAM_E2
289 
+#define MSG_DIAM_E2                         " 2"
290 290 
 #endif
291 
-#ifndef MSG_FILAMENT_SIZE_EXTRUDER_2
292 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
291 
+#ifndef MSG_DIAM_E3
292 
+#define MSG_DIAM_E3                         " 3"
293 293 
 #endif
294 
-#ifndef MSG_FILAMENT_SIZE_EXTRUDER_3
295 
-#define MSG_FILAMENT_SIZE_EXTRUDER_3        "Fil. Dia. 4"
294 
+#ifndef MSG_DIAM_E4
295 
+#define MSG_DIAM_E4                         " 4"
296 296 
 #endif
297 297 
 #ifndef MSG_CONTRAST
298 298 
 #define MSG_CONTRAST                        "LCD contrast"

+ 1
- 3
Marlin/language_es.h Vedi File 

@@ -82,9 +82,7 @@
82 82 
 #define MSG_MOTION                          "Movimiento"
83 83 
 #define MSG_VOLUMETRIC                      "Filamento"
84 84 
 #define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
85 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
86 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
87 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
85 
+#define MSG_FILAMENT_DIAM                   "Fil. Dia."
88 86 
 #define MSG_CONTRAST                        "Contraste"
89 87 
 #define MSG_STORE_EPROM                     "Guardar memoria"
90 88 
 #define MSG_LOAD_EPROM                      "Cargar memoria"

+ 1
- 3
Marlin/language_eu.h Vedi File 

@@ -82,9 +82,7 @@
82 82 
 #define MSG_MOTION                          "Mugimendua"
83 83 
 #define MSG_VOLUMETRIC                      "Filament"
84 84 
 #define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
85 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
86 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
87 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
85 
+#define MSG_FILAMENT_DIAM                   "Fil. Dia."
88 86 
 #define MSG_CONTRAST                        "LCD kontrastea"
89 87 
 #define MSG_STORE_EPROM                     "Gorde memoria"
90 88 
 #define MSG_LOAD_EPROM                      "Kargatu memoria"

+ 1
- 3
Marlin/language_fi.h Vedi File 

@@ -82,9 +82,7 @@
82 82 
 #define MSG_MOTION                          "Liike"
83 83 
 #define MSG_VOLUMETRIC                      "Filament"
84 84 
 #define MSG_VOLUMETRIC_ENABLED              "E in mm³"
85 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
86 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
87 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
85 
+#define MSG_FILAMENT_DIAM                   "Fil. Dia."
88 86 
 #define MSG_CONTRAST                        "LCD kontrasti"
89 87 
 #define MSG_STORE_EPROM                     "Tallenna muistiin"
90 88 
 #define MSG_LOAD_EPROM                      "Lataa muistista"

+ 1
- 3
Marlin/language_fr.h Vedi File 

@@ -84,9 +84,7 @@
84 84 
 #define MSG_MOTION                          "Mouvement"
85 85 
 #define MSG_VOLUMETRIC                      "Filament"
86 86 
 #define MSG_VOLUMETRIC_ENABLED              "E in mm3"
87 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
88 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
89 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
87 
+#define MSG_FILAMENT_DIAM                   "Fil. Dia."
90 88 
 #define MSG_CONTRAST                        "Contraste LCD"
91 89 
 #define MSG_STORE_EPROM                     "Sauver config"
92 90 
 #define MSG_LOAD_EPROM                      "Lire config"

+ 1
- 4
Marlin/language_it.h Vedi File 

@@ -82,10 +82,7 @@
82 82 
 #define MSG_MOTION                          "Movimento"
83 83 
 #define MSG_VOLUMETRIC                      "Filament"
84 84 
 #define MSG_VOLUMETRIC_ENABLED		          "E in mm³"
85 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Diam. filo 1"
86 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Diam. filo 2"
87 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Diam. filo 3"
88 
-#define MSG_FILAMENT_SIZE_EXTRUDER_3        "Diam. filo 4"
85 
+#define MSG_FILAMENT_DIAM                   "Diam. filo"
89 86 
 #define MSG_CONTRAST                        "Contrasto LCD"
90 87 
 #define MSG_STORE_EPROM                     "Salva in EEPROM"
91 88 
 #define MSG_LOAD_EPROM                      "Carica da EEPROM"

+ 1
- 4
Marlin/language_kana.h Vedi File 

@@ -84,10 +84,7 @@
84 84 
 #define MSG_MOTION                          "\xb3\xba\xde\xb7\xbe\xaf\xc3\xb2"                             // "Motion"
85 85 
 #define MSG_VOLUMETRIC                      "\xcc\xa8\xd7\xd2\xdd\xc4"                                     // "Filament"
86 86 
 #define MSG_VOLUMETRIC_ENABLED              "E in mm3"
87 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
88 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
89 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
90 
-#define MSG_FILAMENT_SIZE_EXTRUDER_3        "Fil. Dia. 4"
87 
+#define MSG_FILAMENT_DIAM                   "Fil. Dia."
91 88 
 #define MSG_CONTRAST                        "LCD\xba\xdd\xc4\xd7\xbd\xc4"                                  // "LCD contrast"
92 89 
 #define MSG_STORE_EPROM                     "\xd2\xd3\xd8\xcd\xb6\xb8\xc9\xb3"                             // "Store memory"
93 90 
 #define MSG_LOAD_EPROM                      "\xd2\xd3\xd8\xb6\xd7\xd6\xd0\ba\xd0"                          // "Load memory"

+ 1
- 4
Marlin/language_kana_utf8.h Vedi File 

@@ -88,10 +88,7 @@
88 88 
 #define MSG_MOTION                          "ウゴキセツテイ"                // "Motion"
89 89 
 #define MSG_VOLUMETRIC                      "フィラナント"                    // "Filament"
90 90 
 #define MSG_VOLUMETRIC_ENABLED              "E in mm3"
91 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
92 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
93 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
94 
-#define MSG_FILAMENT_SIZE_EXTRUDER_3        "Fil. Dia. 4"
91 
+#define MSG_FILAMENT_DIAM                   "Fil. Dia."
95 92 
 #define MSG_CONTRAST                        "LCDコントラスト"                 // "LCD contrast"
96 93 
 #define MSG_STORE_EPROM                     "ナモリヘセケノウ"                 // "Store memory"
97 94 
 #define MSG_LOAD_EPROM                      "ナモリセラヨミbaミ"               // "Load memory"

+ 1
- 3
Marlin/language_nl.h Vedi File 

@@ -82,9 +82,7 @@
82 82 
 #define MSG_MOTION                          "Beweging"
83 83 
 #define MSG_VOLUMETRIC                      "Filament"
84 84 
 #define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
85 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
86 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
87 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
85 
+#define MSG_FILAMENT_DIAM                   "Fil. Dia."
88 86 
 #define MSG_CONTRAST                        "LCD contrast"
89 87 
 #define MSG_STORE_EPROM                     "Geheugen opslaan"
90 88 
 #define MSG_LOAD_EPROM                      "Geheugen laden"

+ 1
- 3
Marlin/language_pl.h Vedi File 

@@ -82,9 +82,7 @@
82 82 
 #define MSG_MOTION                          "Ruch"
83 83 
 #define MSG_VOLUMETRIC                      "Filament"
84 84 
 #define MSG_VOLUMETRIC_ENABLED		        "E in mm3"
85 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
86 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
87 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
85 
+#define MSG_FILAMENT_DIAM                   "Fil. Dia."
88 86 
 #define MSG_CONTRAST                        "Kontrast LCD"
89 87 
 #define MSG_STORE_EPROM                     "Zapisz w pamieci"
90 88 
 #define MSG_LOAD_EPROM                      "Wczytaj z pamieci"

+ 1
- 3
Marlin/language_pt-br.h Vedi File 

@@ -82,9 +82,7 @@
82 82 
 #define MSG_MOTION                          "Movimento"
83 83 
 #define MSG_VOLUMETRIC                      "Filament"
84 84 
 #define MSG_VOLUMETRIC_ENABLED              "E in mm3"
85 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
86 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Dia. 2"
87 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Dia. 3"
85 
+#define MSG_FILAMENT_DIAM                   "Fil. Dia."
88 86 
 #define MSG_CONTRAST                        "Contrast"
89 87 
 #define MSG_STORE_EPROM                     "Guardar memoria"
90 88 
 #define MSG_LOAD_EPROM                      "Carregar memoria"

+ 1
- 3
Marlin/language_pt.h Vedi File 

@@ -82,9 +82,7 @@
82 82 
 #define MSG_MOTION                          "Movimento"
83 83 
 #define MSG_VOLUMETRIC                      "Filamento"
84 84 
 #define MSG_VOLUMETRIC_ENABLED              "E in mm3"
85 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Diam. 1"
86 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Fil. Diam. 2"
87 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Fil. Diam. 3"
85 
+#define MSG_FILAMENT_DIAM                   "Fil. Diam."
88 86 
 #define MSG_CONTRAST                        "Contraste"
89 87 
 #define MSG_STORE_EPROM                     "Guardar na memoria"
90 88 
 #define MSG_LOAD_EPROM                      "Carregar da memoria"

+ 1
- 3
Marlin/language_ru.h Vedi File 

@@ -83,9 +83,7 @@
83 83 
 #define MSG_MOTION                          "Механика"
84 84 
 #define MSG_VOLUMETRIC                      "Пруток"
85 85 
 #define MSG_VOLUMETRIC_ENABLED              "E в mm3"
86 
-#define MSG_FILAMENT_SIZE_EXTRUDER_0        "Диаметр прутка 1"
87 
-#define MSG_FILAMENT_SIZE_EXTRUDER_1        "Диаметр прутка 2"
88 
-#define MSG_FILAMENT_SIZE_EXTRUDER_2        "Диаметр прутка 3"
86 
+#define MSG_FILAMENT_DIAM                   "Диаметр прутка"
89 87 
 #define MSG_CONTRAST                        "Контраст LCD"
90 88 
 #define MSG_STORE_EPROM                     "Сохранить в EEPROM"
91 89 
 #define MSG_LOAD_EPROM                      "Считать из EEPROM"

+ 82
- 84
Marlin/ultralcd.cpp Vedi File 

@@ -495,14 +495,19 @@ static void lcd_tune_menu() {
495 495
496 496 
   //
497 497 
   // Nozzle:
498 
+  // Nozzle 1:
498 499 
   // Nozzle 2:
499 500 
   // Nozzle 3:
500 501 
   // Nozzle 4:
501 502 
   //
502 
-  #if TEMP_SENSOR_0 != 0
503 
-    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
504 
-  #endif
505 
-  #if EXTRUDERS > 1
503 
+  #if EXTRUDERS == 1
504 
+    #if TEMP_SENSOR_0 != 0
505 
+      MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
506 
+    #endif
507 
+  #else //EXTRUDERS > 1
508 
+    #if TEMP_SENSOR_0 != 0
509 
+      MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N1, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
510 
+    #endif
506 511 
     #if TEMP_SENSOR_1 != 0
507 512 
       MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N2, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
508 513 
     #endif
 
@@ -536,18 +541,21 @@ static void lcd_tune_menu() {
536 541 
   MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiplier[active_extruder], 10, 999);
537 542
538 543 
   //
539 
-  // Flow 0:
544 
+  // Flow:
540 545 
   // Flow 1:
541 546 
   // Flow 2:
542 547 
   // Flow 3:
548 
+  // Flow 4:
543 549 
   //
544 
-  MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N0, &extruder_multiplier[0], 10, 999);
545 
-  #if EXTRUDERS > 1
546 
-    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N1, &extruder_multiplier[1], 10, 999);
550 
+  #if EXTRUDERS == 1
551 
+    MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiplier[0], 10, 999);
552 
+  #else // EXTRUDERS > 1
553 
+    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N1, &extruder_multiplier[0], 10, 999);
554 
+    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N2, &extruder_multiplier[1], 10, 999);
547 555 
     #if EXTRUDERS > 2
548 
-      MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N2, &extruder_multiplier[2], 10, 999);
556 
+      MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N3, &extruder_multiplier[2], 10, 999);
549 557 
       #if EXTRUDERS > 3
550 
-        MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N3, &extruder_multiplier[3], 10, 999);
558 
+        MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N4, &extruder_multiplier[3], 10, 999);
551 559 
       #endif //EXTRUDERS > 3
552 560 
     #endif //EXTRUDERS > 2
553 561 
   #endif //EXTRUDERS > 1
 
@@ -829,12 +837,12 @@ static void lcd_move_e(
829 837 
       pos_label = PSTR(MSG_MOVE_E);
830 838 
     #else
831 839 
       switch (e) {
832 
-        case 0: pos_label = PSTR(MSG_MOVE_E0); break;
833 
-        case 1: pos_label = PSTR(MSG_MOVE_E1); break;
840 
+        case 0: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E1); break;
841 
+        case 1: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E2); break;
834 842 
         #if EXTRUDERS > 2
835 
-          case 2: pos_label = PSTR(MSG_MOVE_E2); break;
843 
+          case 2: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E3); break;
836 844 
           #if EXTRUDERS > 3
837 
-            case 3: pos_label = PSTR(MSG_MOVE_E3); break;
845 
+            case 3: pos_label = PSTR(MSG_MOVE_E MSG_MOVE_E4); break;
838 846 
           #endif //EXTRUDERS > 3
839 847 
         #endif //EXTRUDERS > 2
840 848 
       }
 
@@ -874,12 +882,12 @@ static void lcd_move_menu_axis() {
874 882 
     #if EXTRUDERS == 1
875 883 
       MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e);
876 884 
     #else
877 
-      MENU_ITEM(submenu, MSG_MOVE_E0, lcd_move_e0);
878 
-      MENU_ITEM(submenu, MSG_MOVE_E1, lcd_move_e1);
885 
+      MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E1, lcd_move_e0);
886 
+      MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E2, lcd_move_e1);
879 887 
       #if EXTRUDERS > 2
880 
-        MENU_ITEM(submenu, MSG_MOVE_E2, lcd_move_e2);
888 
+        MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E3, lcd_move_e2);
881 889 
         #if EXTRUDERS > 3
882 
-          MENU_ITEM(submenu, MSG_MOVE_E3, lcd_move_e3);
890 
+          MENU_ITEM(submenu, MSG_MOVE_E MSG_MOVE_E4, lcd_move_e3);
883 891 
         #endif
884 892 
       #endif
885 893 
     #endif // EXTRUDERS > 1
 
@@ -962,18 +970,18 @@ static void lcd_control_menu() {
962 970 
     PID_PARAM(Kd, e) = scalePID_d(raw_Kd);
963 971 
     updatePID();
964 972 
   }
965 
-  void copy_and_scalePID_i_E1() { copy_and_scalePID_i(0); }
966 
-  void copy_and_scalePID_d_E1() { copy_and_scalePID_d(0); }
973 
+  #define COPY_AND_SCALE(eindex) \
974 
+    void copy_and_scalePID_i_E ## eindex() { copy_and_scalePID_i(eindex); } \
975 
+    void copy_and_scalePID_d_E ## eindex() { copy_and_scalePID_d(eindex); }
976 
+
977 
+  COPY_AND_SCALE(0);
967 978 
   #if ENABLED(PID_PARAMS_PER_EXTRUDER)
968 979 
     #if EXTRUDERS > 1
969 
-      void copy_and_scalePID_i_E2() { copy_and_scalePID_i(1); }
970 
-      void copy_and_scalePID_d_E2() { copy_and_scalePID_d(1); }
980 
+      COPY_AND_SCALE(1);
971 981 
       #if EXTRUDERS > 2
972 
-        void copy_and_scalePID_i_E3() { copy_and_scalePID_i(2); }
973 
-        void copy_and_scalePID_d_E3() { copy_and_scalePID_d(2); }
982 
+        COPY_AND_SCALE(2);
974 983 
         #if EXTRUDERS > 3
975 
-          void copy_and_scalePID_i_E4() { copy_and_scalePID_i(3); }
976 
-          void copy_and_scalePID_d_E4() { copy_and_scalePID_d(3); }
984 
+          COPY_AND_SCALE(3);
977 985 
         #endif //EXTRUDERS > 3
978 986 
       #endif //EXTRUDERS > 2
979 987 
     #endif //EXTRUDERS > 1
 
@@ -995,12 +1003,17 @@ static void lcd_control_temperature_menu() {
995 1003 
   MENU_ITEM(back, MSG_CONTROL, lcd_control_menu);
996 1004
997 1005 
   //
998 
-  // Nozzle, Nozzle 2, Nozzle 3, Nozzle 4
1006 
+  // Nozzle
1007 
+  // Nozzle 1, Nozzle 2, Nozzle 3, Nozzle 4
999 1008 
   //
1000 
-  #if TEMP_SENSOR_0 != 0
1001 
-    MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
1002 
-  #endif
1003 
-  #if EXTRUDERS > 1
1009 
+  #if EXTRUDERS == 1
1010 
+    #if TEMP_SENSOR_0 != 0
1011 
+      MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
1012 
+    #endif
1013 
+  #else //EXTRUDERS > 1
1014 
+    #if TEMP_SENSOR_0 != 0
1015 
+      MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N1, &target_temperature[0], 0, HEATER_0_MAXTEMP - 15);
1016 
+    #endif
1004 1017 
     #if TEMP_SENSOR_1 != 0
1005 1018 
       MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_NOZZLE MSG_N2, &target_temperature[1], 0, HEATER_1_MAXTEMP - 15);
1006 1019 
     #endif
 
@@ -1040,59 +1053,42 @@ static void lcd_control_temperature_menu() {
1040 1053
1041 1054 
   //
1042 1055 
   // PID-P, PID-I, PID-D, PID-C
1056 
+  // PID-P E1, PID-I E1, PID-D E1, PID-C E1
1057 
+  // PID-P E2, PID-I E2, PID-D E2, PID-C E2
1058 
+  // PID-P E3, PID-I E3, PID-D E3, PID-C E3
1059 
+  // PID-P E4, PID-I E4, PID-D E4, PID-C E4
1043 1060 
   //
1044 1061 
   #if ENABLED(PIDTEMP)
1045 
-    // set up temp variables - undo the default scaling
1046 
-    raw_Ki = unscalePID_i(PID_PARAM(Ki,0));
1047 
-    raw_Kd = unscalePID_d(PID_PARAM(Kd,0));
1048 
-    MENU_ITEM_EDIT(float52, MSG_PID_P, &PID_PARAM(Kp,0), 1, 9990);
1049 
-    // i is typically a small value so allows values below 1
1050 
-    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E1);
1051 
-    MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D, &raw_Kd, 1, 9990, copy_and_scalePID_d_E1);
1062 
+
1063 
+    #define _PID_MENU_ITEMS(ELABEL, eindex) \
1064 
+      raw_Ki = unscalePID_i(PID_PARAM(Ki, eindex)); \
1065 
+      raw_Kd = unscalePID_d(PID_PARAM(Kd, eindex)); \
1066 
+      MENU_ITEM_EDIT(float52, MSG_PID_P ELABEL, &PID_PARAM(Kp, eindex), 1, 9990); \
1067 
+      MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I ELABEL, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E ## eindex); \
1068 
+      MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D ELABEL, &raw_Kd, 1, 9990, copy_and_scalePID_d_E ## eindex)
1069 
+
1052 1070 
     #if ENABLED(PID_ADD_EXTRUSION_RATE)
1053 
-      MENU_ITEM_EDIT(float3, MSG_PID_C, &PID_PARAM(Kc,0), 1, 9990);
1054 
-    #endif//PID_ADD_EXTRUSION_RATE
1055 
-    #if ENABLED(PID_PARAMS_PER_EXTRUDER)
1056 
-      #if EXTRUDERS > 1
1057 
-        // set up temp variables - undo the default scaling
1058 
-        raw_Ki = unscalePID_i(PID_PARAM(Ki,1));
1059 
-        raw_Kd = unscalePID_d(PID_PARAM(Kd,1));
1060 
-        MENU_ITEM_EDIT(float52, MSG_PID_P MSG_E2, &PID_PARAM(Kp,1), 1, 9990);
1061 
-        // i is typically a small value so allows values below 1
1062 
-        MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I MSG_E2, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E2);
1063 
-        MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D MSG_E2, &raw_Kd, 1, 9990, copy_and_scalePID_d_E2);
1064 
-        #if ENABLED(PID_ADD_EXTRUSION_RATE)
1065 
-          MENU_ITEM_EDIT(float3, MSG_PID_C MSG_E2, &PID_PARAM(Kc,1), 1, 9990);
1066 
-        #endif//PID_ADD_EXTRUSION_RATE
1071 
+      #define PID_MENU_ITEMS(ELABEL, eindex) \
1072 
+        _PID_MENU_ITEMS(ELABEL, eindex); \
1073 
+        MENU_ITEM_EDIT(float3, MSG_PID_C ELABEL, &PID_PARAM(Kc, eindex), 1, 9990)
1074 
+    #else
1075 
+      #define PID_MENU_ITEMS(ELABEL, eindex) _PID_MENU_ITEMS(ELABEL, eindex)
1076 
+    #endif
1067 1077
1068 
-        #if EXTRUDERS > 2
1069 
-          // set up temp variables - undo the default scaling
1070 
-          raw_Ki = unscalePID_i(PID_PARAM(Ki,2));
1071 
-          raw_Kd = unscalePID_d(PID_PARAM(Kd,2));
1072 
-          MENU_ITEM_EDIT(float52, MSG_PID_P MSG_E3, &PID_PARAM(Kp,2), 1, 9990);
1073 
-          // i is typically a small value so allows values below 1
1074 
-          MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I MSG_E3, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E3);
1075 
-          MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D MSG_E3, &raw_Kd, 1, 9990, copy_and_scalePID_d_E3);
1076 
-          #if ENABLED(PID_ADD_EXTRUSION_RATE)
1077 
-            MENU_ITEM_EDIT(float3, MSG_PID_C MSG_E3, &PID_PARAM(Kc,2), 1, 9990);
1078 
-          #endif//PID_ADD_EXTRUSION_RATE
1078 
+    #if ENABLED(PID_PARAMS_PER_EXTRUDER) && EXTRUDERS > 1
1079 
+      PID_MENU_ITEMS(MSG_E1, 0);
1080 
+      PID_MENU_ITEMS(MSG_E2, 1);
1081 
+      #if EXTRUDERS > 2
1082 
+        PID_MENU_ITEMS(MSG_E3, 2);
1083 
+        #if EXTRUDERS > 3
1084 
+          PID_MENU_ITEMS(MSG_E4, 3);
1085 
+        #endif //EXTRUDERS > 3
1086 
+      #endif //EXTRUDERS > 2
1087 
+    #else //!PID_PARAMS_PER_EXTRUDER || EXTRUDERS == 1
1088 
+      PID_MENU_ITEMS("", 0);
1089 
+    #endif //!PID_PARAMS_PER_EXTRUDER || EXTRUDERS == 1
1079 1090
1080 
-          #if EXTRUDERS > 3
1081 
-            // set up temp variables - undo the default scaling
1082 
-            raw_Ki = unscalePID_i(PID_PARAM(Ki,3));
1083 
-            raw_Kd = unscalePID_d(PID_PARAM(Kd,3));
1084 
-            MENU_ITEM_EDIT(float52, MSG_PID_P MSG_E4, &PID_PARAM(Kp,3), 1, 9990);
1085 
-            // i is typically a small value so allows values below 1
1086 
-            MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I MSG_E4, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E4);
1087 
-            MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D MSG_E4, &raw_Kd, 1, 9990, copy_and_scalePID_d_E4);
1088 
-            #if ENABLED(PID_ADD_EXTRUSION_RATE)
1089 
-              MENU_ITEM_EDIT(float3, MSG_PID_C MSG_E4, &PID_PARAM(Kc,3), 1, 9990);
1090 
-            #endif//PID_ADD_EXTRUSION_RATE
1091 
-          #endif//EXTRUDERS > 3
1092 
-        #endif//EXTRUDERS > 2
1093 
-      #endif//EXTRUDERS > 1
1094 
-    #endif //PID_PARAMS_PER_EXTRUDER
1095 
-  #endif//PIDTEMP
1091 
+  #endif //PIDTEMP
1096 1092
1097 1093 
   //
1098 1094 
   // Preheat PLA conf
 
@@ -1201,13 +1197,15 @@ static void lcd_control_volumetric_menu() {
1201 1197 
   MENU_ITEM_EDIT_CALLBACK(bool, MSG_VOLUMETRIC_ENABLED, &volumetric_enabled, calculate_volumetric_multipliers);
1202 1198
1203 1199 
   if (volumetric_enabled) {
1204 
-    MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_SIZE_EXTRUDER_0, &filament_size[0], 1.5, 3.25, calculate_volumetric_multipliers);
1205 
-    #if EXTRUDERS > 1
1206 
-      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_SIZE_EXTRUDER_1, &filament_size[1], 1.5, 3.25, calculate_volumetric_multipliers);
1200 
+    #if EXTRUDERS == 1
1201 
+      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM, &filament_size[0], 1.5, 3.25, calculate_volumetric_multipliers);
1202 
+    #else //EXTRUDERS > 1
1203 
+      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E1, &filament_size[0], 1.5, 3.25, calculate_volumetric_multipliers);
1204 
+      MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E2, &filament_size[1], 1.5, 3.25, calculate_volumetric_multipliers);
1207 1205 
       #if EXTRUDERS > 2
1208 
-        MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_SIZE_EXTRUDER_2, &filament_size[2], 1.5, 3.25, calculate_volumetric_multipliers);
1206 
+        MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E3, &filament_size[2], 1.5, 3.25, calculate_volumetric_multipliers);
1209 1207 
         #if EXTRUDERS > 3
1210 
-          MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_SIZE_EXTRUDER_3, &filament_size[3], 1.5, 3.25, calculate_volumetric_multipliers);
1208 
+          MENU_MULTIPLIER_ITEM_EDIT_CALLBACK(float43, MSG_FILAMENT_DIAM MSG_DIAM_E4, &filament_size[3], 1.5, 3.25, calculate_volumetric_multipliers);
1211 1209 
         #endif //EXTRUDERS > 3
1212 1210 
       #endif //EXTRUDERS > 2
1213 1211 
     #endif //EXTRUDERS > 1

Write Preview
Loading…
Annulla
Salva