zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

More MKS WiFi

Browse source
This commit is contained in:
Scott Lahteine 2020-11-19 17:28:45 -06:00
parent 3893114c86
commit b51c6d4737
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
View file

@ -1161,7 +1161,7 @@ void clear_cur_ui() {
case ABOUT_UI: lv_clear_about(); break; case ABOUT_UI: lv_clear_about(); break;
case LOG_UI: /* Clear_Connect(); */ break; case LOG_UI: /* Clear_Connect(); */ break;
case DISK_UI: /* Clear_Disk(); */ break; case DISK_UI: /* Clear_Disk(); */ break;
#if ENABLED(USE_WIFI_FUNCTION) #if ENABLED(MKS_WIFI_MODULE)
case WIFI_UI: lv_clear_wifi(); break; case WIFI_UI: lv_clear_wifi(); break;
#endif #endif
case MORE_UI: /* Clear_more(); */ break; case MORE_UI: /* Clear_more(); */ break;
@ -1178,11 +1178,11 @@ void clear_cur_ui() {
case TOOL_UI: lv_clear_tool(); break; case TOOL_UI: lv_clear_tool(); break;
case MESHLEVELING_UI: /* Clear_MeshLeveling(); */ break; case MESHLEVELING_UI: /* Clear_MeshLeveling(); */ break;
case HARDWARE_TEST_UI: /* Clear_Hardwaretest(); */ 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; case WIFI_LIST_UI: lv_clear_wifi_list(); break;
#endif #endif
case KEY_BOARD_UI: lv_clear_keyboard(); break; 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; case WIFI_TIPS_UI: lv_clear_wifi_tips(); break;
#endif #endif
case MACHINE_PARA_UI: lv_clear_machine_para(); break; case MACHINE_PARA_UI: lv_clear_machine_para(); break;
@ -1219,7 +1219,7 @@ void clear_cur_ui() {
#if HAS_STEALTHCHOP #if HAS_STEALTHCHOP
case TMC_MODE_UI: lv_clear_tmc_step_mode_settings(); break; case TMC_MODE_UI: lv_clear_tmc_step_mode_settings(); break;
#endif #endif
#if ENABLED(USE_WIFI_FUNCTION) #if ENABLED(MKS_WIFI_MODULE)
case WIFI_SETTINGS_UI: lv_clear_wifi_settings(); break; case WIFI_SETTINGS_UI: lv_clear_wifi_settings(); break;
#endif #endif
#if USE_SENSORLESS #if USE_SENSORLESS
@ -1267,7 +1267,7 @@ void draw_return_ui() {
case CALIBRATE_UI: /* draw_calibrate(); */ break; case CALIBRATE_UI: /* draw_calibrate(); */ break;
case DISK_UI: /* draw_Disk(); */ break; case DISK_UI: /* draw_Disk(); */ break;
#if ENABLED(USE_WIFI_FUNCTION) #if ENABLED(MKS_WIFI_MODULE)
case WIFI_UI: lv_draw_wifi(); break; case WIFI_UI: lv_draw_wifi(); break;
#endif #endif
case MORE_UI: /* draw_More(); */ break; case MORE_UI: /* draw_More(); */ break;
@ -1281,11 +1281,11 @@ void draw_return_ui() {
case TOOL_UI: lv_draw_tool(); break; case TOOL_UI: lv_draw_tool(); break;
case MESHLEVELING_UI: /* draw_meshleveling(); */ break; case MESHLEVELING_UI: /* draw_meshleveling(); */ break;
case HARDWARE_TEST_UI: /* draw_Hardwaretest(); */ 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; case WIFI_LIST_UI: lv_draw_wifi_list(); break;
#endif #endif
case KEY_BOARD_UI: lv_draw_keyboard(); break; 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; case WIFI_TIPS_UI: lv_draw_wifi_tips(); break;
#endif #endif
case MACHINE_PARA_UI: lv_draw_machine_para(); break; case MACHINE_PARA_UI: lv_draw_machine_para(); break;
@ -1325,7 +1325,7 @@ void draw_return_ui() {
#if HAS_STEALTHCHOP #if HAS_STEALTHCHOP
case TMC_MODE_UI: lv_draw_tmc_step_mode_settings(); break; case TMC_MODE_UI: lv_draw_tmc_step_mode_settings(); break;
#endif #endif
#if ENABLED(USE_WIFI_FUNCTION) #if ENABLED(MKS_WIFI_MODULE)
case WIFI_SETTINGS_UI: lv_draw_wifi_settings(); break; case WIFI_SETTINGS_UI: lv_draw_wifi_settings(); break;
#endif #endif
#if USE_SENSORLESS #if USE_SENSORLESS
@ -1620,7 +1620,7 @@ void LV_TASK_HANDLER() {
GUI_RefreshPage(); GUI_RefreshPage();
TERN_(USE_WIFI_FUNCTION, get_wifi_commands()); TERN_(MKS_WIFI_MODULE, get_wifi_commands());
//sd_detection(); //sd_detection();

4
Marlin/src/lcd/extui/lib/mks_ui/wifi_upload.cpp
View file

@ -21,7 +21,7 @@
*/ */
#include "../../../../inc/MarlinConfigPre.h" #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 "draw_ui.h"
#include "wifi_module.h" #include "wifi_module.h"
@ -822,4 +822,4 @@ int32_t wifi_upload(int type) {
return esp_upload.uploadResult == success ? 0 : -1; return esp_upload.uploadResult == success ? 0 : -1;
} }
#endif // HAS_TFT_LVGL_UI && USE_WIFI_FUNCTION #endif // HAS_TFT_LVGL_UI && MKS_WIFI_MODULE