clean up and setup studio

carrefinho · Nov 15, 2024 · 1190003 · 1190003
1 parent d5d3973
commit 1190003
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 36 deletions.
diff --git a/boards/shields/forager/Kconfig.shield b/boards/shields/forager/Kconfig.shield
@@ -1,5 +1,5 @@
-config FORAGER_LEFT
+config SHIELD_FORAGER_LEFT
     def_bool $(shields_list_contains,forager_left)
 
-config FORAGER_RIGHT
+config SHIELD_FORAGER_RIGHT
     def_bool $(shields_list_contains,forager_right)
diff --git a/boards/shields/forager/forager.conf b/boards/shields/forager/forager.conf
diff --git a/boards/shields/forager/forager.dtsi b/boards/shields/forager/forager.dtsi
@@ -3,7 +3,7 @@
 / {
     chosen {
         zmk,kscan = &kscan0;
-        zmk,matrix-transform = &default_transform;
+        zmk,physical-layout = &default_layout;
     };
 
     kscan0: kscan_0 {
@@ -12,9 +12,52 @@
         wakeup-source;
     };
 
+    default_layout: default_layout {
+        compatible = "zmk,physical-layout";
+        display-name = "Default Layout";
+        transform = <&default_transform>;
+
+        keys  //                     w   h    x    y     rot    rx    ry
+            = <&key_physical_attrs 100 100    0   61       0     0     0>
+            , <&key_physical_attrs 100 100  100   28       0     0     0>
+            , <&key_physical_attrs 100 100  200    0       0     0     0>
+            , <&key_physical_attrs 100 100  300   17       0     0     0>
+            , <&key_physical_attrs 100 100  400   28       0     0     0>
+            , <&key_physical_attrs 100 100  750   28       0     0     0>
+            , <&key_physical_attrs 100 100  850   17       0     0     0>
+            , <&key_physical_attrs 100 100  950    0       0     0     0>
+            , <&key_physical_attrs 100 100 1050   28       0     0     0>
+            , <&key_physical_attrs 100 100 1150   61       0     0     0>
+            , <&key_physical_attrs 100 100    0  161       0     0     0>
+            , <&key_physical_attrs 100 100  100  128       0     0     0>
+            , <&key_physical_attrs 100 100  200  100       0     0     0>
+            , <&key_physical_attrs 100 100  300  117       0     0     0>
+            , <&key_physical_attrs 100 100  400  128       0     0     0>
+            , <&key_physical_attrs 100 100  750  128       0     0     0>
+            , <&key_physical_attrs 100 100  850  117       0     0     0>
+            , <&key_physical_attrs 100 100  950  100       0     0     0>
+            , <&key_physical_attrs 100 100 1050  128       0     0     0>
+            , <&key_physical_attrs 100 100 1150  161       0     0     0>
+            , <&key_physical_attrs 100 100    0  261       0     0     0>
+            , <&key_physical_attrs 100 100  100  228       0     0     0>
+            , <&key_physical_attrs 100 100  200  200       0     0     0>
+            , <&key_physical_attrs 100 100  300  217       0     0     0>
+            , <&key_physical_attrs 100 100  400  228       0     0     0>
+            , <&key_physical_attrs 100 100  750  228       0     0     0>
+            , <&key_physical_attrs 100 100  850  217       0     0     0>
+            , <&key_physical_attrs 100 100  950  200       0     0     0>
+            , <&key_physical_attrs 100 100 1050  228       0     0     0>
+            , <&key_physical_attrs 100 100 1150  261       0     0     0>
+            , <&key_physical_attrs 100 100  400  350    2500   450   400>
+            , <&key_physical_attrs 100 100  500  370    2500   450   400>
+            , <&key_physical_attrs 100 100  650  370  (-2500)  800   400>
+            , <&key_physical_attrs 100 100  750  350  (-2500)  800   400>
+            ;
+    };
+
     default_transform: keymap_transform_0 {
         compatible = "zmk,matrix-transform";
-        columns = <12>;
+        columns = <10>;
         rows = <4>;
 
         map = <
@@ -24,5 +67,4 @@
                                                                             RC(3,3)         RC(3,4)         RC(3,5)         RC(3,6)
         >;
     };
-
 };
diff --git a/boards/shields/forager/forager.keymap b/boards/shields/forager/forager.keymap
@@ -16,16 +16,15 @@
         as: auto_shift {
             compatible = "zmk,behavior-hold-tap";
             #binding-cells = <2>;
-            tapping_term_ms = <250>;
-            // quick_tap_ms = <0>;
+            tapping-term-ms = <250>;
             require-prior-idle-ms = <100>;
             flavor = "tap-preferred";
             bindings = <&kp>, <&kp>;
         };
         ht: hold_tap {
             compatible = "zmk,behavior-hold-tap";
             #binding-cells = <2>;
-            tapping_term_ms = <200>;
+            tapping-term-ms = <200>;
             flavor = "balanced";
             bindings = <&kp>, <&kp>;
         };

diff --git a/boards/shields/forager/forager.zmk.yml b/boards/shields/forager/forager.zmk.yml
@@ -1,10 +1,11 @@
 file_format: "1"
 id: forager
-name: forager
+name: Forager
 type: shield
 requires: [seeeduino_xiao_ble]
 features:
   - keys
+  - studio
 siblings:
   - forager_left
   - forager_right
diff --git a/boards/shields/forager/forager_left.conf b/boards/shields/forager/forager_left.conf
diff --git a/boards/shields/forager/forager_right.conf b/boards/shields/forager/forager_right.conf
diff --git a/build.yaml b/build.yaml
@@ -20,6 +20,7 @@
 include:
   - board: seeeduino_xiao_ble
     shield: forager_left rgbled_adapter
+    snippet: studio-rpc-usb-uart
   - board: seeeduino_xiao_ble
     shield: forager_right rgbled_adapter
   - board: seeeduino_xiao_ble