From be537d06565a38f5fcca8d5a1d0a7b7350b35d51 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Thu, 2 Jul 2020 23:34:11 -0400 Subject: Lots of work on split peripheral/central logic. --- app/src/main.c | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'app/src/main.c') diff --git a/app/src/main.c b/app/src/main.c index 92ecc8b..4a5bd85 100644 --- a/app/src/main.c +++ b/app/src/main.c @@ -16,6 +16,10 @@ LOG_MODULE_REGISTER(zmk, CONFIG_ZMK_LOG_LEVEL); #include #include +#ifdef CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL +#include +#endif /* CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL */ + #define ZMK_KSCAN_DEV DT_LABEL(ZMK_MATRIX_NODE_ID) void main(void) @@ -28,6 +32,13 @@ void main(void) } +#ifdef CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL + if (zmk_split_bt_central_init()) { + LOG_ERR("Failed to start BLE split central"); + return; + } +#endif /* CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL */ + #ifdef CONFIG_SETTINGS settings_load(); #endif -- cgit v1.2.3 From d4afd989f35c46e43468dab1a19bfab9dcf34996 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Wed, 15 Jul 2020 23:26:24 -0400 Subject: More split implementation. * Propogate key position state changes on central. * Various BLE tweaks. --- app/src/main.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'app/src/main.c') diff --git a/app/src/main.c b/app/src/main.c index 4a5bd85..b7d3a4b 100644 --- a/app/src/main.c +++ b/app/src/main.c @@ -31,14 +31,6 @@ void main(void) return; } - -#ifdef CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL - if (zmk_split_bt_central_init()) { - LOG_ERR("Failed to start BLE split central"); - return; - } -#endif /* CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL */ - #ifdef CONFIG_SETTINGS settings_load(); #endif -- cgit v1.2.3 From 6701b7babc68cb8090a9d16105bd3876025aa0e8 Mon Sep 17 00:00:00 2001 From: Pete Johanson Date: Thu, 16 Jul 2020 15:50:41 -0400 Subject: Working BT settings. --- app/src/main.c | 8 -------- 1 file changed, 8 deletions(-) (limited to 'app/src/main.c') diff --git a/app/src/main.c b/app/src/main.c index b7d3a4b..e755304 100644 --- a/app/src/main.c +++ b/app/src/main.c @@ -16,10 +16,6 @@ LOG_MODULE_REGISTER(zmk, CONFIG_ZMK_LOG_LEVEL); #include #include -#ifdef CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL -#include -#endif /* CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL */ - #define ZMK_KSCAN_DEV DT_LABEL(ZMK_MATRIX_NODE_ID) void main(void) @@ -30,8 +26,4 @@ void main(void) { return; } - -#ifdef CONFIG_SETTINGS - settings_load(); -#endif } -- cgit v1.2.3