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

simplify code

Browse source
This commit is contained in:
zhiayang 2024-02-09 01:29:19 -05:00
parent 0a45dab31d
commit dca726de3d
No known key found for this signature in database
GPG key ID: 5E2F30AD6F08571F
3 changed files with 3 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -67,15 +67,9 @@ void battery_status_update_cb(struct battery_status_state state) {
static struct battery_status_state battery_status_get_state(const zmk_event_t *eh) { static struct battery_status_state battery_status_get_state(const zmk_event_t *eh) {
const struct zmk_battery_state_changed *ev = as_zmk_battery_state_changed(eh); const struct zmk_battery_state_changed *ev = as_zmk_battery_state_changed(eh);
uint8_t soc;
if (ev != NULL) {
soc = ev->state_of_charge;
} else {
soc = zmk_battery_state_of_charge();
}
return (struct battery_status_state) { return (struct battery_status_state) {
.level = soc, .level = (ev != NULL) ? ev->state_of_charge : zmk_battery_state_of_charge(),
#if IS_ENABLED(CONFIG_USB_DEVICE_STACK) #if IS_ENABLED(CONFIG_USB_DEVICE_STACK)
.usb_present = zmk_usb_is_powered(), .usb_present = zmk_usb_is_powered(),
#endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */ #endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */

8
app/boards/shields/nice_view/widgets/status.c
View file

@ -211,15 +211,9 @@ static void battery_status_update_cb(struct battery_status_state state) {
static struct battery_status_state battery_status_get_state(const zmk_event_t *eh) { static struct battery_status_state battery_status_get_state(const zmk_event_t *eh) {
const struct zmk_battery_state_changed *ev = as_zmk_battery_state_changed(eh); const struct zmk_battery_state_changed *ev = as_zmk_battery_state_changed(eh);
uint8_t soc;
if (ev != NULL) {
soc = ev->state_of_charge;
} else {
soc = zmk_battery_state_of_charge();
}
return (struct battery_status_state) { return (struct battery_status_state) {
.level = soc, .level = (ev != NULL) ? ev->state_of_charge : zmk_battery_state_of_charge(),
#if IS_ENABLED(CONFIG_USB_DEVICE_STACK) #if IS_ENABLED(CONFIG_USB_DEVICE_STACK)
.usb_present = zmk_usb_is_powered(), .usb_present = zmk_usb_is_powered(),
#endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */ #endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */

8
app/src/display/widgets/battery_status.c
View file

@ -64,15 +64,9 @@ void battery_status_update_cb(struct battery_status_state state) {
static struct battery_status_state battery_status_get_state(const zmk_event_t *eh) { static struct battery_status_state battery_status_get_state(const zmk_event_t *eh) {
const struct zmk_battery_state_changed *ev = as_zmk_battery_state_changed(eh); const struct zmk_battery_state_changed *ev = as_zmk_battery_state_changed(eh);
uint8_t soc;
if (ev != NULL) {
soc = ev->state_of_charge;
} else {
soc = zmk_battery_state_of_charge();
}
return (struct battery_status_state) { return (struct battery_status_state) {
.level = soc, .level = (ev != NULL) ? ev->state_of_charge : zmk_battery_state_of_charge(),
#if IS_ENABLED(CONFIG_USB_DEVICE_STACK) #if IS_ENABLED(CONFIG_USB_DEVICE_STACK)
.usb_present = zmk_usb_is_powered(), .usb_present = zmk_usb_is_powered(),
#endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */ #endif /* IS_ENABLED(CONFIG_USB_DEVICE_STACK) */