From 046ca3e0c9e9e10017efbe2860c129394df17251 Mon Sep 17 00:00:00 2001 From: Terrence Date: Sat, 25 Jan 2025 12:44:31 +0800 Subject: [PATCH] fix upgrade icon --- main/display/lcd_display.cc | 8 ++++++++ main/display/lcd_display.h | 1 + scripts/versions.py | 5 +++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/main/display/lcd_display.cc b/main/display/lcd_display.cc index 5da58227..7efc0898 100644 --- a/main/display/lcd_display.cc +++ b/main/display/lcd_display.cc @@ -377,3 +377,11 @@ void LcdDisplay::SetEmotion(const std::string &emotion) { } } +void LcdDisplay::SetIcon(const char* icon) { + if (emotion_label_ == nullptr) { + return; + } + DisplayLockGuard lock(this); + lv_obj_set_style_text_font(emotion_label_, &font_awesome_30_4, 0); + lv_label_set_text(emotion_label_, icon); +} diff --git a/main/display/lcd_display.h b/main/display/lcd_display.h index 76faf70d..fc98844e 100644 --- a/main/display/lcd_display.h +++ b/main/display/lcd_display.h @@ -50,6 +50,7 @@ public: void SetChatMessage(const std::string &role, const std::string &content) override; void SetEmotion(const std::string &emotion) override; + void SetIcon(const char* icon) override; }; #endif // LCD_DISPLAY_H diff --git a/scripts/versions.py b/scripts/versions.py index 6ab42e6b..1317d2bd 100644 --- a/scripts/versions.py +++ b/scripts/versions.py @@ -67,13 +67,13 @@ def get_board_name(folder): return "bread-compact-wifi" elif "KevinBox1" in basename: return "kevin-box-1" - if basename.startswith("v0.7") or basename.startswith("v0.8") or basename.startswith("v0.9"): + if basename.startswith("v0.7") or basename.startswith("v0.8") or basename.startswith("v0.9") or basename.startswith("v1."): return basename.split("_")[1] raise Exception(f"Unknown board name: {basename}") def read_binary(dir_path): merged_bin_path = os.path.join(dir_path, "merged-binary.bin") - data = open(merged_bin_path, "rb").read()[0x200000:] + data = open(merged_bin_path, "rb").read()[0x100000:] if data[0] != 0xE9: print(dir_path, "is not a valid image") return @@ -105,6 +105,7 @@ def read_binary(dir_path): "flash_size": flash_size, "board": get_board_name(dir_path), "application": desc, + "firmware_size": len(data), } def extract_zip(zip_path, extract_path):