zmk_build

commit 4e0de8b443a82b237dcbab55f19aadcfd71df24f
parent f3619ba8166343246113d6c920cbdb9d9383be9e
Author: Jack Sangdahl <jack@pngu.org>
Date:   Wed, 26 Feb 2025 21:44:30 -0700

Fix Flake firmware & keymap
Remove flash option from build script

Diffstat:
M
build.sh
 | 
12
------------
M
config/flake.keymap
 | 
2
+-
M
flake/boards/shields/flake/flake.dtsi
 | 
19
+++++++++++++------
M
flake/boards/shields/flake/flake_left.overlay
 | 
6
++----
M
flake/boards/shields/flake/flake_right.overlay
 | 
8
+++++---

5 files changed, 21 insertions(+), 26 deletions(-)
diff --git a/build.sh b/build.sh
@@ -18,18 +18,6 @@ build() {
         fi
         west build -p always -b $2 -- -DSHIELD=$1 \
             -DZMK_CONFIG=$HOME/git/zmk_build/config $MODULE_CMD
-
-        read -p "${BOLD}flash? (y/n) ${NORMAL}" yn
-        case $yn in
-            [Yy]*)
-                printf "${YELLOW}enter bootloader${NORMAL}...\n"
-                sleep 5
-                udisksctl mount -b /dev/sdb
-                west flash
-                ;;
-            [Nn]*) cp build/zephyr/zmk.uf2 ~/$1.uf2 ;;
-            * ) printf "${RED}invalid entry${NORMAL}\n" ;;
-        esac
     )
     printf "${GREEN}complete${NORMAL}\n"
 }
diff --git a/config/flake.keymap b/config/flake.keymap
@@ -13,7 +13,7 @@
           &kp  Q &kp W &kp E &kp R  &kp T        &kp Y &kp  U &kp I     &kp O   &kp P
           HRML(A,    S,    D,    F) &kp G        &kp H HRMR(J,    K,        L,      SEMI)
           &kp  Z &kp X &kp C &kp V  &kp B        &kp N &kp  M &kp COMMA &kp DOT &kp FSLH
-          &none  &updir  &lt 1 ESC  &kp SPACE  &none       &none   &kp BSPC  &lt 2 RS(RC(V)) &pnp  &none
+          &none  &none  &updir  &lt 1 ESC  &kp SPACE       &kp BSPC  &lt 2 RS(RC(V)) &pnp  &none &none
         >;
       };
       1 {
diff --git a/flake/boards/shields/flake/flake.dtsi b/flake/boards/shields/flake/flake.dtsi
@@ -9,18 +9,25 @@
 
   chosen {
     zmk,kscan = &kscan0;
-		zmk,matrix_transform = &default_transform;
+    zmk,physical-layout = &physical_layout0;
   };
 
-  default_transform: keymap_transform_0 {
+  physical_layout0: physical_layout_0 {
+    compatible = "zmk,physical-layout";
+    display-name = "Default Layout";
+    kscan = <&kscan0>;
+    transform = <&default_transform>;
+  };
+
+  default_transform: keymap_transform0 {
     compatible = "zmk,matrix-transform";
     columns = <10>;
     rows = <4>;
     map = <
-      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,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5)  RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10)
-      RC(4,1) RC(4,2) RC(4,3) RC(4,4) RC(4,5)  RC(4,6) RC(4,7) RC(4,8) RC(4,9) RC(4,10)
+      RC(0,0) 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(1,0) 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(2,0) 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(3,0) RC(3,1) RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9)
     >;
   };
 };
diff --git a/flake/boards/shields/flake/flake_left.overlay b/flake/boards/shields/flake/flake_left.overlay
@@ -2,8 +2,7 @@
 
 &kscan0 {
   col-gpios
-    = <&pro_micro 2 GPIO_ACTIVE_HIGH>
-    , <&pro_micro 3 GPIO_ACTIVE_HIGH>
+    = <&pro_micro 3 GPIO_ACTIVE_HIGH>
     , <&pro_micro 4 GPIO_ACTIVE_HIGH>
     , <&pro_micro 5 GPIO_ACTIVE_HIGH>
     , <&pro_micro 6 GPIO_ACTIVE_HIGH>
@@ -11,8 +10,7 @@
     ;
 
   row-gpios
-    = <&pro_micro 8  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-    , <&pro_micro 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+    = <&pro_micro 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
     , <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
     , <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
     , <&pro_micro 14 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
diff --git a/flake/boards/shields/flake/flake_right.overlay b/flake/boards/shields/flake/flake_right.overlay
@@ -1,5 +1,9 @@
 #include "flake.dtsi"
 
+&default_transform {
+  col-offset = <5>;
+};
+
 &kscan0 {
   col-gpios
     = <&pro_micro 14 GPIO_ACTIVE_HIGH>
@@ -7,12 +11,10 @@
     , <&pro_micro 18 GPIO_ACTIVE_HIGH>
     , <&pro_micro 19 GPIO_ACTIVE_HIGH>
     , <&pro_micro 20 GPIO_ACTIVE_HIGH>
-    , <&pro_micro 21 GPIO_ACTIVE_HIGH>
     ;
 
   row-gpios
-    = <&pro_micro 16 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
-    , <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
+    = <&pro_micro 10 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
     , <&pro_micro 9  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
     , <&pro_micro 8  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>
     , <&pro_micro 7  (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>