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

Change back to klipper connect screen when connection to klipper gets severed

Browse Source
This commit is contained in:
suchmememanyskill
2023-12-11 22:23:18 +01:00
parent f2d232d9eb
commit 7a430f81c5
5 changed files with 18 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CYD-Klipper/src/core/data_setup.cpp
View File

@@ -12,6 +12,7 @@ const char *printer_state_messages[] = {
"Printing"}; "Printing"};
Printer printer = {0}; Printer printer = {0};
int klipper_request_consecutive_fail_count = 0;
void send_gcode(bool wait, const char *gcode) void send_gcode(bool wait, const char *gcode)
{ {
@@ -46,6 +47,7 @@ void fetch_printer_data()
int httpCode = client.GET(); int httpCode = client.GET();
if (httpCode == 200) if (httpCode == 200)
{ {
klipper_request_consecutive_fail_count = 0;
String payload = client.getString(); String payload = client.getString();
DynamicJsonDocument doc(4096); DynamicJsonDocument doc(4096);
deserializeJson(doc, payload); deserializeJson(doc, payload);
@@ -159,6 +161,7 @@ void fetch_printer_data()
} }
else else
{ {
klipper_request_consecutive_fail_count++;
Serial.printf("Failed to fetch printer data: %d\n", httpCode); Serial.printf("Failed to fetch printer data: %d\n", httpCode);
} }
} }
@@ -171,9 +174,8 @@ void data_loop()
if (millis() - last_data_update < data_update_interval) if (millis() - last_data_update < data_update_interval)
return; return;
last_data_update = millis();
fetch_printer_data(); fetch_printer_data();
last_data_update = millis();
} }
void data_setup() void data_setup()

1
CYD-Klipper/src/core/data_setup.h
View File

@@ -28,6 +28,7 @@ typedef struct _Printer {
} Printer; } Printer;
extern Printer printer; extern Printer printer;
extern int klipper_request_consecutive_fail_count;
#define DATA_PRINTER_STATE 1 #define DATA_PRINTER_STATE 1
#define DATA_PRINTER_DATA 2 #define DATA_PRINTER_DATA 2

1
CYD-Klipper/src/main.cpp
View File

@@ -34,6 +34,7 @@ void setup() {
void loop(){ void loop(){
wifi_ok(); wifi_ok();
ip_ok();
data_loop(); data_loop();
lv_timer_handler(); lv_timer_handler();
lv_task_handler(); lv_task_handler();

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

@@ -3,6 +3,7 @@
#include "lvgl.h" #include "lvgl.h"
#include <TFT_eSPI.h> #include <TFT_eSPI.h>
#include <HTTPClient.h> #include <HTTPClient.h>
#include "core/data_setup.h"
bool connect_ok = false; bool connect_ok = false;
lv_obj_t * ipEntry; lv_obj_t * ipEntry;
@@ -117,6 +118,7 @@ int retry_count = 0;
void ip_init(){ void ip_init(){
connect_ok = false; connect_ok = false;
retry_count = 0;
ip_init_inner(); ip_init_inner();
@@ -134,3 +136,11 @@ void ip_init(){
} }
} }
} }
void ip_ok(){
if (klipper_request_consecutive_fail_count > 5){
ip_init();
klipper_request_consecutive_fail_count = 0;
lv_msg_send(DATA_PRINTER_STATE, &printer);
}
}

1
CYD-Klipper/src/ui/ip_setup.h
View File

@@ -1 +1,2 @@
void ip_init(); void ip_init();
void ip_ok();