Browse Source

updates as per PR changes (i hope)

xmkb
David Barr 4 years ago committed by GitHub
parent
commit
38a418a1d1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      app/boards/shields/cradio/Kconfig.defconfig
  2. 2
      app/boards/shields/cradio/Kconfig.shield
  3. 9
      app/boards/shields/cradio/cradio.dtsi
  4. 3
      app/boards/shields/cradio/cradio_left.conf
  5. 7
      app/boards/shields/cradio/cradio_left.overlay
  6. 3
      app/boards/shields/cradio/cradio_right.conf
  7. 3
      app/boards/shields/cradio/cradio_right.overlay

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

@ -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

@ -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

9
app/boards/shields/cradio/cradio.dtsi

@ -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>
/ { / {
@ -22,20 +23,16 @@ 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,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 {

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

@ -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

@ -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

@ -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

@ -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 {

Loading…
Cancel
Save