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

Fix scaling for 3.5inch, Fix text scaling in general

Browse Source
This commit is contained in:
suchmememanyskill
2024-02-07 21:58:23 +01:00
parent 26a0f35dd2
commit 716f934b6c
17 changed files with 92 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
CYD-Klipper/platformio.ini
View File

@@ -91,11 +91,11 @@ build_flags =
-DCYD_SCREEN_HEIGHT_PX=320
-DCYD_SCREEN_WIDTH_PX=480
-DCYD_SCREEN_GAP_PX=8
-DCYD_SCREEN_MIN_BUTTON_HEIGHT_PX=35
-DCYD_SCREEN_MIN_BUTTON_WIDTH_PX=35
-DCYD_SCREEN_FONT=&lv_font_montserrat_14
-DCYD_SCREEN_FONT_SMALL=&lv_font_montserrat_10
-DCYD_SCREEN_SIDEBAR_SIZE_PX=40
-DCYD_SCREEN_GAP_PX=10
-DCYD_SCREEN_MIN_BUTTON_HEIGHT_PX=40
-DCYD_SCREEN_MIN_BUTTON_WIDTH_PX=40
-DCYD_SCREEN_FONT=&lv_font_montserrat_16
-DCYD_SCREEN_FONT_SMALL=&lv_font_montserrat_12
-DCYD_SCREEN_SIDEBAR_SIZE_PX=50
-DCYD_SCREEN_DRIVER_ESP32_3248S035C=1

4
CYD-Klipper/src/conf/lv_conf.h
View File

@@ -327,9 +327,9 @@
*https://fonts.google.com/specimen/Montserrat*/
#define LV_FONT_MONTSERRAT_8 0
#define LV_FONT_MONTSERRAT_10 1
#define LV_FONT_MONTSERRAT_12 0
#define LV_FONT_MONTSERRAT_12 1
#define LV_FONT_MONTSERRAT_14 1
#define LV_FONT_MONTSERRAT_16 0
#define LV_FONT_MONTSERRAT_16 1
#define LV_FONT_MONTSERRAT_18 0
#define LV_FONT_MONTSERRAT_20 0
#define LV_FONT_MONTSERRAT_22 0

8
CYD-Klipper/src/core/lv_setup.cpp
View File

@@ -12,6 +12,7 @@
bool isScreenInSleep = false;
lv_timer_t *screenSleepTimer;
static lv_style_t default_label_style;
void set_screen_brightness()
{
@@ -90,6 +91,9 @@ void set_color_scheme()
void lv_setup()
{
lv_style_init(&default_label_style);
lv_style_set_text_font(&default_label_style, CYD_SCREEN_FONT);
screen_timer_setup();
screen_timer_start();
set_color_scheme();
@@ -100,3 +104,7 @@ bool is_screen_asleep()
return isScreenInSleep;
}
lv_style_t * get_default_label_style()
{
return &default_label_style;
}

6
CYD-Klipper/src/core/lv_setup.h
View File

@@ -1,5 +1,7 @@
#pragma once
#include "lvgl.h"
void set_screen_brightness();
void set_screen_timer_period();
void screen_timer_wake();
@@ -7,4 +9,6 @@ void screen_timer_start();
void screen_timer_stop();
void set_color_scheme();
void lv_setup();
bool is_screen_asleep();
bool is_screen_asleep();
lv_style_t * get_default_label_style();

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

@@ -110,7 +110,7 @@ static void power_devices_button(lv_event_t * e) {
lv_obj_set_size(button, CYD_SCREEN_WIDTH_PX - CYD_SCREEN_GAP_PX * 2, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
lv_obj_add_event_cb(button, destroy_event_user_data, LV_EVENT_CLICKED, panel);
lv_obj_t * label = lv_label_create(button);
lv_obj_t * label = lv_label_create_ex(button);
lv_label_set_text(label, LV_SYMBOL_CLOSE " Close");
lv_obj_center(label);
@@ -120,7 +120,7 @@ static void power_devices_button(lv_event_t * e) {
void redraw_connect_screen(){
lv_obj_clean(lv_scr_act());
label = lv_label_create(lv_scr_act());
label = lv_label_create_ex(lv_scr_act());
lv_label_set_text(label, "Connecting to Klipper");
lv_obj_align(label, LV_ALIGN_CENTER, 0, 0);
@@ -133,7 +133,7 @@ void redraw_connect_screen(){
lv_obj_add_event_cb(reset_btn, reset_btn_event_handler, LV_EVENT_CLICKED, NULL);
lv_obj_set_height(reset_btn, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
lv_obj_t * btn_label = lv_label_create(reset_btn);
lv_obj_t * btn_label = lv_label_create_ex(reset_btn);
lv_label_set_text(btn_label, "Reset");
lv_obj_center(btn_label);
@@ -142,7 +142,7 @@ void redraw_connect_screen(){
lv_obj_add_event_cb(power_devices_btn, power_devices_button, LV_EVENT_CLICKED, NULL);
lv_obj_set_height(power_devices_btn, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
btn_label = lv_label_create(power_devices_btn);
btn_label = lv_label_create_ex(power_devices_btn);
lv_label_set_text(btn_label, "Power Devices");
lv_obj_center(btn_label);
}
@@ -166,7 +166,7 @@ void ip_init_inner(){
lv_obj_set_flex_grow(top_root, 1);
lv_obj_set_style_pad_all(top_root, CYD_SCREEN_GAP_PX, 0);
label = lv_label_create(top_root);
label = lv_label_create_ex(top_root);
lv_label_set_text(label, "Enter Klipper IP/Hostname and Port");
lv_obj_set_width(label, CYD_SCREEN_WIDTH_PX - CYD_SCREEN_GAP_PX * 2);

12
CYD-Klipper/src/ui/main_ui.cpp
View File

@@ -32,7 +32,7 @@ void error_ui_macros_open(lv_event_t * e){
lv_obj_set_size(button, CYD_SCREEN_WIDTH_PX - CYD_SCREEN_GAP_PX * 2, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
lv_obj_add_event_cb(button, destroy_event_user_data, LV_EVENT_CLICKED, panel);
lv_obj_t * label = lv_label_create(button);
lv_obj_t * label = lv_label_create_ex(button);
lv_label_set_text(label, LV_SYMBOL_CLOSE " Close");
lv_obj_center(label);
@@ -49,10 +49,10 @@ void error_ui(){
lv_obj_set_flex_align(panel, LV_FLEX_ALIGN_SPACE_BETWEEN, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START);
lv_obj_t * label;
label = lv_label_create(panel);
label = lv_label_create_ex(panel);
lv_label_set_text(label, LV_SYMBOL_WARNING " Printer is not ready");
label = lv_label_create(panel);
label = lv_label_create_ex(panel);
lv_label_set_text(label, printer.state_message);
lv_obj_set_width(label, CYD_SCREEN_WIDTH_PX - CYD_SCREEN_GAP_PX * 2);
lv_obj_clear_flag(label, LV_OBJ_FLAG_SCROLLABLE);
@@ -67,7 +67,7 @@ void error_ui(){
lv_obj_add_event_cb(btn, btn_click_restart, LV_EVENT_CLICKED, NULL);
lv_obj_set_flex_grow(btn, 1);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, "Restart");
lv_obj_center(label);
@@ -76,7 +76,7 @@ void error_ui(){
lv_obj_add_event_cb(btn, btn_click_firmware_restart, LV_EVENT_CLICKED, NULL);
lv_obj_set_flex_grow(btn, 1);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, "FW Restart");
lv_obj_center(label);
@@ -86,7 +86,7 @@ void error_ui(){
lv_obj_add_event_cb(btn, error_ui_macros_open, LV_EVENT_CLICKED, NULL);
lv_obj_set_flex_grow(btn, 1);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, "Devices");
lv_obj_center(label);
}

2
CYD-Klipper/src/ui/nav_buttons.cpp
View File

@@ -84,7 +84,7 @@ void create_button(const char* icon, const char* name, lv_event_cb_t button_clic
if (button_click != NULL)
lv_obj_add_event_cb(btn, button_click, LV_EVENT_CLICKED, NULL);
lv_obj_t* label = lv_label_create(btn);
lv_obj_t* label = lv_label_create_ex(btn);
lv_label_set_text(label, icon);
lv_obj_align(label, LV_ALIGN_CENTER, 0, -1 * CYD_SCREEN_GAP_PX);

10
CYD-Klipper/src/ui/panels/macros_panel.cpp
View File

@@ -28,7 +28,7 @@ void macros_panel_add_macros_to_panel(lv_obj_t * root_panel, MACROSQUERY query){
lv_layout_flex_row(panel, LV_FLEX_ALIGN_END);
lv_obj_set_size(panel, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 3, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
lv_obj_t * label = lv_label_create(panel);
lv_obj_t * label = lv_label_create_ex(panel);
lv_label_set_text(label, macro);
lv_label_set_long_mode(label, LV_LABEL_LONG_SCROLL_CIRCULAR);
lv_obj_set_flex_grow(label, 1);
@@ -37,7 +37,7 @@ void macros_panel_add_macros_to_panel(lv_obj_t * root_panel, MACROSQUERY query){
lv_obj_add_event_cb(btn, btn_press, LV_EVENT_CLICKED, (void*)macro);
lv_obj_set_height(btn, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, "Run");
lv_obj_center(label);
@@ -66,7 +66,7 @@ void macros_panel_add_power_devices_to_panel(lv_obj_t * root_panel, POWERQUERY q
lv_layout_flex_row(panel, LV_FLEX_ALIGN_END);
lv_obj_set_size(panel, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 3, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
lv_obj_t * label = lv_label_create(panel);
lv_obj_t * label = lv_label_create_ex(panel);
lv_label_set_text(label, power_device_name);
lv_label_set_long_mode(label, LV_LABEL_LONG_SCROLL_CIRCULAR);
lv_obj_set_flex_grow(label, 1);
@@ -90,14 +90,14 @@ void macros_panel_init(lv_obj_t* panel) {
lv_obj_set_size(btn, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 2, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
lv_obj_align(btn, LV_ALIGN_TOP_MID, 0, CYD_SCREEN_GAP_PX);
lv_obj_t * label = lv_label_create(btn);
lv_obj_t * label = lv_label_create_ex(btn);
lv_label_set_text(label, LV_SYMBOL_SETTINGS " Screen Settings");
lv_obj_center(label);
MACROSQUERY query = macros_query();
POWERQUERY power = power_devices_query();
if (query.count == 0 && power.count == 0){
label = lv_label_create(panel);
label = lv_label_create_ex(panel);
lv_label_set_text(label, "No macros found.\nMacros with the description\n\"CYD_SCREEN_MACRO\"\nwill show up here.");
lv_obj_align(label, LV_ALIGN_CENTER, 0, 0);
return;

12
CYD-Klipper/src/ui/panels/move_panel.cpp
View File

@@ -120,7 +120,7 @@ inline void root_panel_steppers_locked(lv_obj_t * root_panel){
lv_obj_add_event_cb(btn, home_button_click, LV_EVENT_CLICKED, NULL);
lv_obj_set_flex_grow(btn, 1);
lv_obj_t * label = lv_label_create(btn);
lv_obj_t * label = lv_label_create_ex(btn);
lv_label_set_text(label, LV_SYMBOL_HOME "Home Axis");
lv_obj_center(label);
@@ -129,12 +129,12 @@ inline void root_panel_steppers_locked(lv_obj_t * root_panel){
lv_obj_add_event_cb(btn, disable_steppers_click, LV_EVENT_CLICKED, NULL);
lv_obj_set_flex_grow(btn, 1);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, LV_SYMBOL_EYE_CLOSE " Disable Step");
lv_obj_center(label);
for (int row = 0; row < 3; row++) {
label = lv_label_create(panel);
label = lv_label_create_ex(panel);
lv_label_set_text(label, "???");
lv_obj_set_width(label, width);
lv_obj_add_event_cb(label, position_callbacks[row], LV_EVENT_MSG_RECEIVED, NULL);
@@ -151,7 +151,7 @@ inline void root_panel_steppers_locked(lv_obj_t * root_panel){
lv_obj_add_event_cb(btn, button_callbacks[row], LV_EVENT_CLICKED, (void*)(offsets[row] + col));
lv_obj_set_flex_grow(btn, 1);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, offset_labels[row][col]);
lv_obj_center(label);
}
@@ -165,14 +165,14 @@ inline void root_panel_steppers_unlocked(lv_obj_t * root_panel){
lv_obj_set_style_pad_all(panel, CYD_SCREEN_GAP_PX, 0);
lv_layout_flex_column(panel, LV_FLEX_ALIGN_CENTER);
lv_obj_t * label = lv_label_create(panel);
lv_obj_t * label = lv_label_create_ex(panel);
lv_label_set_text(label, LV_SYMBOL_EYE_CLOSE " Steppers unlocked");
lv_obj_t * btn = lv_btn_create(panel);
lv_obj_set_height(btn, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
lv_obj_add_event_cb(btn, home_button_click, LV_EVENT_CLICKED, NULL);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, LV_SYMBOL_HOME "Home Axis");
lv_obj_center(label);
}

12
CYD-Klipper/src/ui/panels/print_panel.cpp
View File

@@ -6,6 +6,7 @@
#include <HardwareSerial.h>
#include <HTTPClient.h>
#include "../ui_utils.h"
#include "../../core/lv_setup.h"
FILESYSTEM_FILE* selected_file = NULL;
@@ -51,11 +52,11 @@ static void btn_print_file_verify(lv_event_t * e){
lv_obj_set_size(panel, CYD_SCREEN_WIDTH_PX - CYD_SCREEN_GAP_PX * 4, CYD_SCREEN_HEIGHT_PX - CYD_SCREEN_GAP_PX * 3);
lv_obj_align(panel, LV_ALIGN_CENTER, 0, 0);
lv_obj_t * label = lv_label_create(panel);
lv_obj_t * label = lv_label_create_ex(panel);
lv_label_set_text(label, "Print File");
lv_obj_align(label, LV_ALIGN_TOP_LEFT, 0, 0);
label = lv_label_create(panel);
label = lv_label_create_ex(panel);
lv_label_set_text(label, selected_file->name);
lv_obj_align(label, LV_ALIGN_CENTER, 0, -20);
lv_obj_set_width(label, CYD_SCREEN_WIDTH_PX - CYD_SCREEN_GAP_PX * 10);
@@ -66,7 +67,7 @@ static void btn_print_file_verify(lv_event_t * e){
lv_obj_set_size(btn, CYD_SCREEN_MIN_BUTTON_WIDTH_PX * button_size_mult, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX * button_size_mult);
lv_obj_add_event_cb(btn, destroy_event_user_data, LV_EVENT_CLICKED, panel);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, LV_SYMBOL_CLOSE);
lv_obj_center(label);
@@ -75,7 +76,7 @@ static void btn_print_file_verify(lv_event_t * e){
lv_obj_set_size(btn, CYD_SCREEN_MIN_BUTTON_WIDTH_PX * button_size_mult, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX * button_size_mult);
lv_obj_add_event_cb(btn, btn_print_file, LV_EVENT_CLICKED, panel);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, LV_SYMBOL_OK);
lv_obj_center(label);
}
@@ -97,6 +98,7 @@ void print_panel_init(lv_obj_t* panel){
int count = 0;
while (files != NULL && files->name != NULL && count <= 20){
lv_obj_t * btn = lv_list_add_btn(list, LV_SYMBOL_FILE, files->name);
lv_obj_add_style(btn, get_default_label_style(), 0);
lv_obj_set_style_bg_opa(btn, LV_OPA_TRANSP, 0);
lv_obj_add_event_cb(btn, btn_print_file_verify, LV_EVENT_CLICKED, (void*)files);
@@ -106,7 +108,7 @@ void print_panel_init(lv_obj_t* panel){
if (count <= 0){
lv_obj_del(list);
lv_obj_t * label = lv_label_create(panel);
lv_obj_t * label = lv_label_create_ex(panel);
lv_label_set_text(label, "Failed to read files.");
lv_obj_align(label, LV_ALIGN_CENTER, 0, 0);
}

14
CYD-Klipper/src/ui/panels/progress_panel.cpp
View File

@@ -57,7 +57,7 @@ void progress_panel_init(lv_obj_t* panel){
lv_layout_flex_column(center_panel);
// Filename
lv_obj_t * label = lv_label_create(center_panel);
lv_obj_t * label = lv_label_create_ex(center_panel);
lv_label_set_text(label, printer.print_filename);
lv_label_set_long_mode(label, LV_LABEL_LONG_SCROLL_CIRCULAR);
lv_obj_set_width(label, panel_width);
@@ -73,21 +73,21 @@ void progress_panel_init(lv_obj_t* panel){
lv_obj_set_size(time_est_panel, panel_width, LV_SIZE_CONTENT);
// Elapsed Time
label = lv_label_create(time_est_panel);
label = lv_label_create_ex(time_est_panel);
lv_label_set_text(label, "???");
lv_obj_align(label, LV_ALIGN_LEFT_MID, 0, 0);
lv_obj_add_event_cb(label, update_printer_data_elapsed_time, LV_EVENT_MSG_RECEIVED, NULL);
lv_msg_subsribe_obj(DATA_PRINTER_DATA, label, NULL);
// Remaining Time
label = lv_label_create(time_est_panel);
label = lv_label_create_ex(time_est_panel);
lv_label_set_text(label, "???");
lv_obj_align(label, LV_ALIGN_RIGHT_MID, 0, 0);
lv_obj_add_event_cb(label, update_printer_data_remaining_time, LV_EVENT_MSG_RECEIVED, NULL);
lv_msg_subsribe_obj(DATA_PRINTER_DATA, label, NULL);
// Percentage
label = lv_label_create(time_est_panel);
label = lv_label_create_ex(time_est_panel);
lv_label_set_text(label, "???");
lv_obj_align(label, LV_ALIGN_CENTER, 0, 0);
lv_obj_add_event_cb(label, update_printer_data_percentage, LV_EVENT_MSG_RECEIVED, NULL);
@@ -99,7 +99,7 @@ void progress_panel_init(lv_obj_t* panel){
lv_obj_set_size(btn, CYD_SCREEN_MIN_BUTTON_WIDTH_PX * button_size_mult, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX * button_size_mult);
lv_obj_add_event_cb(btn, btn_click_stop, LV_EVENT_CLICKED, NULL);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, LV_SYMBOL_STOP);
lv_obj_center(label);
@@ -108,7 +108,7 @@ void progress_panel_init(lv_obj_t* panel){
btn = lv_btn_create(panel);
lv_obj_add_event_cb(btn, btn_click_resume, LV_EVENT_CLICKED, NULL);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, LV_SYMBOL_PLAY);
lv_obj_center(label);
}
@@ -117,7 +117,7 @@ void progress_panel_init(lv_obj_t* panel){
btn = lv_btn_create(panel);
lv_obj_add_event_cb(btn, btn_click_pause, LV_EVENT_CLICKED, NULL);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, LV_SYMBOL_PAUSE);
lv_obj_center(label);
}

9
CYD-Klipper/src/ui/panels/settings_panel.cpp
View File

@@ -91,7 +91,7 @@ void create_settings_widget(const char* label_text, lv_obj_t* object, lv_obj_t*
lv_obj_t * panel = lv_create_empty_panel(root_panel);
lv_obj_set_size(panel, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 3, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
lv_obj_t * label = lv_label_create(panel);
lv_obj_t * label = lv_label_create_ex(panel);
lv_label_set_text(label, label_text);
lv_obj_align(label, LV_ALIGN_LEFT_MID, 0, 0);
@@ -111,7 +111,7 @@ void settings_panel_init(lv_obj_t* panel){
lv_obj_t * btn = lv_btn_create(panel);
lv_obj_add_event_cb(btn, reset_wifi_click, LV_EVENT_CLICKED, NULL);
lv_obj_t * label = lv_label_create(btn);
lv_obj_t * label = lv_label_create_ex(btn);
lv_label_set_text(label, "Restart");
lv_obj_center(label);
@@ -120,7 +120,7 @@ void settings_panel_init(lv_obj_t* panel){
btn = lv_btn_create(panel);
lv_obj_add_event_cb(btn, reset_calibration_click, LV_EVENT_CLICKED, NULL);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, "Restart");
lv_obj_center(label);
@@ -148,12 +148,14 @@ void settings_panel_init(lv_obj_t* panel){
lv_obj_t * dropdown = lv_dropdown_create(panel);
lv_dropdown_set_options(dropdown, "Blue\nGreen\nGrey\nYellow\nOrange\nRed\nPurple");
lv_dropdown_set_selected(dropdown, global_config.color_scheme);
lv_obj_add_style(dropdown, get_default_label_style(), 0);
lv_obj_add_event_cb(dropdown, theme_dropdown, LV_EVENT_VALUE_CHANGED, NULL);
create_settings_widget("Theme", dropdown, panel);
dropdown = lv_dropdown_create(panel);
lv_dropdown_set_options(dropdown, brightness_options);
lv_obj_add_style(dropdown, get_default_label_style(), 0);
lv_obj_add_event_cb(dropdown, brightness_dropdown, LV_EVENT_VALUE_CHANGED, NULL);
for (int i = 0; i < SIZEOF(brightness_options_values); i++){
@@ -167,6 +169,7 @@ void settings_panel_init(lv_obj_t* panel){
dropdown = lv_dropdown_create(panel);
lv_dropdown_set_options(dropdown, wake_timeout_options);
lv_obj_add_style(dropdown, get_default_label_style(), 0);
lv_obj_add_event_cb(dropdown, wake_timeout_dropdown, LV_EVENT_VALUE_CHANGED, NULL);
for (int i = 0; i < SIZEOF(wake_timeout_options_values); i++){

6
CYD-Klipper/src/ui/panels/stats_panel.cpp
View File

@@ -145,7 +145,7 @@ void create_state_button(lv_obj_t * root, lv_event_cb_t label, lv_event_cb_t but
lv_obj_set_size(btn, CYD_SCREEN_PANEL_WIDTH_PX / 2 - CYD_SCREEN_GAP_PX * 3, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
lv_obj_add_event_cb(btn, button, LV_EVENT_CLICKED, NULL);
lv_obj_t * label_obj = lv_label_create(btn);
lv_obj_t * label_obj = lv_label_create_ex(btn);
lv_obj_add_event_cb(label_obj, label, LV_EVENT_MSG_RECEIVED, NULL);
lv_msg_subscribe_obj(DATA_PRINTER_DATA, label_obj, NULL);
lv_obj_align(label_obj, LV_ALIGN_CENTER, 0, 0);
@@ -192,11 +192,11 @@ void create_stat_text_block(lv_obj_t * root, const char* label, lv_event_cb_t va
lv_layout_flex_column(panel , LV_FLEX_ALIGN_START, CYD_SCREEN_GAP_PX / 2, CYD_SCREEN_GAP_PX / 2);
lv_obj_set_flex_align(panel, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_START);
lv_obj_t * label_obj = lv_label_create(panel);
lv_obj_t * label_obj = lv_label_create_ex(panel);
lv_label_set_text(label_obj, label);
lv_obj_set_style_text_font(label_obj, CYD_SCREEN_FONT_SMALL, 0);
lv_obj_t * value_obj = lv_label_create(panel);
lv_obj_t * value_obj = lv_label_create_ex(panel);
lv_obj_add_event_cb(value_obj, value, LV_EVENT_MSG_RECEIVED, NULL);
lv_msg_subscribe_obj(DATA_PRINTER_DATA, value_obj, NULL);
}

14
CYD-Klipper/src/ui/panels/temp_panel.cpp
View File

@@ -221,7 +221,7 @@ void temp_panel_init(lv_obj_t * panel){
lv_layout_flex_column(temp_rows[tempIter]);
lv_obj_set_size(temp_rows[tempIter], element_width, LV_SIZE_CONTENT);
lv_obj_t * label = lv_label_create(temp_rows[tempIter]);
lv_obj_t * label = lv_label_create_ex(temp_rows[tempIter]);
lv_label_set_text(label, "???");
lv_obj_add_event_cb(label, (tempIter == 0) ? update_printer_data_hotend_temp : update_printer_data_bed_temp, LV_EVENT_MSG_RECEIVED, NULL);
lv_msg_subscribe_obj(DATA_PRINTER_DATA, label, NULL);
@@ -237,7 +237,7 @@ void temp_panel_init(lv_obj_t * panel){
lv_obj_set_flex_grow(btn, 1);
lv_obj_set_height(btn, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, "???");
lv_obj_center(label);
lv_obj_add_event_cb(label, update_temp_preset_label, LV_EVENT_MSG_RECEIVED, reinterpret_cast<void*>(TARGET_HOTEND_CONFIG_1 + buttonIter + tempIter * 3));
@@ -249,7 +249,7 @@ void temp_panel_init(lv_obj_t * panel){
lv_obj_set_flex_grow(btn, 1);
lv_obj_set_height(btn, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, "Set");
lv_obj_center(label);
}
@@ -269,7 +269,7 @@ void temp_panel_init(lv_obj_t * panel){
lv_obj_add_event_cb(btn, btn_extrude, LV_EVENT_CLICKED, NULL);
lv_obj_set_height(btn, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
lv_obj_t * label = lv_label_create(btn);
lv_obj_t * label = lv_label_create_ex(btn);
lv_label_set_text(label, LV_SYMBOL_DOWN " Extrude");
lv_obj_center(label);
@@ -278,7 +278,7 @@ void temp_panel_init(lv_obj_t * panel){
lv_obj_add_event_cb(btn, btn_retract, LV_EVENT_CLICKED, NULL);
lv_obj_set_height(btn, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, LV_SYMBOL_UP " Retract");
lv_obj_center(label);
@@ -287,7 +287,7 @@ void temp_panel_init(lv_obj_t * panel){
lv_obj_add_event_cb(btn, cooldown_temp, LV_EVENT_CLICKED, NULL);
lv_obj_set_height(btn, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, "Cooldown");
lv_obj_center(label);
@@ -297,7 +297,7 @@ void temp_panel_init(lv_obj_t * panel){
lv_obj_set_height(btn, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
lv_obj_add_flag(btn, LV_OBJ_FLAG_CHECKABLE);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, "Edit Presets");
lv_obj_center(label);

14
CYD-Klipper/src/ui/ui_utils.cpp
View File

@@ -1,6 +1,14 @@
#include "lvgl.h"
#include "ui_utils.h"
#include "../core/data_setup.h"
#include "../core/lv_setup.h"
lv_obj_t* lv_label_create_ex(lv_obj_t* parent)
{
lv_obj_t* label = lv_label_create(parent);
lv_obj_add_style(label, get_default_label_style(), 0);
return label;
}
lv_obj_t* lv_create_empty_panel(lv_obj_t* root) {
lv_obj_t* panel = lv_obj_create(root);
@@ -53,11 +61,11 @@ void lv_create_fullscreen_button_matrix_popup(lv_obj_t * root, lv_event_cb_t tit
lv_obj_align(btn, LV_ALIGN_RIGHT_MID, 0, 0);
lv_obj_add_event_cb(btn, destroy_event_user_data, LV_EVENT_CLICKED, panel);
lv_obj_t * label = lv_label_create(btn);
lv_obj_t * label = lv_label_create_ex(btn);
lv_label_set_text(label, LV_SYMBOL_CLOSE);
lv_obj_center(label);
label = lv_label_create(top_menu_row);
label = lv_label_create_ex(top_menu_row);
lv_label_set_text(label, "-");
lv_obj_align(label, LV_ALIGN_LEFT_MID, 0, 0);
lv_obj_add_event_cb(label, title, LV_EVENT_MSG_RECEIVED, NULL);
@@ -79,7 +87,7 @@ void lv_create_fullscreen_button_matrix_popup(lv_obj_t * root, lv_event_cb_t tit
lv_obj_set_size(btn, column_width, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
lv_obj_add_event_cb(btn, columns[i].event, LV_EVENT_CLICKED, (void*)columns[i].data[j]);
label = lv_label_create(btn);
label = lv_label_create_ex(btn);
lv_label_set_text(label, columns[i].labels[j]);
lv_obj_center(label);
}

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

@@ -18,6 +18,7 @@ typedef struct {
int length;
} lv_button_column_t;
lv_obj_t* lv_label_create_ex(lv_obj_t* parent);
lv_obj_t* lv_create_empty_panel(lv_obj_t* root);
void lv_layout_flex_column(lv_obj_t* obj, lv_flex_align_t allign = LV_FLEX_ALIGN_START, lv_coord_t pad_column = CYD_SCREEN_GAP_PX, lv_coord_t pad_row = CYD_SCREEN_GAP_PX);
void lv_layout_flex_row(lv_obj_t* obj, lv_flex_align_t allign = LV_FLEX_ALIGN_START, lv_coord_t pad_column = CYD_SCREEN_GAP_PX, lv_coord_t pad_row = CYD_SCREEN_GAP_PX);

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

@@ -58,7 +58,7 @@ void wifi_pass_entry(const char* ssid){
lv_obj_set_flex_grow(top_root, 1);
lv_obj_set_style_pad_all(top_root, CYD_SCREEN_GAP_PX, 0);
lv_obj_t * label = lv_label_create(top_root);
lv_obj_t * label = lv_label_create_ex(top_root);
lv_label_set_text(label, "Enter WiFi Password");
lv_obj_set_width(label, CYD_SCREEN_WIDTH_PX - CYD_SCREEN_GAP_PX * 2);
@@ -92,7 +92,7 @@ void wifi_init_inner(){
if (global_config.wifiConfigured){
WiFi.begin(global_config.wifiSSID, global_config.wifiPassword);
lv_obj_t * label = lv_label_create(lv_scr_act());
lv_obj_t * label = lv_label_create_ex(lv_scr_act());
lv_label_set_text(label, "Connecting to WiFi");
lv_obj_align(label, LV_ALIGN_CENTER, 0, 0);
@@ -101,14 +101,14 @@ void wifi_init_inner(){
lv_obj_set_height(resetBtn, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
lv_obj_align(resetBtn, LV_ALIGN_CENTER, 0, CYD_SCREEN_GAP_PX + CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
label = lv_label_create(resetBtn);
label = lv_label_create_ex(resetBtn);
lv_label_set_text(label, "Reset");
lv_obj_center(label);
return;
}
lv_obj_t * label = lv_label_create(lv_scr_act());
lv_obj_t * label = lv_label_create_ex(lv_scr_act());
lv_label_set_text(label, "Scanning for networks...");
lv_obj_align(label, LV_ALIGN_CENTER, 0, 0);
@@ -127,14 +127,14 @@ void wifi_init_inner(){
lv_obj_set_size(top_row, CYD_SCREEN_WIDTH_PX - CYD_SCREEN_GAP_PX * 2, LV_SIZE_CONTENT);
lv_layout_flex_row(top_row, LV_FLEX_ALIGN_SPACE_BETWEEN);
label = lv_label_create(top_row);
label = lv_label_create_ex(top_row);
lv_label_set_text(label, "Select a network");
lv_obj_t * refreshBtn = lv_btn_create(top_row);
lv_obj_add_event_cb(refreshBtn, reset_btn_event_handler, LV_EVENT_ALL, NULL);
lv_obj_set_size(refreshBtn, CYD_SCREEN_MIN_BUTTON_WIDTH_PX, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);
label = lv_label_create(refreshBtn);
label = lv_label_create_ex(refreshBtn);
lv_label_set_text(label, LV_SYMBOL_REFRESH);
lv_obj_center(label);