Browse Source

Apply bool to some MKS UI

Scott Lahteine 3 years ago
parent
commit
40c8f2001d

+ 4
- 4
Marlin/src/lcd/extui/lib/mks_ui/draw_acceleration_settings.cpp View File

50
   if (event != LV_EVENT_RELEASED) return;
50
   if (event != LV_EVENT_RELEASED) return;
51
   switch (obj->mks_obj_id) {
51
   switch (obj->mks_obj_id) {
52
     case ID_ACCE_RETURN:
52
     case ID_ACCE_RETURN:
53
-      uiCfg.para_ui_page = 0;
53
+      uiCfg.para_ui_page = false;
54
       lv_clear_acceleration_settings();
54
       lv_clear_acceleration_settings();
55
       draw_return_ui();
55
       draw_return_ui();
56
       break;
56
       break;
95
       lv_draw_number_key();
95
       lv_draw_number_key();
96
       break;
96
       break;
97
     case ID_ACCE_UP:
97
     case ID_ACCE_UP:
98
-      uiCfg.para_ui_page = 0;
98
+      uiCfg.para_ui_page = false;
99
       lv_clear_acceleration_settings();
99
       lv_clear_acceleration_settings();
100
       lv_draw_acceleration_settings();
100
       lv_draw_acceleration_settings();
101
       break;
101
       break;
102
     case ID_ACCE_DOWN:
102
     case ID_ACCE_DOWN:
103
-      uiCfg.para_ui_page = 1;
103
+      uiCfg.para_ui_page = true;
104
       lv_clear_acceleration_settings();
104
       lv_clear_acceleration_settings();
105
       lv_draw_acceleration_settings();
105
       lv_draw_acceleration_settings();
106
       break;
106
       break;
110
 void lv_draw_acceleration_settings() {
110
 void lv_draw_acceleration_settings() {
111
   scr = lv_screen_create(ACCELERATION_UI, machine_menu.AccelerationConfTitle);
111
   scr = lv_screen_create(ACCELERATION_UI, machine_menu.AccelerationConfTitle);
112
 
112
 
113
-  if (uiCfg.para_ui_page != 1) {
113
+  if (!uiCfg.para_ui_page) {
114
     sprintf_P(public_buf_l, PSTR("%.1f"), planner.settings.acceleration);
114
     sprintf_P(public_buf_l, PSTR("%.1f"), planner.settings.acceleration);
115
     lv_screen_menu_item_1_edit(scr, machine_menu.PrintAcceleration, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_ACCE_PRINT, 0, public_buf_l);
115
     lv_screen_menu_item_1_edit(scr, machine_menu.PrintAcceleration, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_ACCE_PRINT, 0, public_buf_l);
116
 
116
 

+ 21
- 21
Marlin/src/lcd/extui/lib/mks_ui/draw_dialog.cpp View File

160
     if (!do_draw_cal) draw_return_ui();
160
     if (!do_draw_cal) draw_return_ui();
161
   }
161
   }
162
   else if (DIALOG_IS(WIFI_CONFIG_TIPS)) {
162
   else if (DIALOG_IS(WIFI_CONFIG_TIPS)) {
163
-    uiCfg.configWifi = 1;
163
+    uiCfg.configWifi = true;
164
     clear_cur_ui();
164
     clear_cur_ui();
165
     draw_return_ui();
165
     draw_return_ui();
166
   }
166
   }
167
   else if (DIALOG_IS(TYPE_FILAMENT_HEAT_LOAD_COMPLETED))
167
   else if (DIALOG_IS(TYPE_FILAMENT_HEAT_LOAD_COMPLETED))
168
-    uiCfg.filament_heat_completed_load = 1;
168
+    uiCfg.filament_heat_completed_load = true;
169
   else if (DIALOG_IS(TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED))
169
   else if (DIALOG_IS(TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED))
170
-    uiCfg.filament_heat_completed_unload = 1;
170
+    uiCfg.filament_heat_completed_unload = true;
171
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_COMPLETED, TYPE_FILAMENT_UNLOAD_COMPLETED)) {
171
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_COMPLETED, TYPE_FILAMENT_UNLOAD_COMPLETED)) {
172
     clear_cur_ui();
172
     clear_cur_ui();
173
     draw_return_ui();
173
     draw_return_ui();
198
   else if (DIALOG_IS(TYPE_FILAMENT_LOADING, TYPE_FILAMENT_UNLOADING)) {
198
   else if (DIALOG_IS(TYPE_FILAMENT_LOADING, TYPE_FILAMENT_UNLOADING)) {
199
     queue.enqueue_one_P(PSTR("M410"));
199
     queue.enqueue_one_P(PSTR("M410"));
200
     uiCfg.filament_rate                = 0;
200
     uiCfg.filament_rate                = 0;
201
-    uiCfg.filament_loading_completed   = 0;
202
-    uiCfg.filament_unloading_completed = 0;
203
-    uiCfg.filament_loading_time_flg    = 0;
201
+    uiCfg.filament_loading_completed   = false;
202
+    uiCfg.filament_unloading_completed = false;
203
+    uiCfg.filament_loading_time_flg    = false;
204
     uiCfg.filament_loading_time_cnt    = 0;
204
     uiCfg.filament_loading_time_cnt    = 0;
205
-    uiCfg.filament_unloading_time_flg  = 0;
205
+    uiCfg.filament_unloading_time_flg  = false;
206
     uiCfg.filament_unloading_time_cnt  = 0;
206
     uiCfg.filament_unloading_time_cnt  = 0;
207
     thermalManager.temp_hotend[uiCfg.curSprayerChoose].target = uiCfg.desireSprayerTempBak;
207
     thermalManager.temp_hotend[uiCfg.curSprayerChoose].target = uiCfg.desireSprayerTempBak;
208
     clear_cur_ui();
208
     clear_cur_ui();
493
     filament_sprayer_temp();
493
     filament_sprayer_temp();
494
     temps_update_flag = false;
494
     temps_update_flag = false;
495
   }
495
   }
496
-  if (uiCfg.filament_heat_completed_load == 1) {
497
-    uiCfg.filament_heat_completed_load = 0;
496
+  if (uiCfg.filament_heat_completed_load) {
497
+    uiCfg.filament_heat_completed_load = false;
498
     lv_clear_dialog();
498
     lv_clear_dialog();
499
     lv_draw_dialog(DIALOG_TYPE_FILAMENT_LOADING);
499
     lv_draw_dialog(DIALOG_TYPE_FILAMENT_LOADING);
500
     planner.synchronize();
500
     planner.synchronize();
501
-    uiCfg.filament_loading_time_flg = 1;
501
+    uiCfg.filament_loading_time_flg = true;
502
     uiCfg.filament_loading_time_cnt = 0;
502
     uiCfg.filament_loading_time_cnt = 0;
503
     sprintf_P(public_buf_m, PSTR("T%d\nG91\nG1 E%d F%d\nG90"), uiCfg.curSprayerChoose, gCfgItems.filamentchange_load_length, gCfgItems.filamentchange_load_speed);
503
     sprintf_P(public_buf_m, PSTR("T%d\nG91\nG1 E%d F%d\nG90"), uiCfg.curSprayerChoose, gCfgItems.filamentchange_load_length, gCfgItems.filamentchange_load_speed);
504
     queue.inject(public_buf_m);
504
     queue.inject(public_buf_m);
505
   }
505
   }
506
-  if (uiCfg.filament_heat_completed_unload == 1) {
507
-    uiCfg.filament_heat_completed_unload = 0;
506
+  if (uiCfg.filament_heat_completed_unload) {
507
+    uiCfg.filament_heat_completed_unload = false;
508
     lv_clear_dialog();
508
     lv_clear_dialog();
509
     lv_draw_dialog(DIALOG_TYPE_FILAMENT_UNLOADING);
509
     lv_draw_dialog(DIALOG_TYPE_FILAMENT_UNLOADING);
510
     planner.synchronize();
510
     planner.synchronize();
511
-    uiCfg.filament_unloading_time_flg = 1;
511
+    uiCfg.filament_unloading_time_flg = true;
512
     uiCfg.filament_unloading_time_cnt = 0;
512
     uiCfg.filament_unloading_time_cnt = 0;
513
     sprintf_P(public_buf_m, PSTR("T%d\nG91\nG1 E-%d F%d\nG90"), uiCfg.curSprayerChoose, gCfgItems.filamentchange_unload_length, gCfgItems.filamentchange_unload_speed);
513
     sprintf_P(public_buf_m, PSTR("T%d\nG91\nG1 E-%d F%d\nG90"), uiCfg.curSprayerChoose, gCfgItems.filamentchange_unload_length, gCfgItems.filamentchange_unload_speed);
514
     queue.inject(public_buf_m);
514
     queue.inject(public_buf_m);
516
 
516
 
517
   if (((abs((int)((int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius - gCfgItems.filament_limit_temper)) <= 1)
517
   if (((abs((int)((int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius - gCfgItems.filament_limit_temper)) <= 1)
518
     || ((int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius > gCfgItems.filament_limit_temper))
518
     || ((int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius > gCfgItems.filament_limit_temper))
519
-    && (uiCfg.filament_load_heat_flg == 1)
519
+    && (uiCfg.filament_load_heat_flg)
520
   ) {
520
   ) {
521
-    uiCfg.filament_load_heat_flg = 0;
521
+    uiCfg.filament_load_heat_flg = false;
522
     lv_clear_dialog();
522
     lv_clear_dialog();
523
     lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_LOAD_COMPLETED);
523
     lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_LOAD_COMPLETED);
524
   }
524
   }
525
 
525
 
526
-  if (uiCfg.filament_loading_completed == 1) {
526
+  if (uiCfg.filament_loading_completed) {
527
     uiCfg.filament_rate = 0;
527
     uiCfg.filament_rate = 0;
528
-    uiCfg.filament_loading_completed = 0;
528
+    uiCfg.filament_loading_completed = false;
529
     lv_clear_dialog();
529
     lv_clear_dialog();
530
     lv_draw_dialog(DIALOG_TYPE_FILAMENT_LOAD_COMPLETED);
530
     lv_draw_dialog(DIALOG_TYPE_FILAMENT_LOAD_COMPLETED);
531
   }
531
   }
532
   if (((abs((int)((int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius - gCfgItems.filament_limit_temper)) <= 1)
532
   if (((abs((int)((int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius - gCfgItems.filament_limit_temper)) <= 1)
533
      || ((int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius > gCfgItems.filament_limit_temper))
533
      || ((int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius > gCfgItems.filament_limit_temper))
534
-     && (uiCfg.filament_unload_heat_flg == 1)
534
+     && uiCfg.filament_unload_heat_flg
535
   ) {
535
   ) {
536
-    uiCfg.filament_unload_heat_flg = 0;
536
+    uiCfg.filament_unload_heat_flg = false;
537
     lv_clear_dialog();
537
     lv_clear_dialog();
538
     lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED);
538
     lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_UNLOAD_COMPLETED);
539
   }
539
   }
540
 
540
 
541
-  if (uiCfg.filament_unloading_completed == 1) {
541
+  if (uiCfg.filament_unloading_completed) {
542
     uiCfg.filament_rate = 0;
542
     uiCfg.filament_rate = 0;
543
-    uiCfg.filament_unloading_completed = 0;
543
+    uiCfg.filament_unloading_completed = false;
544
     lv_clear_dialog();
544
     lv_clear_dialog();
545
     lv_draw_dialog(DIALOG_TYPE_FILAMENT_UNLOAD_COMPLETED);
545
     lv_draw_dialog(DIALOG_TYPE_FILAMENT_UNLOAD_COMPLETED);
546
   }
546
   }

+ 2
- 2
Marlin/src/lcd/extui/lib/mks_ui/draw_filament_change.cpp View File

49
   if (event != LV_EVENT_RELEASED) return;
49
   if (event != LV_EVENT_RELEASED) return;
50
   switch (obj->mks_obj_id) {
50
   switch (obj->mks_obj_id) {
51
     case ID_FILAMNT_IN:
51
     case ID_FILAMNT_IN:
52
-      uiCfg.filament_load_heat_flg = 1;
52
+      uiCfg.filament_load_heat_flg = true;
53
       if ((abs(thermalManager.temp_hotend[uiCfg.curSprayerChoose].target - thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius) <= 1)
53
       if ((abs(thermalManager.temp_hotend[uiCfg.curSprayerChoose].target - thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius) <= 1)
54
           || (gCfgItems.filament_limit_temper <= thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius)) {
54
           || (gCfgItems.filament_limit_temper <= thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius)) {
55
         lv_clear_filament_change();
55
         lv_clear_filament_change();
65
       }
65
       }
66
       break;
66
       break;
67
     case ID_FILAMNT_OUT:
67
     case ID_FILAMNT_OUT:
68
-      uiCfg.filament_unload_heat_flg=1;
68
+      uiCfg.filament_unload_heat_flg = true;
69
       if ((thermalManager.temp_hotend[uiCfg.curSprayerChoose].target > 0)
69
       if ((thermalManager.temp_hotend[uiCfg.curSprayerChoose].target > 0)
70
         && ((abs((int)((int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].target - thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius)) <= 1)
70
         && ((abs((int)((int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].target - thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius)) <= 1)
71
         || ((int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius >= gCfgItems.filament_limit_temper))
71
         || ((int)thermalManager.temp_hotend[uiCfg.curSprayerChoose].celsius >= gCfgItems.filament_limit_temper))

+ 4
- 4
Marlin/src/lcd/extui/lib/mks_ui/draw_filament_settings.cpp View File

46
   if (event != LV_EVENT_RELEASED) return;
46
   if (event != LV_EVENT_RELEASED) return;
47
   switch (obj->mks_obj_id) {
47
   switch (obj->mks_obj_id) {
48
     case ID_FILAMENT_SET_RETURN:
48
     case ID_FILAMENT_SET_RETURN:
49
-      uiCfg.para_ui_page = 0;
49
+      uiCfg.para_ui_page = false;
50
       lv_clear_filament_settings();
50
       lv_clear_filament_settings();
51
       draw_return_ui();
51
       draw_return_ui();
52
       break;
52
       break;
76
       lv_draw_number_key();
76
       lv_draw_number_key();
77
       break;
77
       break;
78
     case ID_FILAMENT_SET_UP:
78
     case ID_FILAMENT_SET_UP:
79
-      uiCfg.para_ui_page = 0;
79
+      uiCfg.para_ui_page = false;
80
       lv_clear_filament_settings();
80
       lv_clear_filament_settings();
81
       lv_draw_filament_settings();
81
       lv_draw_filament_settings();
82
       break;
82
       break;
83
     case ID_FILAMENT_SET_DOWN:
83
     case ID_FILAMENT_SET_DOWN:
84
-      uiCfg.para_ui_page = 1;
84
+      uiCfg.para_ui_page = true;
85
       lv_clear_filament_settings();
85
       lv_clear_filament_settings();
86
       lv_draw_filament_settings();
86
       lv_draw_filament_settings();
87
       break;
87
       break;
91
 void lv_draw_filament_settings() {
91
 void lv_draw_filament_settings() {
92
   scr = lv_screen_create(FILAMENT_SETTINGS_UI, machine_menu.FilamentConfTitle);
92
   scr = lv_screen_create(FILAMENT_SETTINGS_UI, machine_menu.FilamentConfTitle);
93
 
93
 
94
-  if (uiCfg.para_ui_page != 1) {
94
+  if (!uiCfg.para_ui_page) {
95
     sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.filamentchange_load_length);
95
     sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.filamentchange_load_length);
96
     lv_screen_menu_item_1_edit(scr, machine_menu.InLength, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_FILAMENT_SET_IN_LENGTH, 0, public_buf_l);
96
     lv_screen_menu_item_1_edit(scr, machine_menu.InLength, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_FILAMENT_SET_IN_LENGTH, 0, public_buf_l);
97
 
97
 

+ 4
- 4
Marlin/src/lcd/extui/lib/mks_ui/draw_manual_level_pos_settings.cpp View File

52
   if (event != LV_EVENT_RELEASED) return;
52
   if (event != LV_EVENT_RELEASED) return;
53
   switch (obj->mks_obj_id) {
53
   switch (obj->mks_obj_id) {
54
     case ID_MANUAL_POS_RETURN:
54
     case ID_MANUAL_POS_RETURN:
55
-      uiCfg.para_ui_page = 0;
55
+      uiCfg.para_ui_page = false;
56
       lv_clear_manual_level_pos_settings();
56
       lv_clear_manual_level_pos_settings();
57
       draw_return_ui();
57
       draw_return_ui();
58
       return;
58
       return;
87
       value = level_pos_y5;
87
       value = level_pos_y5;
88
       break;
88
       break;
89
     case ID_MANUAL_POS_UP:
89
     case ID_MANUAL_POS_UP:
90
-      uiCfg.para_ui_page = 0;
90
+      uiCfg.para_ui_page = false;
91
       lv_clear_manual_level_pos_settings();
91
       lv_clear_manual_level_pos_settings();
92
       lv_draw_manual_level_pos_settings();
92
       lv_draw_manual_level_pos_settings();
93
       return;
93
       return;
94
     case ID_MANUAL_POS_DOWN:
94
     case ID_MANUAL_POS_DOWN:
95
-      uiCfg.para_ui_page = 1;
95
+      uiCfg.para_ui_page = true;
96
       lv_clear_manual_level_pos_settings();
96
       lv_clear_manual_level_pos_settings();
97
       lv_draw_manual_level_pos_settings();
97
       lv_draw_manual_level_pos_settings();
98
       return;
98
       return;
106
 
106
 
107
   scr = lv_screen_create(MANUAL_LEVELING_POSIGION_UI, machine_menu.LevelingParaConfTitle);
107
   scr = lv_screen_create(MANUAL_LEVELING_POSIGION_UI, machine_menu.LevelingParaConfTitle);
108
 
108
 
109
-  if (uiCfg.para_ui_page != 1) {
109
+  if (!uiCfg.para_ui_page) {
110
     sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.levelingPos[0][0]);
110
     sprintf_P(public_buf_l, PSTR("%d"), gCfgItems.levelingPos[0][0]);
111
     sprintf_P(buf2, PSTR("%d"), gCfgItems.levelingPos[0][1]);
111
     sprintf_P(buf2, PSTR("%d"), gCfgItems.levelingPos[0][1]);
112
     lv_screen_menu_item_2_edit(scr, leveling_menu.position1, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_MANUAL_POS_Y1, 0, buf2, ID_MANUAL_POS_X1, public_buf_l);
112
     lv_screen_menu_item_2_edit(scr, leveling_menu.position1, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_MANUAL_POS_Y1, 0, buf2, ID_MANUAL_POS_X1, public_buf_l);

+ 4
- 4
Marlin/src/lcd/extui/lib/mks_ui/draw_max_feedrate_settings.cpp View File

49
   lv_clear_max_feedrate_settings();
49
   lv_clear_max_feedrate_settings();
50
   switch (obj->mks_obj_id) {
50
   switch (obj->mks_obj_id) {
51
     case ID_FEED_RETURN:
51
     case ID_FEED_RETURN:
52
-      uiCfg.para_ui_page = 0;
52
+      uiCfg.para_ui_page = false;
53
       draw_return_ui();
53
       draw_return_ui();
54
       return;
54
       return;
55
     case ID_FEED_X:
55
     case ID_FEED_X:
68
       value = E1MaxFeedRate;
68
       value = E1MaxFeedRate;
69
       break;
69
       break;
70
     case ID_FEED_UP:
70
     case ID_FEED_UP:
71
-      uiCfg.para_ui_page = 0;
71
+      uiCfg.para_ui_page = false;
72
       lv_draw_max_feedrate_settings();
72
       lv_draw_max_feedrate_settings();
73
       return;
73
       return;
74
     case ID_FEED_DOWN:
74
     case ID_FEED_DOWN:
75
-      uiCfg.para_ui_page = 1;
75
+      uiCfg.para_ui_page = true;
76
       lv_draw_max_feedrate_settings();
76
       lv_draw_max_feedrate_settings();
77
       return;
77
       return;
78
   }
78
   }
82
 void lv_draw_max_feedrate_settings() {
82
 void lv_draw_max_feedrate_settings() {
83
   scr = lv_screen_create(MAXFEEDRATE_UI, machine_menu.MaxFeedRateConfTitle);
83
   scr = lv_screen_create(MAXFEEDRATE_UI, machine_menu.MaxFeedRateConfTitle);
84
 
84
 
85
-  if (uiCfg.para_ui_page != 1) {
85
+  if (!uiCfg.para_ui_page) {
86
     sprintf_P(public_buf_l, PSTR("%.1f"), planner.settings.max_feedrate_mm_s[X_AXIS]);
86
     sprintf_P(public_buf_l, PSTR("%.1f"), planner.settings.max_feedrate_mm_s[X_AXIS]);
87
     lv_screen_menu_item_1_edit(scr, machine_menu.XMaxFeedRate, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_FEED_X, 0, public_buf_l);
87
     lv_screen_menu_item_1_edit(scr, machine_menu.XMaxFeedRate, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_FEED_X, 0, public_buf_l);
88
 
88
 

+ 1
- 1
Marlin/src/lcd/extui/lib/mks_ui/draw_set.cpp View File

88
             lv_draw_wifi();
88
             lv_draw_wifi();
89
           }
89
           }
90
           else {
90
           else {
91
-            if (uiCfg.command_send == 1) {
91
+            if (uiCfg.command_send) {
92
               uint8_t cmd_wifi_list[] = { 0xA5, 0x07, 0x00, 0x00, 0xFC };
92
               uint8_t cmd_wifi_list[] = { 0xA5, 0x07, 0x00, 0x00, 0xFC };
93
               raw_send_to_wifi(cmd_wifi_list, COUNT(cmd_wifi_list));
93
               raw_send_to_wifi(cmd_wifi_list, COUNT(cmd_wifi_list));
94
               last_disp_state = SET_UI;
94
               last_disp_state = SET_UI;

+ 4
- 4
Marlin/src/lcd/extui/lib/mks_ui/draw_step_settings.cpp View File

48
   lv_clear_step_settings();
48
   lv_clear_step_settings();
49
   switch (obj->mks_obj_id) {
49
   switch (obj->mks_obj_id) {
50
     case ID_STEP_RETURN:
50
     case ID_STEP_RETURN:
51
-      uiCfg.para_ui_page = 0;
51
+      uiCfg.para_ui_page = false;
52
       draw_return_ui();
52
       draw_return_ui();
53
       return;
53
       return;
54
     case ID_STEP_X:
54
     case ID_STEP_X:
67
       value = E1step;
67
       value = E1step;
68
       break;
68
       break;
69
     case ID_STEP_UP:
69
     case ID_STEP_UP:
70
-      uiCfg.para_ui_page = 0;
70
+      uiCfg.para_ui_page = false;
71
       lv_draw_step_settings();
71
       lv_draw_step_settings();
72
       return;
72
       return;
73
     case ID_STEP_DOWN:
73
     case ID_STEP_DOWN:
74
-      uiCfg.para_ui_page = 1;
74
+      uiCfg.para_ui_page = true;
75
       lv_draw_step_settings();
75
       lv_draw_step_settings();
76
       return;
76
       return;
77
   }
77
   }
81
 void lv_draw_step_settings() {
81
 void lv_draw_step_settings() {
82
   scr = lv_screen_create(STEPS_UI, machine_menu.StepsConfTitle);
82
   scr = lv_screen_create(STEPS_UI, machine_menu.StepsConfTitle);
83
 
83
 
84
-  if (uiCfg.para_ui_page != 1) {
84
+  if (!uiCfg.para_ui_page) {
85
     sprintf_P(public_buf_l, PSTR("%.1f"), planner.settings.axis_steps_per_mm[X_AXIS]);
85
     sprintf_P(public_buf_l, PSTR("%.1f"), planner.settings.axis_steps_per_mm[X_AXIS]);
86
     lv_screen_menu_item_1_edit(scr, machine_menu.X_Steps, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_STEP_X, 0, public_buf_l);
86
     lv_screen_menu_item_1_edit(scr, machine_menu.X_Steps, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_STEP_X, 0, public_buf_l);
87
 
87
 

+ 4
- 4
Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_current_settings.cpp View File

49
   lv_clear_tmc_current_settings();
49
   lv_clear_tmc_current_settings();
50
   switch (obj->mks_obj_id) {
50
   switch (obj->mks_obj_id) {
51
     case ID_TMC_CURRENT_RETURN:
51
     case ID_TMC_CURRENT_RETURN:
52
-      uiCfg.para_ui_page = 0;
52
+      uiCfg.para_ui_page = false;
53
       draw_return_ui();
53
       draw_return_ui();
54
       return;
54
       return;
55
     #if AXIS_IS_TMC(X)
55
     #if AXIS_IS_TMC(X)
79
     #endif
79
     #endif
80
 
80
 
81
     case ID_TMC_CURRENT_UP:
81
     case ID_TMC_CURRENT_UP:
82
-      uiCfg.para_ui_page = 0;
82
+      uiCfg.para_ui_page = false;
83
       lv_draw_tmc_current_settings();
83
       lv_draw_tmc_current_settings();
84
       return;
84
       return;
85
     case ID_TMC_CURRENT_DOWN:
85
     case ID_TMC_CURRENT_DOWN:
86
-      uiCfg.para_ui_page = 1;
86
+      uiCfg.para_ui_page = true;
87
       lv_draw_tmc_current_settings();
87
       lv_draw_tmc_current_settings();
88
       return;
88
       return;
89
   }
89
   }
95
   scr = lv_screen_create(TMC_CURRENT_UI, machine_menu.TmcCurrentConfTitle);
95
   scr = lv_screen_create(TMC_CURRENT_UI, machine_menu.TmcCurrentConfTitle);
96
 
96
 
97
   float milliamps;
97
   float milliamps;
98
-  if (uiCfg.para_ui_page != 1) {
98
+  if (!uiCfg.para_ui_page) {
99
     #if AXIS_IS_TMC(X)
99
     #if AXIS_IS_TMC(X)
100
       milliamps = stepperX.getMilliamps();
100
       milliamps = stepperX.getMilliamps();
101
     #else
101
     #else

+ 4
- 4
Marlin/src/lcd/extui/lib/mks_ui/draw_tmc_step_mode_settings.cpp View File

63
 
63
 
64
   switch (obj->mks_obj_id) {
64
   switch (obj->mks_obj_id) {
65
     case ID_TMC_MODE_RETURN:
65
     case ID_TMC_MODE_RETURN:
66
-      uiCfg.para_ui_page = 0;
66
+      uiCfg.para_ui_page = false;
67
       lv_clear_tmc_step_mode_settings();
67
       lv_clear_tmc_step_mode_settings();
68
       draw_return_ui();
68
       draw_return_ui();
69
       break;
69
       break;
95
     #endif
95
     #endif
96
 
96
 
97
     case ID_TMC_MODE_UP:
97
     case ID_TMC_MODE_UP:
98
-      uiCfg.para_ui_page = 0;
98
+      uiCfg.para_ui_page = false;
99
       lv_clear_tmc_step_mode_settings();
99
       lv_clear_tmc_step_mode_settings();
100
       lv_draw_tmc_step_mode_settings();
100
       lv_draw_tmc_step_mode_settings();
101
       break;
101
       break;
102
     case ID_TMC_MODE_DOWN:
102
     case ID_TMC_MODE_DOWN:
103
-      uiCfg.para_ui_page = 1;
103
+      uiCfg.para_ui_page = true;
104
       lv_clear_tmc_step_mode_settings();
104
       lv_clear_tmc_step_mode_settings();
105
       lv_draw_tmc_step_mode_settings();
105
       lv_draw_tmc_step_mode_settings();
106
       break;
106
       break;
129
     stealth_E1 = stepperE1.get_stealthChop();
129
     stealth_E1 = stepperE1.get_stealthChop();
130
   #endif
130
   #endif
131
 
131
 
132
-  if (uiCfg.para_ui_page != 1) {
132
+  if (!uiCfg.para_ui_page) {
133
     buttonXState = lv_screen_menu_item_onoff(scr, machine_menu.X_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_TMC_MODE_X, 0, stealth_X);
133
     buttonXState = lv_screen_menu_item_onoff(scr, machine_menu.X_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y, event_handler, ID_TMC_MODE_X, 0, stealth_X);
134
     buttonYState = lv_screen_menu_item_onoff(scr, machine_menu.Y_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_TMC_MODE_Y, 1, stealth_Y);
134
     buttonYState = lv_screen_menu_item_onoff(scr, machine_menu.Y_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 2, event_handler, ID_TMC_MODE_Y, 1, stealth_Y);
135
     buttonZState = lv_screen_menu_item_onoff(scr, machine_menu.Z_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_TMC_MODE_Z, 2, stealth_Z);
135
     buttonZState = lv_screen_menu_item_onoff(scr, machine_menu.Z_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 3, event_handler, ID_TMC_MODE_Z, 2, stealth_Z);

+ 1
- 1
Marlin/src/lcd/extui/lib/mks_ui/draw_tool.cpp View File

63
         public_buf_m[sizeof(public_buf_m)-1] = 0;
63
         public_buf_m[sizeof(public_buf_m)-1] = 0;
64
         queue.inject_P(PSTR(public_buf_m));
64
         queue.inject_P(PSTR(public_buf_m));
65
       #else
65
       #else
66
-        uiCfg.leveling_first_time = 1;
66
+        uiCfg.leveling_first_time = true;
67
         lv_draw_manualLevel();
67
         lv_draw_manualLevel();
68
       #endif
68
       #endif
69
       break;
69
       break;

+ 8
- 8
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp View File

181
   uiCfg.curTempType         = 0;
181
   uiCfg.curTempType         = 0;
182
   uiCfg.curSprayerChoose    = 0;
182
   uiCfg.curSprayerChoose    = 0;
183
   uiCfg.stepHeat            = 10;
183
   uiCfg.stepHeat            = 10;
184
-  uiCfg.leveling_first_time = 0;
185
-  uiCfg.para_ui_page        = 0;
184
+  uiCfg.leveling_first_time = false;
185
+  uiCfg.para_ui_page        = false;
186
   uiCfg.extruStep           = 5;
186
   uiCfg.extruStep           = 5;
187
   uiCfg.extruSpeed          = 10;
187
   uiCfg.extruSpeed          = 10;
188
   uiCfg.move_dist           = 1;
188
   uiCfg.move_dist           = 1;
189
   uiCfg.moveSpeed           = 3000;
189
   uiCfg.moveSpeed           = 3000;
190
   uiCfg.stepPrintSpeed      = 10;
190
   uiCfg.stepPrintSpeed      = 10;
191
-  uiCfg.command_send        = 0;
191
+  uiCfg.command_send        = false;
192
   uiCfg.dialogType          = 0;
192
   uiCfg.dialogType          = 0;
193
-  uiCfg.filament_heat_completed_load = 0;
193
+  uiCfg.filament_heat_completed_load = false;
194
   uiCfg.filament_rate                = 0;
194
   uiCfg.filament_rate                = 0;
195
-  uiCfg.filament_loading_completed   = 0;
196
-  uiCfg.filament_unloading_completed = 0;
197
-  uiCfg.filament_loading_time_flg    = 0;
195
+  uiCfg.filament_loading_completed   = false;
196
+  uiCfg.filament_unloading_completed = false;
197
+  uiCfg.filament_loading_time_flg    = false;
198
   uiCfg.filament_loading_time_cnt    = 0;
198
   uiCfg.filament_loading_time_cnt    = 0;
199
-  uiCfg.filament_unloading_time_flg  = 0;
199
+  uiCfg.filament_unloading_time_flg  = false;
200
   uiCfg.filament_unloading_time_cnt  = 0;
200
   uiCfg.filament_unloading_time_cnt  = 0;
201
 
201
 
202
   #if ENABLED(MKS_WIFI_MODULE)
202
   #if ENABLED(MKS_WIFI_MODULE)

+ 24
- 24
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h View File

194
   uint8_t wifi_mode_sel;
194
   uint8_t wifi_mode_sel;
195
   uint8_t fileSysType;
195
   uint8_t fileSysType;
196
   uint8_t wifi_type;
196
   uint8_t wifi_type;
197
-  bool  cloud_enable;
198
-  bool  encoder_enable;
197
+  bool  cloud_enable,
198
+        encoder_enable;
199
   int   levelingPos[5][2];
199
   int   levelingPos[5][2];
200
-  int   filamentchange_load_length;
201
-  int   filamentchange_load_speed;
202
-  int   filamentchange_unload_length;
203
-  int   filamentchange_unload_speed;
204
-  int   filament_limit_temper;
205
-  float pausePosX;
206
-  float pausePosY;
207
-  float pausePosZ;
200
+  int   filamentchange_load_length,
201
+        filamentchange_load_speed,
202
+        filamentchange_unload_length,
203
+        filamentchange_unload_speed,
204
+        filament_limit_temper;
205
+  float pausePosX,
206
+        pausePosY,
207
+        pausePosZ;
208
   uint32_t curFilesize;
208
   uint32_t curFilesize;
209
 } CFG_ITMES;
209
 } CFG_ITMES;
210
 
210
 
211
 typedef struct {
211
 typedef struct {
212
   uint8_t curTempType:1,
212
   uint8_t curTempType:1,
213
           curSprayerChoose:3,
213
           curSprayerChoose:3,
214
-          stepHeat:4;
215
-  uint8_t leveling_first_time:1,
214
+          stepHeat:4,
215
+          curSprayerChoose_bak:4;
216
+  bool    leveling_first_time:1,
216
           para_ui_page:1,
217
           para_ui_page:1,
217
           configWifi:1,
218
           configWifi:1,
218
           command_send:1,
219
           command_send:1,
219
           filament_load_heat_flg:1,
220
           filament_load_heat_flg:1,
220
           filament_heat_completed_load:1,
221
           filament_heat_completed_load:1,
221
           filament_unload_heat_flg:1,
222
           filament_unload_heat_flg:1,
222
-          filament_heat_completed_unload:1;
223
-  uint8_t filament_loading_completed:1,
223
+          filament_heat_completed_unload:1,
224
+          filament_loading_completed:1,
224
           filament_unloading_completed:1,
225
           filament_unloading_completed:1,
225
           filament_loading_time_flg:1,
226
           filament_loading_time_flg:1,
226
-          filament_unloading_time_flg:1,
227
-          curSprayerChoose_bak:4;
227
+          filament_unloading_time_flg:1;
228
   uint8_t wifi_name[32];
228
   uint8_t wifi_name[32];
229
   uint8_t wifi_key[64];
229
   uint8_t wifi_key[64];
230
   uint8_t cloud_hostUrl[96];
230
   uint8_t cloud_hostUrl[96];
240
   uint16_t cloud_port;
240
   uint16_t cloud_port;
241
   uint16_t moveSpeed_bak;
241
   uint16_t moveSpeed_bak;
242
   uint32_t totalSend;
242
   uint32_t totalSend;
243
-  uint32_t filament_loading_time;
244
-  uint32_t filament_unloading_time;
245
-  uint32_t filament_loading_time_cnt;
246
-  uint32_t filament_unloading_time_cnt;
243
+  uint32_t filament_loading_time,
244
+           filament_unloading_time,
245
+           filament_loading_time_cnt,
246
+           filament_unloading_time_cnt;
247
   float move_dist;
247
   float move_dist;
248
   float desireSprayerTempBak;
248
   float desireSprayerTempBak;
249
-  float current_x_position_bak;
250
-  float current_y_position_bak;
251
-  float current_z_position_bak;
252
-  float current_e_position_bak;
249
+  float current_x_position_bak,
250
+        current_y_position_bak,
251
+        current_z_position_bak,
252
+        current_e_position_bak;
253
 } UI_CFG;
253
 } UI_CFG;
254
 
254
 
255
 typedef enum {
255
 typedef enum {

+ 1
- 1
Marlin/src/lcd/extui/lib/mks_ui/draw_wifi_list.cpp View File

157
 }
157
 }
158
 
158
 
159
 void wifi_scan_handle() {
159
 void wifi_scan_handle() {
160
-  if (!DIALOG_IS(WIFI_ENABLE_TIPS) || uiCfg.command_send != 1) return;
160
+  if (!DIALOG_IS(WIFI_ENABLE_TIPS) || !uiCfg.command_send) return;
161
   last_disp_state = DIALOG_UI;
161
   last_disp_state = DIALOG_UI;
162
   lv_clear_dialog();
162
   lv_clear_dialog();
163
   if (wifi_link_state == WIFI_CONNECTED && wifiPara.mode != AP_MODEL)
163
   if (wifi_link_state == WIFI_CONNECTED && wifiPara.mode != AP_MODEL)

+ 6
- 6
Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp View File

87
     if (tips_disp.timer == TIPS_TIMER_START)
87
     if (tips_disp.timer == TIPS_TIMER_START)
88
       tips_disp.timer_count++;
88
       tips_disp.timer_count++;
89
   #endif
89
   #endif
90
-  if (uiCfg.filament_loading_time_flg == 1) {
90
+  if (uiCfg.filament_loading_time_flg) {
91
     uiCfg.filament_loading_time_cnt++;
91
     uiCfg.filament_loading_time_cnt++;
92
     uiCfg.filament_rate = (uint32_t)(((uiCfg.filament_loading_time_cnt / (uiCfg.filament_loading_time * 1000.0)) * 100.0) + 0.5);
92
     uiCfg.filament_rate = (uint32_t)(((uiCfg.filament_loading_time_cnt / (uiCfg.filament_loading_time * 1000.0)) * 100.0) + 0.5);
93
     if (uiCfg.filament_loading_time_cnt >= (uiCfg.filament_loading_time * 1000)) {
93
     if (uiCfg.filament_loading_time_cnt >= (uiCfg.filament_loading_time * 1000)) {
94
       uiCfg.filament_loading_time_cnt  = 0;
94
       uiCfg.filament_loading_time_cnt  = 0;
95
-      uiCfg.filament_loading_time_flg  = 0;
96
-      uiCfg.filament_loading_completed = 1;
95
+      uiCfg.filament_loading_time_flg  = false;
96
+      uiCfg.filament_loading_completed = true;
97
     }
97
     }
98
   }
98
   }
99
-  if (uiCfg.filament_unloading_time_flg == 1) {
99
+  if (uiCfg.filament_unloading_time_flg) {
100
     uiCfg.filament_unloading_time_cnt++;
100
     uiCfg.filament_unloading_time_cnt++;
101
     uiCfg.filament_rate = (uint32_t)(((uiCfg.filament_unloading_time_cnt / (uiCfg.filament_unloading_time * 1000.0)) * 100.0) + 0.5);
101
     uiCfg.filament_rate = (uint32_t)(((uiCfg.filament_unloading_time_cnt / (uiCfg.filament_unloading_time * 1000.0)) * 100.0) + 0.5);
102
     if (uiCfg.filament_unloading_time_cnt >= (uiCfg.filament_unloading_time * 1000)) {
102
     if (uiCfg.filament_unloading_time_cnt >= (uiCfg.filament_unloading_time * 1000)) {
103
       uiCfg.filament_unloading_time_cnt  = 0;
103
       uiCfg.filament_unloading_time_cnt  = 0;
104
-      uiCfg.filament_unloading_time_flg  = 0;
105
-      uiCfg.filament_unloading_completed = 1;
104
+      uiCfg.filament_unloading_time_flg  = false;
105
+      uiCfg.filament_unloading_completed = true;
106
       uiCfg.filament_rate = 100;
106
       uiCfg.filament_rate = 100;
107
     }
107
     }
108
   }
108
   }

+ 4
- 4
Marlin/src/lcd/extui/lib/mks_ui/wifi_module.cpp View File

953
             wifi_ret_ack();
953
             wifi_ret_ack();
954
             send_to_wifi((uint8_t *)"M997 PAUSE\r\n", strlen("M997 PAUSE\r\n"));
954
             send_to_wifi((uint8_t *)"M997 PAUSE\r\n", strlen("M997 PAUSE\r\n"));
955
           }
955
           }
956
-          if (uiCfg.command_send == 0) get_wifi_list_command_send();
956
+          if (!uiCfg.command_send) get_wifi_list_command_send();
957
           break;
957
           break;
958
 
958
 
959
         case 998:
959
         case 998:
1095
     memcpy(wifi_firm_ver, (const char *)&msg[16 + wifiNameLen + wifiKeyLen + hostLen + id_len], ver_len);
1095
     memcpy(wifi_firm_ver, (const char *)&msg[16 + wifiNameLen + wifiKeyLen + hostLen + id_len], ver_len);
1096
   }
1096
   }
1097
 
1097
 
1098
-  if (uiCfg.configWifi == 1) {
1098
+  if (uiCfg.configWifi) {
1099
     if ((wifiPara.mode != gCfgItems.wifi_mode_sel)
1099
     if ((wifiPara.mode != gCfgItems.wifi_mode_sel)
1100
       || (strncmp(wifiPara.ap_name, (const char *)uiCfg.wifi_name, 32) != 0)
1100
       || (strncmp(wifiPara.ap_name, (const char *)uiCfg.wifi_name, 32) != 0)
1101
       || (strncmp(wifiPara.keyCode, (const char *)uiCfg.wifi_key, 64) != 0)) {
1101
       || (strncmp(wifiPara.keyCode, (const char *)uiCfg.wifi_key, 64) != 0)) {
1102
       package_to_wifi(WIFI_PARA_SET, (uint8_t *)0, 0);
1102
       package_to_wifi(WIFI_PARA_SET, (uint8_t *)0, 0);
1103
     }
1103
     }
1104
-    else uiCfg.configWifi = 0;
1104
+    else uiCfg.configWifi = false;
1105
   }
1105
   }
1106
   if (cfg_cloud_flag == 1) {
1106
   if (cfg_cloud_flag == 1) {
1107
     if (((cloud_para.state >> 4) != (char)gCfgItems.cloud_enable)
1107
     if (((cloud_para.state >> 4) != (char)gCfgItems.cloud_enable)
1127
   wifi_list.getNameNum = msg[0];
1127
   wifi_list.getNameNum = msg[0];
1128
 
1128
 
1129
   if (wifi_list.getNameNum < 20) {
1129
   if (wifi_list.getNameNum < 20) {
1130
-    uiCfg.command_send = 1;
1130
+    uiCfg.command_send = true;
1131
     ZERO(wifi_list.wifiName);
1131
     ZERO(wifi_list.wifiName);
1132
     wifi_name_num = wifi_list.getNameNum;
1132
     wifi_name_num = wifi_list.getNameNum;
1133
     valid_name_num = 0;
1133
     valid_name_num = 0;

Loading…
Cancel
Save