浏览代码

TFT_LITTLE_VGL_UI followup (#18410)

Victor 5 年前
父节点
当前提交
2a650a2793
没有帐户链接到提交者的电子邮件

+ 2
- 2
Marlin/src/MarlinCore.cpp 查看文件

61
 
61
 
62
 #if ENABLED(TFT_LITTLE_VGL_UI)
62
 #if ENABLED(TFT_LITTLE_VGL_UI)
63
   #include "lvgl.h"
63
   #include "lvgl.h"
64
-  #include "lcd/extui/lib/mks_ui/inc/tft_lvgl_configuration.h"
65
-  #include "lcd/extui/lib/mks_ui/inc/draw_ui.h"
64
+  #include "lcd/extui/lib/mks_ui/tft_lvgl_configuration.h"
65
+  #include "lcd/extui/lib/mks_ui/draw_ui.h"
66
 #endif
66
 #endif
67
 
67
 
68
 #if ENABLED(DWIN_CREALITY_LCD)
68
 #if ENABLED(DWIN_CREALITY_LCD)

+ 4
- 0
Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.h 查看文件

25
 extern "C" { /* C-declarations for C++ */
25
 extern "C" { /* C-declarations for C++ */
26
 #endif
26
 #endif
27
 
27
 
28
+#ifndef PGM_P
29
+  #define PGM_P const char *
30
+#endif
31
+
28
 extern void lv_draw_error_message(PGM_P const msg);
32
 extern void lv_draw_error_message(PGM_P const msg);
29
 extern void lv_clear_error_message();
33
 extern void lv_clear_error_message();
30
 
34
 

+ 2
- 0
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp 查看文件

46
   #include "../../../../feature/pause.h"
46
   #include "../../../../feature/pause.h"
47
 #endif
47
 #endif
48
 
48
 
49
+#include "draw_ui.h"
50
+
49
 CFG_ITMES gCfgItems;
51
 CFG_ITMES gCfgItems;
50
 UI_CFG uiCfg;
52
 UI_CFG uiCfg;
51
 DISP_STATE_STACK disp_state_stack;
53
 DISP_STATE_STACK disp_state_stack;

+ 19
- 19
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h 查看文件

28
 #include <stdint.h>
28
 #include <stdint.h>
29
 #include <string.h>
29
 #include <string.h>
30
 #include "lvgl.h"
30
 #include "lvgl.h"
31
-#include "inc/tft_multi_language.h"
32
-#include "inc/draw_ready_print.h"
33
-#include "inc/draw_language.h"
34
-#include "inc/draw_set.h"
35
-#include "inc/draw_tool.h"
36
-#include "inc/draw_print_file.h"
37
-#include "inc/draw_dialog.h"
38
-#include "inc/draw_printing.h"
39
-#include "inc/draw_opration.h"
40
-#include "inc/draw_preHeat.h"
41
-#include "inc/draw_extrusion.h"
42
-#include "inc/draw_home.h"
43
-#include "inc/draw_move_motor.h"
44
-#include "inc/draw_fan.h"
45
-#include "inc/draw_about.h"
46
-#include "inc/draw_change_speed.h"
47
-#include "inc/draw_manuaLevel.h"
48
-#include "inc/draw_error_message.h"
49
-#include "inc/printer_opration.h"
31
+#include "tft_multi_language.h"
32
+#include "draw_ready_print.h"
33
+#include "draw_language.h"
34
+#include "draw_set.h"
35
+#include "draw_tool.h"
36
+#include "draw_print_file.h"
37
+#include "draw_dialog.h"
38
+#include "draw_printing.h"
39
+#include "draw_opration.h"
40
+#include "draw_preHeat.h"
41
+#include "draw_extrusion.h"
42
+#include "draw_home.h"
43
+#include "draw_move_motor.h"
44
+#include "draw_fan.h"
45
+#include "draw_about.h"
46
+#include "draw_change_speed.h"
47
+#include "draw_manuaLevel.h"
48
+#include "draw_error_message.h"
49
+#include "printer_opration.h"
50
 
50
 
51
 #define TFT35
51
 #define TFT35
52
 
52
 

+ 204
- 204
Marlin/src/lcd/extui/lib/mks_ui/tft_multi_language.cpp 查看文件

390
         #if 1
390
         #if 1
391
 
391
 
392
           case LANG_COMPLEX_CHINESE:
392
           case LANG_COMPLEX_CHINESE:
393
-            common_menu.dialog_confirm_title = TITLE_DIALOG_CONFIRM_T_CN;
394
-            common_menu.text_back = BACK_TEXT_T_CN;
395
-            common_menu.close_machine_tips = DIALOG_CLOSE_MACHINE_T_CN;
396
-            common_menu.unbind_printer_tips = DIALOG_UNBIND_PRINTER_T_CN;
393
+            common_menu.dialog_confirm_title = TITLE_DIALOG_CONFIRM_CN;
394
+            common_menu.text_back = BACK_TEXT_CN;
395
+            common_menu.close_machine_tips = DIALOG_CLOSE_MACHINE_CN;
396
+            common_menu.unbind_printer_tips = DIALOG_UNBIND_PRINTER_CN;
397
             common_menu.print_special_title = PRINTING_GBK;
397
             common_menu.print_special_title = PRINTING_GBK;
398
             common_menu.pause_special_title = PRINTING_PAUSE_GBK;
398
             common_menu.pause_special_title = PRINTING_PAUSE_GBK;
399
             common_menu.operate_special_title = PRINTING_OPERATION_GBK;
399
             common_menu.operate_special_title = PRINTING_OPERATION_GBK;
400
             //
400
             //
401
-            main_menu.title = TITLE_READYPRINT_T_CN;
402
-            main_menu.preheat = PREHEAT_TEXT_T_CN;
403
-            main_menu.move = MOVE_TEXT_T_CN;
404
-            main_menu.home = HOME_TEXT_T_CN;
405
-            main_menu.print = PRINT_TEXT_T_CN;
406
-            main_menu.extrude = EXTRUDE_TEXT_T_CN;
407
-            main_menu.leveling = LEVELING_TEXT_T_CN;
408
-            main_menu.autoleveling = AUTO_LEVELING_TEXT_T_CN;
409
-            main_menu.fan = FAN_TEXT_T_CN;
410
-            main_menu.set = SET_TEXT_T_CN;
411
-            main_menu.more = MORE_TEXT_T_CN;
412
-            main_menu.tool = TOOL_TEXT_T_CN;
401
+            main_menu.title = TITLE_READYPRINT_CN;
402
+            main_menu.preheat = PREHEAT_TEXT_CN;
403
+            main_menu.move = MOVE_TEXT_CN;
404
+            main_menu.home = HOME_TEXT_CN;
405
+            main_menu.print = PRINT_TEXT_CN;
406
+            main_menu.extrude = EXTRUDE_TEXT_CN;
407
+            main_menu.leveling = LEVELING_TEXT_CN;
408
+            main_menu.autoleveling = AUTO_LEVELING_TEXT_CN;
409
+            main_menu.fan = FAN_TEXT_CN;
410
+            main_menu.set = SET_TEXT_CN;
411
+            main_menu.more = MORE_TEXT_CN;
412
+            main_menu.tool = TOOL_TEXT_CN;
413
             //TOOL
413
             //TOOL
414
-            tool_menu.title = TOOL_TEXT_T_CN;
415
-            tool_menu.preheat = TOOL_PREHEAT_T_CN;
416
-            tool_menu.extrude = TOOL_EXTRUDE_T_CN;
417
-            tool_menu.move = TOOL_MOVE_T_CN;
418
-            tool_menu.home = TOOL_HOME_T_CN;
419
-            tool_menu.leveling = TOOL_LEVELING_T_CN;
420
-            tool_menu.autoleveling = TOOL_AUTO_LEVELING_T_CN;
421
-            tool_menu.filament = TOOL_FILAMENT_T_CN;
422
-            tool_menu.more = TOOL_MORE_T_CN;
423
-            //
424
-            preheat_menu.adjust_title = TITLE_ADJUST_T_CN;
425
-            preheat_menu.title = TITLE_PREHEAT_T_CN;
426
-            preheat_menu.add = ADD_TEXT_T_CN;
427
-            preheat_menu.dec = DEC_TEXT_T_CN;
428
-            preheat_menu.ext1 = EXTRUDER_1_TEXT_T_CN;
429
-            preheat_menu.ext2 = EXTRUDER_2_TEXT_T_CN;
430
-            preheat_menu.hotbed = HEATBED_TEXT_T_CN;
431
-            preheat_menu.off = CLOSE_TEXT_T_CN;
432
-            preheat_menu.value_state = TEXT_VALUE_T_CN;
433
-            preheat_menu.step_1c = TEXT_1C_T_CN;
434
-            preheat_menu.step_5c = TEXT_5C_T_CN;
435
-            preheat_menu.step_10c = TEXT_10C_T_CN;
436
-            //
437
-            move_menu.title = MOVE_TEXT_T_CN;
438
-            more_menu.zoffset = ZOFFSET_T_CN;
439
-            //
440
-            home_menu.title = TITLE_HOME_T_CN;
441
-            home_menu.stopmove = HOME_STOPMOVE_T_CN;
442
-            //
443
-            file_menu.title = TITLE_CHOOSEFILE_T_CN;
444
-            file_menu.page_up = PAGE_UP_TEXT_T_CN;
445
-            file_menu.page_down = PAGE_DOWN_TEXT_T_CN;
446
-            file_menu.file_loading = FILE_LOADING_T_CN;
447
-            file_menu.no_file = NO_FILE_T_CN;
448
-            file_menu.no_file_and_check = NO_FILE_T_CN;//NO_FILE_AND_CHECK_T_CN;
449
-            //
450
-            extrude_menu.title = TITLE_EXTRUDE_T_CN;
451
-            extrude_menu.in = EXTRUDER_IN_TEXT_T_CN;
452
-            extrude_menu.out = EXTRUDER_OUT_TEXT_T_CN;
453
-            extrude_menu.ext1 = EXTRUDER_1_TEXT_T_CN;
454
-            extrude_menu.ext2 = EXTRUDER_2_TEXT_T_CN;
455
-            extrude_menu.low = EXTRUDE_LOW_SPEED_TEXT_T_CN;
456
-            extrude_menu.normal = EXTRUDE_MEDIUM_SPEED_TEXT_T_CN;
457
-            extrude_menu.high = EXTRUDE_HIGH_SPEED_TEXT_T_CN;
458
-            extrude_menu.temper_text = EXTRUDER_TEMP_TEXT_T_CN;
459
-            extrude_menu.temp_value = EXTRUDE_TEXT_VALUE_T_T_CN;
414
+            tool_menu.title = TOOL_TEXT_CN;
415
+            tool_menu.preheat = TOOL_PREHEAT_CN;
416
+            tool_menu.extrude = TOOL_EXTRUDE_CN;
417
+            tool_menu.move = TOOL_MOVE_CN;
418
+            tool_menu.home = TOOL_HOME_CN;
419
+            tool_menu.leveling = TOOL_LEVELING_CN;
420
+            tool_menu.autoleveling = TOOL_AUTO_LEVELING_CN;
421
+            tool_menu.filament = TOOL_FILAMENT_CN;
422
+            tool_menu.more = TOOL_MORE_CN;
423
+            //
424
+            preheat_menu.adjust_title = TITLE_ADJUST_CN;
425
+            preheat_menu.title = TITLE_PREHEAT_CN;
426
+            preheat_menu.add = ADD_TEXT_CN;
427
+            preheat_menu.dec = DEC_TEXT_CN;
428
+            preheat_menu.ext1 = EXTRUDER_1_TEXT_CN;
429
+            preheat_menu.ext2 = EXTRUDER_2_TEXT_CN;
430
+            preheat_menu.hotbed = HEATBED_TEXT_CN;
431
+            preheat_menu.off = CLOSE_TEXT_CN;
432
+            preheat_menu.value_state = TEXT_VALUE_CN;
433
+            preheat_menu.step_1c = TEXT_1C_CN;
434
+            preheat_menu.step_5c = TEXT_5C_CN;
435
+            preheat_menu.step_10c = TEXT_10C_CN;
436
+            //
437
+            move_menu.title = MOVE_TEXT_CN;
438
+            more_menu.zoffset = ZOFFSET_CN;
439
+            //
440
+            home_menu.title = TITLE_HOME_CN;
441
+            home_menu.stopmove = HOME_STOPMOVE_CN;
442
+            //
443
+            file_menu.title = TITLE_CHOOSEFILE_CN;
444
+            file_menu.page_up = PAGE_UP_TEXT_CN;
445
+            file_menu.page_down = PAGE_DOWN_TEXT_CN;
446
+            file_menu.file_loading = FILE_LOADING_CN;
447
+            file_menu.no_file = NO_FILE_CN;
448
+            file_menu.no_file_and_check = NO_FILE_CN;//NO_FILE_AND_CHECK_T_CN;
449
+            //
450
+            extrude_menu.title = TITLE_EXTRUDE_CN;
451
+            extrude_menu.in = EXTRUDER_IN_TEXT_CN;
452
+            extrude_menu.out = EXTRUDER_OUT_TEXT_CN;
453
+            extrude_menu.ext1 = EXTRUDER_1_TEXT_CN;
454
+            extrude_menu.ext2 = EXTRUDER_2_TEXT_CN;
455
+            extrude_menu.low = EXTRUDE_LOW_SPEED_TEXT_CN;
456
+            extrude_menu.normal = EXTRUDE_MEDIUM_SPEED_TEXT_CN;
457
+            extrude_menu.high = EXTRUDE_HIGH_SPEED_TEXT_CN;
458
+            extrude_menu.temper_text = EXTRUDER_TEMP_TEXT_CN;
459
+            extrude_menu.temp_value = EXTRUDE_TEXT_VALUE_T_CN;
460
             //
460
             //
461
             leveling_menu.title = TITLE_LEVELING_CN;
461
             leveling_menu.title = TITLE_LEVELING_CN;
462
-            leveling_menu.position1 = LEVELING_POINT1_TEXT_T_CN;
463
-            leveling_menu.position2 = LEVELING_POINT2_TEXT_T_CN;
464
-            leveling_menu.position3 = LEVELING_POINT3_TEXT_T_CN;
465
-            leveling_menu.position4 = LEVELING_POINT4_TEXT_T_CN;
466
-            leveling_menu.position5 = LEVELING_POINT5_TEXT_T_CN;
467
-            //
468
-            set_menu.title = TITLE_SET_T_CN;
469
-            set_menu.filesys = FILESYS_TEXT_T_CN;
470
-            set_menu.wifi = WIFI_TEXT_T_CN;
471
-            set_menu.about = ABOUT_TEXT_T_CN;
472
-            set_menu.fan = FAN_TEXT_T_CN;
473
-            set_menu.filament = FILAMENT_TEXT_T_CN;
474
-            set_menu.breakpoint = BREAK_POINT_TEXT_T_CN;
475
-            set_menu.motoroff = MOTOR_OFF_TEXT_T_CN;
476
-            set_menu.motoroffXY = MOTOR_OFF_XY_TEXT_T_CN;
477
-            set_menu.language = LANGUAGE_TEXT_T_CN;
478
-            set_menu.shutdown = SHUTDOWN_TEXT_T_CN;
479
-            //set_menu.machine_para = MACHINE_PARA_T_CN;
480
-            //
481
-            filesys_menu.title = TITLE_FILESYS_T_CN;
482
-            filesys_menu.sd_sys = SD_CARD_TEXT_T_CN;
483
-            filesys_menu.usb_sys = U_DISK_TEXT_T_CN;
484
-            //
485
-            more_menu.title = TITLE_MORE_T_CN;
462
+            leveling_menu.position1 = LEVELING_POINT1_TEXT_CN;
463
+            leveling_menu.position2 = LEVELING_POINT2_TEXT_CN;
464
+            leveling_menu.position3 = LEVELING_POINT3_TEXT_CN;
465
+            leveling_menu.position4 = LEVELING_POINT4_TEXT_CN;
466
+            leveling_menu.position5 = LEVELING_POINT5_TEXT_CN;
467
+            //
468
+            set_menu.title = TITLE_SET_CN;
469
+            set_menu.filesys = FILESYS_TEXT_CN;
470
+            set_menu.wifi = WIFI_TEXT_CN;
471
+            set_menu.about = ABOUT_TEXT_CN;
472
+            set_menu.fan = FAN_TEXT_CN;
473
+            set_menu.filament = FILAMENT_TEXT_CN;
474
+            set_menu.breakpoint = BREAK_POINT_TEXT_CN;
475
+            set_menu.motoroff = MOTOR_OFF_TEXT_CN;
476
+            set_menu.motoroffXY = MOTOR_OFF_XY_TEXT_CN;
477
+            set_menu.language = LANGUAGE_TEXT_CN;
478
+            set_menu.shutdown = SHUTDOWN_TEXT_CN;
479
+            //set_menu.machine_para = MACHINE_PARA_CN;
480
+            //
481
+            filesys_menu.title = TITLE_FILESYS_CN;
482
+            filesys_menu.sd_sys = SD_CARD_TEXT_CN;
483
+            filesys_menu.usb_sys = U_DISK_TEXT_CN;
484
+            //
485
+            more_menu.title = TITLE_MORE_CN;
486
             //WIFI
486
             //WIFI
487
             wifi_menu.title = WIFI_TEXT;
487
             wifi_menu.title = WIFI_TEXT;
488
             //wifi_menu.key = WIFI_KEY_TEXT_CN;
488
             //wifi_menu.key = WIFI_KEY_TEXT_CN;
489
             //wifi_menu.ip = WIFI_IP_TEXT_CN;
489
             //wifi_menu.ip = WIFI_IP_TEXT_CN;
490
             //wifi_menu.state = WIFI_STA_TEXT_CN;
490
             //wifi_menu.state = WIFI_STA_TEXT_CN;
491
-            wifi_menu.cloud = CLOUD_TEXT_T_CN;
492
-            wifi_menu.reconnect = WIFI_RECONNECT_TEXT_T_CN;
491
+            wifi_menu.cloud = CLOUD_TEXT_CN;
492
+            wifi_menu.reconnect = WIFI_RECONNECT_TEXT_CN;
493
             //CLOUD
493
             //CLOUD
494
-            cloud_menu.title = TITLE_CLOUD_TEXT_T_CN;
495
-            cloud_menu.bind = CLOUD_BINDED_T_CN;
496
-            cloud_menu.binded = CLOUD_BINDED_T_CN;
497
-            cloud_menu.unbind = CLOUD_UNBIND_T_CN;
498
-            cloud_menu.unbinding = CLOUD_UNBINDED_T_CN;
499
-            cloud_menu.disconnected = CLOUD_DISCONNECTED_T_CN;
500
-            cloud_menu.disable = CLOUD_DISABLE_T_CN;
501
-            //
502
-            about_menu.title = ABOUT_TEXT_T_CN;
503
-            about_menu.type = ABOUT_TYPE_TEXT_T_CN;
504
-            about_menu.version = ABOUT_VERSION_TEXT_T_CN;
505
-            about_menu.wifi = ABOUT_WIFI_TEXT_T_CN;
506
-
507
-            //
508
-            fan_menu.title = FAN_TEXT_T_CN;
509
-            fan_menu.add = FAN_ADD_TEXT_T_CN;
510
-            fan_menu.dec = FAN_DEC_TEXT_T_CN;
511
-            fan_menu.state = FAN_TIPS1_TEXT_T_CN;
512
-            //
513
-            filament_menu.title = TITLE_FILAMENT_T_CN;
514
-            filament_menu.in = FILAMENT_IN_TEXT_T_CN;
515
-            filament_menu.out = FILAMENT_OUT_TEXT_T_CN;
516
-            filament_menu.ext1 = FILAMENT_EXT0_TEXT_T_CN;
517
-            filament_menu.ext2 = FILAMENT_EXT1_TEXT_T_CN;
518
-            filament_menu.ready_replace = FILAMENT_CHANGE_TEXT_T_CN;
519
-            filament_menu.filament_dialog_load_heat = FILAMENT_DIALOG_LOAD_HEAT_TIPS_T_CN;
520
-            filament_menu.filament_dialog_load_heat_confirm = FILAMENT_DIALOG_LOAD_CONFIRM1_TIPS_T_CN;
521
-            filament_menu.filament_dialog_loading = FILAMENT_DIALOG_LOADING_TIPS_T_CN;
522
-            filament_menu.filament_dialog_load_completed = FILAMENT_DIALOG_LOAD_COMPLETE_TIPS_T_CN;
523
-            filament_menu.filament_dialog_unload_heat = FILAMENT_DIALOG_UNLOAD_HEAT_TIPS_T_CN;
524
-            filament_menu.filament_dialog_unload_heat_confirm = FILAMENT_DIALOG_UNLOAD_CONFIRM_TIPS_T_CN;
525
-            filament_menu.filament_dialog_unloading = FILAMENT_DIALOG_UNLOADING_TIPS_T_CN;
526
-            filament_menu.filament_dialog_unload_completed = FILAMENT_DIALOG_UNLOAD_COMPLETE_TIPS_T_CN;
527
-
528
-
529
-            //
530
-            language_menu.title = TITLE_LANGUAGE_T_CN;
531
-            language_menu.next = PAGE_DOWN_TEXT_T_CN;
532
-            language_menu.up = PAGE_UP_TEXT_T_CN;
533
-
534
-            //
535
-            printing_menu.title = TITLE_PRINTING_T_CN;
536
-            printing_menu.option = PRINTING_OPERATION_T_CN;
537
-            printing_menu.stop = PRINTING_STOP_T_CN;
538
-            printing_menu.pause = PRINTING_PAUSE_T_CN;
539
-            printing_menu.resume = PRINTING_RESUME_T_CN;
540
-
541
-            //
542
-            operation_menu.title = TITLE_OPERATION_T_CN;
543
-            operation_menu.pause = PRINTING_PAUSE_T_CN;
544
-            operation_menu.stop = PRINTING_STOP_T_CN;
545
-            operation_menu.temp = PRINTING_TEMP_T_CN;
546
-            operation_menu.fan = FAN_TEXT_T_CN;
547
-            operation_menu.extr = PRINTING_EXTRUDER_T_CN;
548
-            operation_menu.speed = PRINTING_CHANGESPEED_T_CN;
549
-            operation_menu.filament = FILAMENT_TEXT_T_CN;
550
-            operation_menu.more = PRINTING_MORE_T_CN;
551
-            operation_menu.move = PRINTING_MOVE_T_CN;
552
-            operation_menu.auto_off = AUTO_SHUTDOWN_T_CN;
553
-            operation_menu.manual_off = MANUAL_SHUTDOWN_T_CN;
554
-            //
555
-            pause_menu.title = TITLE_PAUSE_T_CN;
556
-            pause_menu.resume = PRINTING_RESUME_T_CN;
557
-            pause_menu.stop = PRINTING_STOP_T_CN;
558
-            pause_menu.extrude = PRINTING_EXTRUDER_T_CN;
559
-            pause_menu.move = PRINTING_MOVE_T_CN;
560
-            pause_menu.filament = FILAMENT_TEXT_T_CN;
561
-            pause_menu.more = PRINTING_MORE_T_CN;
562
-
563
-            //
564
-            speed_menu.title = PRINTING_CHANGESPEED_T_CN;
565
-            speed_menu.add = ADD_TEXT_T_CN;
566
-            speed_menu.dec = DEC_TEXT_T_CN;
567
-            speed_menu.move = MOVE_SPEED_T_CN;
568
-            speed_menu.extrude = EXTRUDER_SPEED_T_CN;
569
-            speed_menu.extrude_speed = EXTRUDER_SPEED_STATE_T_CN;
570
-            speed_menu.move_speed = MOVE_SPEED_STATE_T_CN;
571
-            //
572
-            printing_more_menu.title = TITLE_MORE_T_CN;
573
-            printing_more_menu.fan = FAN_TEXT_T_CN;
574
-            printing_more_menu.auto_close = AUTO_SHUTDOWN_T_CN;
575
-            printing_more_menu.manual = MANUAL_SHUTDOWN_T_CN;
576
-            printing_more_menu.speed = PRINTING_CHANGESPEED_T_CN;
577
-            printing_more_menu.temp = PRINTING_TEMP_T_CN;
494
+            cloud_menu.title = TITLE_CLOUD_TEXT_CN;
495
+            cloud_menu.bind = CLOUD_BINDED_CN;
496
+            cloud_menu.binded = CLOUD_BINDED_CN;
497
+            cloud_menu.unbind = CLOUD_UNBIND_CN;
498
+            cloud_menu.unbinding = CLOUD_UNBINDED_CN;
499
+            cloud_menu.disconnected = CLOUD_DISCONNECTED_CN;
500
+            cloud_menu.disable = CLOUD_DISABLE_CN;
501
+            //
502
+            about_menu.title = ABOUT_TEXT_CN;
503
+            about_menu.type = ABOUT_TYPE_TEXT_CN;
504
+            about_menu.version = ABOUT_VERSION_TEXT_CN;
505
+            about_menu.wifi = ABOUT_WIFI_TEXT_CN;
506
+
507
+            //
508
+            fan_menu.title = FAN_TEXT_CN;
509
+            fan_menu.add = FAN_ADD_TEXT_CN;
510
+            fan_menu.dec = FAN_DEC_TEXT_CN;
511
+            fan_menu.state = FAN_TIPS1_TEXT_CN;
512
+            //
513
+            filament_menu.title = TITLE_FILAMENT_CN;
514
+            filament_menu.in = FILAMENT_IN_TEXT_CN;
515
+            filament_menu.out = FILAMENT_OUT_TEXT_CN;
516
+            filament_menu.ext1 = FILAMENT_EXT0_TEXT_CN;
517
+            filament_menu.ext2 = FILAMENT_EXT1_TEXT_CN;
518
+            filament_menu.ready_replace = FILAMENT_CHANGE_TEXT_CN;
519
+            filament_menu.filament_dialog_load_heat = FILAMENT_DIALOG_LOAD_HEAT_TIPS_CN;
520
+            filament_menu.filament_dialog_load_heat_confirm = FILAMENT_DIALOG_LOAD_CONFIRM1_TIPS_CN;
521
+            filament_menu.filament_dialog_loading = FILAMENT_DIALOG_LOADING_TIPS_CN;
522
+            filament_menu.filament_dialog_load_completed = FILAMENT_DIALOG_LOAD_COMPLETE_TIPS_CN;
523
+            filament_menu.filament_dialog_unload_heat = FILAMENT_DIALOG_UNLOAD_HEAT_TIPS_CN;
524
+            filament_menu.filament_dialog_unload_heat_confirm = FILAMENT_DIALOG_UNLOAD_CONFIRM_TIPS_CN;
525
+            filament_menu.filament_dialog_unloading = FILAMENT_DIALOG_UNLOADING_TIPS_CN;
526
+            filament_menu.filament_dialog_unload_completed = FILAMENT_DIALOG_UNLOAD_COMPLETE_TIPS_CN;
527
+
528
+
529
+            //
530
+            language_menu.title = TITLE_LANGUAGE_CN;
531
+            language_menu.next = PAGE_DOWN_TEXT_CN;
532
+            language_menu.up = PAGE_UP_TEXT_CN;
533
+
534
+            //
535
+            printing_menu.title = TITLE_PRINTING_CN;
536
+            printing_menu.option = PRINTING_OPERATION_CN;
537
+            printing_menu.stop = PRINTING_STOP_CN;
538
+            printing_menu.pause = PRINTING_PAUSE_CN;
539
+            printing_menu.resume = PRINTING_RESUME_CN;
540
+
541
+            //
542
+            operation_menu.title = TITLE_OPERATION_CN;
543
+            operation_menu.pause = PRINTING_PAUSE_CN;
544
+            operation_menu.stop = PRINTING_STOP_CN;
545
+            operation_menu.temp = PRINTING_TEMP_CN;
546
+            operation_menu.fan = FAN_TEXT_CN;
547
+            operation_menu.extr = PRINTING_EXTRUDER_CN;
548
+            operation_menu.speed = PRINTING_CHANGESPEED_CN;
549
+            operation_menu.filament = FILAMENT_TEXT_CN;
550
+            operation_menu.more = PRINTING_MORE_CN;
551
+            operation_menu.move = PRINTING_MOVE_CN;
552
+            operation_menu.auto_off = AUTO_SHUTDOWN_CN;
553
+            operation_menu.manual_off = MANUAL_SHUTDOWN_CN;
554
+            //
555
+            pause_menu.title = TITLE_PAUSE_CN;
556
+            pause_menu.resume = PRINTING_RESUME_CN;
557
+            pause_menu.stop = PRINTING_STOP_CN;
558
+            pause_menu.extrude = PRINTING_EXTRUDER_CN;
559
+            pause_menu.move = PRINTING_MOVE_CN;
560
+            pause_menu.filament = FILAMENT_TEXT_CN;
561
+            pause_menu.more = PRINTING_MORE_CN;
562
+
563
+            //
564
+            speed_menu.title = PRINTING_CHANGESPEED_CN;
565
+            speed_menu.add = ADD_TEXT_CN;
566
+            speed_menu.dec = DEC_TEXT_CN;
567
+            speed_menu.move = MOVE_SPEED_CN;
568
+            speed_menu.extrude = EXTRUDER_SPEED_CN;
569
+            speed_menu.extrude_speed = EXTRUDER_SPEED_STATE_CN;
570
+            speed_menu.move_speed = MOVE_SPEED_STATE_CN;
571
+            //
572
+            printing_more_menu.title = TITLE_MORE_CN;
573
+            printing_more_menu.fan = FAN_TEXT_CN;
574
+            printing_more_menu.auto_close = AUTO_SHUTDOWN_CN;
575
+            printing_more_menu.manual = MANUAL_SHUTDOWN_CN;
576
+            printing_more_menu.speed = PRINTING_CHANGESPEED_CN;
577
+            printing_more_menu.temp = PRINTING_TEMP_CN;
578
 
578
 
579
             //print_file_dialog_menu.title = TITLE_DIALOG_CONFIRM_CN;
579
             //print_file_dialog_menu.title = TITLE_DIALOG_CONFIRM_CN;
580
-            print_file_dialog_menu.confirm = DIALOG_CONFIRM_T_CN;
581
-            print_file_dialog_menu.cancle = DIALOG_CANCLE_T_CN;
582
-            print_file_dialog_menu.print_file = DIALOG_PRINT_MODEL_T_CN;
583
-            print_file_dialog_menu.cancle_print = DIALOG_CANCEL_PRINT_T_CN;
584
-            print_file_dialog_menu.retry = DIALOG_RETRY_T_CN;
585
-            print_file_dialog_menu.stop = DIALOG_STOP_T_CN;
586
-            print_file_dialog_menu.no_file_print_tips = DIALOG_ERROR_TIPS1_T_CN;
587
-            print_file_dialog_menu.print_from_breakpoint = DIALOG_REPRINT_FROM_BREAKPOINT_T_CN;
588
-
589
-            print_file_dialog_menu.close_machine_error = DIALOG_ERROR_TIPS2_T_CN;
590
-            print_file_dialog_menu.filament_no_press = DIALOG_FILAMENT_NO_PRESS_T_CN;
591
-            print_file_dialog_menu.print_finish = DIALOG_PRINT_FINISH_T_CN;
592
-            print_file_dialog_menu.print_time = DIALOG_PRINT_TIME_T_CN;
593
-            print_file_dialog_menu.reprint = DIALOG_REPRINT_T_CN;
594
-            print_file_dialog_menu.wifi_enable_tips = DIALOG_WIFI_ENABLE_TIPS_T_CN;
580
+            print_file_dialog_menu.confirm = DIALOG_CONFIRM_CN;
581
+            print_file_dialog_menu.cancle = DIALOG_CANCLE_CN;
582
+            print_file_dialog_menu.print_file = DIALOG_PRINT_MODEL_CN;
583
+            print_file_dialog_menu.cancle_print = DIALOG_CANCEL_PRINT_CN;
584
+            print_file_dialog_menu.retry = DIALOG_RETRY_CN;
585
+            print_file_dialog_menu.stop = DIALOG_STOP_CN;
586
+            print_file_dialog_menu.no_file_print_tips = DIALOG_ERROR_TIPS1_CN;
587
+            print_file_dialog_menu.print_from_breakpoint = DIALOG_REPRINT_FROM_BREAKPOINT_CN;
588
+
589
+            print_file_dialog_menu.close_machine_error = DIALOG_ERROR_TIPS2_CN;
590
+            print_file_dialog_menu.filament_no_press = DIALOG_FILAMENT_NO_PRESS_CN;
591
+            print_file_dialog_menu.print_finish = DIALOG_PRINT_FINISH_CN;
592
+            print_file_dialog_menu.print_time = DIALOG_PRINT_TIME_CN;
593
+            print_file_dialog_menu.reprint = DIALOG_REPRINT_CN;
594
+            print_file_dialog_menu.wifi_enable_tips = DIALOG_WIFI_ENABLE_TIPS_CN;
595
             //ZOFFSET
595
             //ZOFFSET
596
-            zoffset_menu.title = TITLE_ZOFFSET_T_CN;
597
-            zoffset_menu.inc = ZOFFSET_INC_T_CN;
598
-            zoffset_menu.dec = ZOFFSET_DEC_T_CN;
599
-
600
-            pause_msg_menu.pausing = MESSEGE_PAUSING_T_CN;
601
-            pause_msg_menu.changing = MESSEGE_CHANGING_T_CN;
602
-            pause_msg_menu.unload = MESSEGE_UNLOAD_T_CN;
603
-            pause_msg_menu.waiting = MESSEGE_WAITING_T_CN;
604
-            pause_msg_menu.insert = MESSEGE_INSERT_T_CN;
605
-            pause_msg_menu.load = MESSEGE_LOAD_T_CN;
606
-            pause_msg_menu.purge = MESSEGE_PURGE_T_CN;
607
-            pause_msg_menu.resume = MESSEGE_RESUME_T_CN;
608
-            pause_msg_menu.heat = MESSEGE_HEAT_T_CN;
609
-            pause_msg_menu.heating = MESSEGE_HEATING_T_CN;
610
-            pause_msg_menu.option = MESSEGE_OPTION_T_CN;
611
-            pause_msg_menu.purgeMore = MESSEGE_PURGE_MORE_T_CN;
612
-            pause_msg_menu.continuePrint = MESSEGE_CONTINUE_PRINT_T_CN;
596
+            zoffset_menu.title = TITLE_ZOFFSET_CN;
597
+            zoffset_menu.inc = ZOFFSET_INC_CN;
598
+            zoffset_menu.dec = ZOFFSET_DEC_CN;
599
+
600
+            pause_msg_menu.pausing = MESSEGE_PAUSING_CN;
601
+            pause_msg_menu.changing = MESSEGE_CHANGING_CN;
602
+            pause_msg_menu.unload = MESSEGE_UNLOAD_CN;
603
+            pause_msg_menu.waiting = MESSEGE_WAITING_CN;
604
+            pause_msg_menu.insert = MESSEGE_INSERT_CN;
605
+            pause_msg_menu.load = MESSEGE_LOAD_CN;
606
+            pause_msg_menu.purge = MESSEGE_PURGE_CN;
607
+            pause_msg_menu.resume = MESSEGE_RESUME_CN;
608
+            pause_msg_menu.heat = MESSEGE_HEAT_CN;
609
+            pause_msg_menu.heating = MESSEGE_HEATING_CN;
610
+            pause_msg_menu.option = MESSEGE_OPTION_CN;
611
+            pause_msg_menu.purgeMore = MESSEGE_PURGE_MORE_CN;
612
+            pause_msg_menu.continuePrint = MESSEGE_CONTINUE_PRINT_CN;
613
             break;
613
             break;
614
           case LANG_ENGLISH:
614
           case LANG_ENGLISH:
615
             common_menu.dialog_confirm_title = TITLE_DIALOG_CONFIRM_EN;
615
             common_menu.dialog_confirm_title = TITLE_DIALOG_CONFIRM_EN;

+ 7
- 7
Marlin/src/lcd/extui/lib/mks_ui/tft_multi_language.h 查看文件

21
  */
21
  */
22
 #pragma once
22
 #pragma once
23
 
23
 
24
-#include "inc/tft_Language_en.h"
25
-#include "inc/tft_Language_s_cn.h"
26
-#include "inc/tft_Language_t_cn.h"
27
-#include "inc/tft_Language_ru.h"
28
-#include "inc/tft_Language_fr.h"
29
-#include "inc/tft_Language_sp.h"
30
-#include "inc/tft_Language_it.h"
24
+#include "tft_Language_en.h"
25
+#include "tft_Language_s_cn.h"
26
+#include "tft_Language_t_cn.h"
27
+#include "tft_Language_ru.h"
28
+#include "tft_Language_fr.h"
29
+#include "tft_Language_sp.h"
30
+#include "tft_Language_it.h"
31
 
31
 
32
 extern void disp_language_init();
32
 extern void disp_language_init();
33
 
33
 

正在加载...
取消
保存