summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Barr <dpbarr@gmail.com>2020-09-03 14:46:54 +0100
committerGitHub <noreply@github.com>2020-09-03 14:46:54 +0100
commit95bb220702121756a1f7458dcf549bd3c9187216 (patch)
tree9cecb6bcbb097383cc995ffeee009fff1ea0ecac
parent4551d307693dae30802a3f06d5f62fcf3155f8c0 (diff)
now compiles, not work, baby steps
-rw-r--r--app/boards/shields/cradios/cradios.dtsi11
-rw-r--r--app/boards/shields/cradios/cradios.keymap13
-rw-r--r--app/boards/shields/cradios/cradios_left.overlay7
-rw-r--r--app/boards/shields/cradios/cradios_right.overlay9
4 files changed, 19 insertions, 21 deletions
diff --git a/app/boards/shields/cradios/cradios.dtsi b/app/boards/shields/cradios/cradios.dtsi
index 7c20c00..f5ebb96 100644
--- a/app/boards/shields/cradios/cradios.dtsi
+++ b/app/boards/shields/cradios/cradios.dtsi
@@ -14,18 +14,19 @@
default_transform: keymap_transform_0 {
compatible = "zmk,matrix-transform";
- columns = <10>;
- rows = <4>;
+ 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(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,6) RC(1,7) RC(1,8) RC(1,9) RC(1,10)
-RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10)
- RC(3,4) RC(3,5) RC(3,6) RC(3,7)
+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)
>;
};
kscan0: kscan {
compatible = "zmk,kscan-gpio-direct";
+ label = "KSCAN";
};
};
diff --git a/app/boards/shields/cradios/cradios.keymap b/app/boards/shields/cradios/cradios.keymap
index 2939224..3da61b7 100644
--- a/app/boards/shields/cradios/cradios.keymap
+++ b/app/boards/shields/cradios/cradios.keymap
@@ -3,15 +3,16 @@
/ {
- keymap0: keymap {
- compatible = "zmk,keymap";
+ keymap {
+ compatible = "zmk,keymap";
- default_layer {
+ default_layer {
bindings = <
&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 DEL &kp RET &kp RET &SPC
+ &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
+ >;
};
};
};
diff --git a/app/boards/shields/cradios/cradios_left.overlay b/app/boards/shields/cradios/cradios_left.overlay
index 6f53d8b..3c3e986 100644
--- a/app/boards/shields/cradios/cradios_left.overlay
+++ b/app/boards/shields/cradios/cradios_left.overlay
@@ -5,7 +5,8 @@
*/
#include "cradios.dtsi"
-kscan_0 {
+
+&kscan0 {
input-gpios
= <&pro_micro_d 7 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>
@@ -28,7 +29,5 @@ kscan_0 {
;
};
-&bt_unpair_combo {
- key-positions = <0 38>;
-};
+
diff --git a/app/boards/shields/cradios/cradios_right.overlay b/app/boards/shields/cradios/cradios_right.overlay
index f991ef9..7b47924 100644
--- a/app/boards/shields/cradios/cradios_right.overlay
+++ b/app/boards/shields/cradios/cradios_right.overlay
@@ -6,12 +6,11 @@
#include "cradios.dtsi"
&default_transform {
- col-offset = <5>;
+ col-offset = <17>;
};
- &kscan0 {
+&kscan0 {
input-gpios
-
= <&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)>
@@ -32,7 +31,5 @@
;
};
-&bt_unpair_combo {
- key-positions = <0 38>;
-};
+