pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

updates as per PR changes (i hope)

Browse source
This commit is contained in:
David Barr 2020-10-02 14:16:59 +01:00 committed by GitHub
parent 17bee0223a
commit 38a418a1d1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/boards/shields/cradio/Kconfig.defconfig
View file

@ -1,10 +1,9 @@
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT
config ZMK_KEYBOARD_NAME config ZMK_KEYBOARD_NAME
default "cradio" default "cradio"
# Unable to use interrupts as the same pin number is used
# across A & B controllers, and STM32F303CCT6 can't enable
# interrutps for multiple controllers for the same "line"
# for the external interrupts.
config ZMK_KSCAN_GPIO_POLLING config ZMK_KSCAN_GPIO_POLLING
default y default y

2
app/boards/shields/cradio/Kconfig.shield
View file

@ -1,4 +1,4 @@
# Copyright (c) 2020 Pete Johanson # Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
config SHIELD_CRADIO config SHIELD_CRADIO

23
app/boards/shields/cradio/cradio.dtsi
View file

@ -1,8 +1,9 @@
/* /*
* Copyright (c) 2020 Pete Johanson * Copyright (c) 2020 Pete Johanson
* *
* SPDX-License-Identifier: MIT * Copyright (c) 2020 The ZMK Contributors
*/ */
#include <dt-bindings/zmk/matrix-transform.h> #include <dt-bindings/zmk/matrix-transform.h>
/ { / {
@ -16,31 +17,27 @@
columns = <34>; columns = <34>;
rows = <1>; rows = <1>;
map = < map = <
RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17) RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,21) RC(0,20) RC(0,19) RC(0,18) RC(0,17)
RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,26) RC(0,25) RC(0,24) RC(0,23) RC(0,22)
RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27) RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,31) RC(0,30) RC(0,29) RC(0,28) RC(0,27)
RC(0,15) RC(0,16) RC(0,33) RC(0,32) RC(0,15) RC(0,16) RC(0,33) RC(0,32)
>; >;
};
kscan0: kscan { kscan0: kscan {
compatible = "zmk,kscan-gpio-direct"; compatible = "zmk,kscan-gpio-direct";
label = "KSCAN"; label = "KSCAN";
}; };
bt_unpair_combo: bt_unpair_combo { bt_unpair_combo: bt_unpair_combo {
compatible = "zmk,bt-unpair-combo"; compatible = "zmk,bt-unpair-combo";
}; };
}; };
};
&kscan0 { &kscan0 {
input-gpios input-gpios
= <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
, <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
, <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
, <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)> , <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>

3
app/boards/shields/cradio/cradio_left.conf
View file

@ -1,2 +1,5 @@
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT
CONFIG_ZMK_SPLIT=y CONFIG_ZMK_SPLIT=y
CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y CONFIG_ZMK_SPLIT_BLE_ROLE_CENTRAL=y

7
app/boards/shields/cradio/cradio_left.overlay
View file

@ -1,11 +1,6 @@
/* /*
* Copyright (c) 2020 Pete Johanson * Copyright (c) 2020 Pete Johanson
* *
* SPDX-License-Identifier: MIT * Copyright (c) 2020 The ZMK Contributors
*/ */
#include "cradio.dtsi"
&bt_unpair_combo {
key-positions = <0 16>;
};

3
app/boards/shields/cradio/cradio_right.conf
View file

@ -1,2 +1,5 @@
# Copyright (c) 2020 The ZMK Contributors
# SPDX-License-Identifier: MIT
CONFIG_ZMK_SPLIT=y CONFIG_ZMK_SPLIT=y
CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y CONFIG_ZMK_SPLIT_BLE_ROLE_PERIPHERAL=y

3
app/boards/shields/cradio/cradio_right.overlay
View file

@ -1,8 +1,9 @@
/* /*
* Copyright (c) 2020 Pete Johanson * Copyright (c) 2020 Pete Johanson
* *
* SPDX-License-Identifier: MIT * Copyright (c) 2020 The ZMK Contributors
*/ */
#include "cradio.dtsi" #include "cradio.dtsi"
&default_transform { &default_transform {