From 64c56fcca9b40d8601c57254132b7b31caf8934b Mon Sep 17 00:00:00 2001 From: Wang Beihong Date: Tue, 21 Apr 2026 02:00:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BA=BA=E4=BD=93=E9=97=A8?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=A3=80=E6=B5=8B=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E5=8C=85=E5=90=AB=E5=88=9D=E5=A7=8B=E5=8C=96=E5=92=8C=E8=AF=BB?= =?UTF-8?q?=E5=8F=96=E7=8A=B6=E6=80=81=E7=9A=84=E9=80=BB=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E6=9B=B4=E6=96=B0=E4=B8=BB=E7=A8=8B=E5=BA=8F=E4=BB=A5?= =?UTF-8?q?=E9=9B=86=E6=88=90=E6=AD=A4=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/human_door/CMakeLists.txt | 3 ++ components/human_door/human_door.c | 39 +++++++++++++++++++ components/human_door/include/human_door.h | 26 +++++++++++++ components/ui/screens.c | 24 ++++++------ components/ui/ui.c | 2 +- main/CMakeLists.txt | 2 +- main/main.cpp | 33 +++++++++++++++- .../smart-granary/smart-granary.eez-project | 26 ++++++------- 相关资料/smart-granary/src/ui/screens.c | 24 ++++++------ 相关资料/smart-granary/src/ui/ui.c | 2 +- 10 files changed, 140 insertions(+), 41 deletions(-) create mode 100644 components/human_door/CMakeLists.txt create mode 100644 components/human_door/human_door.c create mode 100644 components/human_door/include/human_door.h diff --git a/components/human_door/CMakeLists.txt b/components/human_door/CMakeLists.txt new file mode 100644 index 0000000..350938d --- /dev/null +++ b/components/human_door/CMakeLists.txt @@ -0,0 +1,3 @@ +idf_component_register(SRCS "human_door.c" + INCLUDE_DIRS "include" + REQUIRES esp_driver_gpio) diff --git a/components/human_door/human_door.c b/components/human_door/human_door.c new file mode 100644 index 0000000..cbfd515 --- /dev/null +++ b/components/human_door/human_door.c @@ -0,0 +1,39 @@ +#include "human_door.h" + +#include "driver/gpio.h" +#include "esp_check.h" + +static const char *TAG = "human_door"; +static bool s_inited = false; + +esp_err_t human_door_init(void) +{ + if (s_inited) { + return ESP_OK; + } + + gpio_config_t io_cfg = { + .pin_bit_mask = (1ULL << HUMAN_SENSOR_GPIO) | (1ULL << DOOR_SWITCH_GPIO), + .mode = GPIO_MODE_INPUT, + .pull_up_en = GPIO_PULLUP_ENABLE, + .pull_down_en = GPIO_PULLDOWN_DISABLE, + .intr_type = GPIO_INTR_DISABLE, + }; + ESP_RETURN_ON_ERROR(gpio_config(&io_cfg), TAG, "gpio config failed"); + + s_inited = true; + return ESP_OK; +} + +esp_err_t human_door_read(human_door_state_t *out_state) +{ + ESP_RETURN_ON_FALSE(out_state != NULL, ESP_ERR_INVALID_ARG, TAG, "out_state is null"); + ESP_RETURN_ON_FALSE(s_inited, ESP_ERR_INVALID_STATE, TAG, "not initialized"); + + int human_level = gpio_get_level((gpio_num_t)HUMAN_SENSOR_GPIO); + int door_level = gpio_get_level((gpio_num_t)DOOR_SWITCH_GPIO); + + out_state->human_present = (human_level != 0); + out_state->door_closed = (door_level == 0); + return ESP_OK; +} diff --git a/components/human_door/include/human_door.h b/components/human_door/include/human_door.h new file mode 100644 index 0000000..7fb3db5 --- /dev/null +++ b/components/human_door/include/human_door.h @@ -0,0 +1,26 @@ +#pragma once + +#include + +#include "esp_err.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define HUMAN_SENSOR_GPIO 16 +#define DOOR_SWITCH_GPIO 17 + +typedef struct { + bool human_present; + bool door_closed; +} human_door_state_t; + +// GPIO16: HC-SR312. High means motion detected. +// GPIO17: Door switch. Low means door closed. +esp_err_t human_door_init(void); +esp_err_t human_door_read(human_door_state_t *out_state); + +#ifdef __cplusplus +} +#endif diff --git a/components/ui/screens.c b/components/ui/screens.c index 0f671ce..1e99930 100644 --- a/components/ui/screens.c +++ b/components/ui/screens.c @@ -77,7 +77,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 17, 72); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_number_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -86,7 +86,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 167, 73); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_number_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -95,7 +95,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 17, 107); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_number_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -111,7 +111,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 163, 140); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_chinese_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -127,7 +127,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 17, 142); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_number_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -143,7 +143,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 14, 176); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_chinese_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -159,7 +159,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 167, 106); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_number_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -175,7 +175,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 139, 176); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_chinese_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -212,7 +212,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 49, 206); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_chinese_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -221,7 +221,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 95, 206); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_chinese_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -230,7 +230,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 143, 206); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_chinese_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -239,7 +239,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 192, 206); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_chinese_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { diff --git a/components/ui/ui.c b/components/ui/ui.c index d8474da..d37ab29 100644 --- a/components/ui/ui.c +++ b/components/ui/ui.c @@ -123,7 +123,7 @@ const uint8_t assets[2068] = { 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x06, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, - 0x00, 0xE0, 0x00, 0x00, 0x03, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, 0x0B, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 888bcff..d116f3b 100755 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -1,3 +1,3 @@ idf_component_register(SRCS "main.cpp" INCLUDE_DIRS "." - REQUIRES nvs_flash esp_wifi sntp_time aht30 esp_event esp_system wifi-connect ui lvgl_st7789_use efuse relay_ctrl bh1750 MQ-2 JW01) + REQUIRES nvs_flash esp_wifi sntp_time aht30 esp_event esp_system wifi-connect ui lvgl_st7789_use efuse relay_ctrl bh1750 MQ-2 JW01 human_door) diff --git a/main/main.cpp b/main/main.cpp index c3b60f6..a73f914 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -21,6 +21,7 @@ #include "aht30.h" #include "MQ-2.h" #include "JW01.h" +#include "human_door.h" #define TAG "MAIN" #define CO2_SPOILAGE_THRESHOLD_PPM 1000.0f @@ -35,6 +36,8 @@ typedef struct float tvoc; float hcho; float co2; + bool human_present; + bool door_closed; } env_data_t; static env_data_t s_env_data; @@ -81,6 +84,26 @@ static void ui_task(void *arg) } } +static void status_task(void *arg) +{ + (void)arg; + for (;;) { + human_door_state_t io_state{}; + if (human_door_read(&io_state) == ESP_OK) { + set_var_hum_status(io_state.human_present ? "有人" : "无人"); + set_var_door_status(io_state.door_closed ? "关闭" : "开启"); + + if (s_env_data_lock) { + xSemaphoreTake(s_env_data_lock, portMAX_DELAY); + s_env_data.human_present = io_state.human_present; + s_env_data.door_closed = io_state.door_closed; + xSemaphoreGive(s_env_data_lock); + } + } + vTaskDelay(pdMS_TO_TICKS(200)); + } +} + extern "C" void app_main(void) { vTaskDelay(pdMS_TO_TICKS(100)); @@ -123,6 +146,11 @@ extern "C" void app_main(void) // JW01 使用 UART0(GPIO43/44) ESP_ERROR_CHECK(jw01_init()); + // GPIO16: HC-SR312, GPIO17: Door switch(低电平=关门) + ESP_ERROR_CHECK(human_door_init()); + set_var_hum_status("无人"); + set_var_door_status("关闭"); + // 6. 创建传感器读取任务 xTaskCreate([](void *arg) { @@ -190,5 +218,8 @@ extern "C" void app_main(void) xSemaphoreGive(s_env_data_lock); } vTaskDelay(pdMS_TO_TICKS(1000)); - } }, "sensor_task", 4096 * 2, (void *)aht30_dev, 6, NULL); + } }, "sensor_task", 4096 * 3, (void *)aht30_dev, 6, NULL); + + // 独立任务：人体与门状态检测 + xTaskCreate(status_task, "status_task", 4096, NULL, 6, NULL); } diff --git a/相关资料/smart-granary/smart-granary.eez-project b/相关资料/smart-granary/smart-granary.eez-project index 3804432..bfe36cc 100644 --- a/相关资料/smart-granary/smart-granary.eez-project +++ b/相关资料/smart-granary/smart-granary.eez-project @@ -534,7 +534,7 @@ "MAIN": { "DEFAULT": { "text_font": "number_16", - "text_color": "#d17f7f" + "text_color": "#ff5e5e" } } } @@ -585,7 +585,7 @@ "MAIN": { "DEFAULT": { "text_font": "number_16", - "text_color": "#d17f7f" + "text_color": "#ff5e5e" } } } @@ -636,7 +636,7 @@ "MAIN": { "DEFAULT": { "text_font": "number_16", - "text_color": "#d17f7f" + "text_color": "#ff5e5e" } } } @@ -736,7 +736,7 @@ "MAIN": { "DEFAULT": { "text_font": "chinese_16", - "text_color": "#d17f7f" + "text_color": "#ff5e5e" } } } @@ -836,7 +836,7 @@ "MAIN": { "DEFAULT": { "text_font": "number_16", - "text_color": "#d17f7f" + "text_color": "#ff5e5e" } } } @@ -936,7 +936,7 @@ "MAIN": { "DEFAULT": { "text_font": "chinese_16", - "text_color": "#d17f7f" + "text_color": "#ff5e5e" } } } @@ -1036,7 +1036,7 @@ "MAIN": { "DEFAULT": { "text_font": "number_16", - "text_color": "#d17f7f" + "text_color": "#ff5e5e" } } } @@ -1136,14 +1136,14 @@ "MAIN": { "DEFAULT": { "text_font": "chinese_16", - "text_color": "#d17f7f" + "text_color": "#ff5e5e" } } } }, "group": "", "groupIndex": 0, - "text": "door_status", + "text": "hum_status", "textType": "expression", "longMode": "WRAP", "recolor": false, @@ -1383,7 +1383,7 @@ "MAIN": { "DEFAULT": { "text_font": "chinese_16", - "text_color": "#d17f7f" + "text_color": "#ff5e5e" } } } @@ -1434,7 +1434,7 @@ "MAIN": { "DEFAULT": { "text_font": "chinese_16", - "text_color": "#d17f7f" + "text_color": "#ff5e5e" } } } @@ -1485,7 +1485,7 @@ "MAIN": { "DEFAULT": { "text_font": "chinese_16", - "text_color": "#d17f7f" + "text_color": "#ff5e5e" } } } @@ -1536,7 +1536,7 @@ "MAIN": { "DEFAULT": { "text_font": "chinese_16", - "text_color": "#d17f7f" + "text_color": "#ff5e5e" } } } diff --git a/相关资料/smart-granary/src/ui/screens.c b/相关资料/smart-granary/src/ui/screens.c index 0f671ce..1e99930 100644 --- a/相关资料/smart-granary/src/ui/screens.c +++ b/相关资料/smart-granary/src/ui/screens.c @@ -77,7 +77,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 17, 72); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_number_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -86,7 +86,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 167, 73); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_number_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -95,7 +95,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 17, 107); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_number_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -111,7 +111,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 163, 140); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_chinese_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -127,7 +127,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 17, 142); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_number_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -143,7 +143,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 14, 176); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_chinese_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -159,7 +159,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 167, 106); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_number_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -175,7 +175,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 139, 176); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_chinese_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -212,7 +212,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 49, 206); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_chinese_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -221,7 +221,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 95, 206); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_chinese_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -230,7 +230,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 143, 206); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_chinese_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { @@ -239,7 +239,7 @@ void create_screen_main() { lv_obj_set_pos(obj, 192, 206); lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT); lv_obj_set_style_text_font(obj, &ui_font_chinese_16, LV_PART_MAIN | LV_STATE_DEFAULT); - lv_obj_set_style_text_color(obj, lv_color_hex(0xffd17f7f), LV_PART_MAIN | LV_STATE_DEFAULT); + lv_obj_set_style_text_color(obj, lv_color_hex(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT); lv_label_set_text(obj, ""); } { diff --git a/相关资料/smart-granary/src/ui/ui.c b/相关资料/smart-granary/src/ui/ui.c index d8474da..d37ab29 100644 --- a/相关资料/smart-granary/src/ui/ui.c +++ b/相关资料/smart-granary/src/ui/ui.c @@ -123,7 +123,7 @@ const uint8_t assets[2068] = { 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x06, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, - 0x00, 0xE0, 0x00, 0x00, 0x03, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, + 0x00, 0xE0, 0x00, 0x00, 0x0B, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,