пофиксил налазиющие модули на текст и обновил примеры
|
Before Width: | Height: | Size: 481 KiB After Width: | Height: | Size: 486 KiB |
|
Before Width: | Height: | Size: 335 KiB After Width: | Height: | Size: 335 KiB |
|
Before Width: | Height: | Size: 411 KiB After Width: | Height: | Size: 410 KiB |
|
Before Width: | Height: | Size: 440 KiB After Width: | Height: | Size: 439 KiB |
|
Before Width: | Height: | Size: 344 KiB After Width: | Height: | Size: 344 KiB |
|
Before Width: | Height: | Size: 432 KiB After Width: | Height: | Size: 433 KiB |
|
Before Width: | Height: | Size: 421 KiB After Width: | Height: | Size: 420 KiB |
BIN
images/example/16.png
Normal file
|
After Width: | Height: | Size: 434 KiB |
BIN
images/example/17.png
Normal file
|
After Width: | Height: | Size: 437 KiB |
|
Before Width: | Height: | Size: 473 KiB After Width: | Height: | Size: 472 KiB |
|
Before Width: | Height: | Size: 474 KiB After Width: | Height: | Size: 473 KiB |
|
Before Width: | Height: | Size: 473 KiB After Width: | Height: | Size: 472 KiB |
|
Before Width: | Height: | Size: 483 KiB After Width: | Height: | Size: 468 KiB |
|
Before Width: | Height: | Size: 487 KiB After Width: | Height: | Size: 476 KiB |
|
Before Width: | Height: | Size: 332 KiB After Width: | Height: | Size: 332 KiB |
|
Before Width: | Height: | Size: 347 KiB After Width: | Height: | Size: 348 KiB |
|
Before Width: | Height: | Size: 361 KiB After Width: | Height: | Size: 361 KiB |
@ -136,7 +136,7 @@ static module_config_t modules[MODULE_COUNT] = {
|
|||||||
#define MODULE_HEIGHT 95
|
#define MODULE_HEIGHT 95
|
||||||
#define MODULE_SPACING 3
|
#define MODULE_SPACING 3
|
||||||
#define MODULES_ACTIVE_Y 20
|
#define MODULES_ACTIVE_Y 20
|
||||||
#define MODULES_INACTIVE_Y 125
|
#define MODULES_INACTIVE_Y 175
|
||||||
#define MODULE_SCALE 140 /* Scale factor: 256=100%, 140~55% for 64x64 images */
|
#define MODULE_SCALE 140 /* Scale factor: 256=100%, 140~55% for 64x64 images */
|
||||||
|
|
||||||
/* Panel for schema (needed globally for drag) */
|
/* Panel for schema (needed globally for drag) */
|
||||||
@ -1456,8 +1456,8 @@ static void create_screen_main(void) {
|
|||||||
|
|
||||||
/* === STATUS PANEL === (нижняя часть экрана) */
|
/* === STATUS PANEL === (нижняя часть экрана) */
|
||||||
lv_obj_t *panel_status = lv_obj_create(scr);
|
lv_obj_t *panel_status = lv_obj_create(scr);
|
||||||
lv_obj_set_pos(panel_status, 10, 255);
|
lv_obj_set_pos(panel_status, 10, 275);
|
||||||
lv_obj_set_size(panel_status, 240, 215);
|
lv_obj_set_size(panel_status, 240, 195);
|
||||||
lv_obj_set_style_bg_color(panel_status, lv_color_hex(COLOR_BG_PANEL), 0);
|
lv_obj_set_style_bg_color(panel_status, lv_color_hex(COLOR_BG_PANEL), 0);
|
||||||
lv_obj_set_style_radius(panel_status, 6, 0);
|
lv_obj_set_style_radius(panel_status, 6, 0);
|
||||||
lv_obj_set_style_border_width(panel_status, 0, 0);
|
lv_obj_set_style_border_width(panel_status, 0, 0);
|
||||||
@ -1494,15 +1494,20 @@ static void create_screen_main(void) {
|
|||||||
lv_obj_set_style_text_font(lbl_mode, &montserrat_16_ru_en, 0);
|
lv_obj_set_style_text_font(lbl_mode, &montserrat_16_ru_en, 0);
|
||||||
|
|
||||||
lbl_datetime = lv_label_create(panel_status);
|
lbl_datetime = lv_label_create(panel_status);
|
||||||
lv_label_set_text(lbl_datetime, "25.02.2025 09:25");
|
{
|
||||||
|
char dt_buf[32];
|
||||||
|
snprintf(dt_buf, sizeof(dt_buf), "%02d.%02d.%04d %02d:%02d",
|
||||||
|
state.day, state.month, state.year, state.hour, state.minute);
|
||||||
|
lv_label_set_text(lbl_datetime, dt_buf);
|
||||||
|
}
|
||||||
lv_obj_set_pos(lbl_datetime, 10, 135);
|
lv_obj_set_pos(lbl_datetime, 10, 135);
|
||||||
lv_obj_set_style_text_color(lbl_datetime, lv_color_hex(COLOR_TEXT_DIM), 0);
|
lv_obj_set_style_text_color(lbl_datetime, lv_color_hex(COLOR_TEXT_DIM), 0);
|
||||||
lv_obj_set_style_text_font(lbl_datetime, &montserrat_16_ru_en, 0);
|
lv_obj_set_style_text_font(lbl_datetime, &montserrat_16_ru_en, 0);
|
||||||
|
|
||||||
/* === CLIMATE PANEL === */
|
/* === CLIMATE PANEL === */
|
||||||
lv_obj_t *panel_climate = lv_obj_create(scr);
|
lv_obj_t *panel_climate = lv_obj_create(scr);
|
||||||
lv_obj_set_pos(panel_climate, 260, 255);
|
lv_obj_set_pos(panel_climate, 260, 275);
|
||||||
lv_obj_set_size(panel_climate, 230, 215);
|
lv_obj_set_size(panel_climate, 230, 195);
|
||||||
lv_obj_set_style_bg_color(panel_climate, lv_color_hex(COLOR_BG_PANEL), 0);
|
lv_obj_set_style_bg_color(panel_climate, lv_color_hex(COLOR_BG_PANEL), 0);
|
||||||
lv_obj_set_style_radius(panel_climate, 6, 0);
|
lv_obj_set_style_radius(panel_climate, 6, 0);
|
||||||
lv_obj_set_style_border_width(panel_climate, 0, 0);
|
lv_obj_set_style_border_width(panel_climate, 0, 0);
|
||||||
@ -1559,7 +1564,7 @@ static void create_screen_main(void) {
|
|||||||
|
|
||||||
/* === CONTROL BUTTONS === (правая часть нижней половины) */
|
/* === CONTROL BUTTONS === (правая часть нижней половины) */
|
||||||
int btn_x = 500;
|
int btn_x = 500;
|
||||||
int btn_y = 255;
|
int btn_y = 275;
|
||||||
|
|
||||||
/* Stop button */
|
/* Stop button */
|
||||||
lv_obj_t *btn = lv_btn_create(scr);
|
lv_obj_t *btn = lv_btn_create(scr);
|
||||||
@ -1629,7 +1634,7 @@ static void create_screen_main(void) {
|
|||||||
/* === EQUIPMENT SCHEMA AREA === (верхняя половина экрана) */
|
/* === EQUIPMENT SCHEMA AREA === (верхняя половина экрана) */
|
||||||
schema_panel = lv_obj_create(scr);
|
schema_panel = lv_obj_create(scr);
|
||||||
lv_obj_set_pos(schema_panel, 10, 10);
|
lv_obj_set_pos(schema_panel, 10, 10);
|
||||||
lv_obj_set_size(schema_panel, 780, 235);
|
lv_obj_set_size(schema_panel, 780, 255);
|
||||||
lv_obj_set_style_bg_color(schema_panel, lv_color_hex(COLOR_BG_PANEL), 0);
|
lv_obj_set_style_bg_color(schema_panel, lv_color_hex(COLOR_BG_PANEL), 0);
|
||||||
lv_obj_set_style_radius(schema_panel, 6, 0);
|
lv_obj_set_style_radius(schema_panel, 6, 0);
|
||||||
lv_obj_set_style_border_width(schema_panel, 0, 0);
|
lv_obj_set_style_border_width(schema_panel, 0, 0);
|
||||||
@ -1644,7 +1649,7 @@ static void create_screen_main(void) {
|
|||||||
|
|
||||||
lv_obj_t *hint2 = lv_label_create(schema_panel);
|
lv_obj_t *hint2 = lv_label_create(schema_panel);
|
||||||
lv_label_set_text(hint2, "Неактивные (перетащите вверх для включения):");
|
lv_label_set_text(hint2, "Неактивные (перетащите вверх для включения):");
|
||||||
lv_obj_set_pos(hint2, 10, 115);
|
lv_obj_set_pos(hint2, 10, 155);
|
||||||
lv_obj_set_style_text_color(hint2, lv_color_hex(COLOR_TEXT_DIM), 0);
|
lv_obj_set_style_text_color(hint2, lv_color_hex(COLOR_TEXT_DIM), 0);
|
||||||
lv_obj_set_style_text_font(hint2, &montserrat_16_ru_en, 0);
|
lv_obj_set_style_text_font(hint2, &montserrat_16_ru_en, 0);
|
||||||
|
|
||||||
|
|||||||