From 8bad40282b89859766cd28949b48fe34c24371fe Mon Sep 17 00:00:00 2001
From: David Barr <dpbarr@gmail.com>
Date: Thu, 3 Sep 2020 22:02:25 +0100
Subject: [PATCH] actually working
---
app/boards/shields/cradios/Kconfig.defconfig | 4 ++--
app/boards/shields/cradios/cradios.dtsi | 10 +++++-----
app/boards/shields/cradios/cradios.keymap | 2 +-
app/boards/shields/cradios/cradios_left.overlay | 3 +--
app/boards/shields/cradios/cradios_right.overlay | 5 ++---
5 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/app/boards/shields/cradios/Kconfig.defconfig b/app/boards/shields/cradios/Kconfig.defconfig
index 0aca38fc..5b9ca9a1 100644
--- a/app/boards/shields/cradios/Kconfig.defconfig
+++ b/app/boards/shields/cradios/Kconfig.defconfig
@@ -1,5 +1,5 @@
-if SHIELD_CRADIOS
+
config ZMK_KEYBOARD_NAME
default "cradios"
@@ -11,4 +11,4 @@ config ZMK_KEYBOARD_NAME
config ZMK_KSCAN_GPIO_POLLING
default y
-endif
+
diff --git a/app/boards/shields/cradios/cradios.dtsi b/app/boards/shields/cradios/cradios.dtsi
index f5ebb962..95b4f272 100644
--- a/app/boards/shields/cradios/cradios.dtsi
+++ b/app/boards/shields/cradios/cradios.dtsi
@@ -17,11 +17,11 @@
columns = <34>;
rows = <1>;
map = <
-RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,10)
-RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15) RC(0,16) RC(0,17) RC(0,18) RC(0,19) RC(0,20)
-RC(0,21) RC(0,22) RC(0,23) RC(0,24) RC(0,25) RC(0,26) RC(0,27) RC(0,28) RC(0,29) RC(0,30)
-RC(0,31) RC(0,32) RC(0,33) RC(0,34)
- >;
+RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,17) RC(0,18) RC(0,19) RC(0,20) RC(0,21)
+RC(0,5) RC(0,6) RC(0,7) RC(0,8) RC(0,9) RC(0,22) RC(0,23) RC(0,24) RC(0,25) RC(0,26)
+RC(0,10)RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,27) RC(0,28) RC(0,29) RC(0,30) RC(0,31)
+RC(0,15) RC(0,16) RC(0,32) RC(0,33)
+>;
};
kscan0: kscan {
diff --git a/app/boards/shields/cradios/cradios.keymap b/app/boards/shields/cradios/cradios.keymap
index 3da61b74..c46468dd 100644
--- a/app/boards/shields/cradios/cradios.keymap
+++ b/app/boards/shields/cradios/cradios.keymap
@@ -11,7 +11,7 @@
&kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P
&kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN
&kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH
- &kp 3 &kp 4 &kp 2 &kp 1
+ &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4
>;
};
};
diff --git a/app/boards/shields/cradios/cradios_left.overlay b/app/boards/shields/cradios/cradios_left.overlay
index 3c3e9863..ab5a874d 100644
--- a/app/boards/shields/cradios/cradios_left.overlay
+++ b/app/boards/shields/cradios/cradios_left.overlay
@@ -7,9 +7,8 @@
&kscan0 {
-
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 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
, <&pro_micro_a 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
diff --git a/app/boards/shields/cradios/cradios_right.overlay b/app/boards/shields/cradios/cradios_right.overlay
index 7b47924d..59a81ba5 100644
--- a/app/boards/shields/cradios/cradios_right.overlay
+++ b/app/boards/shields/cradios/cradios_right.overlay
@@ -8,10 +8,9 @@
&default_transform {
col-offset = <17>;
};
-
&kscan0 {
input-gpios
- = <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+ = <&pro_micro_d 9 (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 2 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
@@ -27,7 +26,7 @@
, <&pro_micro_d 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
, <&pro_micro_d 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
, <&pro_micro_d 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
- , <&pro_micro_d 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
+ , <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
;
};