diff options
author | Pete Johanson <peter@peterjohanson.com> | 2020-07-20 23:14:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-07-20 23:14:48 -0400 |
commit | 25509adef7fe36e1fde794851922ae07216046ab (patch) | |
tree | b00dbd6bb2237640e1fca2d77cd027170c8a1c93 /app/boards | |
parent | f6110a632d0ddbc0a9ebd7bfd4997366f95facfd (diff) | |
parent | c4d3c03eb069c814321ab49a809dc584f1819b34 (diff) |
Merge pull request #56 from petejohanson/core/split-ble-infrastructure
Initial split BLE infrastructure.
Diffstat (limited to 'app/boards')
-rw-r--r-- | app/boards/arm/nice_nano/nice_nano_defconfig | 7 | ||||
-rw-r--r-- | app/boards/shields/kyria/Kconfig.defconfig | 19 | ||||
-rw-r--r-- | app/boards/shields/kyria/kyria_left.conf | 2 | ||||
-rw-r--r-- | app/boards/shields/kyria/kyria_right.conf | 2 | ||||
-rw-r--r-- | app/boards/shields/lily58/Kconfig.defconfig | 11 | ||||
-rw-r--r-- | app/boards/shields/lily58/lily58_left.conf | 2 | ||||
-rw-r--r-- | app/boards/shields/lily58/lily58_right.conf | 2 |
7 files changed, 41 insertions, 4 deletions
diff --git a/app/boards/arm/nice_nano/nice_nano_defconfig b/app/boards/arm/nice_nano/nice_nano_defconfig index f9be0ee..393d61f 100644 --- a/app/boards/arm/nice_nano/nice_nano_defconfig +++ b/app/boards/arm/nice_nano/nice_nano_defconfig @@ -11,3 +11,10 @@ CONFIG_ARM_MPU=y CONFIG_GPIO=y CONFIG_USE_DT_CODE_PARTITION=y + +CONFIG_MPU_ALLOW_FLASH_WRITE=y +CONFIG_NVS=y +CONFIG_SETTINGS_NVS=y +CONFIG_FLASH=y +CONFIG_FLASH_PAGE_LAYOUT=y +CONFIG_FLASH_MAP=y
\ No newline at end of file diff --git a/app/boards/shields/kyria/Kconfig.defconfig b/app/boards/shields/kyria/Kconfig.defconfig index 25af537..bc0a7b8 100644 --- a/app/boards/shields/kyria/Kconfig.defconfig +++ b/app/boards/shields/kyria/Kconfig.defconfig @@ -1,7 +1,22 @@ -if SHIELD_KYRIA_LEFT || SHIELD_KYRIA_RIGHT +if SHIELD_KYRIA_LEFT + +config ZMK_KEYBOARD_NAME + default "Kyria Left" + +endif + + +if SHIELD_KYRIA_RIGHT config ZMK_KEYBOARD_NAME - default "Kyria" + default "Kyria Right" + +endif + +if SHIELD_KYRIA_LEFT || SHIELD_KYRIA_RIGHT + +config ZMK_SPLIT + default y endif diff --git a/app/boards/shields/kyria/kyria_left.conf b/app/boards/shields/kyria/kyria_left.conf new file mode 100644 index 0000000..e51dee4 --- /dev/null +++ b/app/boards/shields/kyria/kyria_left.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y
\ No newline at end of file diff --git a/app/boards/shields/kyria/kyria_right.conf b/app/boards/shields/kyria/kyria_right.conf new file mode 100644 index 0000000..a835adc --- /dev/null +++ b/app/boards/shields/kyria/kyria_right.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y
\ No newline at end of file diff --git a/app/boards/shields/lily58/Kconfig.defconfig b/app/boards/shields/lily58/Kconfig.defconfig index 9ec5834..8f278b0 100644 --- a/app/boards/shields/lily58/Kconfig.defconfig +++ b/app/boards/shields/lily58/Kconfig.defconfig @@ -1,7 +1,14 @@ -if SHIELD_LILY58_LEFT || SHIELD_LILY58_RIGHT +if SHIELD_LILY58_LEFT config ZMK_KEYBOARD_NAME - default "Lily58" + default "Lily58 Left" + +endif + +if SHIELD_LILY58_RIGHT + +config ZMK_KEYBOARD_NAME + default "Lily58 Right" endif diff --git a/app/boards/shields/lily58/lily58_left.conf b/app/boards/shields/lily58/lily58_left.conf new file mode 100644 index 0000000..e51dee4 --- /dev/null +++ b/app/boards/shields/lily58/lily58_left.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y
\ No newline at end of file diff --git a/app/boards/shields/lily58/lily58_right.conf b/app/boards/shields/lily58/lily58_right.conf new file mode 100644 index 0000000..990cf7c --- /dev/null +++ b/app/boards/shields/lily58/lily58_right.conf @@ -0,0 +1,2 @@ +CONFIG_ZMK_SPLIT=y +CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y |