From 357bee6c72ce1b25be5afd802a224dfbcb201832 Mon Sep 17 00:00:00 2001
From: Jason Chestnut <jason.chestnut@gmail.com>
Date: Tue, 29 Sep 2020 10:18:26 -0400
Subject: [PATCH] Update to dts and keymap.
---
AUTHORS | 3 +-
app/boards/arm/preonic/preonic_rev3.dts | 52 +++++++++++-----------
app/boards/arm/preonic/preonic_rev3.keymap | 47 ++++++++++++++++++-
3 files changed, 74 insertions(+), 28 deletions(-)
diff --git a/AUTHORS b/AUTHORS
index 8052fd95..a9f9ca6e 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,4 +8,5 @@ Okke Formsma (@okke-formsma)
Cody McGinnis (@BrainWart)
Kurtis Lew (@kurtis-lew)
Richard Jones (@bmcgavin)
-Kevin Chen (@chenkevinh)
\ No newline at end of file
+Kevin Chen (@chenkevinh)
+Jason Chestnut (@shurikai)
diff --git a/app/boards/arm/preonic/preonic_rev3.dts b/app/boards/arm/preonic/preonic_rev3.dts
index d1228c6a..ae5de552 100644
--- a/app/boards/arm/preonic/preonic_rev3.dts
+++ b/app/boards/arm/preonic/preonic_rev3.dts
@@ -16,10 +16,10 @@
zephyr,sram = &sram0;
zephyr,flash = &flash0;
zmk,kscan = &kscan0;
- zmk,matrix_transform = &default_transform;
+ zmk,matrix_transform = &layout_grid_transform;
};
- default_transform: keymap_transform_0 {
+ layout_grid_transform: keymap_transform_0 {
compatible = "zmk,matrix-transform";
columns = <6>;
rows = <10>;
@@ -32,31 +32,31 @@ RC(8,0) RC(8,1) RC(8,2) RC(9,3) RC(9,4) RC(9,5) RC(9,0) RC(9,1) RC(9,2) RC(8,3)
>;
};
-// mit_transform: keymap_transform_0 {
-// compatible = "zmk,matrix-transform";
-// columns = <6>;
-// rows = <10>;
-// map = <
-//RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)
-//RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5)
-//RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5)
-//RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7,4) RC(7,5)
-//RC(8,0) RC(8,1) RC(8,2) RC(9,3) RC(9,4) RC(9,0) RC(9,1) RC(9,2) RC(8,3) RC(8,4) RC(8,5)
-// >;
-// };
+ layout_mit_transform: keymap_transform_1 {
+ compatible = "zmk,matrix-transform";
+ columns = <6>;
+ rows = <10>;
+ map = <
+RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)
+RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5)
+RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5)
+RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7,4) RC(7,5)
+RC(8,0) RC(8,1) RC(8,2) RC(9,3) RC(9,4) RC(9,0) RC(9,1) RC(9,2) RC(8,3) RC(8,4) RC(8,5)
+ >;
+ };
-// two_u_transform: keymap_transform_0 {
-// compatible = "zmk,matrix-transform";
-// columns = <6>;
-// rows = <10>;
-// map = <
-//RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)
-//RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5)
-//RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5)
-//RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7,4) RC(7,5)
-//RC(8,0) RC(8,1) RC(8,2) RC(9,3) RC(9,5) RC(9,1) RC(9,2) RC(8,3) RC(8,4) RC(8,5)
-// >;
-// };
+ layout_2x2u_transform: keymap_transform_2 {
+ compatible = "zmk,matrix-transform";
+ columns = <6>;
+ rows = <10>;
+ map = <
+RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(4,0) RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)
+RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(5,0) RC(5,1) RC(5,2) RC(5,3) RC(5,4) RC(5,5)
+RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(6,0) RC(6,1) RC(6,2) RC(6,3) RC(6,4) RC(6,5)
+RC(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(7,0) RC(7,1) RC(7,2) RC(7,3) RC(7,4) RC(7,5)
+RC(8,0) RC(8,1) RC(8,2) RC(9,3) RC(9,5) RC(9,1) RC(9,2) RC(8,3) RC(8,4) RC(8,5)
+ >;
+ };
kscan0: kscan_0 {
compatible = "zmk,kscan-gpio-matrix";
diff --git a/app/boards/arm/preonic/preonic_rev3.keymap b/app/boards/arm/preonic/preonic_rev3.keymap
index ddb88bd3..ea5e1e0e 100644
--- a/app/boards/arm/preonic/preonic_rev3.keymap
+++ b/app/boards/arm/preonic/preonic_rev3.keymap
@@ -21,9 +21,54 @@
&kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp BKSP
&kp TAB &kp Q &kp W &kp E &kp R &kp T &kp Y &kp U &kp I &kp O &kp P &kp DEL
&kp ESC &kp A &kp S &kp D &kp F &kp G &kp H &kp J &kp K &kp L &kp SCLN &kp QUOT
- &kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp BSLH &kp RET
+ &kp LSFT &kp Z &kp X &kp C &kp V &kp B &kp N &kp M &kp CMMA &kp DOT &kp FSLH &kp RET
&trans &kp LCTL &kp LALT &kp LGUI &mo LOWER &kp SPC &kp SPC &mo RAISE &kp LARW &kp DARW &kp UARW &kp RARW
>;
};
+ lower {
+// -----------------------------------------------------------------------------------------
+// | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | BSPC |
+// | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | DEL |
+// | DEL | F1 | F2 | F3 | F4 | F5 | F6 | - | + | [ | ] | | |
+// | | F7 | F8 | F9 | F10 | F11 | F12 | | LCTL | HOME | END | |
+// | LALT | | | | | | | ADJ | NEXT | VOL- | VOL+ | PLAY |
+ bindings = <
+ &kp TILD &kp BANG &kp ATSN &kp HASH &kp LABT &kp PRCT &kp CRRT &kp AMPS &kp RABT &kp LPRN &kp RPRN &kp BKSP
+ &kp TILD &kp BANG &kp ATSN &kp HASH &kp LABT &kp PRCT &kp CRRT &kp AMPS &kp RABT &kp LPRN &kp RPRN &kp DEL
+ &kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp KPLS &kp LBKT &kp RBKT &kp PIPE
+ &trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &trans &kp LCTL &kp HOME &kp END &trans
+ &kp LALT &trans &trans &trans &trans &trans &trans &mo ADJ &cp M_NEXT &cp M_VOLD &cp M_VOLU &cp M_PLAY
+ >;
+ };
+ raise {
+// -----------------------------------------------------------------------------------------
+// | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | BSPC |
+// | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | DEL |
+// | DEL | F1 | F2 | F3 | F4 | F5 | F6 | - | = | [ | ] | \ |
+// | | F7 | F8 | F9 | F10 | F11 | F12 | # | \ | PGUP | PGDN | |
+// | | | | | ADJ | | | | NEXT | VOL- | VOL+ | PLAY |
+ bindings = <
+ &kp GRAV &kp NUM_1 &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp BKSP
+ &kp GRAV &kp BANG &kp NUM_2 &kp NUM_3 &kp NUM_4 &kp NUM_5 &kp NUM_6 &kp NUM_7 &kp NUM_8 &kp NUM_9 &kp NUM_0 &kp DEL
+ &kp DEL &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp MINUS &kp EQL &kp LBKT &kp RBKT &kp BSLH
+ &trans &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12 &kp HASH &kp BSLH &kp PGUP &kp PGDN &trans
+ &trans &trans &trans &trans &mo ADJ &trans &trans &trans &cp M_NEXT &cp M_VOLD &cp M_VOLU &cp M_PLAY
+ >;
+ };
+ adjust {
+// -----------------------------------------------------------------------------------------
+// | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 |
+// | |RESET | | | | | | | | | | DEL |
+// | | | | | | | | | | | | |
+// | | | | | | | | | | | | |
+// | | | | | | | | | | | | |
+ bindings = <
+ &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &kp F11 &kp F12
+ &trans &reset &trans &trans &trans &trans &trans &trans &trans &trans &trans &kp DEL
+ &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
+ &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
+ &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
+ >;
+ };
};
};