Merge branch 'manna-harbour:master' into feature/add-hillside46

cairnm · Apr 14, 2024 · ea22f85 · ea22f85
2 parents 446b37a + eea578d
commit ea22f85
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 4 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -71,7 +71,7 @@ jobs:
       MIRYOKU_DEBUG: ${{ secrets.MIRYOKU_DEBUG }}
     steps:
       - name: checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path: 'miryoku_zmk'
       - name: main
@@ -277,7 +277,7 @@ jobs:
           echo "::endgroup::"
       - name: cache
         if: true
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             zmk/modules/

diff --git a/.github/workflows/outboards/shields/bad_wings b/.github/workflows/outboards/shields/bad_wings
@@ -0,0 +1,7 @@
+# Copyright 2024 Manna Harbour
+# https://github.com/manna-harbour/miryoku
+
+outboard_repository=hazels-garage/zmk-bad-wings
+outboard_ref=main
+outboard_from=config/boards/shields/bad_wings
+outboard_to=boards/shields/bad_wings
diff --git a/.github/workflows/test-all-xiao-shields.yml b/.github/workflows/test-all-xiao-shields.yml
@@ -11,6 +11,7 @@ jobs:
     with:
       board: '["seeeduino_xiao"]'
       shield: '[
+        "bad_wings",
         "chipper_left","chipper_right",
         "clog_v2_left","clog_v2_right",
         "hummingbird",

diff --git a/config/bad_wings.keymap b/config/bad_wings.keymap
@@ -0,0 +1,6 @@
+// Copyright 2024 Manna Harbour
+// https://github.com/manna-harbour/miryoku
+
+#include "../miryoku/custom_config.h"
+#include "../miryoku/mapping/36/minidox.h"
+#include "../miryoku/miryoku.dtsi"
diff --git a/miryoku/miryoku.dtsi b/miryoku/miryoku.dtsi
@@ -22,7 +22,7 @@
     compatible = "zmk,keymap";
 #define MIRYOKU_X(LAYER, STRING) \
     LAYER { \
-      label = STRING; \
+      display-name = STRING; \
       bindings = < U_MACRO_VA_ARGS(MIRYOKU_LAYERMAPPING_##LAYER, MIRYOKU_LAYER_##LAYER) >; \
     };
 MIRYOKU_LAYER_LIST

diff --git a/miryoku/miryoku_kludge_tapdelay.h b/miryoku/miryoku_kludge_tapdelay.h
@@ -69,7 +69,7 @@ MIRYOKU_X(COMMA,) \
 MIRYOKU_X(DOT,) \
 MIRYOKU_X(SLASH,) \
 MIRYOKU_X(ESC,) \
-MIRYOKU_X(SPC,) \
+MIRYOKU_X(SPACE,) \
 MIRYOKU_X(TAB,) \
 MIRYOKU_X(RET,) \
 MIRYOKU_X(BSPC,) \