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

Is this why linux CI broke?

Browse Source
This commit is contained in:
suchmememanyskill
2024-02-09 20:13:28 +01:00
parent adea917a5d
commit 452dbefbdb
7 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/compile.yaml vendored
View File

@@ -8,7 +8,7 @@ on: [push, pull_request]
jobs:
build:
runs-on: windows-latest
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

4
CYD-Klipper/boards/esp32-2432S028R.json
View File

@@ -29,8 +29,8 @@
"-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_FONT=lv_font_montserrat_14",
"-DCYD_SCREEN_FONT_SMALL=lv_font_montserrat_10",
"-DCYD_SCREEN_SIDEBAR_SIZE_PX=40",
"-DCYD_SCREEN_DRIVER_ESP32_2432S028R=1"
],

6
CYD-Klipper/boards/esp32-3248S035C.json
View File

@@ -23,14 +23,14 @@
"-DSPI_READ_FREQUENCY=20000000",
"-DSPI_TOUCH_FREQUENCY=2500000",
"-DTOUCH_CS=-1",
"-DCYD_SCREEN_HEIGHT_PX=320",
"-DCYD_SCREEN_WIDTH_PX=480",
"-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_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",
"-DCYD_SCREEN_DISABLE_TOUCH_CALIBRATION=1"

4
CYD-Klipper/platformio.ini
View File

@@ -51,7 +51,7 @@ lib_deps =
# -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_FONT=lv_font_montserrat_16
# -DCYD_SCREEN_FONT_SMALL=lv_font_montserrat_12
# -DCYD_SCREEN_SIDEBAR_SIZE_PX=50
# -DCYD_SCREEN_DRIVER_ESP32_SMARTDISPLAY=1

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

@@ -94,7 +94,7 @@ void set_color_scheme()
main_color = lv_palette_main(color_defs[global_config.color_scheme].primary_color);
}
lv_theme_t *theme = lv_theme_default_init(dispp, main_color, lv_palette_main(color_def.secondary_color), !global_config.lightMode, CYD_SCREEN_FONT);
lv_theme_t *theme = lv_theme_default_init(dispp, main_color, lv_palette_main(color_def.secondary_color), !global_config.lightMode, &CYD_SCREEN_FONT);
lv_disp_set_theme(dispp, theme);
}
@@ -103,7 +103,7 @@ static lv_indev_drv_read_cb_t original_driver = NULL;
void lv_touch_intercept(lv_indev_drv_t *indev_driver, lv_indev_data_t *data)
{
original_driver(indev_driver, data);
if (data->state == LV_INDEV_STATE_PR) {
if (is_screen_asleep()) {
while (data->state == LV_INDEV_STATE_PR) {
@@ -121,7 +121,7 @@ void lv_touch_intercept(lv_indev_drv_t *indev_driver, lv_indev_data_t *data)
void lv_setup()
{
lv_style_init(&default_label_style);
lv_style_set_text_font(&default_label_style, CYD_SCREEN_FONT);
lv_style_set_text_font(&default_label_style, &CYD_SCREEN_FONT);
screen_timer_setup();
screen_timer_start();

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

@@ -147,5 +147,5 @@ void nav_style_setup(){
lv_style_set_radius(&nav_button_style, 0);
lv_style_init(&nav_button_text_style);
lv_style_set_text_font(&nav_button_text_style, CYD_SCREEN_FONT_SMALL);
lv_style_set_text_font(&nav_button_text_style, &CYD_SCREEN_FONT_SMALL);
}

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

@@ -194,7 +194,7 @@ void create_stat_text_block(lv_obj_t * root, const char* label, lv_event_cb_t va
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_set_style_text_font(label_obj, &CYD_SCREEN_FONT_SMALL, 0);
lv_obj_t * value_obj = lv_label_create_ex(panel);
lv_obj_add_event_cb(value_obj, value, LV_EVENT_MSG_RECEIVED, NULL);