moved to official corne studio layout

keeb-it · Sep 24, 2024 · 706f281 · 706f281
1 parent 06b5d82
commit 706f281
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 185 deletions.
diff --git a/boards/shields/acorn/acorn.zmk.yml b/boards/shields/acorn/acorn.zmk.yml
@@ -14,4 +14,3 @@ features:
   - keys
   - encoder
   - display
-  - pointer
diff --git a/boards/shields/acorn/acorn_matrix.dtsi b/boards/shields/acorn/acorn_matrix.dtsi
@@ -1,143 +1,19 @@
 #include <dt-bindings/zmk/matrix_transform.h>
 #include <physical_layouts.dtsi>
+#include <layouts/foostan/corne.dtsi>
 
-// #include <layouts/foostan/corne.dtsi>
-// 
-// &foostan_corne_6col_layout {
-//     transform = <&default_transform>;
-// };
-// 
-// &foostan_corne_5col_layout {
-//     transform = <&five_column_transform>;
-// };
+&foostan_corne_6col_layout {
+    transform = <&six_col_transform>;
+};
+
+&foostan_corne_5col_layout {
+    transform = <&five_col_transform>;
+};
 
 / {
     chosen {
         zmk,kscan = &kscan;
-        zmk,physical-layout = &six_col_layout;
-        // zmk,physical-layout = &foostan_corne_6col_layout;
-    };
-
-    six_col_layout: six_col_layout {
-        compatible = "zmk,physical-layout";
-        display-name = "6-col";
-
-        transform = <&six_col_transform>;
-
-        keys  //                     w   h    x    y     rot    rx    ry
-            = <&key_physical_attrs 100 100    0   37       0     0     0>
-            , <&key_physical_attrs 100 100  100   37       0     0     0>
-            , <&key_physical_attrs 100 100  200   12       0     0     0>
-            , <&key_physical_attrs 100 100  300    0       0     0     0>
-            , <&key_physical_attrs 100 100  400   12       0     0     0>
-            , <&key_physical_attrs 100 100  500   25       0     0     0>
-            , <&key_physical_attrs 100 100  900   25       0     0     0>
-            , <&key_physical_attrs 100 100 1000   12       0     0     0>
-            , <&key_physical_attrs 100 100 1100    0       0     0     0>
-            , <&key_physical_attrs 100 100 1200   12       0     0     0>
-            , <&key_physical_attrs 100 100 1300   37       0     0     0>
-            , <&key_physical_attrs 100 100 1400   37       0     0     0>
-            , <&key_physical_attrs 100 100    0  137       0     0     0>
-            , <&key_physical_attrs 100 100  100  137       0     0     0>
-            , <&key_physical_attrs 100 100  200  112       0     0     0>
-            , <&key_physical_attrs 100 100  300  100       0     0     0>
-            , <&key_physical_attrs 100 100  400  112       0     0     0>
-            , <&key_physical_attrs 100 100  500  125       0     0     0>
-            , <&key_physical_attrs 100 100  900  125       0     0     0>
-            , <&key_physical_attrs 100 100 1000  112       0     0     0>
-            , <&key_physical_attrs 100 100 1100  100       0     0     0>
-            , <&key_physical_attrs 100 100 1200  112       0     0     0>
-            , <&key_physical_attrs 100 100 1300  137       0     0     0>
-            , <&key_physical_attrs 100 100 1400  137       0     0     0>
-            , <&key_physical_attrs 100 100    0  237       0     0     0>
-            , <&key_physical_attrs 100 100  100  237       0     0     0>
-            , <&key_physical_attrs 100 100  200  212       0     0     0>
-            , <&key_physical_attrs 100 100  300  200       0     0     0>
-            , <&key_physical_attrs 100 100  400  212       0     0     0>
-            , <&key_physical_attrs 100 100  500  225       0     0     0>
-            , <&key_physical_attrs 100 100  900  225       0     0     0>
-            , <&key_physical_attrs 100 100 1000  212       0     0     0>
-            , <&key_physical_attrs 100 100 1100  200       0     0     0>
-            , <&key_physical_attrs 100 100 1200  212       0     0     0>
-            , <&key_physical_attrs 100 100 1300  237       0     0     0>
-            , <&key_physical_attrs 100 100 1400  237       0     0     0>
-            , <&key_physical_attrs 100 100  348  312       0     0     0>
-            , <&key_physical_attrs 100 100  348  312    1500   398   789>
-            , <&key_physical_attrs 100 150  348  262    3000   398   789>
-            , <&key_physical_attrs 100 150 1052  262 (-3000)  1102   789>
-            , <&key_physical_attrs 100 100 1052  312 (-1500)  1102   789>
-            , <&key_physical_attrs 100 100 1052  312       0     0     0>
-            ;
-    };
-
-    five_col_layout: five_col_layout {
-        compatible = "zmk,physical-layout";
-        display-name = "5-col";
-
-        transform = <&five_col_transform>;
-
-        keys  //                     w   h    x    y     rot    rx    ry
-            = <&key_physical_attrs 100 100    0   37       0     0     0>
-            , <&key_physical_attrs 100 100  100   12       0     0     0>
-            , <&key_physical_attrs 100 100  200    0       0     0     0>
-            , <&key_physical_attrs 100 100  300   12       0     0     0>
-            , <&key_physical_attrs 100 100  400   25       0     0     0>
-            , <&key_physical_attrs 100 100  800   25       0     0     0>
-            , <&key_physical_attrs 100 100  900   12       0     0     0>
-            , <&key_physical_attrs 100 100 1000    0       0     0     0>
-            , <&key_physical_attrs 100 100 1100   12       0     0     0>
-            , <&key_physical_attrs 100 100 1200   37       0     0     0>
-            , <&key_physical_attrs 100 100    0  137       0     0     0>
-            , <&key_physical_attrs 100 100  100  112       0     0     0>
-            , <&key_physical_attrs 100 100  200  100       0     0     0>
-            , <&key_physical_attrs 100 100  300  112       0     0     0>
-            , <&key_physical_attrs 100 100  400  125       0     0     0>
-            , <&key_physical_attrs 100 100  800  125       0     0     0>
-            , <&key_physical_attrs 100 100  900  112       0     0     0>
-            , <&key_physical_attrs 100 100 1000  100       0     0     0>
-            , <&key_physical_attrs 100 100 1100  112       0     0     0>
-            , <&key_physical_attrs 100 100 1200  137       0     0     0>
-            , <&key_physical_attrs 100 100    0  237       0     0     0>
-            , <&key_physical_attrs 100 100  100  212       0     0     0>
-            , <&key_physical_attrs 100 100  200  200       0     0     0>
-            , <&key_physical_attrs 100 100  300  212       0     0     0>
-            , <&key_physical_attrs 100 100  400  225       0     0     0>
-            , <&key_physical_attrs 100 100  800  225       0     0     0>
-            , <&key_physical_attrs 100 100  900  212       0     0     0>
-            , <&key_physical_attrs 100 100 1000  200       0     0     0>
-            , <&key_physical_attrs 100 100 1100  212       0     0     0>
-            , <&key_physical_attrs 100 100 1200  237       0     0     0>
-            , <&key_physical_attrs 100 100  248  312       0     0     0>
-            , <&key_physical_attrs 100 100  248  312    1500   298   789>
-            , <&key_physical_attrs 100 150  248  262    3000   298   789>
-            , <&key_physical_attrs 100 150  952  262 (-3000)  1002   789>
-            , <&key_physical_attrs 100 100  952  312 (-1500)  1002   789>
-            , <&key_physical_attrs 100 100  952  312       0     0     0>
-            ;
-    };
-
-    acorn_position_map {
-        compatible = "zmk,physical-layout-position-map";
-
-        complete;
-
-        twelve {
-            physical-layout = <&six_col_layout>;
-            positions
-                = < 0  1  2  3  4  5  6  7  8  9 10 11>
-                , <12 13 14 15 16 17 18 19 20 21 22 23>
-                , <24 25 26 27 28 29 30 31 32 33 34 35>
-                , <         36 37 38 39 40 41         >;
-        };
-
-        ten {
-            physical-layout = <&five_col_layout>;
-            positions
-                = <36  0  1  2  3  4  5  6  7  8  9 37>
-                , <38 10 11 12 13 14 15 16 17 18 19 39>
-                , <40 20 21 22 23 24 25 26 27 28 29 41>
-                , <         30 31 32 33 34 35         >;
-        };
+        zmk,physical-layout = &foostan_corne_6col_layout;
     };
 
     kscan: kscan {

diff --git a/build.yaml b/build.yaml
@@ -13,55 +13,26 @@
 #
 ---
 # board: [seeeduino_xiao, seeeduino_xiao_ble, seeeduino_xiao_rp2040]
-# board: [seeeduino_xiao_ble]
-# shield:
-#   - hammer40
-#   - hana_central_left
-#   - hana_peripheral_left
-#   - hana_peripheral_right
+board: [seeeduino_xiao_ble]
+shield:
+  - hammer40
+  - hana_central_left
+  - hana_peripheral_left
+  - hana_peripheral_right
 include:
-  # - board: seeeduino_xiao_ble
-  #   shield: settings_reset
-  # - board: nice_nano_v2
-  #   shield: settings_reset
-  # - board: nice_nano_v2
-  #   shield: hana_central_dongle
-  # - board: nice_nano_v2
-  #   shield: acorn_central_left
-  # - board: nice_nano_v2
-  #   shield: acorn_peripheral_right
-  # - board: seeeduino_xiao_ble
-  #   shield: hammer40
-  #   snippet: studio-rpc-usb-uart
-  #   cmake-args: -DCONFIG_ZMK_STUDIO=y
-  #   artifact-name: hammer40_xiao_ble_studio
-  # - board: seeeduino_xiao_rp2040
-  #   shield: hammer40
-  #   snippet: studio-rpc-usb-uart
-  #   cmake-args: -DCONFIG_ZMK_STUDIO=y
-  #   artifact-name: hammer40_xiao_rp2040_studio
-  # - board: seeeduino_xiao_ble
-  #   shield: hana_central_left
-  #   snippet: studio-rpc-usb-uart
-  #   cmake-args: -DCONFIG_ZMK_STUDIO=y
-  #   artifact-name: hana_left_xiao_ble_studio
-  # - board: seeeduino_xiao_ble
-  #   shield: hana_peripheral_right
-  #   snippet: studio-rpc-usb-uart
-  #   cmake-args: -DCONFIG_ZMK_STUDIO=y
-  #   artifact-name: hana_right_xiao_ble_studio
-  # - board: nice_nano_v2
-  #   shield: acorn_central_left
-  #   snippet: studio-rpc-usb-uart
-  #   cmake-args: -DCONFIG_ZMK_STUDIO=y
-  #   artifact-name: acorn_left_nice_nano_studio
-  # - board: nice_nano_v2
-  #   shield: acorn_peripheral_right
-  #   snippet: studio-rpc-usb-uart
-  #   cmake-args: -DCONFIG_ZMK_STUDIO=y
-  #   artifact-name: acorn_right_nice_nano_studio
-  - board: sparkfun_pro_micro_rp2040
+  - board: seeeduino_xiao_ble
+    shield: settings_reset
+  - board: nice_nano_v2
+    shield: settings_reset
+    # Hana
+  - board: nice_nano_v2
+    shield: hana_central_dongle
+    # Corne Wireless
+  - board: nice_nano_v2
+    shield: acorn_central_dongle
+  - board: nice_nano_v2
     shield: acorn_central_left
-    snippet: studio-rpc-usb-uart
-    cmake-args: -DCONFIG_ZMK_STUDIO=y -DCONFIG_ZMK_STUDIO_LOCKING=n
-    artifact-name: acorn_left_rp2040_studio
+  - board: nice_nano_v2
+    shield: acorn_peripheral_left
+  - board: nice_nano_v2
+    shield: acorn_peripheral_right
diff --git a/config/acorn.conf b/config/acorn.conf
@@ -14,3 +14,6 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
 # Enable deep sleep
 CONFIG_ZMK_SLEEP=y
+
+# Enable ZMK Studio
+CONFIG_ZMK_STUDIO=y
diff --git a/config/hammer40.conf b/config/hammer40.conf
@@ -16,4 +16,7 @@ CONFIG_NFCT_PINS_AS_GPIOS=y
 
 # Turn on logging, and set ZMK logging to debug output
 CONFIG_ZMK_USB_LOGGING=n
-# CONFIG_INPUT_LOG_LEVEL_DBG=y
+# CONFIG_INPUT_LOG_LEVEL_DBG=y
+
+# Enable ZMK Studio
+CONFIG_ZMK_STUDIO=y
diff --git a/config/hana.conf b/config/hana.conf
@@ -17,3 +17,6 @@ CONFIG_ZMK_SLEEP=y
 
 # Set NFC Pins on Xiao as GPIO
 CONFIG_NFCT_PINS_AS_GPIOS=y
+
+# Enable ZMK Studio
+CONFIG_ZMK_STUDIO=y
-Original file line number
+Diff line change
@@ Expand Up / @@ -14,4 +14,3 @@ features: @@
       - keys
       - encoder
       - display
-      - pointer