diff options
| author | Pete Johanson <peter@peterjohanson.com> | 2020-12-01 00:52:32 -0500 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2020-12-14 15:31:10 -0500 |
| commit | f7c16dfe69eb551fa0eb50b8ebcf6f00e23c2bad (patch) | |
| tree | 4deae4fc19973e64cc7d3bb0322e384d42608432 /app/src/power.c | |
| parent | 8a529163fcabf7e63aa79e2116b96763039cfdca (diff) | |
refactor(power): Extract activity/idle detection.
* Refactor power to extract more general purpose
activity detection/events.
* Use activity state to implement PM callback.
Diffstat (limited to 'app/src/power.c')
| -rw-r--r-- | app/src/power.c | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/app/src/power.c b/app/src/power.c index 2330a3e..d014a52 100644 --- a/app/src/power.c +++ b/app/src/power.c @@ -13,13 +13,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL); #include <zmk/usb.h> -#include <zmk/event-manager.h> -#include <zmk/events/position-state-changed.h> -#include <zmk/events/sensor-event.h> - -static uint32_t power_last_uptime; - -#define MAX_IDLE_MS CONFIG_ZMK_IDLE_SLEEP_TIMEOUT +#include <zmk/activity.h> bool is_usb_power_present() { #ifdef CONFIG_USB @@ -32,9 +26,7 @@ bool is_usb_power_present() { enum power_states sys_pm_policy_next_state(int32_t ticks) { #ifdef CONFIG_SYS_POWER_DEEP_SLEEP_STATES #ifdef CONFIG_HAS_SYS_POWER_STATE_DEEP_SLEEP_1 - int32_t current = k_uptime_get(); - if (power_last_uptime > 0 && !is_usb_power_present() && - current - power_last_uptime > MAX_IDLE_MS) { + if (zmk_activity_get_state() == ZMK_ACTIVITY_SLEEP && !is_usb_power_present()) { return SYS_POWER_STATE_DEEP_SLEEP_1; } #endif /* CONFIG_HAS_SYS_POWER_STATE_DEEP_SLEEP_1 */ @@ -42,21 +34,3 @@ enum power_states sys_pm_policy_next_state(int32_t ticks) { return SYS_POWER_STATE_ACTIVE; } - -int power_event_listener(const struct zmk_event_header *eh) { - power_last_uptime = k_uptime_get(); - - return 0; -} - -int power_init() { - power_last_uptime = k_uptime_get(); - - return 0; -} - -ZMK_LISTENER(power, power_event_listener); -ZMK_SUBSCRIPTION(power, position_state_changed); -ZMK_SUBSCRIPTION(power, sensor_event); - -SYS_INIT(power_init, APPLICATION, CONFIG_APPLICATION_INIT_PRIORITY);
\ No newline at end of file |