Option to turn off the BLE profile indicator during inactivity

app/Kconfig

@@ -168,6 +168,14 @@ config ZMK_BLE_PASSKEY_ENTRY
     default n
     select RING_BUFFER
 
+config ZMK_HANDLE_BLE_DISCONNECTION
+    bool "Experimental: Respect user disconnection request from computer"
+    default n
+
+config ZMK_BLE_INDICATOR_AUTO_OFF
+    bool "Experimental: automatically turn off BLE indicator"
+    default n
+
 config BT_PERIPHERAL_PREF_MIN_INT
     default 6
 
@@ -315,6 +323,20 @@ config ZMK_BACKLIGHT_AUTO_OFF_USB
 #ZMK_BACKLIGHT
 endif
 
+menuconfig ZMK_LED_INDICATORS
+    bool "LED indicators"
+    select LED
+
+if ZMK_LED_INDICATORS
+
+config ZMK_LED_INDICATORS_BRT
+    int "Brightness in percent"
+    range 1 100
+    default 80
+
+#ZMK_LED_INDICATORS
+endif
+
 #Display/LED Options
 endmenu
 
@@ -581,4 +603,3 @@ osource "$(ZMK_CONFIG)/boards/shields/*/Kconfig.shield"
 
 
 source "Kconfig.zephyr"
-

app/boards/arm/corneish_zen/widgets/output_status.c

@@ -62,7 +62,7 @@ static void set_status_symbol(lv_obj_t *icon, struct output_status_state state)
         if (state.active_profile_bonded) {
             if (state.active_profile_connected) {
                 // sprintf(text, LV_SYMBOL_BLUETOOTH "%i " LV_SYMBOL_OK, active_profile_index);
-                switch (state.selected_endpoint.ble.profile_index) {
+                switch (state.selected_endpoint.ble_profile_index) {
                 case 0:
                     lv_img_set_src(icon, &bluetooth_connected_1);
                     break;
@@ -83,7 +83,7 @@ static void set_status_symbol(lv_obj_t *icon, struct output_status_state state)
                 lv_img_set_src(icon, &bluetooth_disconnected_right);
             }
         } else {
-            switch (state.selected_endpoint.ble.profile_index) {
+            switch (state.selected_endpoint.ble_profile_index) {
             case 0:
                 lv_img_set_src(icon, &bluetooth_advertising_1);
                 break;

app/include/zmk/ble.h

@@ -37,3 +37,7 @@ int zmk_ble_unpair_all();
 #if IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL)
 int zmk_ble_put_peripheral_addr(const bt_addr_le_t *addr);
 #endif /* IS_ENABLED(CONFIG_ZMK_SPLIT_ROLE_CENTRAL) */
+
+#if IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION)
+bool ble_seeking_connection();
+#endif

app/include/zmk/events/led_indicator_changed.h

@@ -0,0 +1,16 @@
+/*
+ * Copyright (c) 2022 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#pragma once
+
+#include <zmk/led_indicators_types.h>
+#include <zmk/event_manager.h>
+
+struct zmk_led_changed {
+    zmk_leds_flags_t leds;
+};
+
+ZMK_EVENT_DECLARE(zmk_led_changed);

app/src/behaviors/behavior_sensor_rotate_common.h

@@ -27,4 +27,4 @@ int zmk_behavior_sensor_rotate_common_accept_data(
     const struct zmk_sensor_channel_data *channel_data);
 int zmk_behavior_sensor_rotate_common_process(struct zmk_behavior_binding *binding,
                                               struct zmk_behavior_binding_event event,
-                                              enum behavior_sensor_binding_process_mode mode);
+                                              enum behavior_sensor_binding_process_mode mode);

app/src/ble.c

@@ -37,6 +37,11 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 #include <zmk/event_manager.h>
 #include <zmk/events/ble_active_profile_changed.h>
 
+#if IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION)
+#include <zmk/activity.h>
+#include <zmk/events/keycode_state_changed.h>
+#endif /* IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION) */
+
 #if IS_ENABLED(CONFIG_ZMK_BLE_PASSKEY_ENTRY)
 #include <zmk/events/keycode_state_changed.h>
 
@@ -62,6 +67,10 @@ enum advertising_type {
 static struct zmk_ble_profile profiles[ZMK_BLE_PROFILE_COUNT];
 static uint8_t active_profile;
 
+#if IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION)
+bool active_profile_seeking_connection = true;
+#endif
+
 #define DEVICE_NAME CONFIG_BT_DEVICE_NAME
 #define DEVICE_NAME_LEN (sizeof(DEVICE_NAME) - 1)
 
@@ -97,6 +106,10 @@ bool zmk_ble_active_profile_is_open() {
     return !bt_addr_le_cmp(&profiles[active_profile].peer, BT_ADDR_LE_ANY);
 }
 
+#if IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION)
+bool ble_seeking_connection() { return active_profile_seeking_connection; }
+#endif
+
 void set_profile_address(uint8_t index, const bt_addr_le_t *addr) {
     char setting_name[15];
     char addr_str[BT_ADDR_LE_STR_LEN];
@@ -167,15 +180,23 @@ int update_advertising() {
 
     if (zmk_ble_active_profile_is_open()) {
         desired_adv = ZMK_ADV_CONN;
-    } else if (!zmk_ble_active_profile_is_connected()) {
-        desired_adv = ZMK_ADV_CONN;
-        // Need to fix directed advertising for privacy centrals. See
-        // https://github.com/zephyrproject-rtos/zephyr/pull/14984 char
-        // addr_str[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(zmk_ble_active_profile_addr(), addr_str,
-        // sizeof(addr_str));
-
-        // LOG_DBG("Directed advertising to %s", addr_str);
-        // desired_adv = ZMK_ADV_DIR;
+    } else {
+#if IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION)
+        if (!zmk_ble_active_profile_is_connected() && active_profile_seeking_connection) {
+            desired_adv = ZMK_ADV_CONN;
+        }
+#else
+        if (!zmk_ble_active_profile_is_connected()) {
+            desired_adv = ZMK_ADV_CONN;
+            // Need to fix directed advertising for privacy centrals. See
+            // https://github.com/zephyrproject-rtos/zephyr/pull/14984 char
+            // addr_str[BT_ADDR_LE_STR_LEN]; bt_addr_le_to_str(zmk_ble_active_profile_addr(),
+            // addr_str, sizeof(addr_str));
+
+            // LOG_DBG("Directed advertising to %s", addr_str);
+            // desired_adv = ZMK_ADV_DIR;
+        }
+#endif /* IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION) */
     }
     LOG_DBG("advertising from %d to %d", advertising_status, desired_adv);
 
@@ -262,6 +283,9 @@ int zmk_ble_prof_select(uint8_t index) {
     active_profile = index;
     ble_save_profile();
 
+#if IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION)
+    active_profile_seeking_connection = true;
+#endif
     update_advertising();
 
     raise_profile_changed_event();
@@ -431,6 +455,9 @@ static void connected(struct bt_conn *conn, uint8_t err) {
     update_advertising();
 
     if (is_conn_active_profile(conn)) {
+#if IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION)
+        active_profile_seeking_connection = false;
+#endif
         LOG_DBG("Active profile connected");
         k_work_submit(&raise_profile_changed_event_work);
     }
@@ -624,6 +651,22 @@ static int zmk_ble_init(const struct device *_arg) {
         char setting_name[15];
         sprintf(setting_name, "ble/profiles/%d", i);
 
+        err = settings_delete(setting_name);
+        if (err) {
+            LOG_ERR("Failed to delete setting: %d", err);
+        }
+        err = settings_delete("ble/peripheral_address");
+        if (err) {
+            LOG_ERR("Failed to delete setting: %d", err);
+        }
+    }
+
+    // Hardcoding a reasonable hardcoded value of peripheral addresses
+    // to clear so we properly clear a split central as well.
+    for (int i = 0; i < 8; i++) {
+        char setting_name[32];
+        sprintf(setting_name, "ble/peripheral_addresses/%d", i);
+
         err = settings_delete(setting_name);
         if (err) {
             LOG_ERR("Failed to delete setting: %d", err);
@@ -710,6 +753,23 @@ static int zmk_ble_handle_key_user(struct zmk_keycode_state_changed *event) {
         return ZMK_EV_EVENT_BUBBLE;
     }
 
+    if (ring_buf_space_get(&passkey_entries) <= 0) {
+        uint8_t discard_val;
+        ring_buf_get(&passkey_entries, &discard_val, 1);
+    }
+    ring_buf_put(&passkey_entries, &val, 1);
+    LOG_DBG("value entered: %d, digits collected so far: %d", val,
+            ring_buf_size_get(&passkey_entries));
+
+    uint8_t val;
+    if (!(zmk_ble_numeric_usage_to_value(key, HID_USAGE_KEY_KEYBOARD_1_AND_EXCLAMATION,
+                                         HID_USAGE_KEY_KEYBOARD_0_AND_RIGHT_PARENTHESIS, &val) ||
+          zmk_ble_numeric_usage_to_value(key, HID_USAGE_KEY_KEYPAD_1_AND_END,
+                                         HID_USAGE_KEY_KEYPAD_0_AND_INSERT, &val))) {
+        LOG_DBG("Key not a number, ignoring");
+        return ZMK_EV_EVENT_BUBBLE;
+    }
+
     if (ring_buf_space_get(&passkey_entries) <= 0) {
         uint8_t discard_val;
         ring_buf_get(&passkey_entries, &discard_val, 1);
@@ -737,4 +797,18 @@ ZMK_LISTENER(zmk_ble, zmk_ble_listener);
 ZMK_SUBSCRIPTION(zmk_ble, zmk_keycode_state_changed);
 #endif /* IS_ENABLED(CONFIG_ZMK_BLE_PASSKEY_ENTRY) */
 
+#if IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION)
+/* Restart BLE advertsing after user key press */
+static int ble_keypress_listener(const zmk_event_t *eh) {
+    if (as_zmk_keycode_state_changed(eh) != NULL && !active_profile_seeking_connection &&
+        !zmk_ble_active_profile_is_connected()) {
+        active_profile_seeking_connection = true;
+        k_work_submit(&update_advertising_work);
+    }
+    return 0;
+}
+ZMK_LISTENER(ble_keypress, ble_keypress_listener);
+ZMK_SUBSCRIPTION(ble_keypress, zmk_keycode_state_changed);
+#endif /* IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION) */
+
 SYS_INIT(zmk_ble_init, APPLICATION, CONFIG_ZMK_BLE_INIT_PRIORITY);

app/src/events/led_indicator_changed.c

@@ -0,0 +1,10 @@
+/*
+ * Copyright (c) 2022 The ZMK Contributors
+ *
+ * SPDX-License-Identifier: MIT
+ */
+
+#include <zephyr/kernel.h>
+#include <zmk/events/led_indicator_changed.h>
+
+ZMK_EVENT_IMPL(zmk_led_changed);

app/src/rgb_underglow.c

@@ -84,8 +84,14 @@ static struct rgb_underglow_state state;
 static struct zmk_periph_led led_data;
 
 #if IS_ENABLED(CONFIG_ZMK_SPLIT_BLE)
-static bool last_ble_state[2];
-#endif
+
+static bool last_ble_state[3];
+
+#if IS_ENABLED(CONFIG_ZMK_BLE_INDICATOR_AUTO_OFF)
+bool reset_auto_off_counter = true;
+#endif /* CONFIG_ZMK_BLE_INDICATOR_AUTO_OFF */
+
+#endif /* CONFIG_ZMK_SPLIT_BLE */
 
 static bool triggered;
 
@@ -261,6 +267,9 @@ static void zmk_rgb_underglow_effect_kinesis() {
     }
     // blink second led slowly if bluetooth not paired, quickly if not connected
     if (zmk_ble_active_profile_is_open()) {
+#if IS_ENABLED(CONFIG_ZMK_BLE_INDICATOR_AUTO_OFF)
+        reset_auto_off_counter = true;
+#endif
         pixels[1].r = pixels[1].r * last_ble_state[0];
         pixels[1].g = pixels[1].g * last_ble_state[0];
         pixels[1].b = pixels[1].b * last_ble_state[0];
@@ -270,6 +279,27 @@ static void zmk_rgb_underglow_effect_kinesis() {
         }
         state.animation_step++;
     } else if (!zmk_ble_active_profile_is_connected()) {
+#if IS_ENABLED(CONFIG_ZMK_BLE_INDICATOR_AUTO_OFF)
+        reset_auto_off_counter = true;
+#endif
+
+#if IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION)
+        /* only blink the led when BLE is advertising for connection */
+        if (ble_seeking_connection()) {
+            pixels[1].r = pixels[1].r * last_ble_state[1];
+            pixels[1].g = pixels[1].g * last_ble_state[1];
+            pixels[1].b = pixels[1].b * last_ble_state[1];
+            if (state.animation_step > 14) {
+                last_ble_state[1] = !last_ble_state[1];
+                state.animation_step = 0;
+            }
+            state.animation_step++;
+        } else {
+            pixels[1].r = 0;
+            pixels[1].g = 0;
+            pixels[1].b = 0;
+        }
+#else  /* IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION) */
         pixels[1].r = pixels[1].r * last_ble_state[1];
         pixels[1].g = pixels[1].g * last_ble_state[1];
         pixels[1].b = pixels[1].b * last_ble_state[1];
@@ -278,7 +308,29 @@ static void zmk_rgb_underglow_effect_kinesis() {
             state.animation_step = 0;
         }
         state.animation_step++;
+#endif /* IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION) */
     }
+#if IS_ENABLED(CONFIG_ZMK_BLE_INDICATOR_AUTO_OFF)
+    else {                         // ble is connected
+        if (led_data.layer == 3) { // when mod key is pressed,
+                                   // show current BLE profile for few seconds and then off
+            reset_auto_off_counter = true;
+        }
+        if (reset_auto_off_counter) {
+            state.animation_step = 0;
+            last_ble_state[2] = true;
+            reset_auto_off_counter = false;
+        }
+        pixels[1].r = pixels[1].r * last_ble_state[2];
+        pixels[1].g = pixels[1].g * last_ble_state[2];
+        pixels[1].b = pixels[1].b * last_ble_state[2];
+        if (state.animation_step > 84) {
+            last_ble_state[2] = false;
+        } else {
+            state.animation_step++;
+        }
+    }
+#endif /* IS_ENABLED(CONFIG_ZMK_HANDLE_BLE_DISCONNECTION) */
     // set third led as layer state
     switch (led_data.layer) {
     case 0:
@@ -330,7 +382,7 @@ static void zmk_rgb_underglow_effect_kinesis() {
     if (old_led_data.layer != led_data.layer || old_led_data.indicators != led_data.indicators) {
         zmk_rgb_underglow_central_send();
     }
-#else
+#else /* ZMK_BLE_IS_CENTRAL */
 #if IS_ENABLED(CONFIG_ZMK_SPLIT_BLE)
     // leds for peripheral(right) side
     /* if (zmk_ble_active_profile_is_open()) {
@@ -431,7 +483,7 @@ static void zmk_rgb_underglow_effect_kinesis() {
 #if IS_ENABLED(CONFIG_ZMK_SPLIT_BLE)
     }
 #endif
-#endif
+#endif /* ZMK_BLE_IS_CENTRAL */
 }
 
 static void zmk_rgb_underglow_effect_test() {

app/src/split/bluetooth/Kconfig

@@ -89,6 +89,9 @@ config BT_MAX_CONN
 config BT_GAP_AUTO_UPDATE_CONN_PARAMS
     default n
 
+config BT_PRIVACY
+    default y
+
 #!ZMK_SPLIT_ROLE_CENTRAL
 endif
 
@@ -108,6 +111,9 @@ config BT_MAX_CONN
 config BT_MAX_PAIRED
     default 6
 
+config BT_FILTER_ACCEPT_LIST
+    default y
+
 #ZMK_SPLIT_BLE && ZMK_SPLIT_ROLE_CENTRAL
 endif
 
@@ -124,4 +130,3 @@ endif
 
 #ZMK_BLE
 endif
-

app/src/split/bluetooth/central.c

@@ -35,6 +35,10 @@ static int start_scanning(void);
 
 #define POSITION_STATE_DATA_LEN 16
 
+#define BT_LE_SCAN_PASSIVE_FILTER                                                                  \
+    BT_LE_SCAN_PARAM(BT_LE_SCAN_TYPE_PASSIVE, BT_LE_SCAN_OPT_FILTER_ACCEPT_LIST,                   \
+                     BT_GAP_SCAN_FAST_INTERVAL, BT_GAP_SCAN_FAST_WINDOW)
+
 enum peripheral_slot_state {
     PERIPHERAL_SLOT_STATE_OPEN,
     PERIPHERAL_SLOT_STATE_CONNECTING,