|
|
|
@ -9,11 +9,6 @@ static void lv_update_task(struct _lv_task_t* task) {
|
|
|
|
|
user_data->UpdateScreen();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void lv_anim_task(struct _lv_task_t* task) {
|
|
|
|
|
auto user_data = static_cast<BatteryInfo*>(task->user_data);
|
|
|
|
|
user_data->UpdateAnim();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BatteryInfo::BatteryInfo(Pinetime::Applications::DisplayApp* app, Pinetime::Controllers::Battery& batteryController)
|
|
|
|
|
: Screen(app), batteryController {batteryController} {
|
|
|
|
|
|
|
|
|
@ -24,12 +19,12 @@ BatteryInfo::BatteryInfo(Pinetime::Applications::DisplayApp* app, Pinetime::Cont
|
|
|
|
|
lv_obj_set_size(charging_bar, 200, 15);
|
|
|
|
|
lv_bar_set_range(charging_bar, 0, 100);
|
|
|
|
|
lv_obj_align(charging_bar, nullptr, LV_ALIGN_CENTER, 0, 10);
|
|
|
|
|
lv_bar_set_anim_time(charging_bar, 2000);
|
|
|
|
|
lv_bar_set_anim_time(charging_bar, 1000);
|
|
|
|
|
lv_obj_set_style_local_radius(charging_bar, LV_BAR_PART_BG, LV_STATE_DEFAULT, LV_RADIUS_CIRCLE);
|
|
|
|
|
lv_obj_set_style_local_bg_color(charging_bar, LV_BAR_PART_BG, LV_STATE_DEFAULT, lv_color_hex(0x222222));
|
|
|
|
|
lv_obj_set_style_local_bg_opa(charging_bar, LV_BAR_PART_BG, LV_STATE_DEFAULT, LV_OPA_100);
|
|
|
|
|
lv_obj_set_style_local_bg_color(charging_bar, LV_BAR_PART_INDIC, LV_STATE_DEFAULT, lv_color_hex(0xFF0000));
|
|
|
|
|
lv_bar_set_value(charging_bar, batteryPercent, LV_ANIM_OFF);
|
|
|
|
|
lv_bar_set_value(charging_bar, batteryPercent, LV_ANIM_ON);
|
|
|
|
|
|
|
|
|
|
status = lv_label_create(lv_scr_act(), nullptr);
|
|
|
|
|
lv_label_set_text_static(status, "Reading Battery status");
|
|
|
|
@ -54,38 +49,15 @@ BatteryInfo::BatteryInfo(Pinetime::Applications::DisplayApp* app, Pinetime::Cont
|
|
|
|
|
lv_obj_set_pos(backgroundLabel, 0, 0);
|
|
|
|
|
lv_label_set_text_static(backgroundLabel, "");
|
|
|
|
|
|
|
|
|
|
taskUpdate = lv_task_create(lv_update_task, 500000, LV_TASK_PRIO_LOW, this);
|
|
|
|
|
taskAnim = lv_task_create(lv_anim_task, 1000, LV_TASK_PRIO_LOW, this);
|
|
|
|
|
taskUpdate = lv_task_create(lv_update_task, 5000, LV_TASK_PRIO_LOW, this);
|
|
|
|
|
UpdateScreen();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
BatteryInfo::~BatteryInfo() {
|
|
|
|
|
lv_task_del(taskUpdate);
|
|
|
|
|
lv_task_del(taskAnim);
|
|
|
|
|
lv_obj_clean(lv_scr_act());
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void BatteryInfo::UpdateAnim() {
|
|
|
|
|
batteryPercent = batteryController.PercentRemaining();
|
|
|
|
|
|
|
|
|
|
if (batteryController.IsCharging() and batteryPercent < 100) {
|
|
|
|
|
animation += 1;
|
|
|
|
|
if (animation >= 100) {
|
|
|
|
|
animation = 0;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
} else {
|
|
|
|
|
if (animation > batteryPercent) {
|
|
|
|
|
animation--;
|
|
|
|
|
}
|
|
|
|
|
if (animation < batteryPercent) {
|
|
|
|
|
animation++;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
lv_bar_set_value(charging_bar, animation, LV_ANIM_OFF);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
void BatteryInfo::UpdateScreen() {
|
|
|
|
|
|
|
|
|
|
batteryController.Update();
|
|
|
|
@ -111,9 +83,9 @@ void BatteryInfo::UpdateScreen() {
|
|
|
|
|
|
|
|
|
|
lv_obj_align(status, charging_bar, LV_ALIGN_OUT_BOTTOM_MID, 0, 20);
|
|
|
|
|
lv_label_set_text_fmt(voltage, "%1i.%02i volts", batteryVoltage / 1000, batteryVoltage % 1000 / 10);
|
|
|
|
|
lv_bar_set_value(charging_bar, batteryPercent, LV_ANIM_ON);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
bool BatteryInfo::Refresh() {
|
|
|
|
|
|
|
|
|
|
return running;
|
|
|
|
|
}
|
|
|
|
|