From 273ad05c45893ef6b336e2346105ab1cfe5cf1b2 Mon Sep 17 00:00:00 2001 From: angweekiat Date: Fri, 6 Sep 2024 21:26:46 +0800 Subject: [PATCH] cleanup variables --- app/src/activity.c | 14 +++++++------- app/src/split/Kconfig | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/activity.c b/app/src/activity.c index 040ee8c0826..3dac94e35fd 100644 --- a/app/src/activity.c +++ b/app/src/activity.c @@ -45,9 +45,9 @@ static uint32_t activity_last_uptime; #if IS_ENABLED(CONFIG_ZMK_SPLIT_SYNC_LAST_ACTIVITY_TIMING) && \ IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL) static uint32_t last_periodic_sync_time; -#if ZMK_SPLIT_SYNC_KEY_PRESS_INTERVAL_MS > 0 +#if CONFIG_ZMK_SPLIT_SYNC_EVENT_MIN_INTERVAL_MS > 0 static uint32_t last_event_sync_time; -#endif // ZMK_SPLIT_SYNC_KEY_PRESS_INTERVAL_MS > 0 +#endif // CONFIG_ZMK_SPLIT_SYNC_EVENT_MIN_INTERVAL_MS > 0 #endif // IS_ENABLED(CONFIG_ZMK_SPLIT_SYNC_LAST_ACTIVITY_TIMING) && // IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL) @@ -76,13 +76,14 @@ int activity_event_listener(const zmk_event_t *eh) { activity_last_uptime = k_uptime_get(); #if IS_ENABLED(CONFIG_ZMK_SPLIT_SYNC_LAST_ACTIVITY_TIMING) && \ - IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL) && ZMK_SPLIT_SYNC_KEY_PRESS_INTERVAL_MS > 0 - if (current - last_event_sync_time > ZMK_SPLIT_SYNC_EVENT_MIN_INTERVAL_MS) { - last_event_sync_time = current; + IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL) && CONFIG_ZMK_SPLIT_SYNC_EVENT_MIN_INTERVAL_MS > 0 + if (activity_last_uptime - last_event_sync_time > CONFIG_ZMK_SPLIT_SYNC_EVENT_MIN_INTERVAL_MS) { + last_event_sync_time = activity_last_uptime; zmk_split_bt_queue_sync_activity(0); } #endif // IS_ENABLED(CONFIG_ZMK_SPLIT_SYNC_LAST_ACTIVITY_TIMING) && - // IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL) && ZMK_SPLIT_SYNC_KEY_PRESS_INTERVAL_MS > 0 + // IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL) && CONFIG_ZMK_SPLIT_SYNC_EVENT_MIN_INTERVAL_MS > + // 0 return set_state(ZMK_ACTIVITY_ACTIVE); } @@ -90,7 +91,6 @@ int activity_event_listener(const zmk_event_t *eh) { void activity_work_handler(struct k_work *work) { int32_t current = k_uptime_get(); int32_t inactive_time = current - activity_last_uptime; - #if IS_ENABLED(CONFIG_ZMK_SLEEP) if (inactive_time > MAX_SLEEP_MS && !is_usb_power_present()) { // Put devices in suspend power mode before sleeping diff --git a/app/src/split/Kconfig b/app/src/split/Kconfig index ff7d1431164..556ace875c0 100644 --- a/app/src/split/Kconfig +++ b/app/src/split/Kconfig @@ -39,7 +39,7 @@ config ZMK_SPLIT_SYNC_PERIODIC_INTERVAL_MS default 30000 config ZMK_SPLIT_SYNC_EVENT_MIN_INTERVAL_MS - int "Last activity time sync interval in milliseconds" + int "Sync timings on events (key/sensors presses) as well, 0 to disable. Represents minimum interval in milliseconds" default 0 #ZMK_SPLIT_ROLE_CENTRAL && ZMK_SPLIT_SYNC_LAST_ACTIVITY_TIMING