feat: studio?

lesshonor · Nov 10, 2024 · 9270850 · 9270850
1 parent aa05002
commit 9270850
Show file tree

Hide file tree

Showing 7 changed files with 43 additions and 52 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,4 +2,11 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   build:
+    strategy:
+      fail-fast: false
+      matrix:
+        file-prefix: [pro_micro, blackpill]
     uses: zmkfirmware/zmk/.github/workflows/build-user-config.yml@main
+    with:
+      build_matrix_path: ${{ matrix.file-prefix }}.yaml
+      archive_name: ${{ matrix.file-prefix }}
diff --git a/blackpill.yaml b/blackpill.yaml
@@ -0,0 +1,15 @@
+# This file determines which shields will be built for which boards.
+# By default, only the settings_reset firmware will be built for boards that have been tested with MechWild shields. Some others have been added commented out, so you can see the format.
+# Remove the boards and/or shields you don't need, and add/uncomment the ones you do need.
+
+# ADVANCED:
+# You can use the `cmake-args` property to pass flags to the build command, and `artifact-name` to assign a name to
+# distinguish build outputs from each other:
+#  - board: nice_nano_v2
+#    shield: corne_left
+#    cmake-args: -DCONFIG_ZMK_USB_LOGGING=y
+#    artifact-name: corne_left_with_logging
+---
+board: [blackpill_f401cc, blackpill_f411ce]
+shield: [bb40, bb65, bbpad, obe, waka60]
+snippet: ["studio-rpc-usb-uart blackpill-storage"]
diff --git a/build.yaml b/build.yaml
diff --git a/config/default.conf b/config/default.conf
@@ -80,3 +80,6 @@ CONFIG_EC11_TRIGGER_GLOBAL_THREAD=y
 
 # Uncomment to delay the log output. This may help catch issues close to startup.
 #CONFIG_LOG_PROCESS_THREAD_STARTUP_DELAY_MS=3000
+
+CONFIG_ZMK_STUDIO=y
+CONFIG_ZMK_STUDIO_LOCKING=n
diff --git a/config/obe.keymap b/config/obe.keymap
@@ -52,18 +52,18 @@
 
         default_layer {
             bindings = <
-                &kp C_MUTE &kp ESC   &kp N1   &kp N2   &kp N3 &kp N4    &kp N5 &kp N6    &kp N7 &kp N8   &kp N9    &kp N0   &kp MINUS &kp EQUAL &kp BSLH &kp BSPC
-                &kp PG_UP  &kp TAB   &kp Q    &kp W    &kp E  &kp R     &kp T  &kp Y     &kp U  &kp I    &kp O     &kp P    &kp LBKT  &kp RBKT         &kp BSLH
-                &kp PG_DN  &mo 1     &kp A    &kp S    &kp D  &kp F     &kp G  &kp H     &kp J  &kp K    &kp L     &kp SEMI &kp APOS                   &kp ENTER
-                           &kp LSHFT &kp Z    &kp X    &kp C  &kp V     &kp B  &kp B     &kp N  &kp M    &kp COMMA &kp DOT  &kp FSLH  &kp UP           &kp RSHFT
-                           &kp LCTRL &kp LGUI &kp LALT        &kp SPACE &mo 1  &kp SPACE        &kp RALT &mo 1              &kp LEFT  &kp DOWN  &kp RIGHT
+                &studio_unlock &kp ESC   &kp N1   &kp N2   &kp N3 &kp N4    &kp N5 &kp N6    &kp N7 &kp N8   &kp N9    &kp N0   &kp MINUS &kp EQUAL &kp BSLH &kp BSPC
+                &kp PG_UP      &kp TAB   &kp Q    &kp W    &kp E  &kp R     &kp T  &kp Y     &kp U  &kp I    &kp O     &kp P    &kp LBKT  &kp RBKT         &kp BSLH
+                &kp PG_DN      &mo 1     &kp A    &kp S    &kp D  &kp F     &kp G  &kp H     &kp J  &kp K    &kp L     &kp SEMI &kp APOS                   &kp ENTER
+                               &kp LSHFT &kp Z    &kp X    &kp C  &kp V     &kp B  &kp B     &kp N  &kp M    &kp COMMA &kp DOT  &kp FSLH  &kp UP           &kp RSHFT
+                               &kp LCTRL &kp LGUI &kp LALT        &kp SPACE &mo 1  &kp SPACE        &kp RALT &mo 1              &kp LEFT  &kp DOWN  &kp RIGHT
             >;
             sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN>;
         };
 
         fn_layer {
             bindings = <
-                &tog 2      &trans   &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  &kp DEL
+                &kp C_MUTE  &trans   &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  &kp DEL
                 &bootloader &trans   &bt BT_SEL 0 &bt BT_SEL 1    &bt BT_SEL 2    &bt BT_SEL 3 &trans &trans &trans &trans &trans &trans  &trans   &trans            &trans
                 &bt BT_NXT  &kp CAPS &kp KP_NUM   &kp SLCK        &trans          &trans       &trans &trans &trans &trans &trans &trans  &trans                     &trans
                             &trans   &trans       &bt BT_CLR      &trans          &trans       &trans &trans &trans &trans &trans &trans  &trans   &kp PG_UP         &trans

diff --git a/config/west.yml b/config/west.yml
@@ -12,7 +12,7 @@ manifest:
     - name: mechwild-zmk-keyboards
       #remote: mechwild
       remote: lesshonor  # Eventually, you'll want to swap this out with mechwild.
-      revision: main
+      revision: storage
       clone-depth: 1
     - name: zmk
       remote: zmkfirmware

diff --git a/pro_micro.yaml b/pro_micro.yaml
@@ -0,0 +1,11 @@
+---
+board: [nice_nano_v2, nrfmicro_11, nrfmicro_13, adafruit_kb2040, sparkfun_pro_micro_rp2040, proton_c]
+shield: [murphpad, bde_rev2]
+snippet: [studio-rpc-usb-uart]
+
+include:
+  - board: nice_nano_v2
+    shield: mokulua_left
+    snippet: studio-rpc-usb-uart
+  - board: nice_nano_v2
+    shield: mokulua_right