kb01/zmk
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update corneish-zen display widget

Browse source
This commit is contained in:
zhiayang 2024-02-23 01:29:22 -05:00
parent 02ca35130d
commit 670ddb2b8c
No known key found for this signature in database
GPG key ID: 5E2F30AD6F08571F
1 changed files with 9 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/boards/arm/corneish_zen/widgets/battery_status.c
View file

@ -22,9 +22,7 @@ static sys_slist_t widgets = SYS_SLIST_STATIC_INIT(&widgets);
struct battery_status_state { struct battery_status_state {
uint8_t level; uint8_t level;
#if IS_ENABLED(CONFIG_USB_DEVICE_STACK) bool is_charging;
bool usb_present;
#endif
}; };
LV_IMG_DECLARE(batt_100); LV_IMG_DECLARE(batt_100);
@ -45,17 +43,17 @@ static void set_battery_symbol(lv_obj_t *icon, struct battery_status_state state
#if IS_ENABLED(CONFIG_USB_DEVICE_STACK) #if IS_ENABLED(CONFIG_USB_DEVICE_STACK)
if (level > 95) { if (level > 95) {
lv_img_set_src(icon, state.usb_present ? &batt_100_chg : &batt_100); lv_img_set_src(icon, state.is_charging ? &batt_100_chg : &batt_100);
} else if (level > 74) { } else if (level > 74) {
lv_img_set_src(icon, state.usb_present ? &batt_75_chg : &batt_75); lv_img_set_src(icon, state.is_charging ? &batt_75_chg : &batt_75);
} else if (level > 49) { } else if (level > 49) {
lv_img_set_src(icon, state.usb_present ? &batt_50_chg : &batt_50); lv_img_set_src(icon, state.is_charging ? &batt_50_chg : &batt_50);
} else if (level > 24) { } else if (level > 24) {
lv_img_set_src(icon, state.usb_present ? &batt_25_chg : &batt_25); lv_img_set_src(icon, state.is_charging ? &batt_25_chg : &batt_25);
} else if (level > 5) { } else if (level > 5) {
lv_img_set_src(icon, state.usb_present ? &batt_5_chg : &batt_5); lv_img_set_src(icon, state.is_charging ? &batt_5_chg : &batt_5);
} else { } else {
lv_img_set_src(icon, state.usb_present ? &batt_0_chg : &batt_0); lv_img_set_src(icon, state.is_charging ? &batt_0_chg : &batt_0);
} }
#endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */ #endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */
} }
@ -70,9 +68,7 @@ static struct battery_status_state battery_status_get_state(const zmk_event_t *e
return (struct battery_status_state){ return (struct battery_status_state){
.level = (ev != NULL) ? ev->state_of_charge : zmk_battery_state_of_charge(), .level = (ev != NULL) ? ev->state_of_charge : zmk_battery_state_of_charge(),
#if IS_ENABLED(CONFIG_USB_DEVICE_STACK) .is_charging = (ev != NULL) ? ev->is_charging : zmk_battery_is_charging(),
.usb_present = zmk_usb_is_powered(),
#endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */
}; };
} }
@ -80,9 +76,6 @@ ZMK_DISPLAY_WIDGET_LISTENER(widget_battery_status, struct battery_status_state,
battery_status_update_cb, battery_status_get_state) battery_status_update_cb, battery_status_get_state)
ZMK_SUBSCRIPTION(widget_battery_status, zmk_battery_state_changed); ZMK_SUBSCRIPTION(widget_battery_status, zmk_battery_state_changed);
#if IS_ENABLED(CONFIG_USB_DEVICE_STACK)
ZMK_SUBSCRIPTION(widget_battery_status, zmk_usb_conn_state_changed);
#endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */
int zmk_widget_battery_status_init(struct zmk_widget_battery_status *widget, lv_obj_t *parent) { int zmk_widget_battery_status_init(struct zmk_widget_battery_status *widget, lv_obj_t *parent) {
widget->obj = lv_img_create(parent); widget->obj = lv_img_create(parent);