From 3f4d47a06e5a2280a11a1735995e13b914ed9a6e Mon Sep 17 00:00:00 2001 From: Carey Date: Sat, 31 Oct 2020 07:24:38 -0500 Subject: [PATCH] focus on refactor --- .github/workflows/build.yml | 8 +------- app/Kconfig | 18 +++++------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5e7e23fd..e22dc653 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -8,7 +8,7 @@ jobs: name: Build Test strategy: matrix: - board: [nice_nano, bluemicro840_v1, nrfmicro_13] + board: [proton_c, nice_nano, bluemicro840_v1, nrfmicro_13] shield: - boardsource3x4 - corne_left @@ -29,12 +29,6 @@ jobs: include: - board: proton_c shield: clueboard_california - - board: proton_c - shield: romac - - board: proton_c - shield: romac_plus - - board: proton_c - shield: settings_reset steps: # To use this repository's private action, # you must check out the repository diff --git a/app/Kconfig b/app/Kconfig index ed6244a2..28d2aa2e 100644 --- a/app/Kconfig +++ b/app/Kconfig @@ -30,12 +30,12 @@ config ZMK_USB select USB_DEVICE_STACK select USB_DEVICE_HID -if USB +if ZMK_USB config USB_NUMOF_EP_WRITE_RETRIES default 10 -#USB +#ZMK_USB endif config ZMK_BLE @@ -86,17 +86,9 @@ if ZMK_SPLIT config ZMK_SPLIT_BLE bool "Split keyboard support via BLE transport" + depends on ZMK_BLE default y select BT_USER_PHY_UPDATE - select BT - select BT_SMP - select BT_SMP_SC_PAIR_ONLY - select BT_SMP_APP_PAIRING_ACCEPT - select BT_PERIPHERAL - select BT_GATT_DIS - select BT_GATT_BAS - select BT_SETTINGS - select SETTINGS if ZMK_SPLIT_BLE @@ -138,7 +130,7 @@ endif #ZMK_SPLIT endif -if ZMK_BLE || ZMK_SPLIT_BLE +if ZMK_BLE if ZMK_SPLIT_BLE && ZMK_SPLIT_BLE_ROLE_CENTRAL @@ -162,7 +154,7 @@ config BT_MAX_PAIRED #!ZMK_SPLIT_BLE endif -#ZMK_BLE || ZMK_SPLIT_BLE +#ZMK_BLE endif #Split Support