Browse Source

Cleanup and fix ultralcd.cpp

- Fix bug in lcd_control_temperature_menu
- Remove test menu-item left in from multi-line command feature
- Replace literals with translatable strings
- Reduce lcd_preheat code redundancy
- Reduce menu macro redundancy
- Clean up formatting
Scott Lahteine 10 years ago
parent
commit
57bc28b42c
2 changed files with 726 additions and 859 deletions
  1. 43
    1
      Marlin/language_en.h
  2. 683
    858
      Marlin/ultralcd.cpp

+ 43
- 1
Marlin/language_en.h View File

65
 #ifndef MSG_PREHEAT_ABS_SETTINGS
65
 #ifndef MSG_PREHEAT_ABS_SETTINGS
66
 #define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS " conf"
66
 #define MSG_PREHEAT_ABS_SETTINGS            MSG_PREHEAT_ABS " conf"
67
 #endif
67
 #endif
68
+#ifndef MSG_H1
69
+#define MSG_H1                              "1"
70
+#endif
71
+#ifndef MSG_H2
72
+#define MSG_H2                              "2"
73
+#endif
74
+#ifndef MSG_H3
75
+#define MSG_H3                              "3"
76
+#endif
77
+#ifndef MSG_H4
78
+#define MSG_H4                              "4"
79
+#endif
68
 #ifndef MSG_COOLDOWN
80
 #ifndef MSG_COOLDOWN
69
 #define MSG_COOLDOWN                        "Cooldown"
81
 #define MSG_COOLDOWN                        "Cooldown"
70
 #endif
82
 #endif
110
 #ifndef MSG_NOZZLE
122
 #ifndef MSG_NOZZLE
111
 #define MSG_NOZZLE                          "Nozzle"
123
 #define MSG_NOZZLE                          "Nozzle"
112
 #endif
124
 #endif
125
+#ifndef MSG_N2
126
+#define MSG_N2                              " 2"
127
+#endif
128
+#ifndef MSG_N3
129
+#define MSG_N3                              " 3"
130
+#endif
131
+#ifndef MSG_N4
132
+#define MSG_N4                              " 4"
133
+#endif
113
 #ifndef MSG_BED
134
 #ifndef MSG_BED
114
 #define MSG_BED                             "Bed"
135
 #define MSG_BED                             "Bed"
115
 #endif
136
 #endif
119
 #ifndef MSG_FLOW
140
 #ifndef MSG_FLOW
120
 #define MSG_FLOW                            "Flow"
141
 #define MSG_FLOW                            "Flow"
121
 #endif
142
 #endif
143
+#ifndef MSG_F0
144
+#define MSG_F0                              " 0"
145
+#endif
146
+#ifndef MSG_F1
147
+#define MSG_F1                              " 1"
148
+#endif
149
+#ifndef MSG_F2
150
+#define MSG_F2                              " 2"
151
+#endif
152
+#ifndef MSG_F3
153
+#define MSG_F3                              " 3"
154
+#endif
122
 #ifndef MSG_CONTROL
155
 #ifndef MSG_CONTROL
123
 #define MSG_CONTROL                         "Control"
156
 #define MSG_CONTROL                         "Control"
124
 #endif
157
 #endif
152
 #ifndef MSG_PID_C
185
 #ifndef MSG_PID_C
153
 #define MSG_PID_C                           "PID-C"
186
 #define MSG_PID_C                           "PID-C"
154
 #endif
187
 #endif
188
+#ifndef MSG_E2
189
+#define MSG_E2                              " E2"
190
+#endif
191
+#ifndef MSG_E3
192
+#define MSG_E3                              " E3"
193
+#endif
194
+#ifndef MSG_E4
195
+#define MSG_E4                              " E4"
196
+#endif
155
 #ifndef MSG_ACC
197
 #ifndef MSG_ACC
156
 #define MSG_ACC                             "Accel"
198
 #define MSG_ACC                             "Accel"
157
 #endif
199
 #endif
213
 #define MSG_VOLUMETRIC                      "Filament"
255
 #define MSG_VOLUMETRIC                      "Filament"
214
 #endif
256
 #endif
215
 #ifndef MSG_VOLUMETRIC_ENABLED
257
 #ifndef MSG_VOLUMETRIC_ENABLED
216
-#define MSG_VOLUMETRIC_ENABLED		          "E in mm" STR_h3
258
+#define MSG_VOLUMETRIC_ENABLED		        "E in mm" STR_h3
217
 #endif
259
 #endif
218
 #ifndef MSG_FILAMENT_SIZE_EXTRUDER_0
260
 #ifndef MSG_FILAMENT_SIZE_EXTRUDER_0
219
 #define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"
261
 #define MSG_FILAMENT_SIZE_EXTRUDER_0        "Fil. Dia. 1"

+ 683
- 858
Marlin/ultralcd.cpp
File diff suppressed because it is too large
View File


Loading…
Cancel
Save