This commit is contained in:
aZholtikov committed 2026-10-30 11:54:00 +03:00
1 parent 74e449a214
commit f0c611c5c8
1 file changed
+5 -6
+5 -6
View File
@@ -4,8 +4,6 @@
#define VALUE_CLAMP(v, lo, hi) ((v) < (lo) ? (lo) : ((v) > (hi) ? (hi) : (v))) #define VALUE_CLAMP(v, lo, hi) ((v) < (lo) ? (lo) : ((v) > (hi) ? (hi) : (v)))
#define CLEAR_ROW_CACHE() memset(_row_valid, 0, sizeof(_row_valid)) #define CLEAR_ROW_CACHE() memset(_row_valid, 0, sizeof(_row_valid))
#define VIEW_CELLS 5
#define LABEL_BOOT_SCREEN "Boot: " #define LABEL_BOOT_SCREEN "Boot: "
#define LABEL_MAIN_SCREEN "Main: " #define LABEL_MAIN_SCREEN "Main: "
#define LABEL_AIR_CONDITION_TEMP_ON "Temp ON: " #define LABEL_AIR_CONDITION_TEMP_ON "Temp ON: "
@@ -101,7 +99,7 @@ static char _label_exit_channel_3_power[LCD_TOTAL_COLS + 1] = LABEL_EXIT_CHANNEL
static char _label_exit_channel_4_power[LCD_TOTAL_COLS + 1] = LABEL_EXIT_CHANNEL_4_POWER; static char _label_exit_channel_4_power[LCD_TOTAL_COLS + 1] = LABEL_EXIT_CHANNEL_4_POWER;
static char _label_bulb_brightness[LCD_TOTAL_COLS + 1] = LABEL_BULB_BRIGHTNESS; static char _label_bulb_brightness[LCD_TOTAL_COLS + 1] = LABEL_BULB_BRIGHTNESS;
zh_menu_node_t _main_menu = { static zh_menu_node_t _main_menu = {
.label = "Settings", .label = "Settings",
.submenu = (zh_menu_node_t[]){ .submenu = (zh_menu_node_t[]){
{.label = "Screens", .submenu = (zh_menu_node_t[]){ {.label = "Screens", .submenu = (zh_menu_node_t[]){
@@ -130,10 +128,10 @@ zh_menu_node_t _main_menu = {
.item_numbers = 4, .item_numbers = 4,
}; };
static bool _prev_selected = false;
static zh_menu_node_t *_last_node = NULL; static zh_menu_node_t *_last_node = NULL;
static uint8_t _last_index = 0; static uint8_t _last_index = 0;
static zh_menu_node_t *_cached_node = NULL; static zh_menu_node_t *_cached_node = NULL;
static bool _prev_selected = false;
static char _row_cache[LCD_TOTAL_ROWS][LCD_TOTAL_COLS] = {0}; static char _row_cache[LCD_TOTAL_ROWS][LCD_TOTAL_COLS] = {0};
static bool _row_valid[LCD_TOTAL_ROWS] = {0}; static bool _row_valid[LCD_TOTAL_ROWS] = {0};
volatile static uint8_t _air_condition_temp_on = 30; volatile static uint8_t _air_condition_temp_on = 30;
@@ -192,8 +190,8 @@ static void _zh_load_settings(void)
_exit_channel_power[2] = setting_data_blob.exit_channel_power[2]; _exit_channel_power[2] = setting_data_blob.exit_channel_power[2];
_exit_channel_power[3] = setting_data_blob.exit_channel_power[3]; _exit_channel_power[3] = setting_data_blob.exit_channel_power[3];
_bulb_brightness = setting_data_blob.bulb_brightness; _bulb_brightness = setting_data_blob.bulb_brightness;
_boot_screen_number = setting_data_blob.boot_screen_number; _boot_screen_number = VALUE_CLAMP(setting_data_blob.boot_screen_number, 0, ARRAY_SIZE(_boot_screens) - 1);
_main_screen_number = setting_data_blob.main_screen_number; _main_screen_number = VALUE_CLAMP(setting_data_blob.main_screen_number, 0, ARRAY_SIZE(_main_screens) - 1);
} }
static void _zh_save_settings(void) static void _zh_save_settings(void)
@@ -426,6 +424,7 @@ static void _zh_aht_processing_task(void *pvParameter)
{ {
_zh_draw_main_screen(); _zh_draw_main_screen();
} }
// Здесь будет управление кондеем.
vTaskDelay(10000 / portTICK_PERIOD_MS); vTaskDelay(10000 / portTICK_PERIOD_MS);
} }
vTaskDelete(NULL); vTaskDelete(NULL);