Browse Source

🚸 Fix and improve MKS LVGL UI (#22783)

Co-authored-by: makerbase <4164049@qq.com>
Co-authored-by: MKS-Sean <56996910+MKS-Sean@users.noreply.github.com>
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
Sola 3 years ago
parent
commit
8df3e62c89
No account linked to committer's email address
38 changed files with 321 additions and 284 deletions
  1. 3
    3
      Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp
  2. 3
    3
      Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp
  3. 3
    3
      Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp
  4. 2
    3
      Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp
  5. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h
  6. 12
    14
      Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp
  7. 6
    3
      Marlin/src/lcd/extui/mks_ui/draw_fan.cpp
  8. 3
    3
      Marlin/src/lcd/extui/mks_ui/draw_filament_change.cpp
  9. 7
    7
      Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp
  10. 4
    4
      Marlin/src/lcd/extui/mks_ui/draw_homing_sensitivity_settings.cpp
  11. 34
    34
      Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp
  12. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_more.h
  13. 61
    26
      Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp
  14. 2
    0
      Marlin/src/lcd/extui/mks_ui/draw_preHeat.h
  15. 6
    6
      Marlin/src/lcd/extui/mks_ui/draw_printing.cpp
  16. 10
    10
      Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp
  17. 6
    6
      Marlin/src/lcd/extui/mks_ui/draw_tmc_step_mode_settings.cpp
  18. 3
    3
      Marlin/src/lcd/extui/mks_ui/draw_tool.cpp
  19. 3
    3
      Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp
  20. 22
    22
      Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
  21. 2
    2
      Marlin/src/lcd/extui/mks_ui/draw_ui.h
  22. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_wifi.cpp
  23. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_wifi_list.h
  24. 1
    1
      Marlin/src/lcd/extui/mks_ui/draw_wifi_tips.cpp
  25. 1
    1
      Marlin/src/lcd/extui/mks_ui/mks_hardware.cpp
  26. 4
    4
      Marlin/src/lcd/extui/mks_ui/pic_manager.cpp
  27. 24
    24
      Marlin/src/lcd/extui/mks_ui/pic_manager.h
  28. 1
    1
      Marlin/src/lcd/extui/mks_ui/printer_operation.cpp
  29. 25
    25
      Marlin/src/lcd/extui/mks_ui/tft_Language_en.h
  30. 1
    1
      Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h
  31. 3
    4
      Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp
  32. 2
    2
      Marlin/src/lcd/extui/mks_ui/tft_multi_language.h
  33. 10
    10
      Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h
  34. 2
    1
      Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.cpp
  35. 11
    11
      Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.h
  36. 12
    12
      Marlin/src/lcd/extui/mks_ui/wifi_module.cpp
  37. 23
    23
      Marlin/src/lcd/extui/mks_ui/wifi_module.h
  38. 5
    5
      Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp

+ 3
- 3
Marlin/src/lcd/extui/mks_ui/SPIFlashStorage.cpp View File

43
   static uint32_t rle_compress(T *output, uint32_t outputLength, T *input, uint32_t inputLength, uint32_t& inputProcessed) {
43
   static uint32_t rle_compress(T *output, uint32_t outputLength, T *input, uint32_t inputLength, uint32_t& inputProcessed) {
44
     uint32_t count = 0, out = 0, index, i;
44
     uint32_t count = 0, out = 0, index, i;
45
     T pixel;
45
     T pixel;
46
-    //32767 for uint16_t
47
-    //127 for uint16_t
48
-    //calculated at compile time
46
+    // 32767 for uint16_t
47
+    // 127 for uint16_t
48
+    // calculated at compile time
49
     constexpr T max = (0xFFFFFFFF >> (8 * (4 - sizeof(T)))) / 2;
49
     constexpr T max = (0xFFFFFFFF >> (8 * (4 - sizeof(T)))) / 2;
50
 
50
 
51
     inputProcessed = 0;
51
     inputProcessed = 0;

+ 3
- 3
Marlin/src/lcd/extui/mks_ui/SPI_TFT.cpp View File

69
 }
69
 }
70
 
70
 
71
 void TFT::LCD_clear(uint16_t color) {
71
 void TFT::LCD_clear(uint16_t color) {
72
-  setWindow(0, 0, (TFT_WIDTH), (TFT_HEIGHT));
73
-  tftio.WriteMultiple(color, (uint32_t)(TFT_WIDTH) * (TFT_HEIGHT));
72
+  setWindow(0, 0, TFT_WIDTH, TFT_HEIGHT);
73
+  tftio.WriteMultiple(color, uint32_t(TFT_WIDTH) * uint32_t(TFT_HEIGHT));
74
 }
74
 }
75
 
75
 
76
 void TFT::LCD_Draw_Logo() {
76
 void TFT::LCD_Draw_Logo() {
77
   #if HAS_LOGO_IN_FLASH
77
   #if HAS_LOGO_IN_FLASH
78
     setWindow(0, 0, TFT_WIDTH, TFT_HEIGHT);
78
     setWindow(0, 0, TFT_WIDTH, TFT_HEIGHT);
79
-    for (uint16_t i = 0; i < (TFT_HEIGHT); i ++) {
79
+    for (uint16_t i = 0; i < (TFT_HEIGHT); i++) {
80
       Pic_Logo_Read((uint8_t *)"", (uint8_t *)bmp_public_buf, (TFT_WIDTH) * 2);
80
       Pic_Logo_Read((uint8_t *)"", (uint8_t *)bmp_public_buf, (TFT_WIDTH) * 2);
81
       tftio.WriteSequence((uint16_t *)bmp_public_buf, TFT_WIDTH);
81
       tftio.WriteSequence((uint16_t *)bmp_public_buf, TFT_WIDTH);
82
     }
82
     }

+ 3
- 3
Marlin/src/lcd/extui/mks_ui/draw_advance_settings.cpp View File

57
       break;
57
       break;
58
     #if ENABLED(MKS_WIFI_MODULE)
58
     #if ENABLED(MKS_WIFI_MODULE)
59
       case ID_WIFI_PARA:
59
       case ID_WIFI_PARA:
60
-      lv_clear_advance_settings();
61
-      lv_draw_wifi_settings();
62
-      break;
60
+        lv_clear_advance_settings();
61
+        lv_draw_wifi_settings();
62
+        break;
63
     #endif
63
     #endif
64
     #if HAS_ROTARY_ENCODER
64
     #if HAS_ROTARY_ENCODER
65
       case ID_ENCODER_SETTINGS:
65
       case ID_ENCODER_SETTINGS:

+ 2
- 3
Marlin/src/lcd/extui/mks_ui/draw_baby_stepping.cpp View File

55
   ID_BABY_STEP_RETURN
55
   ID_BABY_STEP_RETURN
56
 };
56
 };
57
 
57
 
58
-static float babystep_dist=0.01;
58
+static float babystep_dist  = 0.01;
59
 static uint8_t has_adjust_z = 0;
59
 static uint8_t has_adjust_z = 0;
60
 
60
 
61
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
61
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
124
   buttonV = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_BABY_STEP_DIST);
124
   buttonV = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_BABY_STEP_DIST);
125
   labelV = lv_label_create_empty(buttonV);
125
   labelV = lv_label_create_empty(buttonV);
126
   #if HAS_ROTARY_ENCODER
126
   #if HAS_ROTARY_ENCODER
127
-    if (gCfgItems.encoder_enable) {
127
+    if (gCfgItems.encoder_enable)
128
       lv_group_add_obj(g, buttonV);
128
       lv_group_add_obj(g, buttonV);
129
-    }
130
   #endif
129
   #endif
131
 
130
 
132
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_RETURN);
131
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_BABY_STEP_RETURN);

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_cloud_bind.h View File

22
 #pragma once
22
 #pragma once
23
 
23
 
24
 #ifdef __cplusplus
24
 #ifdef __cplusplus
25
-extern "C" { /* C-declarations for C++ */
25
+  extern "C" { /* C-declarations for C++ */
26
 #endif
26
 #endif
27
 
27
 
28
 void lv_draw_cloud_bind();
28
 void lv_draw_cloud_bind();

+ 12
- 14
Marlin/src/lcd/extui/mks_ui/draw_dialog.cpp View File

103
         if (card.isFileOpen()) {
103
         if (card.isFileOpen()) {
104
           feedrate_percentage = 100;
104
           feedrate_percentage = 100;
105
           planner.flow_percentage[0] = 100;
105
           planner.flow_percentage[0] = 100;
106
-          planner.e_factor[0]        = planner.flow_percentage[0] * 0.01f;
106
+          planner.e_factor[0] = planner.flow_percentage[0] * 0.01f;
107
           #if HAS_MULTI_EXTRUDER
107
           #if HAS_MULTI_EXTRUDER
108
             planner.flow_percentage[1] = 100;
108
             planner.flow_percentage[1] = 100;
109
-            planner.e_factor[1]        = planner.flow_percentage[1] * 0.01f;
109
+            planner.e_factor[1] = planner.flow_percentage[1] * 0.01f;
110
           #endif
110
           #endif
111
           card.startOrResumeFilePrinting();
111
           card.startOrResumeFilePrinting();
112
-          #if ENABLED(POWER_LOSS_RECOVERY)
113
-            recovery.prepare();
114
-          #endif
112
+          TERN_(POWER_LOSS_RECOVERY, recovery.prepare());
115
           once_flag = false;
113
           once_flag = false;
116
         }
114
         }
117
       }
115
       }
229
   lv_obj_t *labelDialog = lv_label_create(scr, "");
227
   lv_obj_t *labelDialog = lv_label_create(scr, "");
230
 
228
 
231
   if (DIALOG_IS(TYPE_FINISH_PRINT, PAUSE_MESSAGE_RESUME)) {
229
   if (DIALOG_IS(TYPE_FINISH_PRINT, PAUSE_MESSAGE_RESUME)) {
232
-      btnOk = lv_button_btn_create(scr, BTN_OK_X + 90, BTN_OK_Y, 100, 50, btn_ok_event_cb);
233
-      lv_obj_t *labelOk = lv_label_create_empty(btnOk);             // Add a label to the button
234
-      lv_label_set_text(labelOk, print_file_dialog_menu.confirm);    // Set the labels text
230
+    btnOk = lv_button_btn_create(scr, BTN_OK_X + 90, BTN_OK_Y, 100, 50, btn_ok_event_cb);
231
+    lv_obj_t *labelOk = lv_label_create_empty(btnOk);           // Add a label to the button
232
+    lv_label_set_text(labelOk, print_file_dialog_menu.confirm); // Set the labels text
235
   }
233
   }
236
   else if (DIALOG_IS(PAUSE_MESSAGE_WAITING, PAUSE_MESSAGE_INSERT, PAUSE_MESSAGE_HEAT)) {
234
   else if (DIALOG_IS(PAUSE_MESSAGE_WAITING, PAUSE_MESSAGE_INSERT, PAUSE_MESSAGE_HEAT)) {
237
     btnOk = lv_button_btn_create(scr, BTN_OK_X + 90, BTN_OK_Y, 100, 50, btn_ok_event_cb);
235
     btnOk = lv_button_btn_create(scr, BTN_OK_X + 90, BTN_OK_Y, 100, 50, btn_ok_event_cb);
238
-    lv_obj_t *labelOk = lv_label_create_empty(btnOk);             // Add a label to the button
239
-    lv_label_set_text(labelOk, print_file_dialog_menu.confirm);    // Set the labels text
236
+    lv_obj_t *labelOk = lv_label_create_empty(btnOk);           // Add a label to the button
237
+    lv_label_set_text(labelOk, print_file_dialog_menu.confirm); // Set the labels text
240
   }
238
   }
241
   else if (DIALOG_IS(PAUSE_MESSAGE_PARKING, PAUSE_MESSAGE_CHANGING, PAUSE_MESSAGE_UNLOAD, PAUSE_MESSAGE_LOAD, PAUSE_MESSAGE_PURGE, PAUSE_MESSAGE_RESUME, PAUSE_MESSAGE_HEATING)) {
239
   else if (DIALOG_IS(PAUSE_MESSAGE_PARKING, PAUSE_MESSAGE_CHANGING, PAUSE_MESSAGE_UNLOAD, PAUSE_MESSAGE_LOAD, PAUSE_MESSAGE_PURGE, PAUSE_MESSAGE_RESUME, PAUSE_MESSAGE_HEATING)) {
242
     // nothing to do
240
     // nothing to do
269
     }
267
     }
270
   #endif
268
   #endif
271
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_HEAT, TYPE_FILAMENT_UNLOAD_HEAT)) {
269
   else if (DIALOG_IS(TYPE_FILAMENT_LOAD_HEAT, TYPE_FILAMENT_UNLOAD_HEAT)) {
272
-    btnCancel = lv_button_btn_create(scr, BTN_OK_X+90, BTN_OK_Y, 100, 50, btn_cancel_event_cb);
270
+    btnCancel = lv_button_btn_create(scr, BTN_OK_X + 90, BTN_OK_Y, 100, 50, btn_cancel_event_cb);
273
     lv_obj_t *labelCancel = lv_label_create_empty(btnCancel);
271
     lv_obj_t *labelCancel = lv_label_create_empty(btnCancel);
274
     lv_label_set_text(labelCancel, print_file_dialog_menu.cancel);
272
     lv_label_set_text(labelCancel, print_file_dialog_menu.cancel);
275
 
273
 
287
     lv_label_set_text(labelCancel, print_file_dialog_menu.cancel);
285
     lv_label_set_text(labelCancel, print_file_dialog_menu.cancel);
288
 
286
 
289
     filament_bar = lv_bar_create(scr, nullptr);
287
     filament_bar = lv_bar_create(scr, nullptr);
290
-    lv_obj_set_pos(filament_bar, (TFT_WIDTH-400)/2, ((TFT_HEIGHT - titleHeight)-40)/2);
288
+    lv_obj_set_pos(filament_bar, (TFT_WIDTH - 400) / 2, ((TFT_HEIGHT - titleHeight) - 40) / 2);
291
     lv_obj_set_size(filament_bar, 400, 25);
289
     lv_obj_set_size(filament_bar, 400, 25);
292
     lv_bar_set_style(filament_bar, LV_BAR_STYLE_INDIC, &lv_bar_style_indic);
290
     lv_bar_set_style(filament_bar, LV_BAR_STYLE_INDIC, &lv_bar_style_indic);
293
     lv_bar_set_anim_time(filament_bar, 1000);
291
     lv_bar_set_anim_time(filament_bar, 1000);
301
     lv_obj_t *labelCancel = lv_label_create_empty(btnCancel);     // Add a label to the button
299
     lv_obj_t *labelCancel = lv_label_create_empty(btnCancel);     // Add a label to the button
302
 
300
 
303
     if (DIALOG_IS(PAUSE_MESSAGE_OPTION)) {
301
     if (DIALOG_IS(PAUSE_MESSAGE_OPTION)) {
304
-      lv_label_set_text(labelOk, pause_msg_menu.purgeMore);        // Set the labels text
302
+      lv_label_set_text(labelOk, pause_msg_menu.purgeMore);       // Set the labels text
305
       lv_label_set_text(labelCancel, pause_msg_menu.continuePrint);
303
       lv_label_set_text(labelCancel, pause_msg_menu.continuePrint);
306
     }
304
     }
307
     else {
305
     else {
308
-      lv_label_set_text(labelOk, print_file_dialog_menu.confirm);  // Set the labels text
306
+      lv_label_set_text(labelOk, print_file_dialog_menu.confirm); // Set the labels text
309
       lv_label_set_text(labelCancel, print_file_dialog_menu.cancel);
307
       lv_label_set_text(labelCancel, print_file_dialog_menu.cancel);
310
     }
308
     }
311
   }
309
   }

+ 6
- 3
Marlin/src/lcd/extui/mks_ui/draw_fan.cpp View File

44
   ID_F_RETURN
44
   ID_F_RETURN
45
 };
45
 };
46
 
46
 
47
+uint8_t fanPercent = 0;
47
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
48
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
48
   if (event != LV_EVENT_RELEASED) return;
49
   if (event != LV_EVENT_RELEASED) return;
49
-  uint8_t fanPercent = map(thermalManager.fan_speed[0], 0, 255, 0, 100);
50
+  const uint8_t temp = map(thermalManager.fan_speed[0], 0, 255, 0, 100);
51
+  if (abs(fanPercent - temp) > 2) fanPercent = temp;
50
   switch (obj->mks_obj_id) {
52
   switch (obj->mks_obj_id) {
51
     case ID_F_ADD: if (fanPercent < 100) fanPercent++; break;
53
     case ID_F_ADD: if (fanPercent < 100) fanPercent++; break;
52
     case ID_F_DEC: if (fanPercent !=  0) fanPercent--; break;
54
     case ID_F_DEC: if (fanPercent !=  0) fanPercent--; break;
56
     case ID_F_RETURN: clear_cur_ui(); draw_return_ui(); return;
58
     case ID_F_RETURN: clear_cur_ui(); draw_return_ui(); return;
57
   }
59
   }
58
   thermalManager.set_fan_speed(0, map(fanPercent, 0, 100, 0, 255));
60
   thermalManager.set_fan_speed(0, map(fanPercent, 0, 100, 0, 255));
61
+  if (obj->mks_obj_id != ID_F_RETURN) disp_fan_value();
59
 }
62
 }
60
 
63
 
61
 void lv_draw_fan() {
64
 void lv_draw_fan() {
63
 
66
 
64
   scr = lv_screen_create(FAN_UI);
67
   scr = lv_screen_create(FAN_UI);
65
   // Create an Image button
68
   // Create an Image button
66
-  buttonAdd  = lv_big_button_create(scr, "F:/bmp_Add.bin", fan_menu.add, INTERVAL_V, titleHeight, event_handler, ID_F_ADD);
69
+  buttonAdd = lv_big_button_create(scr, "F:/bmp_Add.bin", fan_menu.add, INTERVAL_V, titleHeight, event_handler, ID_F_ADD);
67
   lv_obj_clear_protect(buttonAdd, LV_PROTECT_FOLLOW);
70
   lv_obj_clear_protect(buttonAdd, LV_PROTECT_FOLLOW);
68
   lv_big_button_create(scr, "F:/bmp_Dec.bin", fan_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_F_DEC);
71
   lv_big_button_create(scr, "F:/bmp_Dec.bin", fan_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_F_DEC);
69
   lv_big_button_create(scr, "F:/bmp_speed255.bin", fan_menu.full, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_HIGH);
72
   lv_big_button_create(scr, "F:/bmp_speed255.bin", fan_menu.full, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_F_HIGH);
78
 
81
 
79
 void disp_fan_value() {
82
 void disp_fan_value() {
80
   #if HAS_FAN
83
   #if HAS_FAN
81
-    sprintf_P(public_buf_l, PSTR("%s: %3d%%"), fan_menu.state, (int)map(thermalManager.fan_speed[0], 0, 255, 0, 100));
84
+    sprintf_P(public_buf_l, PSTR("%s: %3d%%"), fan_menu.state, fanPercent);
82
   #else
85
   #else
83
     sprintf_P(public_buf_l, PSTR("%s: ---"), fan_menu.state);
86
     sprintf_P(public_buf_l, PSTR("%s: ---"), fan_menu.state);
84
   #endif
87
   #endif

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

52
     case ID_FILAMNT_IN:
52
     case ID_FILAMNT_IN:
53
       uiCfg.filament_load_heat_flg = true;
53
       uiCfg.filament_load_heat_flg = true;
54
       if (ABS(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
54
       if (ABS(thermalManager.degTargetHotend(uiCfg.extruderIndex) - thermalManager.wholeDegHotend(uiCfg.extruderIndex)) <= 1
55
-          || gCfgItems.filament_limit_temp <= thermalManager.wholeDegHotend(uiCfg.extruderIndex)) {
55
+        || gCfgItems.filament_limit_temp <= thermalManager.wholeDegHotend(uiCfg.extruderIndex)
56
+      ) {
56
         lv_clear_filament_change();
57
         lv_clear_filament_change();
57
         lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_LOAD_COMPLETED);
58
         lv_draw_dialog(DIALOG_TYPE_FILAMENT_HEAT_LOAD_COMPLETED);
58
       }
59
       }
115
 
116
 
116
   buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_TYPE);
117
   buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_TYPE);
117
   #if HAS_ROTARY_ENCODER
118
   #if HAS_ROTARY_ENCODER
118
-    if (gCfgItems.encoder_enable) {
119
+    if (gCfgItems.encoder_enable)
119
       lv_group_add_obj(g, buttonType);
120
       lv_group_add_obj(g, buttonType);
120
-    }
121
   #endif
121
   #endif
122
 
122
 
123
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_RETURN);
123
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_FILAMNT_RETURN);

+ 7
- 7
Marlin/src/lcd/extui/mks_ui/draw_gcode.cpp View File

30
 #include "../../../inc/MarlinConfig.h"
30
 #include "../../../inc/MarlinConfig.h"
31
 
31
 
32
 extern lv_group_t *g;
32
 extern lv_group_t *g;
33
-static lv_obj_t *scr,*outL,*outV = 0;
33
+static lv_obj_t *scr, *outL, *outV = 0;
34
 static int currentWritePos = 0;
34
 static int currentWritePos = 0;
35
 extern uint8_t public_buf[513];
35
 extern uint8_t public_buf[513];
36
 extern "C" { extern char public_buf_m[100]; }
36
 extern "C" { extern char public_buf_m[100]; }
59
   if (!memcmp(txt, "echo:", 5)) {
59
   if (!memcmp(txt, "echo:", 5)) {
60
     public_buf[0] = 0; // Clear output buffer
60
     public_buf[0] = 0; // Clear output buffer
61
     return;
61
     return;
62
-   }
62
+  }
63
 
63
 
64
   // Avoid overflow if the answer is too large
64
   // Avoid overflow if the answer is too large
65
   size_t len = strlen((const char*)public_buf), tlen = strlen(txt);
65
   size_t len = strlen((const char*)public_buf), tlen = strlen(txt);
69
   }
69
   }
70
 }
70
 }
71
 
71
 
72
-void lv_serial_capt_hook(void * userPointer, uint8_t c)
73
-{
72
+void lv_serial_capt_hook(void * userPointer, uint8_t c) {
74
   if (c == '\n' || currentWritePos == sizeof(public_buf_m) - 1) { // End of line, probably end of command anyway
73
   if (c == '\n' || currentWritePos == sizeof(public_buf_m) - 1) { // End of line, probably end of command anyway
75
     public_buf_m[currentWritePos] = 0;
74
     public_buf_m[currentWritePos] = 0;
76
     lv_show_gcode_output(userPointer, public_buf_m);
75
     lv_show_gcode_output(userPointer, public_buf_m);
77
     currentWritePos = 0;
76
     currentWritePos = 0;
78
   }
77
   }
79
-  else public_buf_m[currentWritePos++] = c;
78
+  else
79
+    public_buf_m[currentWritePos++] = c;
80
 }
80
 }
81
-void lv_eom_hook(void *)
82
-{
81
+
82
+void lv_eom_hook(void *) {
83
   // Message is done, let's remove the hook now
83
   // Message is done, let's remove the hook now
84
   MYSERIAL1.setHook();
84
   MYSERIAL1.setHook();
85
   // We are back from the keyboard, so let's redraw ourselves
85
   // We are back from the keyboard, so let's redraw ourselves

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

67
       break;
67
       break;
68
     #if Z2_SENSORLESS
68
     #if Z2_SENSORLESS
69
       case ID_SENSITIVITY_Z2:
69
       case ID_SENSITIVITY_Z2:
70
-      value = z2_sensitivity;
71
-      lv_clear_homing_sensitivity_settings();
72
-      lv_draw_number_key();
73
-      break;
70
+        value = z2_sensitivity;
71
+        lv_clear_homing_sensitivity_settings();
72
+        lv_draw_number_key();
73
+        break;
74
     #endif
74
     #endif
75
   }
75
   }
76
 }
76
 }

+ 34
- 34
Marlin/src/lcd/extui/mks_ui/draw_keyboard.cpp View File

41
                                    LV_SYMBOL_CLOSE, LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""};
41
                                    LV_SYMBOL_CLOSE, LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""};
42
 
42
 
43
 static const lv_btnm_ctrl_t kb_ctrl_lc_map[] = {
43
 static const lv_btnm_ctrl_t kb_ctrl_lc_map[] = {
44
-    LV_KB_CTRL_BTN_FLAGS | 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7,
45
-    LV_KB_CTRL_BTN_FLAGS | 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7,
46
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
47
-    LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
44
+  LV_KB_CTRL_BTN_FLAGS | 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7,
45
+  LV_KB_CTRL_BTN_FLAGS | 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7,
46
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
47
+  LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
48
 
48
 
49
 static const char * kb_map_uc[] = {"1#", "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", LV_SYMBOL_BACKSPACE, "\n",
49
 static const char * kb_map_uc[] = {"1#", "Q", "W", "E", "R", "T", "Y", "U", "I", "O", "P", LV_SYMBOL_BACKSPACE, "\n",
50
                                    "abc", "A", "S", "D", "F", "G", "H", "J", "K", "L", LV_SYMBOL_NEW_LINE, "\n",
50
                                    "abc", "A", "S", "D", "F", "G", "H", "J", "K", "L", LV_SYMBOL_NEW_LINE, "\n",
52
                                    LV_SYMBOL_CLOSE, LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""};
52
                                    LV_SYMBOL_CLOSE, LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""};
53
 
53
 
54
 static const lv_btnm_ctrl_t kb_ctrl_uc_map[] = {
54
 static const lv_btnm_ctrl_t kb_ctrl_uc_map[] = {
55
-    LV_KB_CTRL_BTN_FLAGS | 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7,
56
-    LV_KB_CTRL_BTN_FLAGS | 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7,
57
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
58
-    LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
55
+  LV_KB_CTRL_BTN_FLAGS | 5, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 7,
56
+  LV_KB_CTRL_BTN_FLAGS | 6, 3, 3, 3, 3, 3, 3, 3, 3, 3, 7,
57
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
58
+  LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
59
 
59
 
60
-static const char * kb_map_spec[] = {"0", "1", "2", "3", "4" ,"5", "6", "7", "8", "9", ".", LV_SYMBOL_BACKSPACE, "\n",
60
+static const char * kb_map_spec[] = {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", ".", LV_SYMBOL_BACKSPACE, "\n",
61
                                      "abc", "+", "-", "/", "*", "=", "%", "!", "?", "#", "<", ">", "\n",
61
                                      "abc", "+", "-", "/", "*", "=", "%", "!", "?", "#", "<", ">", "\n",
62
                                      "\\",  "@", "$", "(", ")", "{", "}", "[", "]", ";", "\"", "'", "\n",
62
                                      "\\",  "@", "$", "(", ")", "{", "}", "[", "]", ";", "\"", "'", "\n",
63
                                      LV_SYMBOL_CLOSE, LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""};
63
                                      LV_SYMBOL_CLOSE, LV_SYMBOL_LEFT, " ", LV_SYMBOL_RIGHT, LV_SYMBOL_OK, ""};
64
 
64
 
65
 static const lv_btnm_ctrl_t kb_ctrl_spec_map[] = {
65
 static const lv_btnm_ctrl_t kb_ctrl_spec_map[] = {
66
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
67
-    LV_KB_CTRL_BTN_FLAGS | 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
68
-    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
69
-    LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
66
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
67
+  LV_KB_CTRL_BTN_FLAGS | 2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
68
+  1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
69
+  LV_KB_CTRL_BTN_FLAGS | 2, 2, 6, 2, LV_KB_CTRL_BTN_FLAGS | 2};
70
 
70
 
71
 static const lv_btnm_ctrl_t kb_ctrl_num_map[] = {
71
 static const lv_btnm_ctrl_t kb_ctrl_num_map[] = {
72
-        1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
73
-        1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
74
-        1, 1, 1, 2,
75
-        1, 1, 1, 1, 1};
72
+  1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
73
+  1, 1, 1, LV_KB_CTRL_BTN_FLAGS | 2,
74
+  1, 1, 1, 2,
75
+  1, 1, 1, 1, 1
76
+};
76
 
77
 
77
 static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
78
 static void lv_kb_event_cb(lv_obj_t *kb, lv_event_t event) {
78
   if (event != LV_EVENT_VALUE_CHANGED) return;
79
   if (event != LV_EVENT_VALUE_CHANGED) return;
79
 
80
 
80
-  lv_kb_ext_t * ext = (lv_kb_ext_t * )lv_obj_get_ext_attr(kb);
81
+  lv_kb_ext_t *ext = (lv_kb_ext_t*)lv_obj_get_ext_attr(kb);
81
   const uint16_t btn_id = lv_btnm_get_active_btn(kb);
82
   const uint16_t btn_id = lv_btnm_get_active_btn(kb);
82
   if (btn_id == LV_BTNM_BTN_NONE) return;
83
   if (btn_id == LV_BTNM_BTN_NONE) return;
83
   if (lv_btnm_get_btn_ctrl(kb, btn_id, LV_BTNM_CTRL_HIDDEN | LV_BTNM_CTRL_INACTIVE)) return;
84
   if (lv_btnm_get_btn_ctrl(kb, btn_id, LV_BTNM_CTRL_HIDDEN | LV_BTNM_CTRL_INACTIVE)) return;
120
       switch (keyboard_value) {
121
       switch (keyboard_value) {
121
         #if ENABLED(MKS_WIFI_MODULE)
122
         #if ENABLED(MKS_WIFI_MODULE)
122
           case wifiName:
123
           case wifiName:
123
-            memcpy(uiCfg.wifi_name,ret_ta_txt,sizeof(uiCfg.wifi_name));
124
+            memcpy(uiCfg.wifi_name, ret_ta_txt, sizeof(uiCfg.wifi_name));
124
             lv_clear_keyboard();
125
             lv_clear_keyboard();
125
             draw_return_ui();
126
             draw_return_ui();
126
             break;
127
             break;
127
           case wifiPassWord:
128
           case wifiPassWord:
128
-            memcpy(uiCfg.wifi_key,ret_ta_txt,sizeof(uiCfg.wifi_name));
129
+            memcpy(uiCfg.wifi_key, ret_ta_txt, sizeof(uiCfg.wifi_name));
129
             lv_clear_keyboard();
130
             lv_clear_keyboard();
130
             draw_return_ui();
131
             draw_return_ui();
131
             break;
132
             break;
157
         #endif // MKS_WIFI_MODULE
158
         #endif // MKS_WIFI_MODULE
158
         case autoLevelGcodeCommand:
159
         case autoLevelGcodeCommand:
159
           uint8_t buf[100];
160
           uint8_t buf[100];
160
-          strncpy((char *)buf,ret_ta_txt,sizeof(buf));
161
-          update_gcode_command(AUTO_LEVELING_COMMAND_ADDR,buf);
161
+          strncpy((char *)buf, ret_ta_txt, sizeof(buf));
162
+          update_gcode_command(AUTO_LEVELING_COMMAND_ADDR, buf);
162
           lv_clear_keyboard();
163
           lv_clear_keyboard();
163
           draw_return_ui();
164
           draw_return_ui();
164
           break;
165
           break;
176
     }
177
     }
177
     else
178
     else
178
       lv_kb_set_ta(kb, nullptr); // De-assign the text area to hide it cursor if needed
179
       lv_kb_set_ta(kb, nullptr); // De-assign the text area to hide it cursor if needed
179
-  return;
180
+    return;
180
   }
181
   }
181
 
182
 
182
   // Add the characters to the text area if set
183
   // Add the characters to the text area if set
223
   static lv_style_t rel_style, pr_style;
224
   static lv_style_t rel_style, pr_style;
224
 
225
 
225
   lv_style_copy(&rel_style, &lv_style_btn_rel);
226
   lv_style_copy(&rel_style, &lv_style_btn_rel);
226
-  rel_style.body.radius = 0;
227
+  rel_style.body.radius       = 0;
227
   rel_style.body.border.width = 1;
228
   rel_style.body.border.width = 1;
228
-  rel_style.body.main_color = lv_color_make(0xA9, 0x62, 0x1D);
229
-  rel_style.body.grad_color = lv_color_make(0xA7, 0x59, 0x0E);
229
+  rel_style.body.main_color   = lv_color_make(0xA9, 0x62, 0x1D);
230
+  rel_style.body.grad_color   = lv_color_make(0xA7, 0x59, 0x0E);
230
 
231
 
231
   lv_style_copy(&pr_style, &lv_style_btn_pr);
232
   lv_style_copy(&pr_style, &lv_style_btn_pr);
232
-  pr_style.body.radius = 0;
233
+  pr_style.body.radius       = 0;
233
   pr_style.body.border.width = 1;
234
   pr_style.body.border.width = 1;
234
-  pr_style.body.main_color = lv_color_make(0x72, 0x42, 0x15);
235
-  pr_style.body.grad_color = lv_color_make(0x6A, 0x3A, 0x0C);
235
+  pr_style.body.main_color   = lv_color_make(0x72, 0x42, 0x15);
236
+  pr_style.body.grad_color   = lv_color_make(0x6A, 0x3A, 0x0C);
236
 
237
 
237
   // Create a keyboard and apply the styles
238
   // Create a keyboard and apply the styles
238
   lv_obj_t *kb = lv_kb_create(scr, nullptr);
239
   lv_obj_t *kb = lv_kb_create(scr, nullptr);
251
   lv_obj_align(ta, nullptr, LV_ALIGN_IN_TOP_MID, 0, 10);
252
   lv_obj_align(ta, nullptr, LV_ALIGN_IN_TOP_MID, 0, 10);
252
   switch (keyboard_value) {
253
   switch (keyboard_value) {
253
     case autoLevelGcodeCommand:
254
     case autoLevelGcodeCommand:
254
-    get_gcode_command(AUTO_LEVELING_COMMAND_ADDR,(uint8_t *)public_buf_m);
255
-    public_buf_m[sizeof(public_buf_m)-1] = 0;
256
-    lv_ta_set_text(ta, public_buf_m);
255
+      get_gcode_command(AUTO_LEVELING_COMMAND_ADDR, (uint8_t *)public_buf_m);
256
+      public_buf_m[sizeof(public_buf_m) - 1] = '\0';
257
+      lv_ta_set_text(ta, public_buf_m);
257
       break;
258
       break;
258
     case GCodeCommand:
259
     case GCodeCommand:
259
       // Start with uppercase by default
260
       // Start with uppercase by default
261
       lv_btnm_set_ctrl_map(kb, kb_ctrl_uc_map);
262
       lv_btnm_set_ctrl_map(kb, kb_ctrl_uc_map);
262
       // Fallthrough
263
       // Fallthrough
263
     default:
264
     default:
264
-    lv_ta_set_text(ta, "");
265
+      lv_ta_set_text(ta, "");
265
   }
266
   }
266
 
267
 
267
   // Assign the text area to the keyboard
268
   // Assign the text area to the keyboard
272
   lv_obj_del(scr);
273
   lv_obj_del(scr);
273
 }
274
 }
274
 
275
 
275
-
276
 #endif  // HAS_TFT_LVGL_UI
276
 #endif  // HAS_TFT_LVGL_UI

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/draw_more.h View File

22
 #pragma once
22
 #pragma once
23
 
23
 
24
 #ifdef __cplusplus
24
 #ifdef __cplusplus
25
-extern "C" { /* C-declarations for C++ */
25
+  extern "C" { /* C-declarations for C++ */
26
 #endif
26
 #endif
27
 
27
 
28
 void lv_draw_more();
28
 void lv_draw_more();

+ 61
- 26
Marlin/src/lcd/extui/mks_ui/draw_preHeat.cpp View File

32
 
32
 
33
 static lv_obj_t *scr;
33
 static lv_obj_t *scr;
34
 extern lv_group_t*  g;
34
 extern lv_group_t*  g;
35
-static lv_obj_t *buttonType, *buttonStep;
35
+static lv_obj_t *buttonType, *buttonStep, *buttonAdd, *buttonDec;
36
 static lv_obj_t *labelType;
36
 static lv_obj_t *labelType;
37
 static lv_obj_t *labelStep;
37
 static lv_obj_t *labelStep;
38
 static lv_obj_t *tempText1;
38
 static lv_obj_t *tempText1;
39
+static lv_obj_t *btn_pla;
40
+static lv_obj_t *btn_abs;
41
+static lv_obj_t *label_abs;
42
+static lv_obj_t *label_pla;
43
+
44
+static lv_style_t btn_style_pre;
45
+static lv_style_t btn_style_rel;
39
 
46
 
40
 enum {
47
 enum {
41
   ID_P_ADD = 1,
48
   ID_P_ADD = 1,
43
   ID_P_TYPE,
50
   ID_P_TYPE,
44
   ID_P_STEP,
51
   ID_P_STEP,
45
   ID_P_OFF,
52
   ID_P_OFF,
46
-  ID_P_RETURN
53
+  ID_P_RETURN,
54
+  ID_P_ABS,
55
+  ID_P_PLA
47
 };
56
 };
48
 
57
 
49
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
58
 static void event_handler(lv_obj_t *obj, lv_event_t event) {
55
         thermalManager.temp_hotend[uiCfg.extruderIndex].target += uiCfg.stepHeat;
64
         thermalManager.temp_hotend[uiCfg.extruderIndex].target += uiCfg.stepHeat;
56
         if (uiCfg.extruderIndex == 0)
65
         if (uiCfg.extruderIndex == 0)
57
           max_target = HEATER_0_MAXTEMP - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1);
66
           max_target = HEATER_0_MAXTEMP - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1);
58
-        #if HAS_MULTI_HOTEND
59
-          else
67
+        else {
68
+          #if HAS_MULTI_HOTEND
60
             max_target = HEATER_1_MAXTEMP - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1);
69
             max_target = HEATER_1_MAXTEMP - (WATCH_TEMP_INCREASE + TEMP_HYSTERESIS + 1);
61
-        #endif
70
+          #endif
71
+        }
62
         if (thermalManager.degTargetHotend(uiCfg.extruderIndex) > max_target)
72
         if (thermalManager.degTargetHotend(uiCfg.extruderIndex) > max_target)
63
           thermalManager.setTargetHotend(max_target, uiCfg.extruderIndex);
73
           thermalManager.setTargetHotend(max_target, uiCfg.extruderIndex);
64
         thermalManager.start_watching_hotend(uiCfg.extruderIndex);
74
         thermalManager.start_watching_hotend(uiCfg.extruderIndex);
83
           thermalManager.setTargetHotend(0, uiCfg.extruderIndex);
93
           thermalManager.setTargetHotend(0, uiCfg.extruderIndex);
84
         thermalManager.start_watching_hotend(uiCfg.extruderIndex);
94
         thermalManager.start_watching_hotend(uiCfg.extruderIndex);
85
       }
95
       }
86
-      #if HAS_HEATED_BED
87
-        else {
96
+      else {
97
+        #if HAS_HEATED_BED
88
           if (thermalManager.degTargetBed() > uiCfg.stepHeat)
98
           if (thermalManager.degTargetBed() > uiCfg.stepHeat)
89
             thermalManager.temp_bed.target -= uiCfg.stepHeat;
99
             thermalManager.temp_bed.target -= uiCfg.stepHeat;
90
           else
100
           else
91
             thermalManager.setTargetBed(0);
101
             thermalManager.setTargetBed(0);
92
 
102
 
93
           thermalManager.start_watching_bed();
103
           thermalManager.start_watching_bed();
94
-        }
95
-      #endif
104
+        #endif
105
+      }
96
       disp_desire_temp();
106
       disp_desire_temp();
97
       break;
107
       break;
98
     case ID_P_TYPE:
108
     case ID_P_TYPE:
102
             uiCfg.extruderIndex = 1;
112
             uiCfg.extruderIndex = 1;
103
           }
113
           }
104
           else if (uiCfg.extruderIndex == 1) {
114
           else if (uiCfg.extruderIndex == 1) {
105
-            if (TEMP_SENSOR_BED != 0) {
115
+            if (ENABLED(HAS_HEATED_BED)) {
106
               uiCfg.curTempType = 1;
116
               uiCfg.curTempType = 1;
107
             }
117
             }
108
             else {
118
             else {
109
-              uiCfg.curTempType      = 0;
119
+              uiCfg.curTempType = 0;
110
               uiCfg.extruderIndex = 0;
120
               uiCfg.extruderIndex = 0;
111
             }
121
             }
112
           }
122
           }
113
         }
123
         }
114
         else if (uiCfg.extruderIndex == 0) {
124
         else if (uiCfg.extruderIndex == 0) {
115
-          if (TEMP_SENSOR_BED != 0)
116
-            uiCfg.curTempType = 1;
117
-          else
118
-            uiCfg.curTempType = 0;
125
+          uiCfg.curTempType = TERN(HAS_HEATED_BED, 1, 0);
119
         }
126
         }
120
       }
127
       }
121
       else if (uiCfg.curTempType == 1) {
128
       else if (uiCfg.curTempType == 1) {
122
         uiCfg.extruderIndex = 0;
129
         uiCfg.extruderIndex = 0;
123
-        uiCfg.curTempType      = 0;
130
+        uiCfg.curTempType = 0;
131
+        disp_add_dec();
132
+        disp_ext_heart();
124
       }
133
       }
125
       disp_temp_type();
134
       disp_temp_type();
126
       break;
135
       break;
138
         thermalManager.setTargetHotend(0, uiCfg.extruderIndex);
147
         thermalManager.setTargetHotend(0, uiCfg.extruderIndex);
139
         thermalManager.start_watching_hotend(uiCfg.extruderIndex);
148
         thermalManager.start_watching_hotend(uiCfg.extruderIndex);
140
       }
149
       }
141
-      #if HAS_HEATED_BED
142
-        else {
150
+      else {
151
+        #if HAS_HEATED_BED
143
           thermalManager.temp_bed.target = 0;
152
           thermalManager.temp_bed.target = 0;
144
           thermalManager.start_watching_bed();
153
           thermalManager.start_watching_bed();
145
-        }
146
-      #endif
154
+        #endif
155
+      }
147
       disp_desire_temp();
156
       disp_desire_temp();
148
       break;
157
       break;
149
     case ID_P_RETURN:
158
     case ID_P_RETURN:
150
       clear_cur_ui();
159
       clear_cur_ui();
151
       draw_return_ui();
160
       draw_return_ui();
152
       break;
161
       break;
162
+    case ID_P_ABS:
163
+      thermalManager.setTargetHotend(PREHEAT_2_TEMP_HOTEND, 0);
164
+      break;
165
+    case ID_P_PLA:
166
+      thermalManager.setTargetHotend(PREHEAT_1_TEMP_HOTEND, 0);
167
+      break;
153
   }
168
   }
154
 }
169
 }
155
 
170
 
171
+void disp_add_dec() {
172
+  // Create image buttons
173
+  buttonAdd = lv_big_button_create(scr, "F:/bmp_Add.bin", preheat_menu.add, INTERVAL_V, titleHeight, event_handler, ID_P_ADD);
174
+  buttonDec = lv_big_button_create(scr, "F:/bmp_Dec.bin", preheat_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_P_DEC);
175
+}
176
+
156
 void lv_draw_preHeat() {
177
 void lv_draw_preHeat() {
157
   scr = lv_screen_create(PRE_HEAT_UI);
178
   scr = lv_screen_create(PRE_HEAT_UI);
158
 
179
 
159
   // Create image buttons
180
   // Create image buttons
160
-  lv_big_button_create(scr, "F:/bmp_Add.bin", preheat_menu.add, INTERVAL_V, titleHeight, event_handler, ID_P_ADD);
161
-  lv_big_button_create(scr, "F:/bmp_Dec.bin", preheat_menu.dec, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_P_DEC);
181
+  disp_add_dec();
162
 
182
 
163
   buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_TYPE);
183
   buttonType = lv_imgbtn_create(scr, nullptr, INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_TYPE);
164
   buttonStep = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_STEP);
184
   buttonStep = lv_imgbtn_create(scr, nullptr, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_P_STEP);
185
+
186
+  if (uiCfg.curTempType == 0) disp_ext_heart();
187
+
165
   #if HAS_ROTARY_ENCODER
188
   #if HAS_ROTARY_ENCODER
166
     if (gCfgItems.encoder_enable) {
189
     if (gCfgItems.encoder_enable) {
167
       lv_group_add_obj(g, buttonType);
190
       lv_group_add_obj(g, buttonType);
184
   disp_desire_temp();
207
   disp_desire_temp();
185
 }
208
 }
186
 
209
 
210
+void disp_ext_heart() {
211
+  btn_abs = lv_btn_create(scr, 160, 40, 80, 40, event_handler, ID_P_ABS);
212
+  btn_pla = lv_btn_create(scr, 260, 40, 80, 40, event_handler, ID_P_PLA);
213
+
214
+  lv_btn_set_style(btn_abs, LV_BTN_STYLE_PR, &btn_style_pre);
215
+  lv_btn_set_style(btn_abs, LV_BTN_STYLE_REL, &btn_style_rel);
216
+  lv_btn_set_style(btn_pla, LV_BTN_STYLE_PR, &btn_style_pre);
217
+  lv_btn_set_style(btn_pla, LV_BTN_STYLE_REL, &btn_style_rel);
218
+
219
+  label_abs = lv_label_create(btn_abs, PREHEAT_2_LABEL);
220
+  label_pla = lv_label_create(btn_pla, PREHEAT_1_LABEL);
221
+}
222
+
187
 void disp_temp_type() {
223
 void disp_temp_type() {
188
   if (uiCfg.curTempType == 0) {
224
   if (uiCfg.curTempType == 0) {
189
     if (uiCfg.extruderIndex == 1) {
225
     if (uiCfg.extruderIndex == 1) {
190
-    lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru2.bin");
226
+      lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru2.bin");
191
       if (gCfgItems.multiple_language) {
227
       if (gCfgItems.multiple_language) {
192
         lv_label_set_text(labelType, preheat_menu.ext2);
228
         lv_label_set_text(labelType, preheat_menu.ext2);
193
         lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
229
         lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
194
       }
230
       }
195
     }
231
     }
196
     else {
232
     else {
197
-    lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru1.bin");
233
+      lv_imgbtn_set_src_both(buttonType, "F:/bmp_extru1.bin");
198
       if (gCfgItems.multiple_language) {
234
       if (gCfgItems.multiple_language) {
199
         lv_label_set_text(labelType, preheat_menu.ext1);
235
         lv_label_set_text(labelType, preheat_menu.ext1);
200
         lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
236
         lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
201
       }
237
       }
202
     }
238
     }
203
-
204
   }
239
   }
205
   else {
240
   else {
206
-  lv_imgbtn_set_src_both(buttonType, "F:/bmp_bed.bin");
241
+    lv_imgbtn_set_src_both(buttonType, "F:/bmp_bed.bin");
207
     if (gCfgItems.multiple_language) {
242
     if (gCfgItems.multiple_language) {
208
       lv_label_set_text(labelType, preheat_menu.hotbed);
243
       lv_label_set_text(labelType, preheat_menu.hotbed);
209
       lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);
244
       lv_obj_align(labelType, buttonType, LV_ALIGN_IN_BOTTOM_MID, 0, BUTTON_TEXT_Y_OFFSET);

+ 2
- 0
Marlin/src/lcd/extui/mks_ui/draw_preHeat.h View File

30
 void disp_temp_type();
30
 void disp_temp_type();
31
 void disp_step_heat();
31
 void disp_step_heat();
32
 void disp_desire_temp();
32
 void disp_desire_temp();
33
+void disp_ext_heart();
34
+void disp_add_dec();
33
 
35
 
34
 #ifdef __cplusplus
36
 #ifdef __cplusplus
35
   } /* C-declarations for C++ */
37
   } /* C-declarations for C++ */

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

160
 
160
 
161
   buttonZpos = lv_imgbtn_create(scr, "F:/bmp_zpos_state.bin", 350, 86, event_handler, ID_BABYSTEP);
161
   buttonZpos = lv_imgbtn_create(scr, "F:/bmp_zpos_state.bin", 350, 86, event_handler, ID_BABYSTEP);
162
 
162
 
163
-  buttonPause = lv_imgbtn_create(scr, uiCfg.print_state == WORKING ? "F:/bmp_pause.bin" : "F:/bmp_resume.bin", 5, 240, event_handler, ID_PAUSE);
164
-  buttonStop = lv_imgbtn_create(scr, "F:/bmp_stop.bin", 165, 240, event_handler, ID_STOP);
163
+  buttonPause  = lv_imgbtn_create(scr, uiCfg.print_state == WORKING ? "F:/bmp_pause.bin" : "F:/bmp_resume.bin", 5, 240, event_handler, ID_PAUSE);
164
+  buttonStop   = lv_imgbtn_create(scr, "F:/bmp_stop.bin", 165, 240, event_handler, ID_STOP);
165
   buttonOperat = lv_imgbtn_create(scr, "F:/bmp_operate.bin", 325, 240, event_handler, ID_OPTION);
165
   buttonOperat = lv_imgbtn_create(scr, "F:/bmp_operate.bin", 325, 240, event_handler, ID_OPTION);
166
 
166
 
167
   #if HAS_ROTARY_ENCODER
167
   #if HAS_ROTARY_ENCODER
185
     labelBed = lv_label_create(scr, 250, 196, nullptr);
185
     labelBed = lv_label_create(scr, 250, 196, nullptr);
186
   #endif
186
   #endif
187
 
187
 
188
-  labelFan = lv_label_create(scr, 395, 196, nullptr);
188
+  labelFan  = lv_label_create(scr, 395, 196, nullptr);
189
   labelTime = lv_label_create(scr, 250, 96, nullptr);
189
   labelTime = lv_label_create(scr, 250, 96, nullptr);
190
   labelZpos = lv_label_create(scr, 395, 96, nullptr);
190
   labelZpos = lv_label_create(scr, 395, 96, nullptr);
191
 
191
 
210
   lv_bar_set_style(bar1, LV_BAR_STYLE_INDIC, &lv_bar_style_indic);
210
   lv_bar_set_style(bar1, LV_BAR_STYLE_INDIC, &lv_bar_style_indic);
211
   lv_bar_set_anim_time(bar1, 1000);
211
   lv_bar_set_anim_time(bar1, 1000);
212
   lv_bar_set_value(bar1, 0, LV_ANIM_ON);
212
   lv_bar_set_value(bar1, 0, LV_ANIM_ON);
213
-  bar1ValueText  = lv_label_create_empty(bar1);
214
-  lv_label_set_text(bar1ValueText,"0%");
213
+  bar1ValueText = lv_label_create_empty(bar1);
214
+  lv_label_set_text(bar1ValueText, "0%");
215
   lv_obj_align(bar1ValueText, bar1, LV_ALIGN_CENTER, 0, 0);
215
   lv_obj_align(bar1ValueText, bar1, LV_ALIGN_CENTER, 0, 0);
216
 
216
 
217
   disp_ext_temp();
217
   disp_ext_temp();
291
   if (disp_state == PRINTING_UI) {
291
   if (disp_state == PRINTING_UI) {
292
     lv_bar_set_value(bar1, rate, LV_ANIM_ON);
292
     lv_bar_set_value(bar1, rate, LV_ANIM_ON);
293
     sprintf_P(public_buf_l, "%d%%", rate);
293
     sprintf_P(public_buf_l, "%d%%", rate);
294
-    lv_label_set_text(bar1ValueText,public_buf_l);
294
+    lv_label_set_text(bar1ValueText, public_buf_l);
295
     lv_obj_align(bar1ValueText, bar1, LV_ALIGN_CENTER, 0, 0);
295
     lv_obj_align(bar1ValueText, bar1, LV_ALIGN_CENTER, 0, 0);
296
 
296
 
297
     if (marlin_state == MF_SD_COMPLETE) {
297
     if (marlin_state == MF_SD_COMPLETE) {

+ 10
- 10
Marlin/src/lcd/extui/mks_ui/draw_ready_print.cpp View File

43
 #include "mks_hardware.h"
43
 #include "mks_hardware.h"
44
 #include <stdio.h>
44
 #include <stdio.h>
45
 
45
 
46
-#define ICON_POS_Y          38
46
+#define ICON_POS_Y          260
47
 #define TARGET_LABEL_MOD_Y -36
47
 #define TARGET_LABEL_MOD_Y -36
48
 #define LABEL_MOD_Y         30
48
 #define LABEL_MOD_Y         30
49
 
49
 
183
     lv_label_set_text(det_info, " ");
183
     lv_label_set_text(det_info, " ");
184
   }
184
   }
185
   else {
185
   else {
186
-    lv_big_button_create(scr, "F:/bmp_tool.bin", main_menu.tool, 20, 150, event_handler, ID_TOOL);
187
-    lv_big_button_create(scr, "F:/bmp_set.bin", main_menu.set, 180, 150, event_handler, ID_SET);
188
-    lv_big_button_create(scr, "F:/bmp_printing.bin", main_menu.print, 340, 150, event_handler, ID_PRINT);
186
+    lv_big_button_create(scr, "F:/bmp_tool.bin", main_menu.tool, 20, 90, event_handler, ID_TOOL);
187
+    lv_big_button_create(scr, "F:/bmp_set.bin", main_menu.set, 180, 90, event_handler, ID_SET);
188
+    lv_big_button_create(scr, "F:/bmp_printing.bin", main_menu.print, 340, 90, event_handler, ID_PRINT);
189
 
189
 
190
     // Monitoring
190
     // Monitoring
191
     #if HAS_HOTEND
191
     #if HAS_HOTEND
192
-      buttonExt1 = lv_big_button_create(scr, "F:/bmp_ext1_state.bin", " ", 55, ICON_POS_Y, event_handler, ID_INFO_EXT);
192
+      buttonExt1 = lv_big_button_create(scr, "F:/bmp_ext1_state.bin", " ", 20, ICON_POS_Y, event_handler, ID_INFO_EXT);
193
     #endif
193
     #endif
194
     #if HAS_MULTI_HOTEND
194
     #if HAS_MULTI_HOTEND
195
-      buttonExt2 = lv_big_button_create(scr, "F:/bmp_ext2_state.bin", " ", 163, ICON_POS_Y, event_handler, ID_INFO_EXT);
195
+      buttonExt2 = lv_big_button_create(scr, "F:/bmp_ext2_state.bin", " ", 180, ICON_POS_Y, event_handler, ID_INFO_EXT);
196
     #endif
196
     #endif
197
     #if HAS_HEATED_BED
197
     #if HAS_HEATED_BED
198
       buttonBedstate = lv_big_button_create(scr, "F:/bmp_bed_state.bin", " ", TERN(HAS_MULTI_HOTEND, 271, 210), ICON_POS_Y, event_handler, ID_INFO_BED);
198
       buttonBedstate = lv_big_button_create(scr, "F:/bmp_bed_state.bin", " ", TERN(HAS_MULTI_HOTEND, 271, 210), ICON_POS_Y, event_handler, ID_INFO_BED);
219
   #if HAS_HOTEND
219
   #if HAS_HOTEND
220
     sprintf(public_buf_l, printing_menu.temp1, thermalManager.wholeDegHotend(0), thermalManager.degTargetHotend(0));
220
     sprintf(public_buf_l, printing_menu.temp1, thermalManager.wholeDegHotend(0), thermalManager.degTargetHotend(0));
221
     lv_label_set_text(labelExt1, public_buf_l);
221
     lv_label_set_text(labelExt1, public_buf_l);
222
-    lv_obj_align(labelExt1, buttonExt1, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
222
+    lv_obj_align(labelExt1, buttonExt1, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
223
   #endif
223
   #endif
224
   #if HAS_MULTI_HOTEND
224
   #if HAS_MULTI_HOTEND
225
     sprintf(public_buf_l, printing_menu.temp1, thermalManager.wholeDegHotend(1), thermalManager.degTargetHotend(1));
225
     sprintf(public_buf_l, printing_menu.temp1, thermalManager.wholeDegHotend(1), thermalManager.degTargetHotend(1));
226
     lv_label_set_text(labelExt2, public_buf_l);
226
     lv_label_set_text(labelExt2, public_buf_l);
227
-    lv_obj_align(labelExt2, buttonExt2, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
227
+    lv_obj_align(labelExt2, buttonExt2, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
228
   #endif
228
   #endif
229
   #if HAS_HEATED_BED
229
   #if HAS_HEATED_BED
230
     sprintf(public_buf_l, printing_menu.bed_temp, thermalManager.wholeDegBed(), thermalManager.degTargetBed());
230
     sprintf(public_buf_l, printing_menu.bed_temp, thermalManager.wholeDegBed(), thermalManager.degTargetBed());
231
     lv_label_set_text(labelBed, public_buf_l);
231
     lv_label_set_text(labelBed, public_buf_l);
232
-    lv_obj_align(labelBed, buttonBedstate, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
232
+    lv_obj_align(labelBed, buttonBedstate, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
233
   #endif
233
   #endif
234
   #if HAS_FAN
234
   #if HAS_FAN
235
     sprintf_P(public_buf_l, PSTR("%d%%"), (int)thermalManager.fanSpeedPercent(0));
235
     sprintf_P(public_buf_l, PSTR("%d%%"), (int)thermalManager.fanSpeedPercent(0));
236
     lv_label_set_text(labelFan, public_buf_l);
236
     lv_label_set_text(labelFan, public_buf_l);
237
-    lv_obj_align(labelFan, buttonFanstate, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
237
+    lv_obj_align(labelFan, buttonFanstate, LV_ALIGN_OUT_RIGHT_MID, 0, 0);
238
   #endif
238
   #endif
239
 }
239
 }
240
 
240
 

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

104
   scr = lv_screen_create(TMC_MODE_UI, machine_menu.TmcStepModeConfTitle);
104
   scr = lv_screen_create(TMC_MODE_UI, machine_menu.TmcStepModeConfTitle);
105
 
105
 
106
   bool stealth_X = false, stealth_Y = false, stealth_Z = false, stealth_E0 = false, stealth_E1 = false;
106
   bool stealth_X = false, stealth_Y = false, stealth_Z = false, stealth_E0 = false, stealth_E1 = false;
107
-  TERN_(X_HAS_STEALTHCHOP,  stealth_X = stepperX.get_stealthChop());
108
-  TERN_(Y_HAS_STEALTHCHOP,  stealth_Y = stepperY.get_stealthChop());
109
-  TERN_(Z_HAS_STEALTHCHOP,  stealth_Z = stepperZ.get_stealthChop());
107
+  TERN_(X_HAS_STEALTHCHOP,  stealth_X  = stepperX.get_stealthChop());
108
+  TERN_(Y_HAS_STEALTHCHOP,  stealth_Y  = stepperY.get_stealthChop());
109
+  TERN_(Z_HAS_STEALTHCHOP,  stealth_Z  = stepperZ.get_stealthChop());
110
   TERN_(E0_HAS_STEALTHCHOP, stealth_E0 = stepperE0.get_stealthChop());
110
   TERN_(E0_HAS_STEALTHCHOP, stealth_E0 = stepperE0.get_stealthChop());
111
   TERN_(E1_HAS_STEALTHCHOP, stealth_E1 = stepperE1.get_stealthChop());
111
   TERN_(E1_HAS_STEALTHCHOP, stealth_E1 = stepperE1.get_stealthChop());
112
 
112
 
113
   if (!uiCfg.para_ui_page) {
113
   if (!uiCfg.para_ui_page) {
114
-    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);
115
-    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);
116
-    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);
114
+    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);
115
+    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);
116
+    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);
117
     buttonE0State = lv_screen_menu_item_onoff(scr, machine_menu.E0_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_TMC_MODE_E0, 2, stealth_E0);
117
     buttonE0State = lv_screen_menu_item_onoff(scr, machine_menu.E0_StepMode, PARA_UI_POS_X, PARA_UI_POS_Y * 4, event_handler, ID_TMC_MODE_E0, 2, stealth_E0);
118
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.next, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_TMC_MODE_DOWN, true);
118
     lv_big_button_create(scr, "F:/bmp_back70x40.bin", machine_menu.next, PARA_UI_TURN_PAGE_POS_X, PARA_UI_TURN_PAGE_POS_Y, event_handler, ID_TMC_MODE_DOWN, true);
119
   }
119
   }

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

60
     case ID_T_HOME:     lv_draw_home(); break;
60
     case ID_T_HOME:     lv_draw_home(); break;
61
     case ID_T_LEVELING:
61
     case ID_T_LEVELING:
62
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
62
       #if ENABLED(AUTO_BED_LEVELING_BILINEAR)
63
-        get_gcode_command(AUTO_LEVELING_COMMAND_ADDR,(uint8_t *)public_buf_m);
64
-        public_buf_m[sizeof(public_buf_m)-1] = 0;
63
+        get_gcode_command(AUTO_LEVELING_COMMAND_ADDR, (uint8_t *)public_buf_m);
64
+        public_buf_m[sizeof(public_buf_m) - 1] = 0;
65
         queue.inject_P(PSTR(public_buf_m));
65
         queue.inject_P(PSTR(public_buf_m));
66
       #else
66
       #else
67
         uiCfg.leveling_first_time = true;
67
         uiCfg.leveling_first_time = true;
89
   lv_big_button_create(scr, "F:/bmp_mov.bin", tool_menu.move, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_T_MOV);
89
   lv_big_button_create(scr, "F:/bmp_mov.bin", tool_menu.move, BTN_X_PIXEL * 2 + INTERVAL_V * 3, titleHeight, event_handler, ID_T_MOV);
90
   lv_big_button_create(scr, "F:/bmp_zero.bin", tool_menu.home, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_T_HOME);
90
   lv_big_button_create(scr, "F:/bmp_zero.bin", tool_menu.home, BTN_X_PIXEL * 3 + INTERVAL_V * 4, titleHeight, event_handler, ID_T_HOME);
91
   lv_big_button_create(scr, "F:/bmp_leveling.bin", tool_menu.TERN(AUTO_BED_LEVELING_BILINEAR, autoleveling, leveling), INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_LEVELING);
91
   lv_big_button_create(scr, "F:/bmp_leveling.bin", tool_menu.TERN(AUTO_BED_LEVELING_BILINEAR, autoleveling, leveling), INTERVAL_V, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_LEVELING);
92
-  lv_big_button_create(scr, "F:/bmp_filamentchange.bin", tool_menu.filament, BTN_X_PIXEL+INTERVAL_V*2,BTN_Y_PIXEL+INTERVAL_H+titleHeight, event_handler,ID_T_FILAMENT);
92
+  lv_big_button_create(scr, "F:/bmp_filamentchange.bin", tool_menu.filament, BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_FILAMENT);
93
   lv_big_button_create(scr, "F:/bmp_more.bin", tool_menu.more, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_MORE);
93
   lv_big_button_create(scr, "F:/bmp_more.bin", tool_menu.more, BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_MORE);
94
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_RETURN);
94
   lv_big_button_create(scr, "F:/bmp_return.bin", common_menu.text_back, BTN_X_PIXEL * 3 + INTERVAL_V * 4, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_T_RETURN);
95
 }
95
 }

+ 3
- 3
Marlin/src/lcd/extui/mks_ui/draw_touch_calibration.cpp View File

71
   if (calibration_stage < CALIBRATION_SUCCESS) {
71
   if (calibration_stage < CALIBRATION_SUCCESS) {
72
     // handle current state
72
     // handle current state
73
     switch (calibration_stage) {
73
     switch (calibration_stage) {
74
-      case CALIBRATION_TOP_LEFT: str = GET_TEXT(MSG_TOP_LEFT); break;
75
-      case CALIBRATION_BOTTOM_LEFT: str = GET_TEXT(MSG_BOTTOM_LEFT); break;
76
-      case CALIBRATION_TOP_RIGHT:  str = GET_TEXT(MSG_TOP_RIGHT); break;
74
+      case CALIBRATION_TOP_LEFT:     str = GET_TEXT(MSG_TOP_LEFT); break;
75
+      case CALIBRATION_BOTTOM_LEFT:  str = GET_TEXT(MSG_BOTTOM_LEFT); break;
76
+      case CALIBRATION_TOP_RIGHT:    str = GET_TEXT(MSG_TOP_RIGHT); break;
77
       case CALIBRATION_BOTTOM_RIGHT: str = GET_TEXT(MSG_BOTTOM_RIGHT); break;
77
       case CALIBRATION_BOTTOM_RIGHT: str = GET_TEXT(MSG_BOTTOM_RIGHT); break;
78
       default: break;
78
       default: break;
79
     }
79
     }

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

159
     gCfgItems.spi_flash_flag = FLASH_INF_VALID_FLAG;
159
     gCfgItems.spi_flash_flag = FLASH_INF_VALID_FLAG;
160
     W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
160
     W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
161
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
161
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
162
-    //init gcode command
162
+    // init gcode command
163
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[0], AUTO_LEVELING_COMMAND_ADDR, 100);
163
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[0], AUTO_LEVELING_COMMAND_ADDR, 100);
164
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[1], OTHERS_COMMAND_ADDR_1, 100);
164
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[1], OTHERS_COMMAND_ADDR_1, 100);
165
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[2], OTHERS_COMMAND_ADDR_2, 100);
165
     W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&custom_gcode_command[2], OTHERS_COMMAND_ADDR_2, 100);
208
     memset(&ipPara, 0, sizeof(ipPara));
208
     memset(&ipPara, 0, sizeof(ipPara));
209
     strcpy_P(wifiPara.ap_name, PSTR(WIFI_AP_NAME));
209
     strcpy_P(wifiPara.ap_name, PSTR(WIFI_AP_NAME));
210
     strcpy_P(wifiPara.keyCode, PSTR(WIFI_KEY_CODE));
210
     strcpy_P(wifiPara.keyCode, PSTR(WIFI_KEY_CODE));
211
-    //client
211
+    // client
212
     strcpy_P(ipPara.ip_addr, PSTR(IP_ADDR));
212
     strcpy_P(ipPara.ip_addr, PSTR(IP_ADDR));
213
     strcpy_P(ipPara.mask, PSTR(IP_MASK));
213
     strcpy_P(ipPara.mask, PSTR(IP_MASK));
214
     strcpy_P(ipPara.gate, PSTR(IP_GATE));
214
     strcpy_P(ipPara.gate, PSTR(IP_GATE));
216
 
216
 
217
     ipPara.dhcp_flag = IP_DHCP_FLAG;
217
     ipPara.dhcp_flag = IP_DHCP_FLAG;
218
 
218
 
219
-    //AP
219
+    // AP
220
     strcpy_P(ipPara.dhcpd_ip, PSTR(AP_IP_ADDR));
220
     strcpy_P(ipPara.dhcpd_ip, PSTR(AP_IP_ADDR));
221
     strcpy_P(ipPara.dhcpd_mask, PSTR(AP_IP_MASK));
221
     strcpy_P(ipPara.dhcpd_mask, PSTR(AP_IP_MASK));
222
     strcpy_P(ipPara.dhcpd_gate, PSTR(AP_IP_GATE));
222
     strcpy_P(ipPara.dhcpd_gate, PSTR(AP_IP_GATE));
238
   uint8_t command_buf[512];
238
   uint8_t command_buf[512];
239
 
239
 
240
   W25QXX.init(SPI_QUARTER_SPEED);
240
   W25QXX.init(SPI_QUARTER_SPEED);
241
-  //read back the gcode command before erase spi flash
241
+  // read back the gcode command before erase spi flash
242
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
242
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
243
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
243
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
244
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
244
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
245
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
245
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
246
 }
246
 }
247
 
247
 
248
-void update_gcode_command(int addr,uint8_t *s) {
248
+void update_gcode_command(int addr, uint8_t *s) {
249
   uint8_t command_buf[512];
249
   uint8_t command_buf[512];
250
 
250
 
251
   W25QXX.init(SPI_QUARTER_SPEED);
251
   W25QXX.init(SPI_QUARTER_SPEED);
252
-  //read back the gcode command before erase spi flash
252
+  // read back the gcode command before erase spi flash
253
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
253
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
254
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
254
   W25QXX.SPI_FLASH_SectorErase(VAR_INF_ADDR);
255
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
255
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&gCfgItems, VAR_INF_ADDR, sizeof(gCfgItems));
256
   switch (addr) {
256
   switch (addr) {
257
-    case AUTO_LEVELING_COMMAND_ADDR: memcpy(&command_buf[0*100], s, 100); break;
258
-    case OTHERS_COMMAND_ADDR_1: memcpy(&command_buf[1*100], s, 100); break;
259
-    case OTHERS_COMMAND_ADDR_2: memcpy(&command_buf[2*100], s, 100); break;
260
-    case OTHERS_COMMAND_ADDR_3: memcpy(&command_buf[3*100], s, 100); break;
261
-    case OTHERS_COMMAND_ADDR_4: memcpy(&command_buf[4*100], s, 100); break;
257
+    case AUTO_LEVELING_COMMAND_ADDR: memcpy(&command_buf[0 * 100], s, 100); break;
258
+    case OTHERS_COMMAND_ADDR_1: memcpy(&command_buf[1 * 100], s, 100); break;
259
+    case OTHERS_COMMAND_ADDR_2: memcpy(&command_buf[2 * 100], s, 100); break;
260
+    case OTHERS_COMMAND_ADDR_3: memcpy(&command_buf[3 * 100], s, 100); break;
261
+    case OTHERS_COMMAND_ADDR_4: memcpy(&command_buf[4 * 100], s, 100); break;
262
     default: break;
262
     default: break;
263
   }
263
   }
264
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
264
   W25QXX.SPI_FLASH_BufferWrite((uint8_t *)&command_buf, GCODE_COMMAND_ADDR, sizeof(command_buf));
265
 }
265
 }
266
 
266
 
267
-void get_gcode_command(int addr,uint8_t *d) {
267
+void get_gcode_command(int addr, uint8_t *d) {
268
   W25QXX.init(SPI_QUARTER_SPEED);
268
   W25QXX.init(SPI_QUARTER_SPEED);
269
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)d, addr, 100);
269
   W25QXX.SPI_FLASH_BufferRead((uint8_t *)d, addr, 100);
270
 }
270
 }
369
   style_num_text.text.line_space   = -5;
369
   style_num_text.text.line_space   = -5;
370
 
370
 
371
   lv_style_copy(&style_sel_text, &lv_style_scr);
371
   lv_style_copy(&style_sel_text, &lv_style_scr);
372
-  style_sel_text.body.main_color  = LV_COLOR_BACKGROUND;
373
-  style_sel_text.body.grad_color  = LV_COLOR_BACKGROUND;
374
-  style_sel_text.text.color       = LV_COLOR_YELLOW;
375
-  style_sel_text.text.sel_color   = LV_COLOR_YELLOW;
376
-  style_sel_text.text.font        = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
377
-  style_sel_text.line.width       = 0;
378
-  style_sel_text.text.letter_space  = 0;
379
-  style_sel_text.text.line_space    = -5;
372
+  style_sel_text.body.main_color   = LV_COLOR_BACKGROUND;
373
+  style_sel_text.body.grad_color   = LV_COLOR_BACKGROUND;
374
+  style_sel_text.text.color        = LV_COLOR_YELLOW;
375
+  style_sel_text.text.sel_color    = LV_COLOR_YELLOW;
376
+  style_sel_text.text.font         = TERN(HAS_SPI_FLASH_FONT, &gb2312_puhui32, LV_FONT_DEFAULT);
377
+  style_sel_text.line.width        = 0;
378
+  style_sel_text.text.letter_space = 0;
379
+  style_sel_text.text.line_space   = -5;
380
   lv_style_copy(&style_line, &lv_style_plain);
380
   lv_style_copy(&style_line, &lv_style_plain);
381
   style_line.line.color   = LV_COLOR_MAKE(0x49, 0x54, 0xFF);
381
   style_line.line.color   = LV_COLOR_MAKE(0x49, 0x54, 0xFF);
382
   style_line.line.width   = 1;
382
   style_line.line.width   = 1;
624
         if (j >= 400) break;
624
         if (j >= 400) break;
625
       }
625
       }
626
       for (i = 0; i < 400; i += 2) {
626
       for (i = 0; i < 400; i += 2) {
627
-        p_index  = (uint16_t *)(&bmp_public_buf[i]);
627
+        p_index = (uint16_t *)(&bmp_public_buf[i]);
628
         if (*p_index == 0x0000) *p_index = LV_COLOR_BACKGROUND.full;
628
         if (*p_index == 0x0000) *p_index = LV_COLOR_BACKGROUND.full;
629
       }
629
       }
630
       SPI_TFT.tftio.WriteSequence((uint16_t*)bmp_public_buf, 200);
630
       SPI_TFT.tftio.WriteSequence((uint16_t*)bmp_public_buf, 200);
1353
 
1353
 
1354
 void print_time_count() {
1354
 void print_time_count() {
1355
   if ((systick_uptime_millis % 1000) == 0)
1355
   if ((systick_uptime_millis % 1000) == 0)
1356
-  if (print_time.start == 1) print_time.seconds++;
1356
+    if (print_time.start == 1) print_time.seconds++;
1357
 }
1357
 }
1358
 
1358
 
1359
 void LV_TASK_HANDLER() {
1359
 void LV_TASK_HANDLER() {

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

458
 extern char *creat_title_text();
458
 extern char *creat_title_text();
459
 void preview_gcode_prehandle(char *path);
459
 void preview_gcode_prehandle(char *path);
460
 void update_spi_flash();
460
 void update_spi_flash();
461
-void update_gcode_command(int addr,uint8_t *s);
462
-void get_gcode_command(int addr,uint8_t *d);
461
+void update_gcode_command(int addr, uint8_t *s);
462
+void get_gcode_command(int addr, uint8_t *d);
463
 void lv_serial_capt_hook(void *, uint8_t);
463
 void lv_serial_capt_hook(void *, uint8_t);
464
 void lv_eom_hook(void *);
464
 void lv_eom_hook(void *);
465
 #if HAS_GCODE_PREVIEW
465
 #if HAS_GCODE_PREVIEW

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

71
   if (gCfgItems.wifi_mode_sel == STA_MODEL) {
71
   if (gCfgItems.wifi_mode_sel == STA_MODEL) {
72
 
72
 
73
     if (gCfgItems.cloud_enable)
73
     if (gCfgItems.cloud_enable)
74
-      buttonCloud = lv_imgbtn_create(scr, "F:/bmp_cloud.bin", BTN_X_PIXEL+INTERVAL_V*2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_W_CLOUD);
74
+      buttonCloud = lv_imgbtn_create(scr, "F:/bmp_cloud.bin", BTN_X_PIXEL + INTERVAL_V * 2, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_W_CLOUD);
75
 
75
 
76
     buttonReconnect = lv_imgbtn_create(scr, "F:/bmp_wifi.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_W_RECONNECT);
76
     buttonReconnect = lv_imgbtn_create(scr, "F:/bmp_wifi.bin", BTN_X_PIXEL * 2 + INTERVAL_V * 3, BTN_Y_PIXEL + INTERVAL_H + titleHeight, event_handler, ID_W_RECONNECT);
77
 
77
 

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

28
 void lv_draw_wifi_list();
28
 void lv_draw_wifi_list();
29
 void lv_clear_wifi_list();
29
 void lv_clear_wifi_list();
30
 void disp_wifi_list();
30
 void disp_wifi_list();
31
-void cutWifiName(char *name, int len,char *outStr);
31
+void cutWifiName(char *name, int len, char *outStr);
32
 void wifi_scan_handle();
32
 void wifi_scan_handle();
33
 
33
 
34
 #define NUMBER_OF_PAGE 5
34
 #define NUMBER_OF_PAGE 5

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

38
 tips_menu_def tips_menu;
38
 tips_menu_def tips_menu;
39
 
39
 
40
 void lv_draw_wifi_tips() {
40
 void lv_draw_wifi_tips() {
41
-  static lv_obj_t *text_tips,*wifi_name;
41
+  static lv_obj_t *text_tips, *wifi_name;
42
 
42
 
43
   scr = lv_screen_create(WIFI_TIPS_UI, "");
43
   scr = lv_screen_create(WIFI_TIPS_UI, "");
44
 
44
 

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

714
   char buf[30];
714
   char buf[30];
715
   memset(buf, ' ', COUNT(buf));
715
   memset(buf, ' ', COUNT(buf));
716
   strncpy(buf, msg, strlen(msg));
716
   strncpy(buf, msg, strlen(msg));
717
-  buf[COUNT(buf)-1] = '\0';
717
+  buf[COUNT(buf) - 1] = '\0';
718
   disp_string(100, 165, buf, 0xFFFF, 0x0000);
718
   disp_string(100, 165, buf, 0xFFFF, 0x0000);
719
 }
719
 }
720
 
720
 

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

265
 void spiFlashErase_PIC() {
265
 void spiFlashErase_PIC() {
266
   volatile uint32_t pic_sectorcnt = 0;
266
   volatile uint32_t pic_sectorcnt = 0;
267
   W25QXX.init(SPI_QUARTER_SPEED);
267
   W25QXX.init(SPI_QUARTER_SPEED);
268
-  //erase 0x001000 -64K
268
+  // erase 0x001000 -64K
269
   for (pic_sectorcnt = 0; pic_sectorcnt < (64 - 4) / 4; pic_sectorcnt++) {
269
   for (pic_sectorcnt = 0; pic_sectorcnt < (64 - 4) / 4; pic_sectorcnt++) {
270
     watchdog_refresh();
270
     watchdog_refresh();
271
     W25QXX.SPI_FLASH_SectorErase(PICINFOADDR + pic_sectorcnt * 4 * 1024);
271
     W25QXX.SPI_FLASH_SectorErase(PICINFOADDR + pic_sectorcnt * 4 * 1024);
272
   }
272
   }
273
-  //erase 64K -- 6M
273
+  // erase 64K -- 6M
274
   for (pic_sectorcnt = 0; pic_sectorcnt < (PIC_SIZE_xM * 1024 / 64 - 1); pic_sectorcnt++) {
274
   for (pic_sectorcnt = 0; pic_sectorcnt < (PIC_SIZE_xM * 1024 / 64 - 1); pic_sectorcnt++) {
275
     watchdog_refresh();
275
     watchdog_refresh();
276
     W25QXX.SPI_FLASH_BlockErase((pic_sectorcnt + 1) * 64 * 1024);
276
     W25QXX.SPI_FLASH_BlockErase((pic_sectorcnt + 1) * 64 * 1024);
281
   void spiFlashErase_FONT() {
281
   void spiFlashErase_FONT() {
282
     volatile uint32_t Font_sectorcnt = 0;
282
     volatile uint32_t Font_sectorcnt = 0;
283
     W25QXX.init(SPI_QUARTER_SPEED);
283
     W25QXX.init(SPI_QUARTER_SPEED);
284
-    for (Font_sectorcnt = 0; Font_sectorcnt < 32-1; Font_sectorcnt++) {
284
+    for (Font_sectorcnt = 0; Font_sectorcnt < 32 - 1; Font_sectorcnt++) {
285
       watchdog_refresh();
285
       watchdog_refresh();
286
       W25QXX.SPI_FLASH_BlockErase(FONTINFOADDR + Font_sectorcnt * 64 * 1024);
286
       W25QXX.SPI_FLASH_BlockErase(FONTINFOADDR + Font_sectorcnt * 64 * 1024);
287
     }
287
     }
565
       W25QXX.SPI_FLASH_BufferRead(&PIC.name[j], PIC_NAME_ADDR + tmp_cnt, 1);
565
       W25QXX.SPI_FLASH_BufferRead(&PIC.name[j], PIC_NAME_ADDR + tmp_cnt, 1);
566
       tmp_cnt++;
566
       tmp_cnt++;
567
     } while (PIC.name[j++] != '\0');
567
     } while (PIC.name[j++] != '\0');
568
-    //pic size
568
+    // pic size
569
     W25QXX.SPI_FLASH_BufferRead(PIC.size.bytes, PIC_SIZE_ADDR + i * 4, 4);
569
     W25QXX.SPI_FLASH_BufferRead(PIC.size.bytes, PIC_SIZE_ADDR + i * 4, 4);
570
 
570
 
571
     if ((strcmp((char*)Pname, (char*)PIC.name)) == 0) {
571
     if ((strcmp((char*)Pname, (char*)PIC.name)) == 0) {

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

55
 #define PIC_MAX_CN           100    // Maximum number of pictures
55
 #define PIC_MAX_CN           100    // Maximum number of pictures
56
 #define PIC_NAME_MAX_LEN      50    // Picture name maximum length
56
 #define PIC_NAME_MAX_LEN      50    // Picture name maximum length
57
 
57
 
58
-#define LOGO_MAX_SIZE_TFT35             (300*1024)
59
-#define LOGO_MAX_SIZE_TFT32             (150*1024)
60
-#define TITLELOGO_MAX_SIZE              (150*1024) // Little logo maximum
61
-#define DEFAULT_VIEW_MAX_SIZE           (200*200*2)
62
-#define FLASH_VIEW_MAX_SIZE             (200*200*2)
58
+#define LOGO_MAX_SIZE_TFT35             (300 * 1024)
59
+#define LOGO_MAX_SIZE_TFT32             (150 * 1024)
60
+#define TITLELOGO_MAX_SIZE              (150 * 1024) // Little logo maximum
61
+#define DEFAULT_VIEW_MAX_SIZE           (200 * 200 * 2)
62
+#define FLASH_VIEW_MAX_SIZE             (200 * 200 * 2)
63
 
63
 
64
-#define PER_PIC_MAX_SPACE_TFT35         (9*1024)
65
-#define PER_PIC_MAX_SPACE_TFT32         (16*1024)
66
-#define PER_FONT_MAX_SPACE              (16*1024)
64
+#define PER_PIC_MAX_SPACE_TFT35         (9 * 1024)
65
+#define PER_PIC_MAX_SPACE_TFT32         (16 * 1024)
66
+#define PER_FONT_MAX_SPACE              (16 * 1024)
67
 
67
 
68
 #if SPI_FLASH_SIZE == 0x200000
68
 #if SPI_FLASH_SIZE == 0x200000
69
-  //pic
70
-  //Robin_pro pic addr
69
+  // pic
70
+  // Robin_pro pic addr
71
   #define PIC_NAME_ADDR                 0x001000      // Pic information addr
71
   #define PIC_NAME_ADDR                 0x001000      // Pic information addr
72
   #define PIC_SIZE_ADDR                 0x001800      // Pic size information addr
72
   #define PIC_SIZE_ADDR                 0x001800      // Pic size information addr
73
   #define PIC_COUNTER_ADDR              0x002000      // Pic total number
73
   #define PIC_COUNTER_ADDR              0x002000      // Pic total number
77
 
77
 
78
   // TFT35
78
   // TFT35
79
   #define DEFAULT_VIEW_ADDR_TFT35       0x1EA070
79
   #define DEFAULT_VIEW_ADDR_TFT35       0x1EA070
80
-  #define BAK_VIEW_ADDR_TFT35           (DEFAULT_VIEW_ADDR_TFT35+90*1024)
81
-  #define PIC_ICON_LOGO_ADDR_TFT35      (BAK_VIEW_ADDR_TFT35+80*1024)
80
+  #define BAK_VIEW_ADDR_TFT35           (DEFAULT_VIEW_ADDR_TFT35 + 90 * 1024)
81
+  #define PIC_ICON_LOGO_ADDR_TFT35      (BAK_VIEW_ADDR_TFT35 + 80 * 1024)
82
   #define PIC_DATA_ADDR_TFT35           0x003000 // (PIC_ICON_LOGO_ADDR_TFT35+350*1024) //0xC5800
82
   #define PIC_DATA_ADDR_TFT35           0x003000 // (PIC_ICON_LOGO_ADDR_TFT35+350*1024) //0xC5800
83
 
83
 
84
   #define PIC_DATA_ADDR_TFT32           0x00F000
84
   #define PIC_DATA_ADDR_TFT32           0x00F000
87
 
87
 
88
   // font
88
   // font
89
   #define FONTINFOADDR                  0x150000 // 6M -- font addr
89
   #define FONTINFOADDR                  0x150000 // 6M -- font addr
90
-  #define UNIGBK_FLASH_ADDR            (FONTINFOADDR+4096) // 4*1024
90
+  #define UNIGBK_FLASH_ADDR            (FONTINFOADDR + 4096) // 4*1024
91
 
91
 
92
 #else
92
 #else
93
-  //pic
94
-  //Robin_pro pic addr
93
+  // pic
94
+  // Robin_pro pic addr
95
   #define PIC_NAME_ADDR                 0x003000      // Pic information addr
95
   #define PIC_NAME_ADDR                 0x003000      // Pic information addr
96
   #define PIC_SIZE_ADDR                 0x007000      // Pic size information addr
96
   #define PIC_SIZE_ADDR                 0x007000      // Pic size information addr
97
   #define PIC_COUNTER_ADDR              0x008000      // Pic total number
97
   #define PIC_COUNTER_ADDR              0x008000      // Pic total number
99
 
99
 
100
   // TFT35
100
   // TFT35
101
   #define DEFAULT_VIEW_ADDR_TFT35       0xC5800
101
   #define DEFAULT_VIEW_ADDR_TFT35       0xC5800
102
-  #define BAK_VIEW_ADDR_TFT35           (DEFAULT_VIEW_ADDR_TFT35+90*1024)
103
-  #define PIC_ICON_LOGO_ADDR_TFT35      (BAK_VIEW_ADDR_TFT35+80*1024)
104
-  #define PIC_DATA_ADDR_TFT35           (PIC_ICON_LOGO_ADDR_TFT35+350*1024) //0xC5800
102
+  #define BAK_VIEW_ADDR_TFT35           (DEFAULT_VIEW_ADDR_TFT35 + 90 * 1024)
103
+  #define PIC_ICON_LOGO_ADDR_TFT35      (BAK_VIEW_ADDR_TFT35 + 80 * 1024)
104
+  #define PIC_DATA_ADDR_TFT35           (PIC_ICON_LOGO_ADDR_TFT35 + 350 * 1024) // 0xC5800
105
 
105
 
106
   // TFT32
106
   // TFT32
107
   #define PIC_DATA_ADDR_TFT32           0x02F000
107
   #define PIC_DATA_ADDR_TFT32           0x02F000
110
 
110
 
111
   // font
111
   // font
112
   #define FONTINFOADDR                  0x600000 // 6M -- font addr
112
   #define FONTINFOADDR                  0x600000 // 6M -- font addr
113
-  #define UNIGBK_FLASH_ADDR            (FONTINFOADDR+4096) // 4*1024
114
-  #define GBK_FLASH_ADDR               (UNIGBK_FLASH_ADDR+180224) // 176*1024
113
+  #define UNIGBK_FLASH_ADDR            (FONTINFOADDR + 4096) // 4*1024
114
+  #define GBK_FLASH_ADDR               (UNIGBK_FLASH_ADDR + 180224) // 176*1024
115
 
115
 
116
 #endif
116
 #endif
117
 
117
 
118
 // Flash flag
118
 // Flash flag
119
-#define REFLSHE_FLGA_ADD                (0x800000-32)
119
+#define REFLSHE_FLGA_ADD                (0x800000 - 32)
120
 
120
 
121
 // SD card information first addr
121
 // SD card information first addr
122
 #define VAR_INF_ADDR                    0x000000
122
 #define VAR_INF_ADDR                    0x000000
123
 #define FLASH_INF_VALID_FLAG            0x20201118
123
 #define FLASH_INF_VALID_FLAG            0x20201118
124
 
124
 
125
-//Store some gcode commands, such as auto leveling commands
126
-#define GCODE_COMMAND_ADDR              VAR_INF_ADDR + 3*1024
125
+// Store some gcode commands, such as auto leveling commands
126
+#define GCODE_COMMAND_ADDR              VAR_INF_ADDR + 3 * 1024
127
 #define AUTO_LEVELING_COMMAND_ADDR      GCODE_COMMAND_ADDR
127
 #define AUTO_LEVELING_COMMAND_ADDR      GCODE_COMMAND_ADDR
128
 #define OTHERS_COMMAND_ADDR_1           AUTO_LEVELING_COMMAND_ADDR + 100
128
 #define OTHERS_COMMAND_ADDR_1           AUTO_LEVELING_COMMAND_ADDR + 100
129
 #define OTHERS_COMMAND_ADDR_2           OTHERS_COMMAND_ADDR_1 + 100
129
 #define OTHERS_COMMAND_ADDR_2           OTHERS_COMMAND_ADDR_1 + 100
155
 #define FONT_SIZE_xM  2
155
 #define FONT_SIZE_xM  2
156
 
156
 
157
 void Pic_Read(uint8_t *Pname, uint8_t *P_Rbuff);
157
 void Pic_Read(uint8_t *Pname, uint8_t *P_Rbuff);
158
-void Pic_Logo_Read(uint8_t *LogoName,uint8_t *Logo_Rbuff,uint32_t LogoReadsize);
158
+void Pic_Logo_Read(uint8_t *LogoName, uint8_t *Logo_Rbuff, uint32_t LogoReadsize);
159
 void lv_pic_test(uint8_t *P_Rbuff, uint32_t addr, uint32_t size);
159
 void lv_pic_test(uint8_t *P_Rbuff, uint32_t addr, uint32_t size);
160
 uint32_t lv_get_pic_addr(uint8_t *Pname);
160
 uint32_t lv_get_pic_addr(uint8_t *Pname);
161
 void get_spi_flash_data(const char *rec_buf, int offset, int size);
161
 void get_spi_flash_data(const char *rec_buf, int offset, int size);

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

55
 
55
 
56
         gcode.process_subcommands_now_P(PSTR("M25"));
56
         gcode.process_subcommands_now_P(PSTR("M25"));
57
 
57
 
58
-        //save the position
58
+        // save the position
59
         uiCfg.current_x_position_bak = current_position.x;
59
         uiCfg.current_x_position_bak = current_position.x;
60
         uiCfg.current_y_position_bak = current_position.y;
60
         uiCfg.current_y_position_bak = current_position.y;
61
         uiCfg.current_z_position_bak = current_position.z;
61
         uiCfg.current_z_position_bak = current_position.z;

+ 25
- 25
Marlin/src/lcd/extui/mks_ui/tft_Language_en.h View File

503
 #define TEXT_WIFI_FORGET_EN         "Forget Network"
503
 #define TEXT_WIFI_FORGET_EN         "Forget Network"
504
 #define TEXT_DISCONECTED_EN         "Wi-Fi Connected"
504
 #define TEXT_DISCONECTED_EN         "Wi-Fi Connected"
505
 
505
 
506
-//wifi-list
506
+// wifi-list
507
 #define MAIN_BUILT_EN       "Build"
507
 #define MAIN_BUILT_EN       "Build"
508
 #define MAIN_FILAMENT_EN    "Filament"
508
 #define MAIN_FILAMENT_EN    "Filament"
509
 #define MAIN_SETUP_EN       "Setup"
509
 #define MAIN_SETUP_EN       "Setup"
512
 #define FILE_MENU_BUILD_EN  "Build"
512
 #define FILE_MENU_BUILD_EN  "Build"
513
 #define FILE_MENU_MENU_EN   " < Menu"
513
 #define FILE_MENU_MENU_EN   " < Menu"
514
 
514
 
515
-//about
515
+// about
516
 #define ABOUT_TITLE_EN                    "About"
516
 #define ABOUT_TITLE_EN                    "About"
517
 #define ABOUT_BUILT_MACHINES_EN           "Built Machines"
517
 #define ABOUT_BUILT_MACHINES_EN           "Built Machines"
518
 #define ABOUT_SPARK_EN                    "Spark"
518
 #define ABOUT_SPARK_EN                    "Spark"
520
 #define ABOUT_SERIAL_NUMBER_EN            "Serial Number:"
520
 #define ABOUT_SERIAL_NUMBER_EN            "Serial Number:"
521
 #define ABOUT_S_NUMBER_EN                 "DCPLX02KFC6P"
521
 #define ABOUT_S_NUMBER_EN                 "DCPLX02KFC6P"
522
 
522
 
523
-//set
523
+// set
524
 #define SETUP_TITLE_EN                    "Setup"
524
 #define SETUP_TITLE_EN                    "Setup"
525
 #define SETUP_WIFI_EN                     "Wi-Fi"
525
 #define SETUP_WIFI_EN                     "Wi-Fi"
526
 #define SETUP_MANUAL_IP_EN                "Manual IP"
526
 #define SETUP_MANUAL_IP_EN                "Manual IP"
527
 #define SETUP_WIFI_NOT_CONNECTED_EN       "Not Connected"
527
 #define SETUP_WIFI_NOT_CONNECTED_EN       "Not Connected"
528
 #define SETUP_WIFI_NETWORK_EN             "WiFi_Network"
528
 #define SETUP_WIFI_NETWORK_EN             "WiFi_Network"
529
 
529
 
530
-//build
530
+// build
531
 #define BUILD_TITLE_EN                    "Build"
531
 #define BUILD_TITLE_EN                    "Build"
532
 #define BUILD_SD_CARD_EN                  "SD Card"
532
 #define BUILD_SD_CARD_EN                  "SD Card"
533
 #define BUILD_USB_DRIVE_EN                "USB Drive"
533
 #define BUILD_USB_DRIVE_EN                "USB Drive"
534
 
534
 
535
-//SD card
535
+// SD card
536
 #define SD_CARD_TITLE_EN                  "SD Card"
536
 #define SD_CARD_TITLE_EN                  "SD Card"
537
 #define SD_CARD_BACK_EN                   "< Back"
537
 #define SD_CARD_BACK_EN                   "< Back"
538
-//USB Drive
538
+// USB Drive
539
 #define USB_DRIVE_TITLE_EN                "USB Drive"
539
 #define USB_DRIVE_TITLE_EN                "USB Drive"
540
 #define USB_DRIVE_BACK_EN                 "< Back"
540
 #define USB_DRIVE_BACK_EN                 "< Back"
541
 #define FILE_PAGES_EN                     "%d/%d"
541
 #define FILE_PAGES_EN                     "%d/%d"
542
 #define FILE_NEXT_PAGE_EN                 "Next Page"
542
 #define FILE_NEXT_PAGE_EN                 "Next Page"
543
 #define MEDIA_SELECT_TITLE_EN             "Select Media"
543
 #define MEDIA_SELECT_TITLE_EN             "Select Media"
544
 
544
 
545
-//BUILD PLATE
545
+// BUILD PLATE
546
 #define PLATE_TITLE_EN                    "Build Plate"
546
 #define PLATE_TITLE_EN                    "Build Plate"
547
 #define PLATE_BACK_EN                     "< Back"
547
 #define PLATE_BACK_EN                     "< Back"
548
 #define PLATE_CONFIRM_EN                  "Confirm >"
548
 #define PLATE_CONFIRM_EN                  "Confirm >"
549
 #define PLATE_TIPS_EN                     "Confirm that there is a Clear\nBuild Plate installed in the\nmachine."
549
 #define PLATE_TIPS_EN                     "Confirm that there is a Clear\nBuild Plate installed in the\nmachine."
550
 
550
 
551
-//build model
551
+// build model
552
 #define MODEL_TITLE_EN                    "Build Model"
552
 #define MODEL_TITLE_EN                    "Build Model"
553
 #define MODEL_START_BUILD_EN              "Start Build"
553
 #define MODEL_START_BUILD_EN              "Start Build"
554
 #define MODEL_BACK_EN                     "< Back"
554
 #define MODEL_BACK_EN                     "< Back"
555
 
555
 
556
-//building
556
+// building
557
 #define BUILDING_TITLE_EN                 "Building"
557
 #define BUILDING_TITLE_EN                 "Building"
558
 #define BUILDING_MENU_EN                  "Build Menu"
558
 #define BUILDING_MENU_EN                  "Build Menu"
559
 #define BUILDING_COMPLETED                "Build\nComplete"
559
 #define BUILDING_COMPLETED                "Build\nComplete"
560
 
560
 
561
-//building menu
561
+// building menu
562
 #define BUILDING_MENU_TITLE_EN            "Build Menu"
562
 #define BUILDING_MENU_TITLE_EN            "Build Menu"
563
 #define BUILDING_MENU_SETTINGS_EN         "Build Settings"
563
 #define BUILDING_MENU_SETTINGS_EN         "Build Settings"
564
 #define BUILDING_MENU_PAUSE_EN            "Pause Build"
564
 #define BUILDING_MENU_PAUSE_EN            "Pause Build"
565
 #define BUILDING_MENU_CANCEL_EN           "Cancel Build"
565
 #define BUILDING_MENU_CANCEL_EN           "Cancel Build"
566
 #define BUILDING_MENU_BACK_EN             "< Back"
566
 #define BUILDING_MENU_BACK_EN             "< Back"
567
 
567
 
568
-//build settings
568
+// build settings
569
 #define SETTINGS_TITLE_EN                 "Build Settings"
569
 #define SETTINGS_TITLE_EN                 "Build Settings"
570
 #define SETTINGS_NOZZLE_TEMPER_EN         "Nozzle Temp:"
570
 #define SETTINGS_NOZZLE_TEMPER_EN         "Nozzle Temp:"
571
 #define SETTINGS_NOZZLE_VALUE_EN          "%d"
571
 #define SETTINGS_NOZZLE_VALUE_EN          "%d"
575
 #define SETTINGS_SPEED_VALUE_EN           "Standard"
575
 #define SETTINGS_SPEED_VALUE_EN           "Standard"
576
 #define SETTINGS_BACK_EN                  "< Back"
576
 #define SETTINGS_BACK_EN                  "< Back"
577
 
577
 
578
-//build paused
578
+// build paused
579
 #define PAUSED_TITLE_EN                   "Build Paused"
579
 #define PAUSED_TITLE_EN                   "Build Paused"
580
 #define PAUSED_RESUME_EN                  "Resume Build"
580
 #define PAUSED_RESUME_EN                  "Resume Build"
581
 #define PAUSED_CANCEL_EN                  "Cancel Build"
581
 #define PAUSED_CANCEL_EN                  "Cancel Build"
582
 #define PAUSED_BACK_EN                    "< Back"
582
 #define PAUSED_BACK_EN                    "< Back"
583
 
583
 
584
-//build cancel
584
+// build cancel
585
 #define CANCEL_TITLE_EN                   "Cancel Build"
585
 #define CANCEL_TITLE_EN                   "Cancel Build"
586
 #define CANCEL_BUILD_EN                   "Cancel Build"
586
 #define CANCEL_BUILD_EN                   "Cancel Build"
587
 #define CANCEL_TIPS_EN                    "Are you sure you want to\ncancel this build? The model\nwill be deleted from this\nmachine. It will need to be\nresent from your computer\nbefore it can be built in the\nfuture."
587
 #define CANCEL_TIPS_EN                    "Are you sure you want to\ncancel this build? The model\nwill be deleted from this\nmachine. It will need to be\nresent from your computer\nbefore it can be built in the\nfuture."
589
 #define CANCEL_BUILD_DISPLAY_EN           "Build\nCanceled"
589
 #define CANCEL_BUILD_DISPLAY_EN           "Build\nCanceled"
590
 #define CANCEL_OVER_PLATE_TIPS_EN         "Confirm that the Build Plate\nhas been removed from the\nmachine."
590
 #define CANCEL_OVER_PLATE_TIPS_EN         "Confirm that the Build Plate\nhas been removed from the\nmachine."
591
 
591
 
592
-//filament model enter
592
+// filament model enter
593
 #define FILAMENT_MODEL_ENTER_TITLE_EN     "Model-PLA"
593
 #define FILAMENT_MODEL_ENTER_TITLE_EN     "Model-PLA"
594
 #define FILAMENT_MODEL_ENTER_BACK_EN      "< Back"
594
 #define FILAMENT_MODEL_ENTER_BACK_EN      "< Back"
595
 #define FILAMENT_MODEL_ENTER_BEGIN_EN     "Begin >"
595
 #define FILAMENT_MODEL_ENTER_BEGIN_EN     "Begin >"
596
 #define FILAMENT_MODEL_ENTER_TIPS_EN      "The Model Filament spool\ncompartment is located on\nthe right side of the machine."
596
 #define FILAMENT_MODEL_ENTER_TIPS_EN      "The Model Filament spool\ncompartment is located on\nthe right side of the machine."
597
 
597
 
598
-//filament model PLA
598
+// filament model PLA
599
 #define FILAMENT_MODEL_PLA_TITLE_EN       "Model-PLA"
599
 #define FILAMENT_MODEL_PLA_TITLE_EN       "Model-PLA"
600
 #define FILAMENT_PLA_LOAD_TITLE_EN        "Load Filament"
600
 #define FILAMENT_PLA_LOAD_TITLE_EN        "Load Filament"
601
 #define FILAMENT_PLA_UNLOAD_TITLE_EN      "Unload Filament"
601
 #define FILAMENT_PLA_UNLOAD_TITLE_EN      "Unload Filament"
602
 #define FILAMENT_MODEL_PLA_LOAD_EN        "Load Filament"
602
 #define FILAMENT_MODEL_PLA_LOAD_EN        "Load Filament"
603
 #define FILAMENT_MODEL_PLA_UNLOAD_EN      "Unload Filament"
603
 #define FILAMENT_MODEL_PLA_UNLOAD_EN      "Unload Filament"
604
-//filament support enter
604
+// filament support enter
605
 #define FILAMENT_SUPPORT_ENTER_TITLE_EN   "Support-PVA"
605
 #define FILAMENT_SUPPORT_ENTER_TITLE_EN   "Support-PVA"
606
 #define FILAMENT_SUPPORT_ENTER_BACK_EN    "< Back"
606
 #define FILAMENT_SUPPORT_ENTER_BACK_EN    "< Back"
607
 #define FILAMENT_SUPPORT_ENTER_BEGIN_EN   "Begin >"
607
 #define FILAMENT_SUPPORT_ENTER_BEGIN_EN   "Begin >"
608
 #define FILAMENT_SUPPORT_ENTER_TIPS_EN    "The Support Filament spool\ncompartment is located on\nthe left side of the machine."
608
 #define FILAMENT_SUPPORT_ENTER_TIPS_EN    "The Support Filament spool\ncompartment is located on\nthe left side of the machine."
609
-//filament heating
609
+// filament heating
610
 #define FILAMENT_HEATING_LOAD_TITLE_EN    "Load Filament"
610
 #define FILAMENT_HEATING_LOAD_TITLE_EN    "Load Filament"
611
 #define FILAMENT_HEATING_UNLOAD_TITLE_EN  "Unload Filament"
611
 #define FILAMENT_HEATING_UNLOAD_TITLE_EN  "Unload Filament"
612
 #define FILAMENT_HEATING_CANCEL_EN        "< Cancel"
612
 #define FILAMENT_HEATING_CANCEL_EN        "< Cancel"
613
 #define FILAMENT_HEATING_MATERIAL_EN      "Material:"
613
 #define FILAMENT_HEATING_MATERIAL_EN      "Material:"
614
 #define FILAMENT_HEATING_PLA_EN           "Model-PLA"
614
 #define FILAMENT_HEATING_PLA_EN           "Model-PLA"
615
 #define FILAMENT_HEATING_TIPS_EN          "Print head is heating..."
615
 #define FILAMENT_HEATING_TIPS_EN          "Print head is heating..."
616
-//rotate left
616
+// rotate left
617
 #define ROTATE_LEFT_LOAD_TITLE_EN         "Load Filament"
617
 #define ROTATE_LEFT_LOAD_TITLE_EN         "Load Filament"
618
 #define ROTATE_LEFT_UNLOAD_TITLE_EN       "Unload Filament"
618
 #define ROTATE_LEFT_UNLOAD_TITLE_EN       "Unload Filament"
619
 #define ROTATE_LEFT_CANCEL_EN             "< Cancel"
619
 #define ROTATE_LEFT_CANCEL_EN             "< Cancel"
622
 #define ROTATE_LEFT_NEXT_EN               "Next >"
622
 #define ROTATE_LEFT_NEXT_EN               "Next >"
623
 #define ROTATE_LEFT_TIPS_EN               "Rotate extruder selection\ndial to the left."
623
 #define ROTATE_LEFT_TIPS_EN               "Rotate extruder selection\ndial to the left."
624
 
624
 
625
-//hang spool
625
+// hang spool
626
 #define HANG_SPOOL_TITLE_EN         "Load Filament"
626
 #define HANG_SPOOL_TITLE_EN         "Load Filament"
627
 #define HANG_SPOOL_PREVIOUS_EN      "< Previous"
627
 #define HANG_SPOOL_PREVIOUS_EN      "< Previous"
628
 #define HANG_SPOOL_MATERIAL_EN      "Material:"
628
 #define HANG_SPOOL_MATERIAL_EN      "Material:"
630
 #define HANG_SPOOL_NEXT_EN          "Next >"
630
 #define HANG_SPOOL_NEXT_EN          "Next >"
631
 #define HANG_SPOOL_TIPS_EN          "Hang the spool in the spool\ncompartment as shown."
631
 #define HANG_SPOOL_TIPS_EN          "Hang the spool in the spool\ncompartment as shown."
632
 
632
 
633
-//feed filament
633
+// feed filament
634
 #define FEED_FILAMENT_TITLE_EN      "Load Filament"
634
 #define FEED_FILAMENT_TITLE_EN      "Load Filament"
635
 #define FEED_FILAMENT_PREVIOUS_EN   "< Previous"
635
 #define FEED_FILAMENT_PREVIOUS_EN   "< Previous"
636
 #define FEED_FILAMENT_MATERIAL_EN   "Material:"
636
 #define FEED_FILAMENT_MATERIAL_EN   "Material:"
638
 #define FEED_FILAMENT_NEXT_EN       "Next >"
638
 #define FEED_FILAMENT_NEXT_EN       "Next >"
639
 #define FEED_FILAMENT_TIPS_EN       "Feed filament into extruder\nup beyond the gears."
639
 #define FEED_FILAMENT_TIPS_EN       "Feed filament into extruder\nup beyond the gears."
640
 
640
 
641
-//feed filament
641
+// feed filament
642
 #define ROTATE_UP_TITLE_EN          "Load Filament"
642
 #define ROTATE_UP_TITLE_EN          "Load Filament"
643
 #define ROTATE_UP_PREVIOUS_EN        "< Previous"
643
 #define ROTATE_UP_PREVIOUS_EN        "< Previous"
644
 #define ROTATE_UP_MATERIAL_EN       "Material:"
644
 #define ROTATE_UP_MATERIAL_EN       "Material:"
646
 #define ROTATE_UP_NEXT_EN           "Next >"
646
 #define ROTATE_UP_NEXT_EN           "Next >"
647
 #define ROTATE_UP_TIPS_EN           "Rotate extruder selection\ndial up."
647
 #define ROTATE_UP_TIPS_EN           "Rotate extruder selection\ndial up."
648
 
648
 
649
-//filament begin
649
+// filament begin
650
 #define FEED_BEGIN_TITLE_EN         "Load Filament"
650
 #define FEED_BEGIN_TITLE_EN         "Load Filament"
651
 #define FEED_BEGIN_MATERIAL_EN      "Material:"
651
 #define FEED_BEGIN_MATERIAL_EN      "Material:"
652
 #define FEED_BEGIN_PLA_EN           "Model-PLA"
652
 #define FEED_BEGIN_PLA_EN           "Model-PLA"
653
 #define FEED_BEGIN_NEXT_EN          "Next >"
653
 #define FEED_BEGIN_NEXT_EN          "Next >"
654
 #define FEED_BEGIN_TIPS_EN          "Press Next when filament\nbegins to extrude."
654
 #define FEED_BEGIN_TIPS_EN          "Press Next when filament\nbegins to extrude."
655
 
655
 
656
-//filament finish
656
+// filament finish
657
 #define FEED_FINISH_TITLE_EN        "Load Filament"
657
 #define FEED_FINISH_TITLE_EN        "Load Filament"
658
 #define FEED_FINISH_MATERIAL_EN     "Material:"
658
 #define FEED_FINISH_MATERIAL_EN     "Material:"
659
 #define FEED_FINISH_PLA_EN          "Model-PLA"
659
 #define FEED_FINISH_PLA_EN          "Model-PLA"
660
 #define FEED_FINISH_NEXT_EN         "Finish >"
660
 #define FEED_FINISH_NEXT_EN         "Finish >"
661
 #define FEED_FINISH_TIPS_EN         "Remove filament from the\nnozzle and discard."
661
 #define FEED_FINISH_TIPS_EN         "Remove filament from the\nnozzle and discard."
662
-//fiament remove
662
+// fiament remove
663
 #define REMOVE_SPOOL_TITLE_EN       "Unload Filament"
663
 #define REMOVE_SPOOL_TITLE_EN       "Unload Filament"
664
 #define REMOVE_SPOOL_PREVIOUS_EN     "< Previous"
664
 #define REMOVE_SPOOL_PREVIOUS_EN     "< Previous"
665
 #define REMOVE_SPOOL_FINISH_EN      "Finish >"
665
 #define REMOVE_SPOOL_FINISH_EN      "Finish >"
671
 #define LOAD_FINISH_EN              "Load\nFilament\nComplete"
671
 #define LOAD_FINISH_EN              "Load\nFilament\nComplete"
672
 #define UNLOAD_FINISH_EN            "Unload\nFilament\nComplete"
672
 #define UNLOAD_FINISH_EN            "Unload\nFilament\nComplete"
673
 
673
 
674
-//manual ip
674
+// manual ip
675
 #define MANUAL_IP_TITLE_EN          "Manual IP"
675
 #define MANUAL_IP_TITLE_EN          "Manual IP"
676
 #define MANUAL_IP_CANCEL_EN         "< Cancel"
676
 #define MANUAL_IP_CANCEL_EN         "< Cancel"
677
 #define MANUAL_IP_APPLY_EN          "Join >"
677
 #define MANUAL_IP_APPLY_EN          "Join >"

+ 1
- 1
Marlin/src/lcd/extui/mks_ui/tft_Language_ru.h View File

215
 #define AUTO_SHUTDOWN_RU                    "авто-откл"
215
 #define AUTO_SHUTDOWN_RU                    "авто-откл"
216
 #define MANUAL_SHUTDOWN_RU                  "ручн-откл"
216
 #define MANUAL_SHUTDOWN_RU                  "ручн-откл"
217
 
217
 
218
-#define DIALOG_CONFIRM_RU                   "да"//"подтвердить"
218
+#define DIALOG_CONFIRM_RU                   "да" // "подтвердить"
219
 #define DIALOG_CANCLE_RU                    "отмена"
219
 #define DIALOG_CANCLE_RU                    "отмена"
220
 #define DIALOG_OK_RU                        "да"
220
 #define DIALOG_OK_RU                        "да"
221
 #define DIALOG_RESET_RU                     "сброс"
221
 #define DIALOG_RESET_RU                     "сброс"

+ 3
- 4
Marlin/src/lcd/extui/mks_ui/tft_lvgl_configuration.cpp View File

241
 
241
 
242
   SPI_TFT.setWindow((uint16_t)area->x1, (uint16_t)area->y1, width, height);
242
   SPI_TFT.setWindow((uint16_t)area->x1, (uint16_t)area->y1, width, height);
243
 
243
 
244
-  for (uint16_t i = 0; i < height; i++)
245
-    SPI_TFT.tftio.WriteSequence((uint16_t*)(color_p + width * i), width);
244
+  SPI_TFT.tftio.WriteSequence((uint16_t*)color_p, width * height);
246
 
245
 
247
   lv_disp_flush_ready(disp); // Indicate you are ready with the flushing
246
   lv_disp_flush_ready(disp); // Indicate you are ready with the flushing
248
 
247
 
333
 
332
 
334
 extern uint8_t currentFlashPage;
333
 extern uint8_t currentFlashPage;
335
 
334
 
336
-//spi_flash
335
+// spi_flash
337
 uint32_t pic_read_base_addr = 0, pic_read_addr_offset = 0;
336
 uint32_t pic_read_base_addr = 0, pic_read_addr_offset = 0;
338
 lv_fs_res_t spi_flash_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode) {
337
 lv_fs_res_t spi_flash_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode) {
339
   static char last_path_name[30];
338
   static char last_path_name[30];
382
   return LV_FS_RES_OK;
381
   return LV_FS_RES_OK;
383
 }
382
 }
384
 
383
 
385
-//sd
384
+// sd
386
 char *cur_namefff;
385
 char *cur_namefff;
387
 uint32_t sd_read_base_addr = 0, sd_read_addr_offset = 0, small_image_size = 409;
386
 uint32_t sd_read_base_addr = 0, sd_read_addr_offset = 0, small_image_size = 409;
388
 lv_fs_res_t sd_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode) {
387
 lv_fs_res_t sd_open_cb (lv_fs_drv_t * drv, void * file_p, const char * path, lv_fs_mode_t mode) {

+ 2
- 2
Marlin/src/lcd/extui/mks_ui/tft_multi_language.h View File

48
 #define MULTI_LANGUAGE_ENABLE   1
48
 #define MULTI_LANGUAGE_ENABLE   1
49
 #define MULTI_LANGUAGE_DISABLE  0
49
 #define MULTI_LANGUAGE_DISABLE  0
50
 
50
 
51
-typedef struct machine_common_disp{
51
+typedef struct machine_common_disp {
52
   const char *default_value;
52
   const char *default_value;
53
 
53
 
54
   const char *next;
54
   const char *next;
742
 
742
 
743
 extern pause_msg_def pause_msg_menu;
743
 extern pause_msg_def pause_msg_menu;
744
 
744
 
745
-typedef struct eeprom_disp{
745
+typedef struct eeprom_disp {
746
   const char *title;
746
   const char *title;
747
   const char *store;
747
   const char *store;
748
   const char *read;
748
   const char *read;

+ 10
- 10
Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32.h View File

37
 
37
 
38
     // Set up / tear down
38
     // Set up / tear down
39
     void begin(uint32_t baud);
39
     void begin(uint32_t baud);
40
-    void begin(uint32_t baud,uint8_t config);
40
+    void begin(uint32_t baud, uint8_t config);
41
     void end();
41
     void end();
42
     int available(void);
42
     int available(void);
43
     int read(void);
43
     int read(void);
51
     bool isHalfDuplex(void) const;
51
     bool isHalfDuplex(void) const;
52
     void enableHalfDuplexRx(void);
52
     void enableHalfDuplexRx(void);
53
 
53
 
54
-    private:
55
-      void setRx(uint32_t _rx);
56
-      void setTx(uint32_t _tx);
57
-      void setRx(PinName _rx);
58
-      void setTx(PinName _tx);
59
-      void init(PinName _rx, PinName _tx);
60
-      bool _rx_enabled;
61
-      uint8_t _config;
62
-      unsigned long _baud;
54
+  private:
55
+    void setRx(uint32_t _rx);
56
+    void setTx(uint32_t _tx);
57
+    void setRx(PinName _rx);
58
+    void setTx(PinName _tx);
59
+    void init(PinName _rx, PinName _tx);
60
+    bool _rx_enabled;
61
+    uint8_t _config;
62
+    unsigned long _baud;
63
 };
63
 };

+ 2
- 1
Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.cpp View File

68
   #define disable_timer_if_necessary(dev, ch) NOOP
68
   #define disable_timer_if_necessary(dev, ch) NOOP
69
 
69
 
70
   static void usart_enable_no_irq(usart_dev *usart_device, bool with_irq) {
70
   static void usart_enable_no_irq(usart_dev *usart_device, bool with_irq) {
71
-    if (with_irq) usart_enable(usart_device);
71
+    if (with_irq)
72
+      usart_enable(usart_device);
72
     else {
73
     else {
73
       usart_reg_map *regs = usart_device->regs;
74
       usart_reg_map *regs = usart_device->regs;
74
       regs->CR1 |= (USART_CR1_TE | USART_CR1_RE);   // Preserve word length, etc. Use 'or' to preserve USART_CR1_M_8N1
75
       regs->CR1 |= (USART_CR1_TE | USART_CR1_RE);   // Preserve word length, etc. Use 'or' to preserve USART_CR1_M_8N1

+ 11
- 11
Marlin/src/lcd/extui/mks_ui/wifiSerial_STM32F1.h View File

39
 
39
 
40
     /* Set up/tear down */
40
     /* Set up/tear down */
41
     void begin(uint32 baud);
41
     void begin(uint32 baud);
42
-    void begin(uint32 baud,uint8_t config);
42
+    void begin(uint32 baud, uint8_t config);
43
     void end();
43
     void end();
44
     int available();
44
     int available();
45
     int read();
45
     int read();
46
     int write(uint8_t);
46
     int write(uint8_t);
47
     inline void wifi_usart_irq(usart_reg_map *regs) {
47
     inline void wifi_usart_irq(usart_reg_map *regs) {
48
       /* Handling RXNEIE and TXEIE interrupts.
48
       /* Handling RXNEIE and TXEIE interrupts.
49
-      * RXNE signifies availability of a byte in DR.
50
-      *
51
-      * See table 198 (sec 27.4, p809) in STM document RM0008 rev 15.
52
-      * We enable RXNEIE.
53
-      */
49
+       * RXNE signifies availability of a byte in DR.
50
+       *
51
+       * See table 198 (sec 27.4, p809) in STM document RM0008 rev 15.
52
+       * We enable RXNEIE.
53
+       */
54
       if ((regs->CR1 & USART_CR1_RXNEIE) && (regs->SR & USART_SR_RXNE)) {
54
       if ((regs->CR1 & USART_CR1_RXNEIE) && (regs->SR & USART_SR_RXNE)) {
55
         #ifdef USART_SAFE_INSERT
55
         #ifdef USART_SAFE_INSERT
56
           /* If the buffer is full and the user defines USART_SAFE_INSERT,
56
           /* If the buffer is full and the user defines USART_SAFE_INSERT,
63
       }
63
       }
64
       /* TXE signifies readiness to send a byte to DR. */
64
       /* TXE signifies readiness to send a byte to DR. */
65
       if ((regs->CR1 & USART_CR1_TXEIE) && (regs->SR & USART_SR_TXE)) {
65
       if ((regs->CR1 & USART_CR1_TXEIE) && (regs->SR & USART_SR_TXE)) {
66
-          if (!rb_is_empty(this->usart_device->wb))
67
-              regs->DR=rb_remove(this->usart_device->wb);
68
-          else
69
-              regs->CR1 &= ~((uint32)USART_CR1_TXEIE); // disable TXEIE
66
+        if (!rb_is_empty(this->usart_device->wb))
67
+          regs->DR = rb_remove(this->usart_device->wb);
68
+        else
69
+          regs->CR1 &= ~((uint32)USART_CR1_TXEIE);         // disable TXEIE
70
       }
70
       }
71
     }
71
     }
72
     int wifi_rb_is_full();
72
     int wifi_rb_is_full();
73
     struct usart_dev *usart_device;
73
     struct usart_dev *usart_device;
74
-    private:
74
+  private:
75
     uint8 tx_pin;
75
     uint8 tx_pin;
76
     uint8 rx_pin;
76
     uint8 rx_pin;
77
 };
77
 };

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

55
 #define WIFI_IO1_SET()    WRITE(WIFI_IO1_PIN, HIGH);
55
 #define WIFI_IO1_SET()    WRITE(WIFI_IO1_PIN, HIGH);
56
 #define WIFI_IO1_RESET()  WRITE(WIFI_IO1_PIN, LOW);
56
 #define WIFI_IO1_RESET()  WRITE(WIFI_IO1_PIN, LOW);
57
 
57
 
58
-extern uint8_t Explore_Disk (char *path , uint8_t recu_level);
58
+extern uint8_t Explore_Disk(char *path, uint8_t recu_level);
59
 
59
 
60
 extern uint8_t commands_in_queue;
60
 extern uint8_t commands_in_queue;
61
 extern uint8_t sel_id;
61
 extern uint8_t sel_id;
62
-extern unsigned int  getTickDiff(unsigned int curTick, unsigned int  lastTick);
62
+extern unsigned int getTickDiff(unsigned int curTick, unsigned int lastTick);
63
 
63
 
64
-volatile SZ_USART_FIFO  WifiRxFifo;
64
+volatile SZ_USART_FIFO WifiRxFifo;
65
 
65
 
66
 #define WAIT_ESP_TRANS_TIMEOUT_TICK 10500
66
 #define WAIT_ESP_TRANS_TIMEOUT_TICK 10500
67
 
67
 
487
     if (len > UDISKBUFLEN) return 0;
487
     if (len > UDISKBUFLEN) return 0;
488
 
488
 
489
     if (wifiDmaRcvFifo.state[tmpW] == udisk_buf_empty) {
489
     if (wifiDmaRcvFifo.state[tmpW] == udisk_buf_empty) {
490
-      const int timeOut = 2000; //millisecond
490
+      const int timeOut = 2000; // millisecond
491
       dmaTransmitBegin();
491
       dmaTransmitBegin();
492
       if (HAL_DMA_PollForTransferCustomize(&wifiUsartDMArx, HAL_DMA_FULL_TRANSFER, timeOut) == HAL_OK) {
492
       if (HAL_DMA_PollForTransferCustomize(&wifiUsartDMArx, HAL_DMA_FULL_TRANSFER, timeOut) == HAL_OK) {
493
         memcpy((unsigned char *) wifiDmaRcvFifo.bufferAddr[tmpW], (uint8_t *)bufToCpy, len);
493
         memcpy((unsigned char *) wifiDmaRcvFifo.bufferAddr[tmpW], (uint8_t *)bufToCpy, len);
612
       return 0;
612
       return 0;
613
     }
613
     }
614
 
614
 
615
-   if (len > 0) {
615
+    if (len > 0) {
616
       memcpy(&buf_to_wifi[4 + index_to_wifi], buf, len);
616
       memcpy(&buf_to_wifi[4 + index_to_wifi], buf, len);
617
       index_to_wifi += len;
617
       index_to_wifi += len;
618
 
618
 
619
       if (index_to_wifi < 1)
619
       if (index_to_wifi < 1)
620
         return 0;
620
         return 0;
621
 
621
 
622
-       if (buf_to_wifi[index_to_wifi + 3] == '\n') {
622
+      if (buf_to_wifi[index_to_wifi + 3] == '\n') {
623
         // mask "wait" "busy" "X:"
623
         // mask "wait" "busy" "X:"
624
         if ( ((buf_to_wifi[4] == 'w') && (buf_to_wifi[5] == 'a') && (buf_to_wifi[6] == 'i') && (buf_to_wifi[7] == 't'))
624
         if ( ((buf_to_wifi[4] == 'w') && (buf_to_wifi[5] == 'a') && (buf_to_wifi[6] == 'i') && (buf_to_wifi[7] == 't'))
625
           || ((buf_to_wifi[4] == 'b') && (buf_to_wifi[5] == 'u') && (buf_to_wifi[6] == 's') && (buf_to_wifi[7] == 'y'))
625
           || ((buf_to_wifi[4] == 'b') && (buf_to_wifi[5] == 'u') && (buf_to_wifi[6] == 's') && (buf_to_wifi[7] == 'y'))
768
   if (res == -1) {
768
   if (res == -1) {
769
     ZERO(public_buf);
769
     ZERO(public_buf);
770
     file_writer.write_index = 0;
770
     file_writer.write_index = 0;
771
-    return  -1;
771
+    return -1;
772
   }
772
   }
773
 
773
 
774
   return 0;
774
   return 0;
840
 static void wifi_gcode_exec(uint8_t *cmd_line) {
840
 static void wifi_gcode_exec(uint8_t *cmd_line) {
841
   int8_t tempBuf[100] = { 0 };
841
   int8_t tempBuf[100] = { 0 };
842
   uint8_t *tmpStr = 0;
842
   uint8_t *tmpStr = 0;
843
-  int  cmd_value;
843
+  int cmd_value;
844
   volatile int print_rate;
844
   volatile int print_rate;
845
   if (strchr((char *)cmd_line, '\n') && (strchr((char *)cmd_line, 'G') || strchr((char *)cmd_line, 'M') || strchr((char *)cmd_line, 'T'))) {
845
   if (strchr((char *)cmd_line, '\n') && (strchr((char *)cmd_line, 'G') || strchr((char *)cmd_line, 'M') || strchr((char *)cmd_line, 'T'))) {
846
     tmpStr = (uint8_t *)strchr((char *)cmd_line, '\n');
846
     tmpStr = (uint8_t *)strchr((char *)cmd_line, '\n');
1492
 
1492
 
1493
   memcpy(file_writer.saveFileName, msg + 5, fileNameLen);
1493
   memcpy(file_writer.saveFileName, msg + 5, fileNameLen);
1494
 
1494
 
1495
-  utf8_2_unicode(file_writer.saveFileName,fileNameLen);
1495
+  utf8_2_unicode(file_writer.saveFileName, fileNameLen);
1496
 
1496
 
1497
   ZERO(public_buf);
1497
   ZERO(public_buf);
1498
 
1498
 
1745
 
1745
 
1746
 void stopEspTransfer() {
1746
 void stopEspTransfer() {
1747
   if (wifi_link_state == WIFI_TRANS_FILE)
1747
   if (wifi_link_state == WIFI_TRANS_FILE)
1748
-  wifi_link_state = WIFI_CONNECTED;
1748
+    wifi_link_state = WIFI_CONNECTED;
1749
 
1749
 
1750
   TERN_(SDSUPPORT, card.closefile());
1750
   TERN_(SDSUPPORT, card.closefile());
1751
 
1751
 
2015
           if (gpos) {
2015
           if (gpos) {
2016
             switch (strtol(gpos + 1, nullptr, 10)) {
2016
             switch (strtol(gpos + 1, nullptr, 10)) {
2017
               case 0 ... 1:
2017
               case 0 ... 1:
2018
-              TERN_(ARC_SUPPORT, case 2 ... 3:)
2019
-              TERN_(BEZIER_CURVE_SUPPORT, case 5:)
2018
+                TERN_(ARC_SUPPORT, case 2 ... 3:)
2019
+                TERN_(BEZIER_CURVE_SUPPORT, case 5:)
2020
                 SERIAL_ECHOLNPGM(STR_ERR_STOPPED);
2020
                 SERIAL_ECHOLNPGM(STR_ERR_STOPPED);
2021
                 LCD_MESSAGEPGM(MSG_STOPPED);
2021
                 LCD_MESSAGEPGM(MSG_STOPPED);
2022
                 break;
2022
                 break;

+ 23
- 23
Marlin/src/lcd/extui/mks_ui/wifi_module.h View File

56
 
56
 
57
 #define UDISKBUFLEN           1024
57
 #define UDISKBUFLEN           1024
58
 
58
 
59
-typedef enum{
59
+typedef enum {
60
   udisk_buf_empty = 0,
60
   udisk_buf_empty = 0,
61
   udisk_buf_full,
61
   udisk_buf_full,
62
 } UDISK_DATA_BUFFER_STATE;
62
 } UDISK_DATA_BUFFER_STATE;
74
 
74
 
75
 typedef struct {
75
 typedef struct {
76
   uint8_t flag; // 0x0: no error;  0x01: error
76
   uint8_t flag; // 0x0: no error;  0x01: error
77
-  uint32_t start_tick; //error start time
77
+  uint32_t start_tick; // error start time
78
   uint32_t now_tick;
78
   uint32_t now_tick;
79
 } WIFI_TRANS_ERROR;
79
 } WIFI_TRANS_ERROR;
80
 
80
 
81
 extern volatile WIFI_TRANS_ERROR wifiTransError;
81
 extern volatile WIFI_TRANS_ERROR wifiTransError;
82
 
82
 
83
 typedef struct {
83
 typedef struct {
84
-  char ap_name[32];   //wifi-name
85
-  char keyCode[64]; //wifi password
86
-  int  decodeType;
87
-  int  baud;
88
-  int  mode;
84
+  char ap_name[32];   // wifi-name
85
+  char keyCode[64]; // wifi password
86
+  int decodeType;
87
+  int baud;
88
+  int mode;
89
 } WIFI_PARA;
89
 } WIFI_PARA;
90
 
90
 
91
 typedef struct {
91
 typedef struct {
92
   char state;
92
   char state;
93
   char hostUrl[96];
93
   char hostUrl[96];
94
-  int  port;
94
+  int port;
95
   char id[21];
95
   char id[21];
96
 } CLOUD_PARA;
96
 } CLOUD_PARA;
97
 
97
 
98
 typedef struct {
98
 typedef struct {
99
-  char  dhcp_flag;
100
-  char  ip_addr[16];
101
-  char  mask[16];
102
-  char  gate[16];
103
-  char  dns[16];
104
-
105
-  char  dhcpd_flag;
106
-  char  dhcpd_ip[16];
107
-  char  dhcpd_mask[16];
108
-  char  dhcpd_gate[16];
109
-  char  dhcpd_dns[16];
110
-  char  start_ip_addr[16];
111
-  char  end_ip_addr[16];
99
+  char dhcp_flag;
100
+  char ip_addr[16];
101
+  char mask[16];
102
+  char gate[16];
103
+  char dns[16];
104
+
105
+  char dhcpd_flag;
106
+  char dhcpd_ip[16];
107
+  char dhcpd_mask[16];
108
+  char dhcpd_gate[16];
109
+  char dhcpd_dns[16];
110
+  char start_ip_addr[16];
111
+  char end_ip_addr[16];
112
 } IP_PARA;
112
 } IP_PARA;
113
 
113
 
114
 typedef enum {
114
 typedef enum {
144
 
144
 
145
 typedef struct {
145
 typedef struct {
146
   char buf[20][80];
146
   char buf[20][80];
147
-  int  rd_index;
148
-  int  wt_index;
147
+  int rd_index;
148
+  int wt_index;
149
 } QUEUE;
149
 } QUEUE;
150
 
150
 
151
 typedef enum {
151
 typedef enum {

+ 5
- 5
Marlin/src/lcd/extui/mks_ui/wifi_upload.cpp View File

36
 #define WIFI_IO1_SET()    WRITE(WIFI_IO1_PIN, HIGH);
36
 #define WIFI_IO1_SET()    WRITE(WIFI_IO1_PIN, HIGH);
37
 #define WIFI_IO1_RESET()  WRITE(WIFI_IO1_PIN, LOW);
37
 #define WIFI_IO1_RESET()  WRITE(WIFI_IO1_PIN, LOW);
38
 
38
 
39
-extern SZ_USART_FIFO  WifiRxFifo;
39
+extern SZ_USART_FIFO WifiRxFifo;
40
 
40
 
41
 extern int readUsartFifo(SZ_USART_FIFO *fifo, int8_t *buf, int32_t len);
41
 extern int readUsartFifo(SZ_USART_FIFO *fifo, int8_t *buf, int32_t len);
42
 extern int writeUsartFifo(SZ_USART_FIFO * fifo, int8_t * buf, int32_t len);
42
 extern int writeUsartFifo(SZ_USART_FIFO * fifo, int8_t * buf, int32_t len);
301
           return stat;
301
           return stat;
302
         }
302
         }
303
         else if (state == header) {
303
         else if (state == header) {
304
-          //store the header byte
304
+          // store the header byte
305
           hdr[hdrIdx++] = c;
305
           hdr[hdrIdx++] = c;
306
           if (hdrIdx >= headerLength) {
306
           if (hdrIdx >= headerLength) {
307
             // get the body length, prepare a buffer for it
307
             // get the body length, prepare a buffer for it
423
 EspUploadResult Sync(uint16_t timeout) {
423
 EspUploadResult Sync(uint16_t timeout) {
424
   uint8_t buf[36];
424
   uint8_t buf[36];
425
   EspUploadResult stat;
425
   EspUploadResult stat;
426
-  int i ;
426
+  int i;
427
 
427
 
428
   // compose the data for the sync attempt
428
   // compose the data for the sync attempt
429
   memset(buf, 0x55, sizeof(buf));
429
   memset(buf, 0x55, sizeof(buf));
449
       if (rc != success || bodyLen != 2) break;
449
       if (rc != success || bodyLen != 2) break;
450
     }
450
     }
451
   }
451
   }
452
-  //DEBUG
453
-  //else debug//printf("stat=%d\n", (int)stat);
452
+  // DEBUG
453
+  //else printf("stat=%d\n", (int)stat);
454
   return stat;
454
   return stat;
455
 }
455
 }
456
 
456
 

Loading…
Cancel
Save