bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

✨ MKS Robin Nano v3 + TFT_LVGL_UI + WiFi module (#22109)

Browse Source
This commit is contained in:
MKS-Sean
2021-07-13 08:17:28 +08:00
committed by Scott Lahteine
parent 31fbec9a00
commit cad2f69687
51 changed files with 1271 additions and 650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
Marlin/src/lcd/extui/mks_ui/draw_ui.cpp
View File

@ -30,7 +30,6 @@
#include "pic_manager.h"
#include "draw_ui.h"
#include "mks_hardware_test.h"
#include <SPI.h>
@ -52,6 +51,10 @@
#include "draw_touch_calibration.h"
#endif
#if ENABLED(MKS_TEST)
#include "mks_hardware_test.h"
#endif
CFG_ITMES gCfgItems;
UI_CFG uiCfg;
DISP_STATE_STACK disp_state_stack;
@ -202,27 +205,27 @@ void ui_cfg_init() {
#if ENABLED(MKS_WIFI_MODULE)
memset(&wifiPara, 0, sizeof(wifiPara));
memset(&ipPara, 0, sizeof(ipPara));
strcpy(wifiPara.ap_name, WIFI_AP_NAME);
strcpy(wifiPara.keyCode, WIFI_KEY_CODE);
strcpy_P(wifiPara.ap_name, PSTR(WIFI_AP_NAME));
strcpy_P(wifiPara.keyCode, PSTR(WIFI_KEY_CODE));
//client
strcpy(ipPara.ip_addr, IP_ADDR);
strcpy(ipPara.mask, IP_MASK);
strcpy(ipPara.gate, IP_GATE);
strcpy(ipPara.dns, IP_DNS);
strcpy_P(ipPara.ip_addr, PSTR(IP_ADDR));
strcpy_P(ipPara.mask, PSTR(IP_MASK));
strcpy_P(ipPara.gate, PSTR(IP_GATE));
strcpy_P(ipPara.dns, PSTR(IP_DNS));
ipPara.dhcp_flag = IP_DHCP_FLAG;
//AP
strcpy(ipPara.dhcpd_ip, AP_IP_ADDR);
strcpy(ipPara.dhcpd_mask, AP_IP_MASK);
strcpy(ipPara.dhcpd_gate, AP_IP_GATE);
strcpy(ipPara.dhcpd_dns, AP_IP_DNS);
strcpy(ipPara.start_ip_addr, IP_START_IP);
strcpy(ipPara.end_ip_addr, IP_END_IP);
strcpy_P(ipPara.dhcpd_ip, PSTR(AP_IP_ADDR));
strcpy_P(ipPara.dhcpd_mask, PSTR(AP_IP_MASK));
strcpy_P(ipPara.dhcpd_gate, PSTR(AP_IP_GATE));
strcpy_P(ipPara.dhcpd_dns, PSTR(AP_IP_DNS));
strcpy_P(ipPara.start_ip_addr, PSTR(IP_START_IP));
strcpy_P(ipPara.end_ip_addr, PSTR(IP_END_IP));
ipPara.dhcpd_flag = AP_IP_DHCP_FLAG;
strcpy((char*)uiCfg.cloud_hostUrl, "baizhongyun.cn");
strcpy_P((char*)uiCfg.cloud_hostUrl, PSTR("baizhongyun.cn"));
uiCfg.cloud_port = 10086;
#endif
@ -1362,7 +1365,10 @@ void print_time_count() {
void LV_TASK_HANDLER() {
lv_task_handler();
if (mks_test_flag == 0x1E) mks_hardware_test();
#if ENABLED(MKS_TEST)
if (mks_test_flag == 0x1E) mks_hardware_test();
#endif
TERN_(HAS_GCODE_PREVIEW, disp_pre_gcode(2, 36));