瀏覽代碼

More MKS WiFi

Scott Lahteine 4 年之前
父節點
當前提交
b51c6d4737
共有 2 個檔案被更改,包括 11 行新增11 行删除
  1. 9
    9
      Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
  2. 2
    2
      Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.cpp

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

@@ -1161,7 +1161,7 @@ void clear_cur_ui() {
1161 1161
     case ABOUT_UI:                    lv_clear_about(); break;
1162 1162
     case LOG_UI:                      /* Clear_Connect(); */ break;
1163 1163
     case DISK_UI:                     /* Clear_Disk(); */ break;
1164
-    #if ENABLED(USE_WIFI_FUNCTION)
1164
+    #if ENABLED(MKS_WIFI_MODULE)
1165 1165
       case WIFI_UI:                   lv_clear_wifi(); break;
1166 1166
     #endif
1167 1167
     case MORE_UI:                     /* Clear_more(); */ break;
@@ -1178,11 +1178,11 @@ void clear_cur_ui() {
1178 1178
     case TOOL_UI:                     lv_clear_tool(); break;
1179 1179
     case MESHLEVELING_UI:             /* Clear_MeshLeveling(); */ break;
1180 1180
     case HARDWARE_TEST_UI:            /* Clear_Hardwaretest(); */ break;
1181
-    #if ENABLED(USE_WIFI_FUNCTION)
1181
+    #if ENABLED(MKS_WIFI_MODULE)
1182 1182
       case WIFI_LIST_UI:              lv_clear_wifi_list(); break;
1183 1183
     #endif
1184 1184
     case KEY_BOARD_UI:                lv_clear_keyboard(); break;
1185
-    #if ENABLED(USE_WIFI_FUNCTION)
1185
+    #if ENABLED(MKS_WIFI_MODULE)
1186 1186
       case WIFI_TIPS_UI:              lv_clear_wifi_tips(); break;
1187 1187
     #endif
1188 1188
     case MACHINE_PARA_UI:             lv_clear_machine_para(); break;
@@ -1219,7 +1219,7 @@ void clear_cur_ui() {
1219 1219
     #if HAS_STEALTHCHOP
1220 1220
       case TMC_MODE_UI:               lv_clear_tmc_step_mode_settings(); break;
1221 1221
     #endif
1222
-    #if ENABLED(USE_WIFI_FUNCTION)
1222
+    #if ENABLED(MKS_WIFI_MODULE)
1223 1223
       case WIFI_SETTINGS_UI:          lv_clear_wifi_settings(); break;
1224 1224
     #endif
1225 1225
     #if USE_SENSORLESS
@@ -1267,7 +1267,7 @@ void draw_return_ui() {
1267 1267
 
1268 1268
       case CALIBRATE_UI:                /* draw_calibrate(); */ break;
1269 1269
       case DISK_UI:                     /* draw_Disk(); */ break;
1270
-      #if ENABLED(USE_WIFI_FUNCTION)
1270
+      #if ENABLED(MKS_WIFI_MODULE)
1271 1271
         case WIFI_UI:                   lv_draw_wifi(); break;
1272 1272
       #endif
1273 1273
       case MORE_UI:                     /* draw_More(); */ break;
@@ -1281,11 +1281,11 @@ void draw_return_ui() {
1281 1281
       case TOOL_UI:                     lv_draw_tool(); break;
1282 1282
       case MESHLEVELING_UI:             /* draw_meshleveling(); */ break;
1283 1283
       case HARDWARE_TEST_UI:            /* draw_Hardwaretest(); */ break;
1284
-      #if ENABLED(USE_WIFI_FUNCTION)
1284
+      #if ENABLED(MKS_WIFI_MODULE)
1285 1285
         case WIFI_LIST_UI:              lv_draw_wifi_list(); break;
1286 1286
       #endif
1287 1287
       case KEY_BOARD_UI:                lv_draw_keyboard(); break;
1288
-      #if ENABLED(USE_WIFI_FUNCTION)
1288
+      #if ENABLED(MKS_WIFI_MODULE)
1289 1289
         case WIFI_TIPS_UI:              lv_draw_wifi_tips(); break;
1290 1290
       #endif
1291 1291
       case MACHINE_PARA_UI:             lv_draw_machine_para(); break;
@@ -1325,7 +1325,7 @@ void draw_return_ui() {
1325 1325
         #if HAS_STEALTHCHOP
1326 1326
           case TMC_MODE_UI:             lv_draw_tmc_step_mode_settings(); break;
1327 1327
         #endif
1328
-      #if ENABLED(USE_WIFI_FUNCTION)
1328
+      #if ENABLED(MKS_WIFI_MODULE)
1329 1329
         case WIFI_SETTINGS_UI:          lv_draw_wifi_settings(); break;
1330 1330
       #endif
1331 1331
       #if USE_SENSORLESS
@@ -1620,7 +1620,7 @@ void LV_TASK_HANDLER() {
1620 1620
 
1621 1621
   GUI_RefreshPage();
1622 1622
 
1623
-  TERN_(USE_WIFI_FUNCTION, get_wifi_commands());
1623
+  TERN_(MKS_WIFI_MODULE, get_wifi_commands());
1624 1624
 
1625 1625
   //sd_detection();
1626 1626
 

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

@@ -21,7 +21,7 @@
21 21
  */
22 22
 #include "../../../../inc/MarlinConfigPre.h"
23 23
 
24
-#if BOTH(HAS_TFT_LVGL_UI, USE_WIFI_FUNCTION)
24
+#if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
25 25
 
26 26
 #include "draw_ui.h"
27 27
 #include "wifi_module.h"
@@ -822,4 +822,4 @@ int32_t wifi_upload(int type) {
822 822
   return esp_upload.uploadResult == success ? 0 : -1;
823 823
 }
824 824
 
825
-#endif // HAS_TFT_LVGL_UI && USE_WIFI_FUNCTION
825
+#endif // HAS_TFT_LVGL_UI && MKS_WIFI_MODULE

Loading…
取消
儲存