diff options
| author | Pete Johanson <peter@peterjohanson.com> | 2020-07-16 15:50:41 -0400 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2020-07-17 22:43:40 -0400 |
| commit | 6701b7babc68cb8090a9d16105bd3876025aa0e8 (patch) | |
| tree | 11ef4aeb7db0de9fb36b9913865bfedf5c59eaec /app/src/ble.c | |
| parent | 0321c490b5d0d087e76c06185a2940420cf7ab4c (diff) | |
Working BT settings.
Diffstat (limited to 'app/src/ble.c')
| -rw-r--r-- | app/src/ble.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/app/src/ble.c b/app/src/ble.c index 3cbb14d..809575d 100644 --- a/app/src/ble.c +++ b/app/src/ble.c @@ -128,8 +128,11 @@ static struct bt_conn_auth_cb zmk_ble_auth_cb_display = { static const struct bt_data zmk_ble_ad[] = { BT_DATA_BYTES(BT_DATA_FLAGS, (BT_LE_AD_GENERAL | BT_LE_AD_NO_BREDR)), BT_DATA_BYTES(BT_DATA_UUID16_SOME, +#if !IS_ENABLED(CONFIG_ZMK_SPLIT_BLE) 0x12, 0x18, /* HID Service */ - 0x0f, 0x18), /* Battery Service */ +#endif + 0x0f, 0x18 /* Battery Service */ + ), #if IS_ENABLED(CONFIG_ZMK_SPLIT_BLE) BT_DATA_BYTES(BT_DATA_UUID128_ALL, ZMK_SPLIT_BT_SERVICE_UUID) @@ -155,10 +158,6 @@ static void zmk_ble_ready(int err) static int zmk_ble_init(struct device *_arg) { - if (IS_ENABLED(CONFIG_SETTINGS)) - { - settings_load(); - } int err = bt_enable(NULL); if (err) @@ -167,6 +166,11 @@ static int zmk_ble_init(struct device *_arg) return err; } + if (IS_ENABLED(CONFIG_BT_SETTINGS)) + { + settings_load(); + } + bt_conn_cb_register(&conn_callbacks); bt_conn_auth_cb_register(&zmk_ble_auth_cb_display); |