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

Allow accessing device settings from wifi panel

Browse Source
This commit is contained in:
suchmememanyskill
2024-11-09 12:30:38 +01:00
parent 17143d2878
commit e5390e731f
3 changed files with 32 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CYD-Klipper/src/core/klipper-serial/serial_klipper_printer_integration.cpp
View File

@@ -81,6 +81,8 @@ typedef struct
unsigned char* data; unsigned char* data;
} BinaryResponse; } BinaryResponse;
// Request: {timeout} {method} {endpoint}
// Response: {8 char 0's padded body length}{body}
bool make_binary_request(BinaryResponse* data, int timeout_ms, HttpRequestType requestType, const char* endpoint) bool make_binary_request(BinaryResponse* data, int timeout_ms, HttpRequestType requestType, const char* endpoint)
{ {
serial_console::global_disable_serial_console = true; serial_console::global_disable_serial_console = true;

4
CYD-Klipper/src/ui/panels/panel.h
View File

@@ -11,4 +11,6 @@ void macros_panel_init(lv_obj_t* panel);
void stats_panel_init(lv_obj_t* panel); void stats_panel_init(lv_obj_t* panel);
void printer_panel_init(lv_obj_t* panel); void printer_panel_init(lv_obj_t* panel);
void error_panel_init(lv_obj_t* panel); void error_panel_init(lv_obj_t* panel);
void connecting_panel_init(lv_obj_t* panel); void connecting_panel_init(lv_obj_t* panel);
void settings_section_device(lv_obj_t* panel);

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

@@ -6,6 +6,7 @@
#include "../core/data_setup.h" #include "../core/data_setup.h"
#include "../core/lv_setup.h" #include "../core/lv_setup.h"
#include "serial/serial_console.h" #include "serial/serial_console.h"
#include "panels/panel.h"
void wifi_init_inner(); void wifi_init_inner();
void wifi_pass_entry(const char* ssid); void wifi_pass_entry(const char* ssid);
@@ -110,6 +111,23 @@ static void wifi_btn_skip_setup(lv_event_t * e){
global_config.wifi_configuration_skipped = true; global_config.wifi_configuration_skipped = true;
} }
static void wifi_btn_settings(lv_event_t * e){
lv_obj_clean(lv_scr_act());
lv_obj_t * panel = lv_create_empty_panel(lv_scr_act());
lv_obj_set_size(panel, CYD_SCREEN_WIDTH_PX, CYD_SCREEN_HEIGHT_PX);
lv_layout_flex_column(panel);
lv_obj_t * btn = lv_btn_create(panel);
lv_obj_add_event_cb(btn, reset_btn_event_handler, LV_EVENT_CLICKED, NULL);
lv_obj_set_size(btn, LV_PCT(100), CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
lv_obj_t * label = lv_label_create(btn);
lv_label_set_text(label, "Return to WiFi Setup");
lv_obj_center(label);
settings_section_device(panel);
}
void wifi_init_inner(){ void wifi_init_inner(){
WiFi.disconnect(); WiFi.disconnect();
lv_obj_clean(lv_scr_act()); lv_obj_clean(lv_scr_act());
@@ -166,8 +184,16 @@ void wifi_init_inner(){
lv_obj_set_flex_grow(label, 1); lv_obj_set_flex_grow(label, 1);
lv_obj_t * btn = lv_btn_create(top_row); lv_obj_t * btn = lv_btn_create(top_row);
lv_obj_add_event_cb(btn, wifi_btn_settings, LV_EVENT_CLICKED, NULL);
lv_obj_set_size(btn, CYD_SCREEN_MIN_BUTTON_WIDTH_PX, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
label = lv_label_create(btn);
lv_label_set_text(label, LV_SYMBOL_SETTINGS);
lv_obj_center(label);
btn = lv_btn_create(top_row);
lv_obj_add_event_cb(btn, wifi_btn_skip_setup, LV_EVENT_CLICKED, NULL); lv_obj_add_event_cb(btn, wifi_btn_skip_setup, LV_EVENT_CLICKED, NULL);
lv_obj_set_size(btn, CYD_SCREEN_MIN_BUTTON_WIDTH_PX * 2, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX); lv_obj_set_size(btn, CYD_SCREEN_MIN_BUTTON_WIDTH_PX * 1.5, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
label = lv_label_create(btn); label = lv_label_create(btn);
lv_label_set_text(label, "Skip"); lv_label_set_text(label, "Skip");