Bläddra i källkod

Default E3 V2 to English

Scott Lahteine 3 år sedan
förälder
incheckning
be7bbadabe
2 ändrade filer med 66 tillägg och 63 borttagningar
  1. 60
    60
      Marlin/src/lcd/dwin/e3v2/dwin.cpp
  2. 6
    3
      Marlin/src/lcd/dwin/e3v2/dwin.h

+ 60
- 60
Marlin/src/lcd/dwin/e3v2/dwin.cpp Visa fil

151
 
151
 
152
 /* Value Init */
152
 /* Value Init */
153
 HMI_value_t HMI_ValueStruct;
153
 HMI_value_t HMI_ValueStruct;
154
-HMI_Flag HMI_flag{0};
154
+HMI_Flag_t HMI_flag{0};
155
 
155
 
156
 millis_t dwin_heat_time = 0;
156
 millis_t dwin_heat_time = 0;
157
 
157
 
173
          , select_acc{0}
173
          , select_acc{0}
174
          , select_jerk{0}
174
          , select_jerk{0}
175
          , select_step{0}
175
          , select_step{0}
176
-         // , select_leveling{0}
177
          ;
176
          ;
178
 
177
 
179
 uint8_t index_file     = MROWS,
178
 uint8_t index_file     = MROWS,
208
 #define DWIN_LANGUAGE_EEPROM_ADDRESS 0x01   // Between 0x01 and 0x63 (EEPROM_OFFSET-1)
207
 #define DWIN_LANGUAGE_EEPROM_ADDRESS 0x01   // Between 0x01 and 0x63 (EEPROM_OFFSET-1)
209
                                             // BL24CXX::check() uses 0x00
208
                                             // BL24CXX::check() uses 0x00
210
 
209
 
210
+inline bool HMI_IsChinese() { return HMI_flag.language == DWIN_CHINESE; }
211
+
211
 void HMI_SetLanguageCache() {
212
 void HMI_SetLanguageCache() {
212
-  DWIN_JPG_CacheTo1(HMI_flag.language_chinese ? Language_Chinese : Language_English);
213
+  DWIN_JPG_CacheTo1(HMI_IsChinese() ? Language_Chinese : Language_English);
213
 }
214
 }
214
 
215
 
215
 void HMI_SetLanguage() {
216
 void HMI_SetLanguage() {
216
   #if ENABLED(EEPROM_SETTINGS)
217
   #if ENABLED(EEPROM_SETTINGS)
217
-    BL24CXX::read(DWIN_LANGUAGE_EEPROM_ADDRESS, (uint8_t*)&HMI_flag.language_chinese, sizeof(HMI_flag.language_chinese));
218
+    BL24CXX::read(DWIN_LANGUAGE_EEPROM_ADDRESS, (uint8_t*)&HMI_flag.language, sizeof(HMI_flag.language));
218
   #endif
219
   #endif
219
   HMI_SetLanguageCache();
220
   HMI_SetLanguageCache();
220
 }
221
 }
221
 
222
 
222
 void HMI_ToggleLanguage() {
223
 void HMI_ToggleLanguage() {
223
-  HMI_flag.language_chinese ^= true;
224
+  HMI_flag.language = HMI_IsChinese() ? DWIN_ENGLISH : DWIN_CHINESE;
224
   HMI_SetLanguageCache();
225
   HMI_SetLanguageCache();
225
   #if ENABLED(EEPROM_SETTINGS)
226
   #if ENABLED(EEPROM_SETTINGS)
226
-    BL24CXX::write(DWIN_LANGUAGE_EEPROM_ADDRESS, (uint8_t*)&HMI_flag.language_chinese, sizeof(HMI_flag.language_chinese));
227
+    BL24CXX::write(DWIN_LANGUAGE_EEPROM_ADDRESS, (uint8_t*)&HMI_flag.language, sizeof(HMI_flag.language));
227
   #endif
228
   #endif
228
 }
229
 }
229
 
230
 
242
   if (select_page.now == 0) {
243
   if (select_page.now == 0) {
243
     DWIN_ICON_Show(ICON, ICON_Print_1, 17, 130);
244
     DWIN_ICON_Show(ICON, ICON_Print_1, 17, 130);
244
     DWIN_Draw_Rectangle(0, Color_White, 17, 130, 126, 229);
245
     DWIN_Draw_Rectangle(0, Color_White, 17, 130, 126, 229);
245
-    if (HMI_flag.language_chinese)
246
+    if (HMI_IsChinese())
246
       DWIN_Frame_AreaCopy(1, 1, 447, 28, 460, 58, 201);
247
       DWIN_Frame_AreaCopy(1, 1, 447, 28, 460, 58, 201);
247
     else
248
     else
248
       DWIN_Frame_AreaCopy(1, 1, 451, 31, 463, 57, 201);
249
       DWIN_Frame_AreaCopy(1, 1, 451, 31, 463, 57, 201);
249
   }
250
   }
250
   else {
251
   else {
251
     DWIN_ICON_Show(ICON, ICON_Print_0, 17, 130);
252
     DWIN_ICON_Show(ICON, ICON_Print_0, 17, 130);
252
-    if (HMI_flag.language_chinese)
253
+    if (HMI_IsChinese())
253
       DWIN_Frame_AreaCopy(1, 1, 405, 28, 420, 58, 201);
254
       DWIN_Frame_AreaCopy(1, 1, 405, 28, 420, 58, 201);
254
     else
255
     else
255
       DWIN_Frame_AreaCopy(1, 1, 423, 31, 435, 57, 201);
256
       DWIN_Frame_AreaCopy(1, 1, 423, 31, 435, 57, 201);
260
   if (select_page.now == 1) {
261
   if (select_page.now == 1) {
261
     DWIN_ICON_Show(ICON, ICON_Prepare_1, 145, 130);
262
     DWIN_ICON_Show(ICON, ICON_Prepare_1, 145, 130);
262
     DWIN_Draw_Rectangle(0, Color_White, 145, 130, 254, 229);
263
     DWIN_Draw_Rectangle(0, Color_White, 145, 130, 254, 229);
263
-    if (HMI_flag.language_chinese)
264
+    if (HMI_IsChinese())
264
       DWIN_Frame_AreaCopy(1, 31, 447, 58, 460, 186, 201);
265
       DWIN_Frame_AreaCopy(1, 31, 447, 58, 460, 186, 201);
265
     else
266
     else
266
       DWIN_Frame_AreaCopy(1, 33, 451, 82, 466, 175, 201);
267
       DWIN_Frame_AreaCopy(1, 33, 451, 82, 466, 175, 201);
267
   }
268
   }
268
   else {
269
   else {
269
     DWIN_ICON_Show(ICON, ICON_Prepare_0, 145, 130);
270
     DWIN_ICON_Show(ICON, ICON_Prepare_0, 145, 130);
270
-    if (HMI_flag.language_chinese)
271
+    if (HMI_IsChinese())
271
       DWIN_Frame_AreaCopy(1, 31, 405, 58, 420, 186, 201);
272
       DWIN_Frame_AreaCopy(1, 31, 405, 58, 420, 186, 201);
272
     else
273
     else
273
       DWIN_Frame_AreaCopy(1, 33, 423, 82, 438, 175, 201);
274
       DWIN_Frame_AreaCopy(1, 33, 423, 82, 438, 175, 201);
278
   if (select_page.now == 2) {
279
   if (select_page.now == 2) {
279
     DWIN_ICON_Show(ICON, ICON_Control_1, 17, 246);
280
     DWIN_ICON_Show(ICON, ICON_Control_1, 17, 246);
280
     DWIN_Draw_Rectangle(0, Color_White, 17, 246, 126, 345);
281
     DWIN_Draw_Rectangle(0, Color_White, 17, 246, 126, 345);
281
-    if (HMI_flag.language_chinese)
282
+    if (HMI_IsChinese())
282
       DWIN_Frame_AreaCopy(1, 61, 447, 88, 460, 58, 318);
283
       DWIN_Frame_AreaCopy(1, 61, 447, 88, 460, 58, 318);
283
     else
284
     else
284
       DWIN_Frame_AreaCopy(1, 85, 451, 132, 463, 48, 318);
285
       DWIN_Frame_AreaCopy(1, 85, 451, 132, 463, 48, 318);
285
   }
286
   }
286
   else {
287
   else {
287
     DWIN_ICON_Show(ICON, ICON_Control_0, 17, 246);
288
     DWIN_ICON_Show(ICON, ICON_Control_0, 17, 246);
288
-    if (HMI_flag.language_chinese)
289
+    if (HMI_IsChinese())
289
       DWIN_Frame_AreaCopy(1, 61, 405, 88, 420, 58, 318);
290
       DWIN_Frame_AreaCopy(1, 61, 405, 88, 420, 58, 318);
290
     else
291
     else
291
       DWIN_Frame_AreaCopy(1, 85, 423, 132, 434, 48, 318);
292
       DWIN_Frame_AreaCopy(1, 85, 423, 132, 434, 48, 318);
296
   if (show) {
297
   if (show) {
297
     DWIN_ICON_Show(ICON, ICON_Info_1, 145, 246);
298
     DWIN_ICON_Show(ICON, ICON_Info_1, 145, 246);
298
     DWIN_Draw_Rectangle(0, Color_White, 145, 246, 254, 345);
299
     DWIN_Draw_Rectangle(0, Color_White, 145, 246, 254, 345);
299
-    if (HMI_flag.language_chinese)
300
+    if (HMI_IsChinese())
300
       DWIN_Frame_AreaCopy(1, 91, 447, 118, 460, 186, 318);
301
       DWIN_Frame_AreaCopy(1, 91, 447, 118, 460, 186, 318);
301
     else
302
     else
302
       DWIN_Frame_AreaCopy(1, 132, 451, 159, 466, 186, 318);
303
       DWIN_Frame_AreaCopy(1, 132, 451, 159, 466, 186, 318);
303
   }
304
   }
304
   else {
305
   else {
305
     DWIN_ICON_Show(ICON, ICON_Info_0, 145, 246);
306
     DWIN_ICON_Show(ICON, ICON_Info_0, 145, 246);
306
-    if (HMI_flag.language_chinese)
307
+    if (HMI_IsChinese())
307
       DWIN_Frame_AreaCopy(1, 91, 405, 118, 420, 186, 318);
308
       DWIN_Frame_AreaCopy(1, 91, 405, 118, 420, 186, 318);
308
     else
309
     else
309
       DWIN_Frame_AreaCopy(1, 132, 423, 159, 435, 186, 318);
310
       DWIN_Frame_AreaCopy(1, 132, 423, 159, 435, 186, 318);
314
   if (show) {
315
   if (show) {
315
     DWIN_ICON_Show(ICON, ICON_Leveling_1, 145, 246);
316
     DWIN_ICON_Show(ICON, ICON_Leveling_1, 145, 246);
316
     DWIN_Draw_Rectangle(0, Color_White, 145, 246, 254, 345);
317
     DWIN_Draw_Rectangle(0, Color_White, 145, 246, 254, 345);
317
-    if (HMI_flag.language_chinese)
318
+    if (HMI_IsChinese())
318
       DWIN_Frame_AreaCopy(1, 211, 447, 238, 460, 186, 318);
319
       DWIN_Frame_AreaCopy(1, 211, 447, 238, 460, 186, 318);
319
     else
320
     else
320
       DWIN_Frame_AreaCopy(1, 84, 437, 120,  449, 182, 318);
321
       DWIN_Frame_AreaCopy(1, 84, 437, 120,  449, 182, 318);
321
   }
322
   }
322
   else {
323
   else {
323
     DWIN_ICON_Show(ICON, ICON_Leveling_0, 145, 246);
324
     DWIN_ICON_Show(ICON, ICON_Leveling_0, 145, 246);
324
-    if (HMI_flag.language_chinese)
325
+    if (HMI_IsChinese())
325
       DWIN_Frame_AreaCopy(1, 211, 405, 238, 420, 186, 318);
326
       DWIN_Frame_AreaCopy(1, 211, 405, 238, 420, 186, 318);
326
     else
327
     else
327
       DWIN_Frame_AreaCopy(1, 84, 465, 120, 478, 182, 318);
328
       DWIN_Frame_AreaCopy(1, 84, 465, 120, 478, 182, 318);
332
   if (select_print.now == 0) {
333
   if (select_print.now == 0) {
333
     DWIN_ICON_Show(ICON, ICON_Setup_1, 8, 252);
334
     DWIN_ICON_Show(ICON, ICON_Setup_1, 8, 252);
334
     DWIN_Draw_Rectangle(0, Color_White, 8, 252, 87, 351);
335
     DWIN_Draw_Rectangle(0, Color_White, 8, 252, 87, 351);
335
-    if (HMI_flag.language_chinese)
336
+    if (HMI_IsChinese())
336
       DWIN_Frame_AreaCopy(1, 121, 447, 148, 458, 34, 325);
337
       DWIN_Frame_AreaCopy(1, 121, 447, 148, 458, 34, 325);
337
     else
338
     else
338
       DWIN_Frame_AreaCopy(1,   0, 466,  34, 476, 31, 325);
339
       DWIN_Frame_AreaCopy(1,   0, 466,  34, 476, 31, 325);
339
   }
340
   }
340
   else {
341
   else {
341
     DWIN_ICON_Show(ICON, ICON_Setup_0, 8, 252);
342
     DWIN_ICON_Show(ICON, ICON_Setup_0, 8, 252);
342
-    if (HMI_flag.language_chinese)
343
+    if (HMI_IsChinese())
343
       DWIN_Frame_AreaCopy(1, 121, 405, 148, 420, 34, 325);
344
       DWIN_Frame_AreaCopy(1, 121, 405, 148, 420, 34, 325);
344
     else
345
     else
345
       DWIN_Frame_AreaCopy(1,   0, 438,  32, 448, 31, 325);
346
       DWIN_Frame_AreaCopy(1,   0, 438,  32, 448, 31, 325);
350
   if (select_print.now == 1) {
351
   if (select_print.now == 1) {
351
     DWIN_ICON_Show(ICON, ICON_Pause_1, 96, 252);
352
     DWIN_ICON_Show(ICON, ICON_Pause_1, 96, 252);
352
     DWIN_Draw_Rectangle(0, Color_White, 96, 252, 175, 351);
353
     DWIN_Draw_Rectangle(0, Color_White, 96, 252, 175, 351);
353
-    if (HMI_flag.language_chinese)
354
+    if (HMI_IsChinese())
354
       DWIN_Frame_AreaCopy(1, 181, 447, 208, 459, 124, 325);
355
       DWIN_Frame_AreaCopy(1, 181, 447, 208, 459, 124, 325);
355
     else
356
     else
356
       DWIN_Frame_AreaCopy(1, 177, 451, 216, 462, 116, 325);
357
       DWIN_Frame_AreaCopy(1, 177, 451, 216, 462, 116, 325);
357
   }
358
   }
358
   else {
359
   else {
359
     DWIN_ICON_Show(ICON, ICON_Pause_0, 96, 252);
360
     DWIN_ICON_Show(ICON, ICON_Pause_0, 96, 252);
360
-    if (HMI_flag.language_chinese)
361
+    if (HMI_IsChinese())
361
       DWIN_Frame_AreaCopy(1, 181, 405, 208, 420, 124, 325);
362
       DWIN_Frame_AreaCopy(1, 181, 405, 208, 420, 124, 325);
362
     else
363
     else
363
       DWIN_Frame_AreaCopy(1, 177, 423, 215, 433, 116, 325);
364
       DWIN_Frame_AreaCopy(1, 177, 423, 215, 433, 116, 325);
368
   if (select_print.now == 1) {
369
   if (select_print.now == 1) {
369
     DWIN_ICON_Show(ICON, ICON_Continue_1, 96, 252);
370
     DWIN_ICON_Show(ICON, ICON_Continue_1, 96, 252);
370
     DWIN_Draw_Rectangle(0, Color_White, 96, 252, 175, 351);
371
     DWIN_Draw_Rectangle(0, Color_White, 96, 252, 175, 351);
371
-    if (HMI_flag.language_chinese)
372
+    if (HMI_IsChinese())
372
       DWIN_Frame_AreaCopy(1, 1, 447, 28, 460, 124, 325);
373
       DWIN_Frame_AreaCopy(1, 1, 447, 28, 460, 124, 325);
373
     else
374
     else
374
       DWIN_Frame_AreaCopy(1, 1, 452, 32, 464, 121, 325);
375
       DWIN_Frame_AreaCopy(1, 1, 452, 32, 464, 121, 325);
375
   }
376
   }
376
   else {
377
   else {
377
     DWIN_ICON_Show(ICON, ICON_Continue_0, 96, 252);
378
     DWIN_ICON_Show(ICON, ICON_Continue_0, 96, 252);
378
-    if (HMI_flag.language_chinese)
379
+    if (HMI_IsChinese())
379
       DWIN_Frame_AreaCopy(1, 1, 405, 28, 420, 124, 325);
380
       DWIN_Frame_AreaCopy(1, 1, 405, 28, 420, 124, 325);
380
     else
381
     else
381
       DWIN_Frame_AreaCopy(1, 1, 424, 31, 434, 121, 325);
382
       DWIN_Frame_AreaCopy(1, 1, 424, 31, 434, 121, 325);
386
   if (select_print.now == 2) {
387
   if (select_print.now == 2) {
387
     DWIN_ICON_Show(ICON, ICON_Stop_1, 184, 252);
388
     DWIN_ICON_Show(ICON, ICON_Stop_1, 184, 252);
388
     DWIN_Draw_Rectangle(0, Color_White, 184, 252, 263, 351);
389
     DWIN_Draw_Rectangle(0, Color_White, 184, 252, 263, 351);
389
-    if (HMI_flag.language_chinese)
390
+    if (HMI_IsChinese())
390
       DWIN_Frame_AreaCopy(1, 151, 447, 178, 459, 210, 325);
391
       DWIN_Frame_AreaCopy(1, 151, 447, 178, 459, 210, 325);
391
     else
392
     else
392
       DWIN_Frame_AreaCopy(1, 218, 452, 249, 466, 209, 325);
393
       DWIN_Frame_AreaCopy(1, 218, 452, 249, 466, 209, 325);
393
   }
394
   }
394
   else {
395
   else {
395
     DWIN_ICON_Show(ICON, ICON_Stop_0, 184, 252);
396
     DWIN_ICON_Show(ICON, ICON_Stop_0, 184, 252);
396
-    if (HMI_flag.language_chinese)
397
+    if (HMI_IsChinese())
397
       DWIN_Frame_AreaCopy(1, 151, 405, 178, 420, 210, 325);
398
       DWIN_Frame_AreaCopy(1, 151, 405, 178, 420, 210, 325);
398
     else
399
     else
399
       DWIN_Frame_AreaCopy(1, 218, 423, 247, 436, 209, 325);
400
       DWIN_Frame_AreaCopy(1, 218, 423, 247, 436, 209, 325);
481
 
482
 
482
 // The "Back" label is always on the first line
483
 // The "Back" label is always on the first line
483
 inline void Draw_Back_Label() {
484
 inline void Draw_Back_Label() {
484
-  if (HMI_flag.language_chinese)
485
+  if (HMI_IsChinese())
485
     DWIN_Frame_AreaCopy(1, 129, 72, 156, 84, LBLX, MBASE(0));
486
     DWIN_Frame_AreaCopy(1, 129, 72, 156, 84, LBLX, MBASE(0));
486
   else
487
   else
487
     DWIN_Frame_AreaCopy(1, 226, 179, 256, 189, LBLX, MBASE(0));
488
     DWIN_Frame_AreaCopy(1, 226, 179, 256, 189, LBLX, MBASE(0));
563
 inline void DWIN_Frame_TitleCopy(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) { DWIN_Frame_AreaCopy(id, x1, y1, x2, y2, 14, 8); }
564
 inline void DWIN_Frame_TitleCopy(uint8_t id, uint16_t x1, uint16_t y1, uint16_t x2, uint16_t y2) { DWIN_Frame_AreaCopy(id, x1, y1, x2, y2, 14, 8); }
564
 
565
 
565
 inline void Item_Prepare_Move(const uint8_t row) {
566
 inline void Item_Prepare_Move(const uint8_t row) {
566
-  if (HMI_flag.language_chinese)
567
+  if (HMI_IsChinese())
567
     DWIN_Frame_AreaCopy(1, 159, 70, 200, 84, LBLX, MBASE(row));
568
     DWIN_Frame_AreaCopy(1, 159, 70, 200, 84, LBLX, MBASE(row));
568
   else
569
   else
569
     draw_move_en(MBASE(row)); // "Move >"
570
     draw_move_en(MBASE(row)); // "Move >"
572
 }
573
 }
573
 
574
 
574
 inline void Item_Prepare_Disable(const uint8_t row) {
575
 inline void Item_Prepare_Disable(const uint8_t row) {
575
-  if (HMI_flag.language_chinese)
576
+  if (HMI_IsChinese())
576
     DWIN_Frame_AreaCopy(1, 204, 70, 259, 82, LBLX, MBASE(row));
577
     DWIN_Frame_AreaCopy(1, 204, 70, 259, 82, LBLX, MBASE(row));
577
   else
578
   else
578
     DWIN_Frame_AreaCopy(1, 103, 59, 200, 74, LBLX, MBASE(row)); // "Disable Stepper"
579
     DWIN_Frame_AreaCopy(1, 103, 59, 200, 74, LBLX, MBASE(row)); // "Disable Stepper"
580
 }
581
 }
581
 
582
 
582
 inline void Item_Prepare_Home(const uint8_t row) {
583
 inline void Item_Prepare_Home(const uint8_t row) {
583
-  if (HMI_flag.language_chinese)
584
+  if (HMI_IsChinese())
584
     DWIN_Frame_AreaCopy(1, 0, 89, 41, 101, LBLX, MBASE(row));
585
     DWIN_Frame_AreaCopy(1, 0, 89, 41, 101, LBLX, MBASE(row));
585
   else
586
   else
586
     DWIN_Frame_AreaCopy(1, 202, 61, 271, 71, LBLX, MBASE(row)); // "Auto Home"
587
     DWIN_Frame_AreaCopy(1, 202, 61, 271, 71, LBLX, MBASE(row)); // "Auto Home"
590
 #if HAS_ZOFFSET_ITEM
591
 #if HAS_ZOFFSET_ITEM
591
 
592
 
592
   inline void Item_Prepare_Offset(const uint8_t row) {
593
   inline void Item_Prepare_Offset(const uint8_t row) {
593
-    if (HMI_flag.language_chinese) {
594
+    if (HMI_IsChinese()) {
594
       #if HAS_BED_PROBE
595
       #if HAS_BED_PROBE
595
         DWIN_Frame_AreaCopy(1, 174, 164, 223, 177, LBLX, MBASE(row));
596
         DWIN_Frame_AreaCopy(1, 174, 164, 223, 177, LBLX, MBASE(row));
596
         DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, MBASE(row), BABY_Z_VAR * 100);
597
         DWIN_Draw_Signed_Float(font8x16, Color_Bg_Black, 2, 2, 202, MBASE(row), BABY_Z_VAR * 100);
613
 
614
 
614
 #if HAS_HOTEND
615
 #if HAS_HOTEND
615
   inline void Item_Prepare_PLA(const uint8_t row) {
616
   inline void Item_Prepare_PLA(const uint8_t row) {
616
-    if (HMI_flag.language_chinese) {
617
+    if (HMI_IsChinese()) {
617
       DWIN_Frame_AreaCopy(1, 100, 89, 151, 101, LBLX, MBASE(row));
618
       DWIN_Frame_AreaCopy(1, 100, 89, 151, 101, LBLX, MBASE(row));
618
     }
619
     }
619
     else {
620
     else {
624
   }
625
   }
625
 
626
 
626
   inline void Item_Prepare_ABS(const uint8_t row) {
627
   inline void Item_Prepare_ABS(const uint8_t row) {
627
-    if (HMI_flag.language_chinese) {
628
+    if (HMI_IsChinese()) {
628
       DWIN_Frame_AreaCopy(1, 180, 89, 233, 100, LBLX, MBASE(row));
629
       DWIN_Frame_AreaCopy(1, 180, 89, 233, 100, LBLX, MBASE(row));
629
     }
630
     }
630
     else {
631
     else {
637
 
638
 
638
 #if HAS_PREHEAT
639
 #if HAS_PREHEAT
639
   inline void Item_Prepare_Cool(const uint8_t row) {
640
   inline void Item_Prepare_Cool(const uint8_t row) {
640
-    if (HMI_flag.language_chinese)
641
+    if (HMI_IsChinese())
641
       DWIN_Frame_AreaCopy(1,   1, 104,  56, 117, LBLX, MBASE(row));
642
       DWIN_Frame_AreaCopy(1,   1, 104,  56, 117, LBLX, MBASE(row));
642
     else
643
     else
643
       DWIN_Frame_AreaCopy(1, 200,  76, 264,  86, LBLX, MBASE(row));      // "Cooldown"
644
       DWIN_Frame_AreaCopy(1, 200,  76, 264,  86, LBLX, MBASE(row));      // "Cooldown"
646
 #endif
647
 #endif
647
 
648
 
648
 inline void Item_Prepare_Lang(const uint8_t row) {
649
 inline void Item_Prepare_Lang(const uint8_t row) {
649
-  if (HMI_flag.language_chinese) {
650
+  if (HMI_IsChinese()) {
650
     DWIN_Frame_AreaCopy(1, 239, 134, 266, 146, LBLX, MBASE(row));
651
     DWIN_Frame_AreaCopy(1, 239, 134, 266, 146, LBLX, MBASE(row));
651
     DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, 226, MBASE(row), F("CN"));
652
     DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, 226, MBASE(row), F("CN"));
652
   }
653
   }
664
   #define PSCROL(L) (scroll + (L))
665
   #define PSCROL(L) (scroll + (L))
665
   #define PVISI(L)  WITHIN(PSCROL(L), 0, MROWS)
666
   #define PVISI(L)  WITHIN(PSCROL(L), 0, MROWS)
666
 
667
 
667
-  if (HMI_flag.language_chinese) {
668
+  if (HMI_IsChinese()) {
668
     DWIN_Frame_TitleCopy(1, 133, 1, 160, 13);   // "Prepare"
669
     DWIN_Frame_TitleCopy(1, 133, 1, 160, 13);   // "Prepare"
669
   }
670
   }
670
   else {
671
   else {
708
 
709
 
709
   if (CVISI(0)) Draw_Back_First(select_control.now == 0);                         // < Back
710
   if (CVISI(0)) Draw_Back_First(select_control.now == 0);                         // < Back
710
 
711
 
711
-  if (HMI_flag.language_chinese) {
712
+  if (HMI_IsChinese()) {
712
     DWIN_Frame_TitleCopy(1, 103, 1, 130, 14);                                     // "Control"
713
     DWIN_Frame_TitleCopy(1, 103, 1, 130, 14);                                     // "Control"
713
 
714
 
714
     DWIN_Frame_AreaCopy(1,  57, 104,  84, 116, LBLX, CLINE(CONTROL_CASE_TEMP));   // Temperature >
715
     DWIN_Frame_AreaCopy(1,  57, 104,  84, 116, LBLX, CLINE(CONTROL_CASE_TEMP));   // Temperature >
775
 inline void Draw_Tune_Menu() {
776
 inline void Draw_Tune_Menu() {
776
   Clear_Main_Window();
777
   Clear_Main_Window();
777
 
778
 
778
-  if (HMI_flag.language_chinese) {
779
+  if (HMI_IsChinese()) {
779
     DWIN_Frame_AreaCopy(1, 73, 2, 100, 13, 14, 9);
780
     DWIN_Frame_AreaCopy(1, 73, 2, 100, 13, 14, 9);
780
     DWIN_Frame_AreaCopy(1, 116, 164, 171, 176, LBLX, MBASE(TUNE_CASE_SPEED));
781
     DWIN_Frame_AreaCopy(1, 116, 164, 171, 176, LBLX, MBASE(TUNE_CASE_SPEED));
781
     #if HAS_HOTEND
782
     #if HAS_HOTEND
881
 inline void Draw_Motion_Menu() {
882
 inline void Draw_Motion_Menu() {
882
   Clear_Main_Window();
883
   Clear_Main_Window();
883
 
884
 
884
-  if (HMI_flag.language_chinese) {
885
+  if (HMI_IsChinese()) {
885
     DWIN_Frame_TitleCopy(1, 1, 16, 28, 28);                                     // "Motion"
886
     DWIN_Frame_TitleCopy(1, 1, 16, 28, 28);                                     // "Motion"
886
     DWIN_Frame_AreaCopy(1, 173, 133, 228, 147, LBLX, MBASE(MOTION_CASE_RATE));  // Max speed
887
     DWIN_Frame_AreaCopy(1, 173, 133, 228, 147, LBLX, MBASE(MOTION_CASE_RATE));  // Max speed
887
     DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(MOTION_CASE_ACCEL));        // Max...
888
     DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(MOTION_CASE_ACCEL));        // Max...
936
     Draw_Popup_Bkgd_105();
937
     Draw_Popup_Bkgd_105();
937
     if (toohigh) {
938
     if (toohigh) {
938
       DWIN_ICON_Show(ICON, ICON_TempTooHigh, 102, 165);
939
       DWIN_ICON_Show(ICON, ICON_TempTooHigh, 102, 165);
939
-      if (HMI_flag.language_chinese) {
940
+      if (HMI_IsChinese()) {
940
         DWIN_Frame_AreaCopy(1, 103, 371, 237, 386, 52, 285);
941
         DWIN_Frame_AreaCopy(1, 103, 371, 237, 386, 52, 285);
941
         DWIN_Frame_AreaCopy(1, 151, 389, 185, 402, 187, 285);
942
         DWIN_Frame_AreaCopy(1, 151, 389, 185, 402, 187, 285);
942
         DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
943
         DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
948
     }
949
     }
949
     else {
950
     else {
950
       DWIN_ICON_Show(ICON, ICON_TempTooLow, 102, 165);
951
       DWIN_ICON_Show(ICON, ICON_TempTooLow, 102, 165);
951
-      if (HMI_flag.language_chinese) {
952
+      if (HMI_IsChinese()) {
952
         DWIN_Frame_AreaCopy(1, 103, 371, 270, 386, 52, 285);
953
         DWIN_Frame_AreaCopy(1, 103, 371, 270, 386, 52, 285);
953
         DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
954
         DWIN_Frame_AreaCopy(1, 189, 389, 271, 402, 95, 310);
954
       }
955
       }
971
     Clear_Main_Window();
972
     Clear_Main_Window();
972
     Draw_Popup_Bkgd_60();
973
     Draw_Popup_Bkgd_60();
973
     DWIN_ICON_Show(ICON, ICON_TempTooLow, 102, 105);
974
     DWIN_ICON_Show(ICON, ICON_TempTooLow, 102, 105);
974
-    if (HMI_flag.language_chinese) {
975
+    if (HMI_IsChinese()) {
975
       DWIN_Frame_AreaCopy(1, 103, 371, 136, 386, 69, 240);
976
       DWIN_Frame_AreaCopy(1, 103, 371, 136, 386, 69, 240);
976
       DWIN_Frame_AreaCopy(1, 170, 371, 270, 386, 102, 240);
977
       DWIN_Frame_AreaCopy(1, 170, 371, 270, 386, 102, 240);
977
       DWIN_ICON_Show(ICON, ICON_Confirm_C, 86, 280);
978
       DWIN_ICON_Show(ICON, ICON_Confirm_C, 86, 280);
987
 void Popup_Window_Resume() {
988
 void Popup_Window_Resume() {
988
   Clear_Popup_Area();
989
   Clear_Popup_Area();
989
   Draw_Popup_Bkgd_105();
990
   Draw_Popup_Bkgd_105();
990
-  if (HMI_flag.language_chinese) {
991
+  if (HMI_IsChinese()) {
991
     DWIN_Frame_AreaCopy(1, 160, 338, 235, 354, 98, 135);
992
     DWIN_Frame_AreaCopy(1, 160, 338, 235, 354, 98, 135);
992
     DWIN_Frame_AreaCopy(1, 103, 321, 271, 335, 52, 192);
993
     DWIN_Frame_AreaCopy(1, 103, 321, 271, 335, 52, 192);
993
     DWIN_ICON_Show(ICON, ICON_Continue_C, 26, 307);
994
     DWIN_ICON_Show(ICON, ICON_Continue_C, 26, 307);
1006
   Clear_Main_Window();
1007
   Clear_Main_Window();
1007
   Draw_Popup_Bkgd_60();
1008
   Draw_Popup_Bkgd_60();
1008
   DWIN_ICON_Show(ICON, ICON_BLTouch, 101, 105);
1009
   DWIN_ICON_Show(ICON, ICON_BLTouch, 101, 105);
1009
-  if (HMI_flag.language_chinese) {
1010
+  if (HMI_IsChinese()) {
1010
     DWIN_Frame_AreaCopy(1, 0, 371, 33, 386, 85, 240);
1011
     DWIN_Frame_AreaCopy(1, 0, 371, 33, 386, 85, 240);
1011
     DWIN_Frame_AreaCopy(1, 203, 286, 271, 302, 118, 240);
1012
     DWIN_Frame_AreaCopy(1, 203, 286, 271, 302, 118, 240);
1012
     DWIN_Frame_AreaCopy(1, 0, 389, 150, 402, 61, 280);
1013
     DWIN_Frame_AreaCopy(1, 0, 389, 150, 402, 61, 280);
1023
     Clear_Main_Window();
1024
     Clear_Main_Window();
1024
     Draw_Popup_Bkgd_60();
1025
     Draw_Popup_Bkgd_60();
1025
     DWIN_ICON_Show(ICON, ICON_AutoLeveling, 101, 105);
1026
     DWIN_ICON_Show(ICON, ICON_AutoLeveling, 101, 105);
1026
-    if (HMI_flag.language_chinese) {
1027
+    if (HMI_IsChinese()) {
1027
       DWIN_Frame_AreaCopy(1, 0, 371, 100, 386, 84, 240);
1028
       DWIN_Frame_AreaCopy(1, 0, 371, 100, 386, 84, 240);
1028
       DWIN_Frame_AreaCopy(1, 0, 389, 150, 402, 61, 280);
1029
       DWIN_Frame_AreaCopy(1, 0, 389, 150, 402, 61, 280);
1029
     }
1030
     }
1048
 void Popup_window_PauseOrStop() {
1049
 void Popup_window_PauseOrStop() {
1049
   Clear_Main_Window();
1050
   Clear_Main_Window();
1050
   Draw_Popup_Bkgd_60();
1051
   Draw_Popup_Bkgd_60();
1051
-  if (HMI_flag.language_chinese) {
1052
+  if (HMI_IsChinese()) {
1052
          if (select_print.now == 1) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);
1053
          if (select_print.now == 1) DWIN_Frame_AreaCopy(1, 237, 338, 269, 356, 98, 150);
1053
     else if (select_print.now == 2) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);
1054
     else if (select_print.now == 2) DWIN_Frame_AreaCopy(1, 221, 320, 253, 336, 98, 150);
1054
     DWIN_Frame_AreaCopy(1, 220, 304, 264, 319, 130, 150);
1055
     DWIN_Frame_AreaCopy(1, 220, 304, 264, 319, 130, 150);
1065
 }
1066
 }
1066
 
1067
 
1067
 void Draw_Printing_Screen() {
1068
 void Draw_Printing_Screen() {
1068
-  if (HMI_flag.language_chinese) {
1069
+  if (HMI_IsChinese()) {
1069
     DWIN_Frame_AreaCopy(1, 30,  1,  71, 14,  14,   9);  // Tune
1070
     DWIN_Frame_AreaCopy(1, 30,  1,  71, 14,  14,   9);  // Tune
1070
     DWIN_Frame_AreaCopy(1,  0, 72,  63, 86,  41, 188);  // Pause
1071
     DWIN_Frame_AreaCopy(1,  0, 72,  63, 86,  41, 188);  // Pause
1071
     DWIN_Frame_AreaCopy(1, 65, 72, 128, 86, 176, 188);  // Stop
1072
     DWIN_Frame_AreaCopy(1, 65, 72, 128, 86, 176, 188);  // Stop
1125
 
1126
 
1126
   Clear_Main_Window();
1127
   Clear_Main_Window();
1127
 
1128
 
1128
-  if (HMI_flag.language_chinese) {
1129
+  if (HMI_IsChinese()) {
1129
     DWIN_Frame_AreaCopy(1, 2, 2, 27, 14, 14, 9); // "Home"
1130
     DWIN_Frame_AreaCopy(1, 2, 2, 27, 14, 14, 9); // "Home"
1130
   }
1131
   }
1131
   else {
1132
   else {
1864
   DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(MACHINE_SIZE) * MENU_CHR_W) / 2, 122, (char*)MACHINE_SIZE);
1865
   DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(MACHINE_SIZE) * MENU_CHR_W) / 2, 122, (char*)MACHINE_SIZE);
1865
   DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(SHORT_BUILD_VERSION) * MENU_CHR_W) / 2, 195, (char*)SHORT_BUILD_VERSION);
1866
   DWIN_Draw_String(false, false, font8x16, Color_White, Color_Bg_Black, (DWIN_WIDTH - strlen(SHORT_BUILD_VERSION) * MENU_CHR_W) / 2, 195, (char*)SHORT_BUILD_VERSION);
1866
 
1867
 
1867
-  if (HMI_flag.language_chinese) {
1868
+  if (HMI_IsChinese()) {
1868
     DWIN_Frame_TitleCopy(1, 30, 17, 57, 29); // "Info"
1869
     DWIN_Frame_TitleCopy(1, 30, 17, 57, 29); // "Info"
1869
 
1870
 
1870
     DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102);
1871
     DWIN_Frame_AreaCopy(1, 197, 149, 252, 161, 108, 102);
1895
 inline void Draw_Print_File_Menu() {
1896
 inline void Draw_Print_File_Menu() {
1896
   Clear_Title_Bar();
1897
   Clear_Title_Bar();
1897
 
1898
 
1898
-  if (HMI_flag.language_chinese) {
1899
+  if (HMI_IsChinese()) {
1899
     DWIN_Frame_TitleCopy(1, 0, 31, 55, 44); // "Print file"
1900
     DWIN_Frame_TitleCopy(1, 0, 31, 55, 44); // "Print file"
1900
   }
1901
   }
1901
   else {
1902
   else {
2226
           dwin_abort_flag = true;
2227
           dwin_abort_flag = true;
2227
         #endif
2228
         #endif
2228
       }
2229
       }
2229
-      else {
2230
+      else
2230
         Goto_PrintProcess(); // cancel stop
2231
         Goto_PrintProcess(); // cancel stop
2231
-      }
2232
     }
2232
     }
2233
   }
2233
   }
2234
   DWIN_UpdateLCD();
2234
   DWIN_UpdateLCD();
2237
 inline void Draw_Move_Menu() {
2237
 inline void Draw_Move_Menu() {
2238
   Clear_Main_Window();
2238
   Clear_Main_Window();
2239
 
2239
 
2240
-  if (HMI_flag.language_chinese) {
2240
+  if (HMI_IsChinese()) {
2241
     DWIN_Frame_TitleCopy(1, 192, 1, 233, 14); // "Move"
2241
     DWIN_Frame_TitleCopy(1, 192, 1, 233, 14); // "Move"
2242
     DWIN_Frame_AreaCopy(1, 58, 118, 106, 132, LBLX, MBASE(1));
2242
     DWIN_Frame_AreaCopy(1, 58, 118, 106, 132, LBLX, MBASE(1));
2243
     DWIN_Frame_AreaCopy(1, 109, 118, 157, 132, LBLX, MBASE(2));
2243
     DWIN_Frame_AreaCopy(1, 109, 118, 157, 132, LBLX, MBASE(2));
2409
 void Draw_Temperature_Menu() {
2409
 void Draw_Temperature_Menu() {
2410
   Clear_Main_Window();
2410
   Clear_Main_Window();
2411
 
2411
 
2412
-  if (HMI_flag.language_chinese) {
2412
+  if (HMI_IsChinese()) {
2413
     DWIN_Frame_TitleCopy(1, 236, 2, 263, 13); // "Temperature"
2413
     DWIN_Frame_TitleCopy(1, 236, 2, 263, 13); // "Temperature"
2414
     #if HAS_HOTEND
2414
     #if HAS_HOTEND
2415
       DWIN_Frame_AreaCopy(1, 1, 134, 56, 146, LBLX, MBASE(TEMP_CASE_TEMP));
2415
       DWIN_Frame_AreaCopy(1, 1, 134, 56, 146, LBLX, MBASE(TEMP_CASE_TEMP));
2508
         Draw_More_Icon(CONTROL_CASE_MOVE + MROWS - index_control); // Motion >
2508
         Draw_More_Icon(CONTROL_CASE_MOVE + MROWS - index_control); // Motion >
2509
         if (index_control > MROWS) {
2509
         if (index_control > MROWS) {
2510
           Draw_More_Icon(CONTROL_CASE_INFO + MROWS - index_control); // Info >
2510
           Draw_More_Icon(CONTROL_CASE_INFO + MROWS - index_control); // Info >
2511
-          if (HMI_flag.language_chinese)
2511
+          if (HMI_IsChinese())
2512
             DWIN_Frame_AreaCopy(1, 231, 104, 258, 116, LBLX, MBASE(CONTROL_CASE_INFO - 1));
2512
             DWIN_Frame_AreaCopy(1, 231, 104, 258, 116, LBLX, MBASE(CONTROL_CASE_INFO - 1));
2513
           else
2513
           else
2514
             DWIN_Frame_AreaCopy(1, 0, 104, 24, 114, LBLX, MBASE(CONTROL_CASE_INFO - 1));
2514
             DWIN_Frame_AreaCopy(1, 0, 104, 24, 114, LBLX, MBASE(CONTROL_CASE_INFO - 1));
2718
 
2718
 
2719
           Clear_Main_Window();
2719
           Clear_Main_Window();
2720
 
2720
 
2721
-          if (HMI_flag.language_chinese) {
2721
+          if (HMI_IsChinese()) {
2722
             DWIN_Frame_TitleCopy(1, 59, 16, 139, 29);                                         // "PLA Settings"
2722
             DWIN_Frame_TitleCopy(1, 59, 16, 139, 29);                                         // "PLA Settings"
2723
             DWIN_Frame_AreaCopy(1, 100, 89, 124, 101, LBLX, MBASE(PREHEAT_CASE_TEMP));
2723
             DWIN_Frame_AreaCopy(1, 100, 89, 124, 101, LBLX, MBASE(PREHEAT_CASE_TEMP));
2724
             DWIN_Frame_AreaCopy(1, 1, 134, 56, 146, LBLX + 24, MBASE(PREHEAT_CASE_TEMP));     // PLA nozzle temp
2724
             DWIN_Frame_AreaCopy(1, 1, 134, 56, 146, LBLX + 24, MBASE(PREHEAT_CASE_TEMP));     // PLA nozzle temp
2792
 
2792
 
2793
           Clear_Main_Window();
2793
           Clear_Main_Window();
2794
 
2794
 
2795
-          if (HMI_flag.language_chinese) {
2795
+          if (HMI_IsChinese()) {
2796
             DWIN_Frame_TitleCopy(1, 142, 16, 223, 29);                                        // "ABS Settings"
2796
             DWIN_Frame_TitleCopy(1, 142, 16, 223, 29);                                        // "ABS Settings"
2797
 
2797
 
2798
             DWIN_Frame_AreaCopy(1, 180, 89, 204, 100, LBLX, MBASE(PREHEAT_CASE_TEMP));
2798
             DWIN_Frame_AreaCopy(1, 180, 89, 204, 100, LBLX, MBASE(PREHEAT_CASE_TEMP));
2872
 inline void Draw_Max_Speed_Menu() {
2872
 inline void Draw_Max_Speed_Menu() {
2873
   Clear_Main_Window();
2873
   Clear_Main_Window();
2874
 
2874
 
2875
-  if (HMI_flag.language_chinese) {
2875
+  if (HMI_IsChinese()) {
2876
     DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Max Speed (mm/s)"
2876
     DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Max Speed (mm/s)"
2877
 
2877
 
2878
     auto say_max_speed = [](const uint16_t row) {
2878
     auto say_max_speed = [](const uint16_t row) {
2934
 inline void Draw_Max_Accel_Menu() {
2934
 inline void Draw_Max_Accel_Menu() {
2935
   Clear_Main_Window();
2935
   Clear_Main_Window();
2936
 
2936
 
2937
-  if (HMI_flag.language_chinese) {
2937
+  if (HMI_IsChinese()) {
2938
     DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Acceleration"
2938
     DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Acceleration"
2939
 
2939
 
2940
     DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(1));
2940
     DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX, MBASE(1));
2985
 inline void Draw_Max_Jerk_Menu() {
2985
 inline void Draw_Max_Jerk_Menu() {
2986
   Clear_Main_Window();
2986
   Clear_Main_Window();
2987
 
2987
 
2988
-  if (HMI_flag.language_chinese) {
2988
+  if (HMI_IsChinese()) {
2989
     DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Jerk"
2989
     DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Jerk"
2990
 
2990
 
2991
     DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX     , MBASE(1));
2991
     DWIN_Frame_AreaCopy(1, 173, 133, 200, 147, LBLX     , MBASE(1));
3055
 inline void Draw_Steps_Menu() {
3055
 inline void Draw_Steps_Menu() {
3056
   Clear_Main_Window();
3056
   Clear_Main_Window();
3057
 
3057
 
3058
-  if (HMI_flag.language_chinese) {
3058
+  if (HMI_IsChinese()) {
3059
     DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Steps per mm"
3059
     DWIN_Frame_TitleCopy(1, 1, 16, 28, 28); // "Steps per mm"
3060
 
3060
 
3061
     DWIN_Frame_AreaCopy(1, 153, 148, 194, 161, LBLX, MBASE(1));
3061
     DWIN_Frame_AreaCopy(1, 153, 148, 194, 161, LBLX, MBASE(1));
3528
 
3528
 
3529
       // show print done confirm
3529
       // show print done confirm
3530
       DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, 250, DWIN_WIDTH - 1, STATUS_Y);
3530
       DWIN_Draw_Rectangle(1, Color_Bg_Black, 0, 250, DWIN_WIDTH - 1, STATUS_Y);
3531
-      DWIN_ICON_Show(ICON, HMI_flag.language_chinese ? ICON_Confirm_C : ICON_Confirm_E, 86, 283);
3531
+      DWIN_ICON_Show(ICON, HMI_IsChinese() ? ICON_Confirm_C : ICON_Confirm_E, 86, 283);
3532
     }
3532
     }
3533
     else if (HMI_flag.pause_flag != printingIsPaused()) {
3533
     else if (HMI_flag.pause_flag != printingIsPaused()) {
3534
       // print status update
3534
       // print status update

+ 6
- 3
Marlin/src/lcd/dwin/e3v2/dwin.h Visa fil

252
   char show_mode          = 0;    // -1: Temperature control    0: Printing temperature
252
   char show_mode          = 0;    // -1: Temperature control    0: Printing temperature
253
 } HMI_value_t;
253
 } HMI_value_t;
254
 
254
 
255
+#define DWIN_CHINESE 123
256
+#define DWIN_ENGLISH 0
257
+
255
 typedef struct {
258
 typedef struct {
256
-  bool language_chinese;  // 0: EN, 1: CN
259
+  uint8_t language;
257
   bool pause_flag:1;
260
   bool pause_flag:1;
258
   bool pause_action:1;
261
   bool pause_action:1;
259
   bool print_finish:1;
262
   bool print_finish:1;
271
     AxisEnum feedspeed_axis;
274
     AxisEnum feedspeed_axis;
272
   #endif
275
   #endif
273
   AxisEnum acc_axis, jerk_axis, step_axis;
276
   AxisEnum acc_axis, jerk_axis, step_axis;
274
-} HMI_Flag;
277
+} HMI_Flag_t;
275
 
278
 
276
 extern HMI_value_t HMI_ValueStruct;
279
 extern HMI_value_t HMI_ValueStruct;
277
-extern HMI_Flag    HMI_flag;
280
+extern HMI_Flag_t HMI_flag;
278
 
281
 
279
 // Show ICO
282
 // Show ICO
280
 void ICON_Print(bool show);
283
 void ICON_Print(bool show);

Laddar…
Avbryt
Spara