From 79b546632b18a70911a4c9636805033c88427d26 Mon Sep 17 00:00:00 2001
From: Wang Beihong <beihong@example.com>
Date: Tue, 21 Apr 2026 02:25:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AF=B9=E9=A2=9D=E5=A4=96?=
 =?UTF-8?q?=20UI=20=E8=B5=84=E6=BA=90=E5=92=8C=E7=81=AB=E7=84=B0=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E5=8F=98=E9=87=8F=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 增加了 `ui.h` 中资源数组的大小以容纳新的 UI 元素。
- 更新了 `ui_font_chinese_16.c`，添加了更多中文字符以更好地支持本地化。
- 在 `vars.h` 中添加了用于管理火焰状态的新函数，增强了系统的监测能力。
---
 components/MQ-2/MQ-2.c                        |   5 +
 components/MQ-2/include/MQ-2.h                |   6 +
 components/fire_sensor/CMakeLists.txt         |   3 +
 components/fire_sensor/fire_sensor.c          |  77 ++++++
 components/fire_sensor/include/fire_sensor.h  |  21 ++
 components/ui/screens.c                       |  69 ++++--
 components/ui/screens.h                       |   1 +
 components/ui/ui.c                            | 227 +++++++++---------
 components/ui/ui.h                            |   2 +-
 components/ui/ui_font_chinese_16.c            | 212 ++++++++++++----
 components/ui/vars.c                          |  13 +
 components/ui/vars.h                          |   2 +
 main/CMakeLists.txt                           |   2 +-
 main/main.cpp                                 |  62 +++--
 .../smart-granary/smart-granary.eez-project   | 164 ++++++++++---
 相关资料/smart-granary/src/ui/screens.c       |  69 ++++--
 相关资料/smart-granary/src/ui/screens.h       |   1 +
 相关资料/smart-granary/src/ui/ui.c            | 227 +++++++++---------
 相关资料/smart-granary/src/ui/ui.h            |   2 +-
 .../smart-granary/src/ui/ui_font_chinese_16.c | 212 ++++++++++++----
 相关资料/smart-granary/src/ui/vars.h          |   2 +
 21 files changed, 978 insertions(+), 401 deletions(-)
 create mode 100644 components/fire_sensor/CMakeLists.txt
 create mode 100644 components/fire_sensor/fire_sensor.c
 create mode 100644 components/fire_sensor/include/fire_sensor.h

diff --git a/components/MQ-2/MQ-2.c b/components/MQ-2/MQ-2.c
index c455e4b..85b2a62 100644
--- a/components/MQ-2/MQ-2.c
+++ b/components/MQ-2/MQ-2.c
@@ -65,3 +65,8 @@ bool mq2_is_alarm(float percent, float threshold_percent)
 {
 	return percent >= threshold_percent;
 }
+
+adc_oneshot_unit_handle_t mq2_get_adc_handle(void)
+{
+	return s_adc_handle;
+}
diff --git a/components/MQ-2/include/MQ-2.h b/components/MQ-2/include/MQ-2.h
index a871b76..047dfbb 100644
--- a/components/MQ-2/include/MQ-2.h
+++ b/components/MQ-2/include/MQ-2.h
@@ -4,6 +4,7 @@
 #include <stdint.h>
 
 #include "esp_err.h"
+#include "esp_adc/adc_oneshot.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,6 +33,11 @@ esp_err_t mq2_read_percent(float *percent_out);
  */
 bool mq2_is_alarm(float percent, float threshold_percent);
 
+/**
+ * @brief 获取 MQ-2 使用的 ADC oneshot 句柄（ADC1）
+ */
+adc_oneshot_unit_handle_t mq2_get_adc_handle(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/components/fire_sensor/CMakeLists.txt b/components/fire_sensor/CMakeLists.txt
new file mode 100644
index 0000000..ec0a573
--- /dev/null
+++ b/components/fire_sensor/CMakeLists.txt
@@ -0,0 +1,3 @@
+idf_component_register(SRCS "fire_sensor.c"
+                    INCLUDE_DIRS "include"
+                    REQUIRES esp_adc MQ-2)
diff --git a/components/fire_sensor/fire_sensor.c b/components/fire_sensor/fire_sensor.c
new file mode 100644
index 0000000..6b117fc
--- /dev/null
+++ b/components/fire_sensor/fire_sensor.c
@@ -0,0 +1,77 @@
+#include "fire_sensor.h"
+
+#include "MQ-2.h"
+
+#include "esp_adc/adc_oneshot.h"
+#include "esp_check.h"
+
+#define FIRE_ADC_UNIT ADC_UNIT_1
+#define FIRE_ADC_CHANNEL ADC_CHANNEL_2
+#define FIRE_SAMPLE_COUNT 8
+
+static const char *TAG = "fire_sensor";
+static adc_oneshot_unit_handle_t s_adc_handle = NULL;
+static bool s_inited = false;
+
+esp_err_t fire_sensor_init(void)
+{
+    if (s_inited) {
+        return ESP_OK;
+    }
+
+    // Reuse ADC1 oneshot unit created by MQ-2 to avoid "adc1 is already in use".
+    ESP_RETURN_ON_ERROR(mq2_init(), TAG, "mq2 init failed");
+    s_adc_handle = mq2_get_adc_handle();
+    ESP_RETURN_ON_FALSE(s_adc_handle != NULL, ESP_ERR_INVALID_STATE, TAG, "shared adc handle is null");
+
+    adc_oneshot_chan_cfg_t chan_cfg = {
+        .atten = ADC_ATTEN_DB_12,
+        .bitwidth = ADC_BITWIDTH_DEFAULT,
+    };
+    ESP_RETURN_ON_ERROR(adc_oneshot_config_channel(s_adc_handle, FIRE_ADC_CHANNEL, &chan_cfg),
+                        TAG, "adc channel config failed");
+
+    s_inited = true;
+    return ESP_OK;
+}
+
+esp_err_t fire_sensor_read_raw(int *raw_out)
+{
+    ESP_RETURN_ON_FALSE(raw_out != NULL, ESP_ERR_INVALID_ARG, TAG, "raw_out is null");
+    ESP_RETURN_ON_FALSE(s_inited, ESP_ERR_INVALID_STATE, TAG, "fire sensor not initialized");
+
+    int sum = 0;
+    for (int i = 0; i < FIRE_SAMPLE_COUNT; ++i) {
+        int sample = 0;
+        ESP_RETURN_ON_ERROR(adc_oneshot_read(s_adc_handle, FIRE_ADC_CHANNEL, &sample),
+                            TAG, "adc read failed");
+        sum += sample;
+    }
+
+    *raw_out = sum / FIRE_SAMPLE_COUNT;
+    return ESP_OK;
+}
+
+esp_err_t fire_sensor_read_percent(float *percent_out)
+{
+    ESP_RETURN_ON_FALSE(percent_out != NULL, ESP_ERR_INVALID_ARG, TAG, "percent_out is null");
+
+    int raw = 0;
+    ESP_RETURN_ON_ERROR(fire_sensor_read_raw(&raw), TAG, "read raw failed");
+
+    // Most flame modules output lower voltage when flame is stronger.
+    // Map raw inversely to "danger percent":
+    // raw=4095 -> 0%, raw=0 -> 100%
+    *percent_out = ((4095.0f - (float)raw) * 100.0f) / 4095.0f;
+    if (*percent_out < 0.0f) {
+        *percent_out = 0.0f;
+    } else if (*percent_out > 100.0f) {
+        *percent_out = 100.0f;
+    }
+    return ESP_OK;
+}
+
+bool fire_sensor_is_danger(float percent, float threshold_percent)
+{
+    return percent >= threshold_percent;
+}
diff --git a/components/fire_sensor/include/fire_sensor.h b/components/fire_sensor/include/fire_sensor.h
new file mode 100644
index 0000000..4054d8a
--- /dev/null
+++ b/components/fire_sensor/include/fire_sensor.h
@@ -0,0 +1,21 @@
+#pragma once
+
+#include <stdbool.h>
+
+#include "esp_err.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// ESP32-S3: GPIO3 -> ADC1_CHANNEL_2
+#define FIRE_SENSOR_ADC_GPIO 3
+
+esp_err_t fire_sensor_init(void);
+esp_err_t fire_sensor_read_raw(int *raw_out);
+esp_err_t fire_sensor_read_percent(float *percent_out);
+bool fire_sensor_is_danger(float percent, float threshold_percent);
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/components/ui/screens.c b/components/ui/screens.c
index 1e99930..1c01e10 100644
--- a/components/ui/screens.c
+++ b/components/ui/screens.c
@@ -13,7 +13,7 @@
 objects_t objects;
 
 static const char *screen_names[] = { "Main" };
-static const char *object_names[] = { "main", "background_pic", "obj0", "obj1", "obj2", "obj3", "obj4", "obj5", "obj6", "obj7", "obj8", "obj9", "obj10", "obj11", "obj12", "obj13" };
+static const char *object_names[] = { "main", "background_pic", "obj0", "obj1", "obj2", "obj3", "obj4", "obj5", "obj6", "obj7", "obj8", "obj9", "obj10", "obj11", "obj12", "obj13", "obj14" };
 
 //
 // Event handlers
@@ -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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
@@ -95,12 +95,12 @@ 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
             lv_obj_t *obj = lv_label_create(parent_obj);
-            lv_obj_set_pos(obj, 151, 122);
+            lv_obj_set_pos(obj, 88, 158);
             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_label_set_text(obj, "门状态");
@@ -108,10 +108,10 @@ void create_screen_main() {
         {
             lv_obj_t *obj = lv_label_create(parent_obj);
             objects.obj3 = obj;
-            lv_obj_set_pos(obj, 163, 140);
+            lv_obj_set_pos(obj, 95, 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
@@ -140,10 +140,10 @@ void create_screen_main() {
         {
             lv_obj_t *obj = lv_label_create(parent_obj);
             objects.obj5 = obj;
-            lv_obj_set_pos(obj, 14, 176);
+            lv_obj_set_pos(obj, 29, 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
@@ -159,12 +159,12 @@ 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
             lv_obj_t *obj = lv_label_create(parent_obj);
-            lv_obj_set_pos(obj, 135, 158);
+            lv_obj_set_pos(obj, 144, 123);
             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_label_set_text(obj, "人存在状态");
@@ -172,10 +172,10 @@ void create_screen_main() {
         {
             lv_obj_t *obj = lv_label_create(parent_obj);
             objects.obj7 = obj;
-            lv_obj_set_pos(obj, 139, 176);
+            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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
@@ -239,25 +239,41 @@ 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
             lv_obj_t *obj = lv_label_create(parent_obj);
             objects.obj12 = obj;
-            lv_obj_set_pos(obj, 88, 8);
+            lv_obj_set_pos(obj, 15, 8);
             lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
-            lv_obj_set_style_text_font(obj, &ui_font_number_14, LV_PART_MAIN | LV_STATE_DEFAULT);
+            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(0xff000000), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
             lv_obj_t *obj = lv_label_create(parent_obj);
             objects.obj13 = obj;
-            lv_obj_set_pos(obj, 124, 28);
+            lv_obj_set_pos(obj, 128, 28);
             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(0xff000000), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xfffe979e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_label_set_text(obj, "");
+        }
+        {
+            lv_obj_t *obj = lv_label_create(parent_obj);
+            lv_obj_set_pos(obj, 152, 159);
+            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_label_set_text(obj, "火焰状态");
+        }
+        {
+            lv_obj_t *obj = lv_label_create(parent_obj);
+            objects.obj14 = obj;
+            lv_obj_set_pos(obj, 170, 177);
+            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(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
     }
@@ -394,6 +410,15 @@ void tick_screen_main() {
             tick_value_change_obj = NULL;
         }
     }
+    {
+        const char *new_val = evalTextProperty(flowState, 30, 3, "Failed to evaluate Text in Label widget");
+        const char *cur_val = lv_label_get_text(objects.obj14);
+        if (strcmp(new_val, cur_val) != 0) {
+            tick_value_change_obj = objects.obj14;
+            lv_label_set_text(objects.obj14, new_val);
+            tick_value_change_obj = NULL;
+        }
+    }
 }
 
 typedef void (*tick_screen_func_t)();
diff --git a/components/ui/screens.h b/components/ui/screens.h
index f98166e..9eb2fe0 100644
--- a/components/ui/screens.h
+++ b/components/ui/screens.h
@@ -32,6 +32,7 @@ typedef struct _objects_t {
     lv_obj_t *obj11;
     lv_obj_t *obj12;
     lv_obj_t *obj13;
+    lv_obj_t *obj14;
 } objects_t;
 
 extern objects_t objects;
diff --git a/components/ui/ui.c b/components/ui/ui.c
index d37ab29..2e86c24 100644
--- a/components/ui/ui.c
+++ b/components/ui/ui.c
@@ -5,134 +5,142 @@
 #include "vars.h"
 
 // ASSETS DEFINITION
-const uint8_t assets[2068] = {
+const uint8_t assets[2196] = {
     0x7E, 0x45, 0x45, 0x5A, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00,
     0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0xF0, 0x00, 0xF0, 0x00, 0x01, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
     0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-    0x98, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00,
+    0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00,
     0x00, 0x00, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x00, 0x74, 0x00, 0x00, 0x00,
-    0x90, 0x00, 0x00, 0x00, 0xAC, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00, 0xE4, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x00, 0x00, 0x1C, 0x01, 0x00, 0x00, 0x38, 0x01, 0x00, 0x00, 0x54, 0x01, 0x00, 0x00,
-    0x70, 0x01, 0x00, 0x00, 0x8C, 0x01, 0x00, 0x00, 0xA8, 0x01, 0x00, 0x00, 0xC4, 0x01, 0x00, 0x00,
-    0xE0, 0x01, 0x00, 0x00, 0xFC, 0x01, 0x00, 0x00, 0x18, 0x02, 0x00, 0x00, 0x34, 0x02, 0x00, 0x00,
-    0x50, 0x02, 0x00, 0x00, 0x6C, 0x02, 0x00, 0x00, 0x88, 0x02, 0x00, 0x00, 0xA4, 0x02, 0x00, 0x00,
-    0xC0, 0x02, 0x00, 0x00, 0xDC, 0x02, 0x00, 0x00, 0xF8, 0x02, 0x00, 0x00, 0x14, 0x03, 0x00, 0x00,
-    0x30, 0x03, 0x00, 0x00, 0x4C, 0x03, 0x00, 0x00, 0x68, 0x03, 0x00, 0x00, 0x84, 0x03, 0x00, 0x00,
-    0x30, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x31, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x7C, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x68, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x54, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x40, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x2C, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0x18, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0x08, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xF8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0xE8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xD4, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0xC4, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xB0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0xA0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0x8C, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x7C, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0x68, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x58, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0x44, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x34, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x0C, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0xF8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xE4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xD4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xC4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xB4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xA4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x00, 0x7C, 0x00, 0x00, 0x00,
+    0x98, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00, 0xD0, 0x00, 0x00, 0x00, 0xEC, 0x00, 0x00, 0x00,
+    0x08, 0x01, 0x00, 0x00, 0x24, 0x01, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x5C, 0x01, 0x00, 0x00,
+    0x78, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00,
+    0xE8, 0x01, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00, 0x3C, 0x02, 0x00, 0x00,
+    0x58, 0x02, 0x00, 0x00, 0x74, 0x02, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00, 0xAC, 0x02, 0x00, 0x00,
+    0xC8, 0x02, 0x00, 0x00, 0xE4, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x1C, 0x03, 0x00, 0x00,
+    0x38, 0x03, 0x00, 0x00, 0x54, 0x03, 0x00, 0x00, 0x70, 0x03, 0x00, 0x00, 0x8C, 0x03, 0x00, 0x00,
+    0xA8, 0x03, 0x00, 0x00, 0xC4, 0x03, 0x00, 0x00, 0x30, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xD0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x31, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xBC, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xA8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x94, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x6C, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x58, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x48, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x38, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x28, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x14, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xF0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xE0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xCC, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xBC, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xA8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x98, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x84, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x74, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x4C, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x38, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x24, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x14, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xF4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xE4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xD4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xC4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 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, 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, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
-    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x01, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
-    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x02, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x60, 0x00, 0xE0,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x01, 0x60, 0x00, 0xE0,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x02, 0x60, 0x00, 0xE0,
     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, 0x00, 0xE0, 0x00, 0x00, 0x03, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
     0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
-    0x04, 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, 0x05, 0x60, 0x00, 0xE0,
+    0x00, 0xE0, 0x00, 0x00, 0x04, 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, 0x06, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
+    0x05, 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, 0x06, 0x60, 0x00, 0xE0,
     0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 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, 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, 0x07, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
-    0x00, 0xE0, 0x00, 0x00, 0x08, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
-    0x00, 0xE0, 0x00, 0x00, 0x09, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
-    0x00, 0xE0, 0x00, 0x00, 0x0A, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
-    0x00, 0xE0, 0x00, 0x00, 0x0C, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
-    0x00, 0xE0, 0x00, 0x00, 0x0D, 0x60, 0x00, 0xE0, 0x0C, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x07, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x08, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x09, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x0A, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x0C, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x0D, 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, 0x0E, 0x60, 0x00, 0xE0, 0x0C, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00
@@ -154,6 +162,7 @@ native_var_t native_vars[] = {
     { NATIVE_VAR_TYPE_STRING, get_var_hum_status, set_var_hum_status }, 
     { NATIVE_VAR_TYPE_STRING, get_var_local_time, set_var_local_time }, 
     { NATIVE_VAR_TYPE_STRING, get_var_system_ip, set_var_system_ip }, 
+    { NATIVE_VAR_TYPE_STRING, get_var_fire_status, set_var_fire_status }, 
 };
 
 ActionExecFunc actions[] = {
diff --git a/components/ui/ui.h b/components/ui/ui.h
index ffad363..78281bb 100644
--- a/components/ui/ui.h
+++ b/components/ui/ui.h
@@ -9,7 +9,7 @@
 extern "C" {
 #endif
 
-extern const uint8_t assets[2068];
+extern const uint8_t assets[2196];
 
 void ui_init();
 void ui_tick();
diff --git a/components/ui/ui_font_chinese_16.c b/components/ui/ui_font_chinese_16.c
index 7dac9b4..d84c517 100644
--- a/components/ui/ui_font_chinese_16.c
+++ b/components/ui/ui_font_chinese_16.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 16 px
  * Bpp: 8
- * Opts: --bpp 8 --size 16 --no-compress --font ..\YeZiGongChangTangYingHei\YeZiGongChangTangYingHei-2.ttf --symbols 温度湿粮食储环境光强火焰监测状热空质人体气存在门重有通风无加开启关闭制冷散照量明态变质良好 --range 32-127 --format lvgl
+ * Opts: --bpp 8 --size 16 --no-compress --font ..\YeZiGongChangTangYingHei\YeZiGongChangTangYingHei-2.ttf --symbols 温度湿粮食储环境光强火焰监测状热空质人体安全危险气存在门重有通风无加开启关闭制冷散照量明态变质良好 --range 32-127 --format lvgl
  ******************************************************************************/
 
 #ifdef __has_include
@@ -1469,6 +1469,33 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
     0x0, 0x0,
 
+    /* U+5168 "全" */
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x9d, 0xff, 0xfe,
+    0x83, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0x83, 0xff, 0xff, 0xff, 0xfe, 0x62,
+    0x0, 0x0, 0x0, 0x0, 0x21, 0x5e, 0x8d, 0xe1,
+    0xff, 0xff, 0xa0, 0x90, 0xff, 0xff, 0xc3, 0x69,
+    0x3a, 0xa, 0xca, 0xff, 0xff, 0xff, 0xff, 0x97,
+    0x5, 0x2, 0x80, 0xff, 0xff, 0xff, 0xff, 0xbb,
+    0xcc, 0xff, 0xff, 0xff, 0xff, 0xec, 0xe8, 0xe8,
+    0xe9, 0xff, 0xff, 0xf7, 0xff, 0xba, 0x25, 0x26,
+    0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0x3f, 0x1e, 0x1a, 0x0, 0x0, 0x1c, 0x53,
+    0x54, 0x99, 0xff, 0xff, 0x5e, 0x54, 0x4e, 0x6,
+    0x0, 0x0, 0x0, 0x0, 0x26, 0x34, 0x34, 0x85,
+    0xff, 0xff, 0x3f, 0x34, 0x34, 0x1b, 0x0, 0x0,
+    0x0, 0x10, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xd7, 0x0, 0x0, 0x0, 0x8,
+    0xe4, 0xf4, 0xf4, 0xfa, 0xff, 0xff, 0xf6, 0xf4,
+    0xf4, 0xbb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x62, 0xff, 0xff, 0xa, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x22, 0x67, 0x68, 0x68, 0x68, 0xa5,
+    0xff, 0xff, 0x71, 0x68, 0x68, 0x68, 0x63, 0xc,
+    0x8d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0x4d, 0x76, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xfb, 0x3a,
+
     /* U+5173 "关" */
     0x0, 0x0, 0x26, 0xfc, 0xfd, 0x63, 0x0, 0x0,
     0x42, 0xfa, 0xfe, 0x46, 0x0, 0x0, 0x0, 0x11,
@@ -1582,6 +1609,35 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x30, 0x18, 0xf0, 0xff, 0xfe, 0x99, 0x41, 0xfc,
     0xff, 0xff, 0xff, 0xae,
 
+    /* U+5371 "危" */
+    0x0, 0x0, 0xa, 0xdf, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0x64, 0x0, 0x0, 0x0, 0x0,
+    0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0x3b, 0x0, 0x0, 0xf, 0x95, 0xfd, 0xff,
+    0xab, 0x3c, 0x3c, 0x3c, 0xc5, 0xff, 0xfb, 0x38,
+    0x33, 0xb, 0x59, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x91,
+    0x48, 0xf6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0x91, 0x0, 0x70,
+    0xff, 0xfa, 0x26, 0x40, 0x44, 0x44, 0x44, 0x44,
+    0x44, 0x44, 0x2a, 0x6, 0x0, 0x70, 0xff, 0xf8,
+    0x4b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x98, 0x0, 0x0, 0x70, 0xff, 0xf8, 0x58, 0xff,
+    0xff, 0xf6, 0xf4, 0xf4, 0xff, 0xff, 0xa4, 0x0,
+    0x0, 0x74, 0xff, 0xf2, 0x58, 0xff, 0xff, 0x2,
+    0x0, 0x5, 0xcf, 0xff, 0xa4, 0x0, 0x0, 0x96,
+    0xff, 0xe3, 0x58, 0xff, 0xff, 0x0, 0x57, 0xff,
+    0xff, 0xff, 0x9f, 0x0, 0x48, 0xf5, 0xff, 0xbb,
+    0x58, 0xff, 0xff, 0x0, 0x1d, 0xb1, 0xb8, 0xb1,
+    0x39, 0x0, 0xdf, 0xff, 0xff, 0x6c, 0x58, 0xff,
+    0xff, 0x68, 0x58, 0x58, 0x58, 0x58, 0x57, 0x1f,
+    0xe7, 0xff, 0xcb, 0x7, 0x4f, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0x98, 0xcf, 0x96,
+    0xc, 0x0, 0xf, 0xd2, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0x88, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x9, 0xc, 0xc, 0xc, 0xc, 0xc,
+    0xb, 0x0,
+
     /* U+53D8 "变" */
     0x0, 0x30, 0x3c, 0x3c, 0x3c, 0x78, 0xfe, 0xff,
     0xc5, 0x3c, 0x3c, 0x3c, 0x3c, 0x1a, 0x21, 0xff,
@@ -1759,6 +1815,35 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x0, 0x0, 0x0, 0xb, 0x10, 0x0, 0x0, 0x0,
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
 
+    /* U+5B89 "安" */
+    0x0, 0x2, 0x4, 0x4, 0x4, 0x7c, 0xff, 0xfd,
+    0x51, 0x4, 0x4, 0x4, 0x2, 0x0, 0x2d, 0xfa,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xf8, 0x1b, 0x40, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0x2c, 0x3f, 0xff, 0xff, 0x2c, 0x20, 0x8e,
+    0x9b, 0x4c, 0x1c, 0x1c, 0x43, 0xff, 0xff, 0x2b,
+    0x12, 0x91, 0x84, 0x0, 0x6a, 0xff, 0xff, 0x61,
+    0x0, 0x0, 0x8, 0x8e, 0x8e, 0x9, 0x8d, 0xf4,
+    0xf4, 0xf4, 0xfd, 0xff, 0xff, 0xf8, 0xf4, 0xf4,
+    0xf4, 0xf4, 0xf4, 0xab, 0xac, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xc5, 0x16, 0x3c, 0x4c, 0xfd, 0xff, 0xd5,
+    0x3e, 0x3c, 0xb2, 0xff, 0xfe, 0x50, 0x3c, 0x1c,
+    0x0, 0x0, 0x90, 0xff, 0xff, 0x9a, 0x15, 0x2a,
+    0xf8, 0xff, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x8c, 0xf7, 0xff, 0xff, 0xfd, 0xf2, 0xff, 0xff,
+    0x41, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x17,
+    0xb6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb0, 0x4d,
+    0x4, 0x0, 0x44, 0xb2, 0xd4, 0xfa, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xea, 0x57,
+    0x97, 0xff, 0xff, 0xff, 0xff, 0xff, 0xec, 0x6b,
+    0x19, 0x7d, 0xe6, 0xff, 0xff, 0x93, 0x86, 0xfe,
+    0xea, 0xc8, 0x95, 0x51, 0x6, 0x0, 0x0, 0x0,
+    0x7, 0x66, 0xda, 0x5c, 0x0, 0x5, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0,
+
     /* U+5EA6 "度" */
     0x0, 0x0, 0xcc, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8d, 0x0,
@@ -2582,6 +2667,35 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xd1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8f,
     0xff, 0xff, 0xcc, 0xb,
 
+    /* U+9669 "险" */
+    0xc8, 0xff, 0xff, 0xff, 0xb8, 0x0, 0x0, 0x22,
+    0xf4, 0xff, 0xc8, 0x0, 0x0, 0x0, 0xe4, 0xff,
+    0xff, 0xff, 0xba, 0x0, 0x0, 0x8f, 0xff, 0xff,
+    0xff, 0x39, 0x0, 0x0, 0xe4, 0xff, 0x8c, 0xff,
+    0x9b, 0x3, 0x6c, 0xfd, 0xff, 0xdc, 0xff, 0xd6,
+    0x1e, 0x0, 0xe3, 0xff, 0x6a, 0xff, 0x98, 0xde,
+    0xff, 0xff, 0xe4, 0x1e, 0xf3, 0xff, 0xf8, 0x8c,
+    0xe3, 0xff, 0x91, 0xff, 0x98, 0xff, 0xff, 0xff,
+    0x72, 0x20, 0x8e, 0xff, 0xff, 0xed, 0xe3, 0xff,
+    0xb2, 0xff, 0x85, 0xcb, 0xe7, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xd4, 0xaf, 0xe3, 0xff, 0x5b, 0xff,
+    0x97, 0x0, 0x7b, 0xec, 0xec, 0xec, 0xec, 0xe7,
+    0x37, 0x0, 0xe2, 0xff, 0x58, 0xff, 0x98, 0x75,
+    0x95, 0xe, 0xa0, 0x65, 0x0, 0x67, 0xa3, 0x1b,
+    0xe2, 0xff, 0x5b, 0xff, 0x99, 0xb4, 0xff, 0x3b,
+    0xfb, 0xe2, 0x0, 0xe7, 0xff, 0x2b, 0xe2, 0xff,
+    0xc8, 0xff, 0x9a, 0x83, 0xff, 0x61, 0xd3, 0xff,
+    0x2a, 0xff, 0xeb, 0x1, 0xe1, 0xff, 0xff, 0xff,
+    0x99, 0x54, 0xff, 0x7a, 0xa4, 0xff, 0x8b, 0xff,
+    0xad, 0x0, 0xe1, 0xff, 0xf6, 0xee, 0x5f, 0x62,
+    0x80, 0x6a, 0x6d, 0x7d, 0xc9, 0xff, 0xb8, 0x3c,
+    0xe1, 0xff, 0xe, 0x0, 0x45, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xcd, 0xd6, 0xfb,
+    0x6, 0x0, 0x33, 0xfa, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xb5, 0x18, 0x20, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0,
+
     /* U+98CE "风" */
     0x0, 0x0, 0xb8, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xf6, 0x1a, 0x0, 0x0,
@@ -2746,45 +2860,49 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
     {.bitmap_index = 9244, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
     {.bitmap_index = 9484, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
     {.bitmap_index = 9694, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 9890, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 10114, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 10324, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 10520, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 10730, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 10926, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 11122, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 11347, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 11572, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 11812, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 12037, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 12247, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 12443, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 12653, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 12893, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 13103, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 13313, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 13509, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 13719, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 13975, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 14215, .adv_w = 256, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 14455, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 14665, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 14861, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 15086, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 15282, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 15492, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 15732, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 15942, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 16138, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 16348, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16573, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 16798, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 16994, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 17204, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 17414, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 17624, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 17820, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 18030, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2}
+    {.bitmap_index = 9890, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 10086, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 10310, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 10520, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 10716, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 10926, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 11136, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 11332, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 11528, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 11753, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 11978, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 12218, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 12428, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 12653, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 12863, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 13059, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 13269, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 13509, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 13719, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 13929, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 14125, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 14335, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 14591, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 14831, .adv_w = 256, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15071, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 15281, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 15477, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15702, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 15898, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 16108, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 16348, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 16558, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 16754, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 16964, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 17189, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 17414, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 17610, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 17820, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 18030, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 18240, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 18436, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 18646, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 18856, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2}
 };
 
 /*---------------------
@@ -2792,12 +2910,12 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
  *--------------------*/
 
 static const uint16_t unicode_list_2[] = {
-    0x0, 0x99, 0x1ee, 0x28f, 0x2b9, 0x2fd, 0x37c, 0x3e6,
-    0x51e, 0x575, 0x86e, 0x9c9, 0xac3, 0xc9e, 0xfec, 0x1046,
-    0x1080, 0x1147, 0x16a9, 0x1726, 0x1754, 0x184f, 0x1d5a, 0x1e91,
-    0x1f6f, 0x1fc5, 0x21b1, 0x2233, 0x2276, 0x22ad, 0x23fc, 0x24f5,
-    0x2817, 0x2bc0, 0x2df4, 0x33b5, 0x3e6e, 0x4160, 0x4313, 0x4315,
-    0x472e, 0x4733, 0x4a14, 0x4a25
+    0x0, 0x99, 0x1ee, 0x28f, 0x2ae, 0x2b9, 0x2fd, 0x37c,
+    0x3e6, 0x4b7, 0x51e, 0x575, 0x86e, 0x9c9, 0xac3, 0xc9e,
+    0xccf, 0xfec, 0x1046, 0x1080, 0x1147, 0x16a9, 0x1726, 0x1754,
+    0x184f, 0x1d5a, 0x1e91, 0x1f6f, 0x1fc5, 0x21b1, 0x2233, 0x2276,
+    0x22ad, 0x23fc, 0x24f5, 0x2817, 0x2bc0, 0x2df4, 0x33b5, 0x3e6e,
+    0x4160, 0x4313, 0x4315, 0x472e, 0x4733, 0x47af, 0x4a14, 0x4a25
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
@@ -2813,7 +2931,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
     },
     {
         .range_start = 20154, .range_length = 18982, .glyph_id_start = 95,
-        .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 44, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
+        .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 48, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
     }
 };
 
diff --git a/components/ui/vars.c b/components/ui/vars.c
index c6fa149..4e2d10b 100644
--- a/components/ui/vars.c
+++ b/components/ui/vars.c
@@ -163,3 +163,16 @@ void set_var_system_ip(const char *value) {
     strncpy(system_ip, value, sizeof(system_ip) / sizeof(char));
     system_ip[sizeof(system_ip) / sizeof(char) - 1] = 0;
 }
+
+char fire_status[100] = { 0 };
+
+const char *get_var_fire_status() {
+    return fire_status;
+}
+
+void set_var_fire_status(const char *value) {
+    strncpy(fire_status, value, sizeof(fire_status) / sizeof(char));
+    fire_status[sizeof(fire_status) / sizeof(char) - 1] = 0;
+}
+
+
diff --git a/components/ui/vars.h b/components/ui/vars.h
index 4d2574c..87bbc05 100644
--- a/components/ui/vars.h
+++ b/components/ui/vars.h
@@ -46,6 +46,8 @@ extern const char *get_var_local_time();
 extern void set_var_local_time(const char *value);
 extern const char *get_var_system_ip();
 extern void set_var_system_ip(const char *value);
+extern const char *get_var_fire_status();
+extern void set_var_fire_status(const char *value);
 
 #ifdef __cplusplus
 }
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
index d116f3b..ae791fd 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 human_door)
+                    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 fire_sensor)
diff --git a/main/main.cpp b/main/main.cpp
index a73f914..bac1377 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -22,9 +22,11 @@
 #include "MQ-2.h"
 #include "JW01.h"
 #include "human_door.h"
+#include "fire_sensor.h"
 
 #define TAG "MAIN"
-#define CO2_SPOILAGE_THRESHOLD_PPM 1000.0f
+#define CO2_SPOILAGE_THRESHOLD_PPM 1500.0f
+#define FIRE_DANGER_THRESHOLD_PERCENT 35.0f
 
 typedef struct
 {
@@ -36,12 +38,15 @@ typedef struct
     float tvoc;
     float hcho;
     float co2;
+    float fire_percent;
+    bool fire_danger;
     bool human_present;
     bool door_closed;
 } env_data_t;
 
 static env_data_t s_env_data;
 static SemaphoreHandle_t s_env_data_lock = NULL;
+static volatile bool s_ui_ready = false;
 
 static bool wait_for_wifi_connected(TickType_t timeout_ticks)
 {
@@ -76,6 +81,10 @@ static void ui_task(void *arg)
 {
     for (;;)
     {
+        if (!s_ui_ready) {
+            vTaskDelay(pdMS_TO_TICKS(20));
+            continue;
+        }
         env_data_update_system_info();
         lvgl_port_lock(0);
         ui_tick();
@@ -84,16 +93,31 @@ static void ui_task(void *arg)
     }
 }
 
+static void ui_init_task(void *arg)
+{
+    (void)arg;
+
+    lvgl_port_lock(100 / portTICK_PERIOD_MS);
+    ui_init();
+    lvgl_port_unlock();
+
+    s_ui_ready = true;
+    vTaskDelete(NULL);
+}
+
 static void status_task(void *arg)
 {
     (void)arg;
-    for (;;) {
+    for (;;)
+    {
         human_door_state_t io_state{};
-        if (human_door_read(&io_state) == ESP_OK) {
+        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) {
+            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;
@@ -116,22 +140,19 @@ extern "C" void app_main(void)
     // 2. 初始化显示屏和 LVGL
     start_lvgl_demo();
 
-    // 3. 初始化 UI
-    lvgl_port_lock(100 / portTICK_PERIOD_MS);
-    ui_init();
-    lvgl_port_unlock();
+    // 3. 在 CPU1 上执行 UI 初始化，避免 app_main 长时间占用 CPU0
+    xTaskCreatePinnedToCore(ui_init_task, "ui_init_task", 8192, NULL, 8, NULL, 1);
     set_var_food_status("良好");
+    set_var_fire_status("安全");
 
-    // 7. 创建 UI 任务
-    xTaskCreate(ui_task, "ui_task", 8192, NULL, 5, NULL);
+    // 7. 创建 UI 刷新任务并固定在 CPU1（与 ui_init_task 同核）
+    xTaskCreatePinnedToCore(ui_task, "ui_task", 8192, NULL, 5, NULL, 1);
 
     if (wait_for_wifi_connected(pdMS_TO_TICKS(15000)))
     {
         set_var_system_ip(wifi_connect_get_ip());
     }
 
-
-
     // 5. 初始化 I2C 总线并注册传感器 (共享总线)
     ESP_ERROR_CHECK(bh1750_user_init());
     i2c_master_bus_handle_t i2c_bus = bh1750_get_i2c_bus_handle();
@@ -146,6 +167,9 @@ extern "C" void app_main(void)
     // JW01 使用 UART0(GPIO43/44)
     ESP_ERROR_CHECK(jw01_init());
 
+    // 火焰传感器使用 ADC(GPIO3)
+    ESP_ERROR_CHECK(fire_sensor_init());
+
     // GPIO16: HC-SR312, GPIO17: Door switch(低电平=关门)
     ESP_ERROR_CHECK(human_door_init());
     set_var_hum_status("无人");
@@ -157,12 +181,13 @@ extern "C" void app_main(void)
         aht30_handle_t aht30 = (aht30_handle_t)arg;
         uint32_t log_cnt = 0;
         for (;;) {
-            float lux = 0.0f, temp = 0.0f, hum = 0.0f, gas_percent = 0.0f;
+            float lux = 0.0f, temp = 0.0f, hum = 0.0f, gas_percent = 0.0f, fire_percent = 0.0f;
             jw01_data_t jw01{};
             esp_err_t bh_ret = ESP_FAIL;
             esp_err_t aht_ret = ESP_FAIL;
             esp_err_t mq2_ret = ESP_FAIL;
             esp_err_t jw_ret = ESP_FAIL;
+            esp_err_t fire_ret = ESP_FAIL;
             // 读取 BH1750
             bh_ret = bh1750_user_read(&lux);
             if (bh_ret == ESP_OK) {
@@ -181,6 +206,12 @@ extern "C" void app_main(void)
                 set_var_air_quity(gas_percent);
             }
 
+            // 读取火焰传感器，更新火焰状态
+            fire_ret = fire_sensor_read_percent(&fire_percent);
+            if (fire_ret == ESP_OK) {
+                set_var_fire_status(fire_sensor_is_danger(fire_percent, FIRE_DANGER_THRESHOLD_PERCENT) ? "危险" : "安全");
+            }
+
             // 读取 JW01（TVOC/HCHO/CO2）
             jw_ret = jw01_read(&jw01, 200);
             if (jw_ret == ESP_OK) {
@@ -197,10 +228,11 @@ extern "C" void app_main(void)
             // 每 5 次打印一次综合状态，避免日志刷屏
             if ((log_cnt++ % 10) == 0) {
                 ESP_LOGI(TAG,
-                         "SENS bh=%s lux=%.1f | aht=%s t=%.1f h=%.1f | mq2=%s gas=%.1f | jw01=%s co2_valid=%d co2=%.1f",
+                         "SENS bh=%s lux=%.1f | aht=%s t=%.1f h=%.1f | mq2=%s gas=%.1f | fire=%s fp=%.1f | jw01=%s co2_valid=%d co2=%.1f",
                          esp_err_to_name(bh_ret), lux,
                          esp_err_to_name(aht_ret), temp, hum,
                          esp_err_to_name(mq2_ret), gas_percent,
+                         esp_err_to_name(fire_ret), fire_percent,
                          esp_err_to_name(jw_ret), jw01.co2_valid ? 1 : 0, jw01.co2);
             }
             
@@ -212,6 +244,8 @@ extern "C" void app_main(void)
                 s_env_data.temp = temp;
                 s_env_data.humidity = hum;
                 s_env_data.gas_percent = gas_percent;
+                s_env_data.fire_percent = fire_percent;
+                s_env_data.fire_danger = fire_sensor_is_danger(fire_percent, FIRE_DANGER_THRESHOLD_PERCENT);
                 if (jw01.tvoc_valid) s_env_data.tvoc = jw01.tvoc;
                 if (jw01.hcho_valid) s_env_data.hcho = jw01.hcho;
                 if (jw01.co2_valid) s_env_data.co2 = jw01.co2;
diff --git a/相关资料/smart-granary/smart-granary.eez-project b/相关资料/smart-granary/smart-granary.eez-project
index bfe36cc..330a4b9 100644
--- a/相关资料/smart-granary/smart-granary.eez-project
+++ b/相关资料/smart-granary/smart-granary.eez-project
@@ -218,6 +218,14 @@
         "defaultValue": "\"\"",
         "persistent": false,
         "native": true
+      },
+      {
+        "objID": "e7d613bb-52ae-4744-aab5-1f1cc861e49c",
+        "name": "fire_status",
+        "type": "string",
+        "defaultValue": "\"\"",
+        "persistent": false,
+        "native": true
       }
     ],
     "structures": [],
@@ -534,7 +542,7 @@
                   "MAIN": {
                     "DEFAULT": {
                       "text_font": "number_16",
-                      "text_color": "#ff5e5e"
+                      "text_color": "#ff2a2a"
                     }
                   }
                 }
@@ -585,7 +593,7 @@
                   "MAIN": {
                     "DEFAULT": {
                       "text_font": "number_16",
-                      "text_color": "#ff5e5e"
+                      "text_color": "#ff2a2a"
                     }
                   }
                 }
@@ -636,7 +644,7 @@
                   "MAIN": {
                     "DEFAULT": {
                       "text_font": "number_16",
-                      "text_color": "#ff5e5e"
+                      "text_color": "#ff2a2a"
                     }
                   }
                 }
@@ -652,8 +660,8 @@
             {
               "objID": "1bcab9f8-f491-4418-cd50-5fff4f615687",
               "type": "LVGLLabelWidget",
-              "left": 151,
-              "top": 122,
+              "left": 88,
+              "top": 158,
               "width": 48,
               "height": 18,
               "customInputs": [],
@@ -701,8 +709,8 @@
             {
               "objID": "3037d501-9168-4ab4-c5ee-86a85189cb6d",
               "type": "LVGLLabelWidget",
-              "left": 163,
-              "top": 140,
+              "left": 95,
+              "top": 176,
               "width": 32,
               "height": 18,
               "customInputs": [],
@@ -736,7 +744,7 @@
                   "MAIN": {
                     "DEFAULT": {
                       "text_font": "chinese_16",
-                      "text_color": "#ff5e5e"
+                      "text_color": "#ff2a2a"
                     }
                   }
                 }
@@ -836,7 +844,7 @@
                   "MAIN": {
                     "DEFAULT": {
                       "text_font": "number_16",
-                      "text_color": "#ff5e5e"
+                      "text_color": "#ff2a2a"
                     }
                   }
                 }
@@ -901,7 +909,7 @@
             {
               "objID": "640a3e04-8f18-4527-dc2b-33003ac5959a",
               "type": "LVGLLabelWidget",
-              "left": 14,
+              "left": 29,
               "top": 176,
               "width": 32,
               "height": 18,
@@ -936,7 +944,7 @@
                   "MAIN": {
                     "DEFAULT": {
                       "text_font": "chinese_16",
-                      "text_color": "#ff5e5e"
+                      "text_color": "#ff2a2a"
                     }
                   }
                 }
@@ -1036,7 +1044,7 @@
                   "MAIN": {
                     "DEFAULT": {
                       "text_font": "number_16",
-                      "text_color": "#ff5e5e"
+                      "text_color": "#ff2a2a"
                     }
                   }
                 }
@@ -1052,8 +1060,8 @@
             {
               "objID": "82818512-2a20-4b2e-82e2-fbbd2f4bf62f",
               "type": "LVGLLabelWidget",
-              "left": 135,
-              "top": 158,
+              "left": 144,
+              "top": 123,
               "width": 80,
               "height": 18,
               "customInputs": [],
@@ -1101,8 +1109,8 @@
             {
               "objID": "1a4506d3-c156-4b63-f585-647302058a3e",
               "type": "LVGLLabelWidget",
-              "left": 139,
-              "top": 176,
+              "left": 163,
+              "top": 140,
               "width": 32,
               "height": 18,
               "customInputs": [],
@@ -1136,7 +1144,7 @@
                   "MAIN": {
                     "DEFAULT": {
                       "text_font": "chinese_16",
-                      "text_color": "#ff5e5e"
+                      "text_color": "#ff2a2a"
                     }
                   }
                 }
@@ -1383,7 +1391,7 @@
                   "MAIN": {
                     "DEFAULT": {
                       "text_font": "chinese_16",
-                      "text_color": "#ff5e5e"
+                      "text_color": "#ff2a2a"
                     }
                   }
                 }
@@ -1434,7 +1442,7 @@
                   "MAIN": {
                     "DEFAULT": {
                       "text_font": "chinese_16",
-                      "text_color": "#ff5e5e"
+                      "text_color": "#ff2a2a"
                     }
                   }
                 }
@@ -1485,7 +1493,7 @@
                   "MAIN": {
                     "DEFAULT": {
                       "text_font": "chinese_16",
-                      "text_color": "#ff5e5e"
+                      "text_color": "#ff2a2a"
                     }
                   }
                 }
@@ -1536,7 +1544,7 @@
                   "MAIN": {
                     "DEFAULT": {
                       "text_font": "chinese_16",
-                      "text_color": "#ff5e5e"
+                      "text_color": "#ff2a2a"
                     }
                   }
                 }
@@ -1552,10 +1560,10 @@
             {
               "objID": "94c14770-4f62-4b30-f0a2-a6f432feeda1",
               "type": "LVGLLabelWidget",
-              "left": 88,
+              "left": 15,
               "top": 8,
-              "width": 143,
-              "height": 14,
+              "width": 164,
+              "height": 16,
               "customInputs": [],
               "customOutputs": [],
               "style": {
@@ -1586,7 +1594,7 @@
                 "definition": {
                   "MAIN": {
                     "DEFAULT": {
-                      "text_font": "number_14",
+                      "text_font": "number_16",
                       "text_color": "#000000"
                     }
                   }
@@ -1603,7 +1611,7 @@
             {
               "objID": "e90319ea-674c-4f41-ca0b-595c4d3f13f5",
               "type": "LVGLLabelWidget",
-              "left": 124,
+              "left": 128,
               "top": 28,
               "width": 92,
               "height": 16,
@@ -1638,7 +1646,7 @@
                   "MAIN": {
                     "DEFAULT": {
                       "text_font": "number_16",
-                      "text_color": "#000000"
+                      "text_color": "#fe979e"
                     }
                   }
                 }
@@ -1650,6 +1658,106 @@
               "longMode": "WRAP",
               "recolor": false,
               "previewValue": "192.168.1.169"
+            },
+            {
+              "objID": "1e6bf4a0-3d80-4771-ef44-92c4abd5aa0b",
+              "type": "LVGLLabelWidget",
+              "left": 152,
+              "top": 159,
+              "width": 64,
+              "height": 18,
+              "customInputs": [],
+              "customOutputs": [],
+              "style": {
+                "objID": "61c61d34-f4f5-49a8-c501-af74642291c8",
+                "useStyle": "default",
+                "conditionalStyles": [],
+                "childStyles": []
+              },
+              "timeline": [],
+              "eventHandlers": [],
+              "leftUnit": "px",
+              "topUnit": "px",
+              "widthUnit": "content",
+              "heightUnit": "content",
+              "children": [],
+              "widgetFlags": "CLICK_FOCUSABLE|GESTURE_BUBBLE|PRESS_LOCK|SCROLLABLE|SCROLL_CHAIN_HOR|SCROLL_CHAIN_VER|SCROLL_ELASTIC|SCROLL_MOMENTUM|SCROLL_WITH_ARROW|SNAPPABLE",
+              "hiddenFlagType": "literal",
+              "clickableFlagType": "literal",
+              "flagScrollbarMode": "",
+              "flagScrollDirection": "",
+              "scrollSnapX": "",
+              "scrollSnapY": "",
+              "checkedStateType": "literal",
+              "disabledStateType": "literal",
+              "states": "",
+              "localStyles": {
+                "objID": "0ab84cbe-5505-4f5e-c387-ba54330993f0",
+                "definition": {
+                  "MAIN": {
+                    "DEFAULT": {
+                      "text_font": "chinese_16"
+                    }
+                  }
+                }
+              },
+              "group": "",
+              "groupIndex": 0,
+              "text": "火焰状态",
+              "textType": "literal",
+              "longMode": "WRAP",
+              "recolor": false
+            },
+            {
+              "objID": "a367e705-b5b6-4ea7-c80c-cf227db26c6f",
+              "type": "LVGLLabelWidget",
+              "left": 170,
+              "top": 177,
+              "width": 32,
+              "height": 18,
+              "customInputs": [],
+              "customOutputs": [],
+              "style": {
+                "objID": "6a18c9c7-3e38-462d-c9c9-e01900d6fda5",
+                "useStyle": "default",
+                "conditionalStyles": [],
+                "childStyles": []
+              },
+              "timeline": [],
+              "eventHandlers": [],
+              "leftUnit": "px",
+              "topUnit": "px",
+              "widthUnit": "content",
+              "heightUnit": "content",
+              "children": [],
+              "widgetFlags": "CLICK_FOCUSABLE|GESTURE_BUBBLE|PRESS_LOCK|SCROLLABLE|SCROLL_CHAIN_HOR|SCROLL_CHAIN_VER|SCROLL_ELASTIC|SCROLL_MOMENTUM|SCROLL_WITH_ARROW|SNAPPABLE",
+              "hiddenFlagType": "literal",
+              "clickableFlagType": "literal",
+              "flagScrollbarMode": "",
+              "flagScrollDirection": "",
+              "scrollSnapX": "",
+              "scrollSnapY": "",
+              "checkedStateType": "literal",
+              "disabledStateType": "literal",
+              "states": "",
+              "localStyles": {
+                "objID": "205e25ca-d7a2-4e9e-aab7-cf5f54710fac",
+                "definition": {
+                  "MAIN": {
+                    "DEFAULT": {
+                      "text_font": "chinese_16",
+                      "text_color": "#ff2a2a"
+                    }
+                  }
+                }
+              },
+              "group": "",
+              "groupIndex": 0,
+              "text": "fire_status",
+              "textType": "expression",
+              "longMode": "WRAP",
+              "recolor": false,
+              "previewValue": "安全"
             }
           ],
           "widgetFlags": "CLICKABLE|PRESS_LOCK|CLICK_FOCUSABLE|GESTURE_BUBBLE|SNAPPABLE|SCROLLABLE|SCROLL_ELASTIC|SCROLL_MOMENTUM|SCROLL_CHAIN_HOR|SCROLL_CHAIN_VER",
@@ -1768,7 +1876,7 @@
       "descent": 4,
       "glyphs": [],
       "lvglRanges": "32-127",
-      "lvglSymbols": "温度湿粮食储环境光强火焰监测状热空质人体气存在门重有通风无加开启关闭制冷散照量明态变质良好",
+      "lvglSymbols": "温度湿粮食储环境光强火焰监测状热空质人体安全危险气存在门重有通风无加开启关闭制冷散照量明态变质良好",
       "lvglGlyphs": {
         "encodings": [
           {
diff --git a/相关资料/smart-granary/src/ui/screens.c b/相关资料/smart-granary/src/ui/screens.c
index 1e99930..1c01e10 100644
--- a/相关资料/smart-granary/src/ui/screens.c
+++ b/相关资料/smart-granary/src/ui/screens.c
@@ -13,7 +13,7 @@
 objects_t objects;
 
 static const char *screen_names[] = { "Main" };
-static const char *object_names[] = { "main", "background_pic", "obj0", "obj1", "obj2", "obj3", "obj4", "obj5", "obj6", "obj7", "obj8", "obj9", "obj10", "obj11", "obj12", "obj13" };
+static const char *object_names[] = { "main", "background_pic", "obj0", "obj1", "obj2", "obj3", "obj4", "obj5", "obj6", "obj7", "obj8", "obj9", "obj10", "obj11", "obj12", "obj13", "obj14" };
 
 //
 // Event handlers
@@ -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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
@@ -95,12 +95,12 @@ 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
             lv_obj_t *obj = lv_label_create(parent_obj);
-            lv_obj_set_pos(obj, 151, 122);
+            lv_obj_set_pos(obj, 88, 158);
             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_label_set_text(obj, "门状态");
@@ -108,10 +108,10 @@ void create_screen_main() {
         {
             lv_obj_t *obj = lv_label_create(parent_obj);
             objects.obj3 = obj;
-            lv_obj_set_pos(obj, 163, 140);
+            lv_obj_set_pos(obj, 95, 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
@@ -140,10 +140,10 @@ void create_screen_main() {
         {
             lv_obj_t *obj = lv_label_create(parent_obj);
             objects.obj5 = obj;
-            lv_obj_set_pos(obj, 14, 176);
+            lv_obj_set_pos(obj, 29, 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
@@ -159,12 +159,12 @@ 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
             lv_obj_t *obj = lv_label_create(parent_obj);
-            lv_obj_set_pos(obj, 135, 158);
+            lv_obj_set_pos(obj, 144, 123);
             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_label_set_text(obj, "人存在状态");
@@ -172,10 +172,10 @@ void create_screen_main() {
         {
             lv_obj_t *obj = lv_label_create(parent_obj);
             objects.obj7 = obj;
-            lv_obj_set_pos(obj, 139, 176);
+            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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
@@ -239,25 +239,41 @@ 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(0xffff5e5e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
             lv_obj_t *obj = lv_label_create(parent_obj);
             objects.obj12 = obj;
-            lv_obj_set_pos(obj, 88, 8);
+            lv_obj_set_pos(obj, 15, 8);
             lv_obj_set_size(obj, LV_SIZE_CONTENT, LV_SIZE_CONTENT);
-            lv_obj_set_style_text_font(obj, &ui_font_number_14, LV_PART_MAIN | LV_STATE_DEFAULT);
+            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(0xff000000), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
         {
             lv_obj_t *obj = lv_label_create(parent_obj);
             objects.obj13 = obj;
-            lv_obj_set_pos(obj, 124, 28);
+            lv_obj_set_pos(obj, 128, 28);
             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(0xff000000), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_obj_set_style_text_color(obj, lv_color_hex(0xfffe979e), LV_PART_MAIN | LV_STATE_DEFAULT);
+            lv_label_set_text(obj, "");
+        }
+        {
+            lv_obj_t *obj = lv_label_create(parent_obj);
+            lv_obj_set_pos(obj, 152, 159);
+            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_label_set_text(obj, "火焰状态");
+        }
+        {
+            lv_obj_t *obj = lv_label_create(parent_obj);
+            objects.obj14 = obj;
+            lv_obj_set_pos(obj, 170, 177);
+            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(0xffff2a2a), LV_PART_MAIN | LV_STATE_DEFAULT);
             lv_label_set_text(obj, "");
         }
     }
@@ -394,6 +410,15 @@ void tick_screen_main() {
             tick_value_change_obj = NULL;
         }
     }
+    {
+        const char *new_val = evalTextProperty(flowState, 30, 3, "Failed to evaluate Text in Label widget");
+        const char *cur_val = lv_label_get_text(objects.obj14);
+        if (strcmp(new_val, cur_val) != 0) {
+            tick_value_change_obj = objects.obj14;
+            lv_label_set_text(objects.obj14, new_val);
+            tick_value_change_obj = NULL;
+        }
+    }
 }
 
 typedef void (*tick_screen_func_t)();
diff --git a/相关资料/smart-granary/src/ui/screens.h b/相关资料/smart-granary/src/ui/screens.h
index f98166e..9eb2fe0 100644
--- a/相关资料/smart-granary/src/ui/screens.h
+++ b/相关资料/smart-granary/src/ui/screens.h
@@ -32,6 +32,7 @@ typedef struct _objects_t {
     lv_obj_t *obj11;
     lv_obj_t *obj12;
     lv_obj_t *obj13;
+    lv_obj_t *obj14;
 } objects_t;
 
 extern objects_t objects;
diff --git a/相关资料/smart-granary/src/ui/ui.c b/相关资料/smart-granary/src/ui/ui.c
index d37ab29..2e86c24 100644
--- a/相关资料/smart-granary/src/ui/ui.c
+++ b/相关资料/smart-granary/src/ui/ui.c
@@ -5,134 +5,142 @@
 #include "vars.h"
 
 // ASSETS DEFINITION
-const uint8_t assets[2068] = {
+const uint8_t assets[2196] = {
     0x7E, 0x45, 0x45, 0x5A, 0x03, 0x00, 0x06, 0x00, 0x00, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00,
     0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0xF0, 0x00, 0xF0, 0x00, 0x01, 0x00, 0x00, 0x00, 0x24, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
     0x20, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1C, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00,
-    0x98, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00,
+    0x18, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0C, 0x00, 0x00, 0x00,
     0x00, 0x00, 0xFF, 0xFF, 0x10, 0x00, 0x00, 0x00, 0x3C, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x1D, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x1F, 0x00, 0x00, 0x00, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x00, 0x74, 0x00, 0x00, 0x00,
-    0x90, 0x00, 0x00, 0x00, 0xAC, 0x00, 0x00, 0x00, 0xC8, 0x00, 0x00, 0x00, 0xE4, 0x00, 0x00, 0x00,
-    0x00, 0x01, 0x00, 0x00, 0x1C, 0x01, 0x00, 0x00, 0x38, 0x01, 0x00, 0x00, 0x54, 0x01, 0x00, 0x00,
-    0x70, 0x01, 0x00, 0x00, 0x8C, 0x01, 0x00, 0x00, 0xA8, 0x01, 0x00, 0x00, 0xC4, 0x01, 0x00, 0x00,
-    0xE0, 0x01, 0x00, 0x00, 0xFC, 0x01, 0x00, 0x00, 0x18, 0x02, 0x00, 0x00, 0x34, 0x02, 0x00, 0x00,
-    0x50, 0x02, 0x00, 0x00, 0x6C, 0x02, 0x00, 0x00, 0x88, 0x02, 0x00, 0x00, 0xA4, 0x02, 0x00, 0x00,
-    0xC0, 0x02, 0x00, 0x00, 0xDC, 0x02, 0x00, 0x00, 0xF8, 0x02, 0x00, 0x00, 0x14, 0x03, 0x00, 0x00,
-    0x30, 0x03, 0x00, 0x00, 0x4C, 0x03, 0x00, 0x00, 0x68, 0x03, 0x00, 0x00, 0x84, 0x03, 0x00, 0x00,
-    0x30, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x90, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x31, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x7C, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x68, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x54, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x40, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x2C, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0x18, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0x08, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xF8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0xE8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xD4, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0xC4, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xB0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0xA0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0x8C, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x7C, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0x68, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x58, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0x44, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x34, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x20, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0x0C, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00,
-    0xF8, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xE4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xD4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xC4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xB4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0xA4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00,
-    0x94, 0x01, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x44, 0x65, 0x66, 0x61, 0x75, 0x6C, 0x74, 0x00, 0x7C, 0x00, 0x00, 0x00,
+    0x98, 0x00, 0x00, 0x00, 0xB4, 0x00, 0x00, 0x00, 0xD0, 0x00, 0x00, 0x00, 0xEC, 0x00, 0x00, 0x00,
+    0x08, 0x01, 0x00, 0x00, 0x24, 0x01, 0x00, 0x00, 0x40, 0x01, 0x00, 0x00, 0x5C, 0x01, 0x00, 0x00,
+    0x78, 0x01, 0x00, 0x00, 0x94, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xCC, 0x01, 0x00, 0x00,
+    0xE8, 0x01, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x20, 0x02, 0x00, 0x00, 0x3C, 0x02, 0x00, 0x00,
+    0x58, 0x02, 0x00, 0x00, 0x74, 0x02, 0x00, 0x00, 0x90, 0x02, 0x00, 0x00, 0xAC, 0x02, 0x00, 0x00,
+    0xC8, 0x02, 0x00, 0x00, 0xE4, 0x02, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x1C, 0x03, 0x00, 0x00,
+    0x38, 0x03, 0x00, 0x00, 0x54, 0x03, 0x00, 0x00, 0x70, 0x03, 0x00, 0x00, 0x8C, 0x03, 0x00, 0x00,
+    0xA8, 0x03, 0x00, 0x00, 0xC4, 0x03, 0x00, 0x00, 0x30, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xD0, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x31, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xBC, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xA8, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x94, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x80, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x6C, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x58, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x48, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x38, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x28, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x14, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x04, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xF0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xE0, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xCC, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xBC, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xA8, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x98, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x84, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x74, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x60, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x4C, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0x38, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x24, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x14, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x04, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xF4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xE4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xD4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x00, 0xC4, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0x32, 0x75, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0xFF, 0xFF, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 0x00, 0x00,
+    0xB0, 0x01, 0x00, 0x00, 0xB0, 0x01, 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, 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, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
-    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x01, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
-    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x02, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0x60, 0x00, 0xE0,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x01, 0x60, 0x00, 0xE0,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x02, 0x60, 0x00, 0xE0,
     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, 0x00, 0xE0, 0x00, 0x00, 0x03, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
     0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
-    0x04, 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, 0x05, 0x60, 0x00, 0xE0,
+    0x00, 0xE0, 0x00, 0x00, 0x04, 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, 0x06, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
+    0x05, 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, 0x06, 0x60, 0x00, 0xE0,
     0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 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, 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, 0x07, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
-    0x00, 0xE0, 0x00, 0x00, 0x08, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
-    0x00, 0xE0, 0x00, 0x00, 0x09, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
-    0x00, 0xE0, 0x00, 0x00, 0x0A, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
-    0x00, 0xE0, 0x00, 0x00, 0x0C, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00,
-    0x00, 0xE0, 0x00, 0x00, 0x0D, 0x60, 0x00, 0xE0, 0x0C, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x07, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x08, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x09, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x0A, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x0C, 0x60, 0x00, 0xE0, 0x00, 0xE0, 0x00, 0x00,
+    0x00, 0xE0, 0x00, 0x00, 0x00, 0xE0, 0x00, 0x00, 0x0D, 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, 0x0E, 0x60, 0x00, 0xE0, 0x0C, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
     0x00, 0x00, 0x00, 0x00
@@ -154,6 +162,7 @@ native_var_t native_vars[] = {
     { NATIVE_VAR_TYPE_STRING, get_var_hum_status, set_var_hum_status }, 
     { NATIVE_VAR_TYPE_STRING, get_var_local_time, set_var_local_time }, 
     { NATIVE_VAR_TYPE_STRING, get_var_system_ip, set_var_system_ip }, 
+    { NATIVE_VAR_TYPE_STRING, get_var_fire_status, set_var_fire_status }, 
 };
 
 ActionExecFunc actions[] = {
diff --git a/相关资料/smart-granary/src/ui/ui.h b/相关资料/smart-granary/src/ui/ui.h
index ffad363..78281bb 100644
--- a/相关资料/smart-granary/src/ui/ui.h
+++ b/相关资料/smart-granary/src/ui/ui.h
@@ -9,7 +9,7 @@
 extern "C" {
 #endif
 
-extern const uint8_t assets[2068];
+extern const uint8_t assets[2196];
 
 void ui_init();
 void ui_tick();
diff --git a/相关资料/smart-granary/src/ui/ui_font_chinese_16.c b/相关资料/smart-granary/src/ui/ui_font_chinese_16.c
index 7dac9b4..d84c517 100644
--- a/相关资料/smart-granary/src/ui/ui_font_chinese_16.c
+++ b/相关资料/smart-granary/src/ui/ui_font_chinese_16.c
@@ -1,7 +1,7 @@
 /*******************************************************************************
  * Size: 16 px
  * Bpp: 8
- * Opts: --bpp 8 --size 16 --no-compress --font ..\YeZiGongChangTangYingHei\YeZiGongChangTangYingHei-2.ttf --symbols 温度湿粮食储环境光强火焰监测状热空质人体气存在门重有通风无加开启关闭制冷散照量明态变质良好 --range 32-127 --format lvgl
+ * Opts: --bpp 8 --size 16 --no-compress --font ..\YeZiGongChangTangYingHei\YeZiGongChangTangYingHei-2.ttf --symbols 温度湿粮食储环境光强火焰监测状热空质人体安全危险气存在门重有通风无加开启关闭制冷散照量明态变质良好 --range 32-127 --format lvgl
  ******************************************************************************/
 
 #ifdef __has_include
@@ -1469,6 +1469,33 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
     0x0, 0x0,
 
+    /* U+5168 "全" */
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x9d, 0xff, 0xfe,
+    0x83, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x3, 0x83, 0xff, 0xff, 0xff, 0xfe, 0x62,
+    0x0, 0x0, 0x0, 0x0, 0x21, 0x5e, 0x8d, 0xe1,
+    0xff, 0xff, 0xa0, 0x90, 0xff, 0xff, 0xc3, 0x69,
+    0x3a, 0xa, 0xca, 0xff, 0xff, 0xff, 0xff, 0x97,
+    0x5, 0x2, 0x80, 0xff, 0xff, 0xff, 0xff, 0xbb,
+    0xcc, 0xff, 0xff, 0xff, 0xff, 0xec, 0xe8, 0xe8,
+    0xe9, 0xff, 0xff, 0xf7, 0xff, 0xba, 0x25, 0x26,
+    0x9f, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0x3f, 0x1e, 0x1a, 0x0, 0x0, 0x1c, 0x53,
+    0x54, 0x99, 0xff, 0xff, 0x5e, 0x54, 0x4e, 0x6,
+    0x0, 0x0, 0x0, 0x0, 0x26, 0x34, 0x34, 0x85,
+    0xff, 0xff, 0x3f, 0x34, 0x34, 0x1b, 0x0, 0x0,
+    0x0, 0x10, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xd7, 0x0, 0x0, 0x0, 0x8,
+    0xe4, 0xf4, 0xf4, 0xfa, 0xff, 0xff, 0xf6, 0xf4,
+    0xf4, 0xbb, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x62, 0xff, 0xff, 0xa, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x22, 0x67, 0x68, 0x68, 0x68, 0xa5,
+    0xff, 0xff, 0x71, 0x68, 0x68, 0x68, 0x63, 0xc,
+    0x8d, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0x4d, 0x76, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xfb, 0x3a,
+
     /* U+5173 "关" */
     0x0, 0x0, 0x26, 0xfc, 0xfd, 0x63, 0x0, 0x0,
     0x42, 0xfa, 0xfe, 0x46, 0x0, 0x0, 0x0, 0x11,
@@ -1582,6 +1609,35 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x30, 0x18, 0xf0, 0xff, 0xfe, 0x99, 0x41, 0xfc,
     0xff, 0xff, 0xff, 0xae,
 
+    /* U+5371 "危" */
+    0x0, 0x0, 0xa, 0xdf, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0x64, 0x0, 0x0, 0x0, 0x0,
+    0x7b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0x3b, 0x0, 0x0, 0xf, 0x95, 0xfd, 0xff,
+    0xab, 0x3c, 0x3c, 0x3c, 0xc5, 0xff, 0xfb, 0x38,
+    0x33, 0xb, 0x59, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x91,
+    0x48, 0xf6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0x91, 0x0, 0x70,
+    0xff, 0xfa, 0x26, 0x40, 0x44, 0x44, 0x44, 0x44,
+    0x44, 0x44, 0x2a, 0x6, 0x0, 0x70, 0xff, 0xf8,
+    0x4b, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0x98, 0x0, 0x0, 0x70, 0xff, 0xf8, 0x58, 0xff,
+    0xff, 0xf6, 0xf4, 0xf4, 0xff, 0xff, 0xa4, 0x0,
+    0x0, 0x74, 0xff, 0xf2, 0x58, 0xff, 0xff, 0x2,
+    0x0, 0x5, 0xcf, 0xff, 0xa4, 0x0, 0x0, 0x96,
+    0xff, 0xe3, 0x58, 0xff, 0xff, 0x0, 0x57, 0xff,
+    0xff, 0xff, 0x9f, 0x0, 0x48, 0xf5, 0xff, 0xbb,
+    0x58, 0xff, 0xff, 0x0, 0x1d, 0xb1, 0xb8, 0xb1,
+    0x39, 0x0, 0xdf, 0xff, 0xff, 0x6c, 0x58, 0xff,
+    0xff, 0x68, 0x58, 0x58, 0x58, 0x58, 0x57, 0x1f,
+    0xe7, 0xff, 0xcb, 0x7, 0x4f, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0x98, 0xcf, 0x96,
+    0xc, 0x0, 0xf, 0xd2, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0x88, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0, 0x9, 0xc, 0xc, 0xc, 0xc, 0xc,
+    0xb, 0x0,
+
     /* U+53D8 "变" */
     0x0, 0x30, 0x3c, 0x3c, 0x3c, 0x78, 0xfe, 0xff,
     0xc5, 0x3c, 0x3c, 0x3c, 0x3c, 0x1a, 0x21, 0xff,
@@ -1759,6 +1815,35 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0x0, 0x0, 0x0, 0xb, 0x10, 0x0, 0x0, 0x0,
     0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
 
+    /* U+5B89 "安" */
+    0x0, 0x2, 0x4, 0x4, 0x4, 0x7c, 0xff, 0xfd,
+    0x51, 0x4, 0x4, 0x4, 0x2, 0x0, 0x2d, 0xfa,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xf8, 0x1b, 0x40, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0x2c, 0x3f, 0xff, 0xff, 0x2c, 0x20, 0x8e,
+    0x9b, 0x4c, 0x1c, 0x1c, 0x43, 0xff, 0xff, 0x2b,
+    0x12, 0x91, 0x84, 0x0, 0x6a, 0xff, 0xff, 0x61,
+    0x0, 0x0, 0x8, 0x8e, 0x8e, 0x9, 0x8d, 0xf4,
+    0xf4, 0xf4, 0xfd, 0xff, 0xff, 0xf8, 0xf4, 0xf4,
+    0xf4, 0xf4, 0xf4, 0xab, 0xac, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xc5, 0x16, 0x3c, 0x4c, 0xfd, 0xff, 0xd5,
+    0x3e, 0x3c, 0xb2, 0xff, 0xfe, 0x50, 0x3c, 0x1c,
+    0x0, 0x0, 0x90, 0xff, 0xff, 0x9a, 0x15, 0x2a,
+    0xf8, 0xff, 0xbc, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x8c, 0xf7, 0xff, 0xff, 0xfd, 0xf2, 0xff, 0xff,
+    0x41, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x17,
+    0xb6, 0xff, 0xff, 0xff, 0xff, 0xff, 0xb0, 0x4d,
+    0x4, 0x0, 0x44, 0xb2, 0xd4, 0xfa, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xea, 0x57,
+    0x97, 0xff, 0xff, 0xff, 0xff, 0xff, 0xec, 0x6b,
+    0x19, 0x7d, 0xe6, 0xff, 0xff, 0x93, 0x86, 0xfe,
+    0xea, 0xc8, 0x95, 0x51, 0x6, 0x0, 0x0, 0x0,
+    0x7, 0x66, 0xda, 0x5c, 0x0, 0x5, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0,
+
     /* U+5EA6 "度" */
     0x0, 0x0, 0xcc, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x8d, 0x0,
@@ -2582,6 +2667,35 @@ static LV_ATTRIBUTE_LARGE_CONST const uint8_t glyph_bitmap[] = {
     0xd1, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x8f,
     0xff, 0xff, 0xcc, 0xb,
 
+    /* U+9669 "险" */
+    0xc8, 0xff, 0xff, 0xff, 0xb8, 0x0, 0x0, 0x22,
+    0xf4, 0xff, 0xc8, 0x0, 0x0, 0x0, 0xe4, 0xff,
+    0xff, 0xff, 0xba, 0x0, 0x0, 0x8f, 0xff, 0xff,
+    0xff, 0x39, 0x0, 0x0, 0xe4, 0xff, 0x8c, 0xff,
+    0x9b, 0x3, 0x6c, 0xfd, 0xff, 0xdc, 0xff, 0xd6,
+    0x1e, 0x0, 0xe3, 0xff, 0x6a, 0xff, 0x98, 0xde,
+    0xff, 0xff, 0xe4, 0x1e, 0xf3, 0xff, 0xf8, 0x8c,
+    0xe3, 0xff, 0x91, 0xff, 0x98, 0xff, 0xff, 0xff,
+    0x72, 0x20, 0x8e, 0xff, 0xff, 0xed, 0xe3, 0xff,
+    0xb2, 0xff, 0x85, 0xcb, 0xe7, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xd4, 0xaf, 0xe3, 0xff, 0x5b, 0xff,
+    0x97, 0x0, 0x7b, 0xec, 0xec, 0xec, 0xec, 0xe7,
+    0x37, 0x0, 0xe2, 0xff, 0x58, 0xff, 0x98, 0x75,
+    0x95, 0xe, 0xa0, 0x65, 0x0, 0x67, 0xa3, 0x1b,
+    0xe2, 0xff, 0x5b, 0xff, 0x99, 0xb4, 0xff, 0x3b,
+    0xfb, 0xe2, 0x0, 0xe7, 0xff, 0x2b, 0xe2, 0xff,
+    0xc8, 0xff, 0x9a, 0x83, 0xff, 0x61, 0xd3, 0xff,
+    0x2a, 0xff, 0xeb, 0x1, 0xe1, 0xff, 0xff, 0xff,
+    0x99, 0x54, 0xff, 0x7a, 0xa4, 0xff, 0x8b, 0xff,
+    0xad, 0x0, 0xe1, 0xff, 0xf6, 0xee, 0x5f, 0x62,
+    0x80, 0x6a, 0x6d, 0x7d, 0xc9, 0xff, 0xb8, 0x3c,
+    0xe1, 0xff, 0xe, 0x0, 0x45, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xff, 0xff, 0xcd, 0xd6, 0xfb,
+    0x6, 0x0, 0x33, 0xfa, 0xff, 0xff, 0xff, 0xff,
+    0xff, 0xff, 0xff, 0xb5, 0x18, 0x20, 0x0, 0x0,
+    0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
+    0x0, 0x0,
+
     /* U+98CE "风" */
     0x0, 0x0, 0xb8, 0xff, 0xff, 0xff, 0xff, 0xff,
     0xff, 0xff, 0xff, 0xff, 0xf6, 0x1a, 0x0, 0x0,
@@ -2746,45 +2860,49 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
     {.bitmap_index = 9244, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
     {.bitmap_index = 9484, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
     {.bitmap_index = 9694, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 9890, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 10114, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 10324, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 10520, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 10730, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 10926, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 11122, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 11347, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 11572, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 11812, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 12037, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 12247, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 12443, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 12653, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 12893, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 13103, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 13313, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 13509, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 13719, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 13975, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 14215, .adv_w = 256, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 14455, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 14665, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 14861, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 15086, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 15282, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 15492, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 15732, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 15942, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 16138, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 16348, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
-    {.bitmap_index = 16573, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 16798, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 16994, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 17204, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 17414, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
-    {.bitmap_index = 17624, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
-    {.bitmap_index = 17820, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
-    {.bitmap_index = 18030, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2}
+    {.bitmap_index = 9890, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 10086, .adv_w = 256, .box_w = 16, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 10310, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 10520, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 10716, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 10926, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 11136, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 11332, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 11528, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 11753, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 11978, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 12218, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 12428, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 12653, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 12863, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 13059, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 13269, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 13509, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 13719, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 13929, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 14125, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 14335, .adv_w = 256, .box_w = 16, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 14591, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 14831, .adv_w = 256, .box_w = 15, .box_h = 16, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15071, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 15281, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 15477, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 15702, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 15898, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 16108, .adv_w = 256, .box_w = 16, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 16348, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 16558, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 16754, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 16964, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -2},
+    {.bitmap_index = 17189, .adv_w = 256, .box_w = 15, .box_h = 15, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 17414, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 17610, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 17820, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 18030, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 18240, .adv_w = 256, .box_w = 14, .box_h = 14, .ofs_x = 1, .ofs_y = -1},
+    {.bitmap_index = 18436, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2},
+    {.bitmap_index = 18646, .adv_w = 256, .box_w = 15, .box_h = 14, .ofs_x = 0, .ofs_y = -1},
+    {.bitmap_index = 18856, .adv_w = 256, .box_w = 14, .box_h = 15, .ofs_x = 1, .ofs_y = -2}
 };
 
 /*---------------------
@@ -2792,12 +2910,12 @@ static const lv_font_fmt_txt_glyph_dsc_t glyph_dsc[] = {
  *--------------------*/
 
 static const uint16_t unicode_list_2[] = {
-    0x0, 0x99, 0x1ee, 0x28f, 0x2b9, 0x2fd, 0x37c, 0x3e6,
-    0x51e, 0x575, 0x86e, 0x9c9, 0xac3, 0xc9e, 0xfec, 0x1046,
-    0x1080, 0x1147, 0x16a9, 0x1726, 0x1754, 0x184f, 0x1d5a, 0x1e91,
-    0x1f6f, 0x1fc5, 0x21b1, 0x2233, 0x2276, 0x22ad, 0x23fc, 0x24f5,
-    0x2817, 0x2bc0, 0x2df4, 0x33b5, 0x3e6e, 0x4160, 0x4313, 0x4315,
-    0x472e, 0x4733, 0x4a14, 0x4a25
+    0x0, 0x99, 0x1ee, 0x28f, 0x2ae, 0x2b9, 0x2fd, 0x37c,
+    0x3e6, 0x4b7, 0x51e, 0x575, 0x86e, 0x9c9, 0xac3, 0xc9e,
+    0xccf, 0xfec, 0x1046, 0x1080, 0x1147, 0x16a9, 0x1726, 0x1754,
+    0x184f, 0x1d5a, 0x1e91, 0x1f6f, 0x1fc5, 0x21b1, 0x2233, 0x2276,
+    0x22ad, 0x23fc, 0x24f5, 0x2817, 0x2bc0, 0x2df4, 0x33b5, 0x3e6e,
+    0x4160, 0x4313, 0x4315, 0x472e, 0x4733, 0x47af, 0x4a14, 0x4a25
 };
 
 /*Collect the unicode lists and glyph_id offsets*/
@@ -2813,7 +2931,7 @@ static const lv_font_fmt_txt_cmap_t cmaps[] =
     },
     {
         .range_start = 20154, .range_length = 18982, .glyph_id_start = 95,
-        .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 44, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
+        .unicode_list = unicode_list_2, .glyph_id_ofs_list = NULL, .list_length = 48, .type = LV_FONT_FMT_TXT_CMAP_SPARSE_TINY
     }
 };
 
diff --git a/相关资料/smart-granary/src/ui/vars.h b/相关资料/smart-granary/src/ui/vars.h
index 4d2574c..87bbc05 100644
--- a/相关资料/smart-granary/src/ui/vars.h
+++ b/相关资料/smart-granary/src/ui/vars.h
@@ -46,6 +46,8 @@ extern const char *get_var_local_time();
 extern void set_var_local_time(const char *value);
 extern const char *get_var_system_ip();
 extern void set_var_system_ip(const char *value);
+extern const char *get_var_fire_status();
+extern void set_var_fire_status(const char *value);
 
 #ifdef __cplusplus
 }