upgrade to LVGL 9

This commit is contained in:
Terrence
2025-02-03 23:43:07 +08:00
parent e434cd1aed
commit c36e25ce3f
26 changed files with 119 additions and 197 deletions

View File

@@ -36,17 +36,21 @@ Display::Display() {
.arg = this,
.dispatch_method = ESP_TIMER_TASK,
.name = "Update Display Timer",
.skip_unhandled_events = false,
.skip_unhandled_events = true,
};
ESP_ERROR_CHECK(esp_timer_create(&update_display_timer_args, &update_timer_));
ESP_ERROR_CHECK(esp_timer_start_periodic(update_timer_, 1000000));
}
Display::~Display() {
esp_timer_stop(notification_timer_);
esp_timer_stop(update_timer_);
esp_timer_delete(notification_timer_);
esp_timer_delete(update_timer_);
if (notification_timer_ != nullptr) {
esp_timer_stop(notification_timer_);
esp_timer_delete(notification_timer_);
}
if (update_timer_ != nullptr) {
esp_timer_stop(update_timer_);
esp_timer_delete(update_timer_);
}
if (network_label_ != nullptr) {
lv_obj_del(network_label_);
@@ -54,6 +58,7 @@ Display::~Display() {
lv_obj_del(status_label_);
lv_obj_del(mute_label_);
lv_obj_del(battery_label_);
lv_obj_del(emotion_label_);
}
}
@@ -97,7 +102,7 @@ void Display::Update() {
} else if (codec->output_volume() > 0 && muted_) {
muted_ = false;
lv_label_set_text(mute_label_, "");
}
}
}
// 更新电池图标
@@ -177,13 +182,12 @@ void Display::SetEmotion(const std::string &emotion) {
{FONT_AWESOME_EMOJI_SILLY, "silly"},
{FONT_AWESOME_EMOJI_CONFUSED, "confused"}
};
DisplayLockGuard lock(this);
// 查找匹配的表情
auto it = std::find_if(emotions.begin(), emotions.end(),
[&emotion](const Emotion& e) { return e.text == emotion; });
DisplayLockGuard lock(this);
// 如果找到匹配的表情就显示对应图标否则显示默认的neutral表情
if (it != emotions.end()) {
lv_label_set_text(emotion_label_, it->icon);