From 7729a0c3bb43951d136946cd74c778d5f926ae3e Mon Sep 17 00:00:00 2001
From: Scott Lahteine <github@thinkyhead.com>
Date: Thu, 19 Nov 2020 17:28:45 -0600
Subject: [PATCH] More MKS WiFi

---
 Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp    | 18 +++++++++---------
 .../src/lcd/extui/lib/mks_ui/wifi_upload.cpp   |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
index 102234b09..46c1ab827 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
+++ b/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
@@ -1161,7 +1161,7 @@ void clear_cur_ui() {
     case ABOUT_UI:                    lv_clear_about(); break;
     case LOG_UI:                      /* Clear_Connect(); */ break;
     case DISK_UI:                     /* Clear_Disk(); */ break;
-    #if ENABLED(USE_WIFI_FUNCTION)
+    #if ENABLED(MKS_WIFI_MODULE)
       case WIFI_UI:                   lv_clear_wifi(); break;
     #endif
     case MORE_UI:                     /* Clear_more(); */ break;
@@ -1178,11 +1178,11 @@ void clear_cur_ui() {
     case TOOL_UI:                     lv_clear_tool(); break;
     case MESHLEVELING_UI:             /* Clear_MeshLeveling(); */ break;
     case HARDWARE_TEST_UI:            /* Clear_Hardwaretest(); */ break;
-    #if ENABLED(USE_WIFI_FUNCTION)
+    #if ENABLED(MKS_WIFI_MODULE)
       case WIFI_LIST_UI:              lv_clear_wifi_list(); break;
     #endif
     case KEY_BOARD_UI:                lv_clear_keyboard(); break;
-    #if ENABLED(USE_WIFI_FUNCTION)
+    #if ENABLED(MKS_WIFI_MODULE)
       case WIFI_TIPS_UI:              lv_clear_wifi_tips(); break;
     #endif
     case MACHINE_PARA_UI:             lv_clear_machine_para(); break;
@@ -1219,7 +1219,7 @@ void clear_cur_ui() {
     #if HAS_STEALTHCHOP
       case TMC_MODE_UI:               lv_clear_tmc_step_mode_settings(); break;
     #endif
-    #if ENABLED(USE_WIFI_FUNCTION)
+    #if ENABLED(MKS_WIFI_MODULE)
       case WIFI_SETTINGS_UI:          lv_clear_wifi_settings(); break;
     #endif
     #if USE_SENSORLESS
@@ -1267,7 +1267,7 @@ void draw_return_ui() {
 
       case CALIBRATE_UI:                /* draw_calibrate(); */ break;
       case DISK_UI:                     /* draw_Disk(); */ break;
-      #if ENABLED(USE_WIFI_FUNCTION)
+      #if ENABLED(MKS_WIFI_MODULE)
         case WIFI_UI:                   lv_draw_wifi(); break;
       #endif
       case MORE_UI:                     /* draw_More(); */ break;
@@ -1281,11 +1281,11 @@ void draw_return_ui() {
       case TOOL_UI:                     lv_draw_tool(); break;
       case MESHLEVELING_UI:             /* draw_meshleveling(); */ break;
       case HARDWARE_TEST_UI:            /* draw_Hardwaretest(); */ break;
-      #if ENABLED(USE_WIFI_FUNCTION)
+      #if ENABLED(MKS_WIFI_MODULE)
         case WIFI_LIST_UI:              lv_draw_wifi_list(); break;
       #endif
       case KEY_BOARD_UI:                lv_draw_keyboard(); break;
-      #if ENABLED(USE_WIFI_FUNCTION)
+      #if ENABLED(MKS_WIFI_MODULE)
         case WIFI_TIPS_UI:              lv_draw_wifi_tips(); break;
       #endif
       case MACHINE_PARA_UI:             lv_draw_machine_para(); break;
@@ -1325,7 +1325,7 @@ void draw_return_ui() {
         #if HAS_STEALTHCHOP
           case TMC_MODE_UI:             lv_draw_tmc_step_mode_settings(); break;
         #endif
-      #if ENABLED(USE_WIFI_FUNCTION)
+      #if ENABLED(MKS_WIFI_MODULE)
         case WIFI_SETTINGS_UI:          lv_draw_wifi_settings(); break;
       #endif
       #if USE_SENSORLESS
@@ -1620,7 +1620,7 @@ void LV_TASK_HANDLER() {
 
   GUI_RefreshPage();
 
-  TERN_(USE_WIFI_FUNCTION, get_wifi_commands());
+  TERN_(MKS_WIFI_MODULE, get_wifi_commands());
 
   //sd_detection();
 
diff --git a/Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.cpp b/Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.cpp
index d67cb8cc2..1de557127 100644
--- a/Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.cpp
+++ b/Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.cpp
@@ -21,7 +21,7 @@
  */
 #include "../../../../inc/MarlinConfigPre.h"
 
-#if BOTH(HAS_TFT_LVGL_UI, USE_WIFI_FUNCTION)
+#if BOTH(HAS_TFT_LVGL_UI, MKS_WIFI_MODULE)
 
 #include "draw_ui.h"
 #include "wifi_module.h"
@@ -822,4 +822,4 @@ int32_t wifi_upload(int type) {
   return esp_upload.uploadResult == success ? 0 : -1;
 }
 
-#endif // HAS_TFT_LVGL_UI && USE_WIFI_FUNCTION
+#endif // HAS_TFT_LVGL_UI && MKS_WIFI_MODULE