Ver código fonte

Replace MSG_F? with MSG_N?

To avoid double definitions.
I prefer to read N for Number not for Nozzle.
AnHardt 10 anos atrás
pai
commit
f18f689c01
3 arquivos alterados com 12 adições e 20 exclusões
  1. 2
    4
      Marlin/language_cn.h
  2. 6
    12
      Marlin/language_en.h
  3. 4
    4
      Marlin/ultralcd.cpp

+ 2
- 4
Marlin/language_cn.h Ver arquivo

50
   #define MSG_MOVE_10MM                       "\xc1\xb2 10mm"
50
   #define MSG_MOVE_10MM                       "\xc1\xb2 10mm"
51
   #define MSG_SPEED                           "\xd1\xd2"
51
   #define MSG_SPEED                           "\xd1\xd2"
52
   #define MSG_NOZZLE                          "\xd3\xd4"
52
   #define MSG_NOZZLE                          "\xd3\xd4"
53
+  #define MSG_N0                              " 0"
54
+  #define MSG_N1                              " 1"
53
   #define MSG_N2                              " 2"
55
   #define MSG_N2                              " 2"
54
   #define MSG_N3                              " 3"
56
   #define MSG_N3                              " 3"
55
   #define MSG_N4                              " 4"
57
   #define MSG_N4                              " 4"
56
   #define MSG_BED                             "\xc4\xc7"
58
   #define MSG_BED                             "\xc4\xc7"
57
   #define MSG_FAN_SPEED                       "\xd5\xd6\xd1\xd2"
59
   #define MSG_FAN_SPEED                       "\xd5\xd6\xd1\xd2"
58
   #define MSG_FLOW                            "\xcc\xad\xd1\xd2"
60
   #define MSG_FLOW                            "\xcc\xad\xd1\xd2"
59
-  #define MSG_F0                              " 0"
60
-  #define MSG_F1                              " 1"
61
-  #define MSG_F2                              " 2"
62
-  #define MSG_F3                              " 3"
63
   #define MSG_CONTROL                         "\xd8\xd9"
61
   #define MSG_CONTROL                         "\xd8\xd9"
64
   #define MSG_MIN                             LCD_STR_THERMOMETER " \xda\xdb"
62
   #define MSG_MIN                             LCD_STR_THERMOMETER " \xda\xdb"
65
   #define MSG_MAX                             LCD_STR_THERMOMETER " \xda\xdc"
63
   #define MSG_MAX                             LCD_STR_THERMOMETER " \xda\xdc"

+ 6
- 12
Marlin/language_en.h Ver arquivo

135
 #ifndef MSG_NOZZLE
135
 #ifndef MSG_NOZZLE
136
 #define MSG_NOZZLE                          "Nozzle"
136
 #define MSG_NOZZLE                          "Nozzle"
137
 #endif
137
 #endif
138
+#ifndef MSG_N0
139
+#define MSG_N0                              " 0"
140
+#endif
141
+#ifndef MSG_N1
142
+#define MSG_N1                              " 1"
143
+#endif
138
 #ifndef MSG_N2
144
 #ifndef MSG_N2
139
 #define MSG_N2                              " 2"
145
 #define MSG_N2                              " 2"
140
 #endif
146
 #endif
153
 #ifndef MSG_FLOW
159
 #ifndef MSG_FLOW
154
 #define MSG_FLOW                            "Flow"
160
 #define MSG_FLOW                            "Flow"
155
 #endif
161
 #endif
156
-#ifndef MSG_F0
157
-#define MSG_F0                              " 0"
158
-#endif
159
-#ifndef MSG_F1
160
-#define MSG_F1                              " 1"
161
-#endif
162
-#ifndef MSG_F2
163
-#define MSG_F2                              " 2"
164
-#endif
165
-#ifndef MSG_F3
166
-#define MSG_F3                              " 3"
167
-#endif
168
 #ifndef MSG_CONTROL
162
 #ifndef MSG_CONTROL
169
 #define MSG_CONTROL                         "Control"
163
 #define MSG_CONTROL                         "Control"
170
 #endif
164
 #endif

+ 4
- 4
Marlin/ultralcd.cpp Ver arquivo

489
   #endif
489
   #endif
490
   MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
490
   MENU_MULTIPLIER_ITEM_EDIT(int3, MSG_FAN_SPEED, &fanSpeed, 0, 255);
491
   MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiply[active_extruder], 10, 999);
491
   MENU_ITEM_EDIT(int3, MSG_FLOW, &extruder_multiply[active_extruder], 10, 999);
492
-  MENU_ITEM_EDIT(int3, MSG_FLOW MSG_F0, &extruder_multiply[0], 10, 999);
492
+  MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N0, &extruder_multiply[0], 10, 999);
493
   #if TEMP_SENSOR_1 != 0
493
   #if TEMP_SENSOR_1 != 0
494
-    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_F1, &extruder_multiply[1], 10, 999);
494
+    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N1, &extruder_multiply[1], 10, 999);
495
   #endif
495
   #endif
496
   #if TEMP_SENSOR_2 != 0
496
   #if TEMP_SENSOR_2 != 0
497
-    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_F2, &extruder_multiply[2], 10, 999);
497
+    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N2, &extruder_multiply[2], 10, 999);
498
   #endif
498
   #endif
499
   #if TEMP_SENSOR_3 != 0
499
   #if TEMP_SENSOR_3 != 0
500
-    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_F3, &extruder_multiply[3], 10, 999);
500
+    MENU_ITEM_EDIT(int3, MSG_FLOW MSG_N3, &extruder_multiply[3], 10, 999);
501
   #endif
501
   #endif
502
 
502
 
503
   #ifdef BABYSTEPPING
503
   #ifdef BABYSTEPPING

Carregando…
Cancelar
Salvar