CloneRepos/CYD-Klipper
2
0
Fork 0
mirror of https://github.com/suchmememanyskill/CYD-Klipper.git synced 2026-03-21 13:43:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Retry IP connect on boot, fix network c string issue

Browse Source
This commit is contained in:
suchmememanyskill
2023-11-14 00:31:52 +01:00
parent 5224e34f8c
commit c5d08253a7
2 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
CYD-Klipper/src/ui/ip_setup.cpp
View File

@@ -25,6 +25,17 @@ bool verify_ip(){
} }
} }
bool retry_ip_verify(){
for (int i = 0; i < 3; i++){
if (verify_ip()){
return true;
}
delay(500);
}
return false;
}
static void ta_event_cb(lv_event_t * e) { static void ta_event_cb(lv_event_t * e) {
lv_event_code_t code = lv_event_get_code(e); lv_event_code_t code = lv_event_get_code(e);
lv_obj_t * ta = lv_event_get_target(e); lv_obj_t * ta = lv_event_get_target(e);
@@ -87,7 +98,7 @@ void ip_setup_inner(){
void ip_setup(){ void ip_setup(){
connect_ok = false; connect_ok = false;
if (global_config.ipConfigured && verify_ip()){ if (global_config.ipConfigured && retry_ip_verify()){
return; return;
} }

21
CYD-Klipper/src/ui/wifi_setup.cpp
View File

@@ -108,8 +108,6 @@ void wifi_init_inner(){
lv_task_handler(); lv_task_handler();
lv_refr_now(NULL); lv_refr_now(NULL);
int n = WiFi.scanNetworks();
lv_obj_clean(lv_scr_act()); lv_obj_clean(lv_scr_act());
lv_obj_t * refreshBtn = lv_btn_create(lv_scr_act()); lv_obj_t * refreshBtn = lv_btn_create(lv_scr_act());
@@ -128,15 +126,22 @@ void wifi_init_inner(){
lv_obj_align(list, LV_ALIGN_TOP_LEFT, 10, 40); lv_obj_align(list, LV_ALIGN_TOP_LEFT, 10, 40);
lv_obj_set_size(list, TFT_HEIGHT - 20, TFT_WIDTH - 40 - 5); lv_obj_set_size(list, TFT_HEIGHT - 20, TFT_WIDTH - 40 - 5);
for (int i = 0; i < n; ++i) { int n = WiFi.scanNetworks();
const char* ssid = WiFi.SSID(i).c_str();
int len = strlen(ssid);
if (len == 0) for (int i = 0; i < n; ++i) {
String ssid = WiFi.SSID(i);
char* ssid_copy = (char*)malloc(ssid.length() + 1);
int j = 0;
for (; j < ssid.length(); ++j){
if (ssid[j] == '\0')
continue; continue;
const char* ssid_copy = (const char*)malloc(len + 1); ssid_copy[j] = ssid[j];
strcpy((char*)ssid_copy, ssid); }
ssid_copy[j] = '\0';
lv_obj_t * btn = lv_list_add_btn(list, LV_SYMBOL_WIFI, ssid_copy); lv_obj_t * btn = lv_list_add_btn(list, LV_SYMBOL_WIFI, ssid_copy);
lv_obj_add_event_cb(btn, wifi_btn_event_handler, LV_EVENT_ALL, (void*)ssid_copy); lv_obj_add_event_cb(btn, wifi_btn_event_handler, LV_EVENT_ALL, (void*)ssid_copy);
} }