diff --git a/.github/workflows/build-matrix-template.yml b/.github/workflows/build-matrix-template.yml index c6d6f05..b057b51 100644 --- a/.github/workflows/build-matrix-template.yml +++ b/.github/workflows/build-matrix-template.yml @@ -16,14 +16,14 @@ jobs: # - bastyl_right # out # - corne_left # in # - corne_right # in - # - cradio36_left # TODO - # - cradio36_right # TODO + # - cradio36_left # out + # - cradio36_right # out # - cradio_left # in # - cradio_right # in - # - cradios_left # TODO - # - cradios_right # TODO - # - cradioz_left # TODO - # - cradioz_right # TODO + # - cradios_left # out + # - cradios_right # out + # - cradioz_left # out TODO + # - cradioz_right # out TODO # - crbn # in # - eek # in # - helix_left # in @@ -44,8 +44,12 @@ jobs: # - pteron36_right # out # - sofle_left # in # - sofle_right # in + # - sweepv2_left # out + # - sweepv2_right # out # - splitreus62_left # in # - splitreus62_right # in + # - tbkmini_left # out + # - tbkmini_right # out # without shield: # - "" board: @@ -58,10 +62,9 @@ jobs: # - proton_c # in # without shield: # - ahokore # out - # - corne-ish_zen_left # TODO - # - corne-ish_zen_right # TODO - # - ferris_rev02_left # TODO - # - ferris_rev02_right # TODO + # - corne-ish_zen_left # out broken + # - corne-ish_zen_right # out broken + # - ferris_rev02 # out broken # - planck_rev6 # in # - zaphod # out alphas: diff --git a/.github/workflows/test-boards.yml b/.github/workflows/test-boards.yml index 0b30361..ebc787f 100644 --- a/.github/workflows/test-boards.yml +++ b/.github/workflows/test-boards.yml @@ -13,10 +13,9 @@ jobs: - "" board: - ahokore # out - # - corne-ish_zen_left # TODO - # - corne-ish_zen_right # TODO - # - ferris_rev02_left # TODO - # - ferris_rev02_right # TODO + # - corne-ish_zen_left # out broken + # - corne-ish_zen_right # out broken + # - ferris_rev02 out broken - planck_rev6 # in - zaphod # out alphas: diff --git a/.github/workflows/test-shields.yml b/.github/workflows/test-shields.yml index a5af656..2c3bcb3 100644 --- a/.github/workflows/test-shields.yml +++ b/.github/workflows/test-shields.yml @@ -15,14 +15,14 @@ jobs: - bastyl_right # out - corne_left # in - corne_right # in - # - cradio36_left # TODO - # - cradio36_right # TODO + - cradio36_left # out + - cradio36_right # out - cradio_left # in - cradio_right # in - # - cradios_left # TODO - # - cradios_right # TODO - # - cradioz_left # TODO - # - cradioz_right # TODO + - cradios_left # out + - cradios_right # out + # - cradioz_left out TODO + # - cradioz_right out TODO - crbn # in - eek # in - helix_left # in @@ -45,6 +45,10 @@ jobs: - sofle_right # in - splitreus62_left # in - splitreus62_right # in + - sweepv2_left # out + - sweepv2_right # out + - tbkmini_left # out + - tbkmini_right # out board: - nice_nano alphas: diff --git a/config/bastyl.keymap b/config/bastyl.keymap index 3018d98..4b3e74f 100644 --- a/config/bastyl.keymap +++ b/config/bastyl.keymap @@ -1,6 +1,4 @@ // https://github.com/manna-harbour/miryoku-zmk/ -#define MIRYOKU_COMBO_TPS_ENABLE - -#include "../miryoku/mapping/42-corne.h" +#include "../miryoku/mapping/58-bastyl.h" #include "../miryoku/miryoku.dtsi" diff --git a/config/manifests/west-corneishzen.yml b/config/manifests/west-corne-ish_zen.yml similarity index 100% rename from config/manifests/west-corneishzen.yml rename to config/manifests/west-corne-ish_zen.yml diff --git a/config/manifests/west-ferris_rev02.yml b/config/manifests/west-ferris_rev02.yml new file mode 100644 index 0000000..7f374cc --- /dev/null +++ b/config/manifests/west-ferris_rev02.yml @@ -0,0 +1,13 @@ +manifest: + remotes: + - name: zmkfirmware + url-base: https://github.com/zmkfirmware + - name: ferris_rev02 + url-base: https://github.com/petejohanson + projects: + - name: zmk + remote: ferris_rev02 + revision: boards/ferris-02-bling-basics + import: app/west.yml + self: + path: config diff --git a/config/outboards/absolem.env b/config/outboards/absolem.env index 9c7d1f8..a71cfaf 100644 --- a/config/outboards/absolem.env +++ b/config/outboards/absolem.env @@ -2,4 +2,3 @@ outboard_repository=mrzealot/zmk-config outboard_ref=master outboard_from=/ outboard_to=boards/shields/absolem - diff --git a/config/outboards/cradio36.env b/config/outboards/cradio36.env new file mode 100644 index 0000000..61f8718 --- /dev/null +++ b/config/outboards/cradio36.env @@ -0,0 +1,5 @@ +outboard_repository=davidphilipbarr/zmk-shields +outboard_ref=main +outboard_from=cradio36 +outboard_to=boards/shields/cradio36 + diff --git a/config/outboards/cradios.env b/config/outboards/cradios.env new file mode 100644 index 0000000..0a7d19c --- /dev/null +++ b/config/outboards/cradios.env @@ -0,0 +1,5 @@ +outboard_repository=davidphilipbarr/zmk-shields +outboard_ref=main +outboard_from=cradios +outboard_to=boards/shields/cradios + diff --git a/config/outboards/cradioz.env b/config/outboards/cradioz.env new file mode 100644 index 0000000..053aa66 --- /dev/null +++ b/config/outboards/cradioz.env @@ -0,0 +1,5 @@ +outboard_repository=davidphilipbarr/zmk-shields +outboard_ref=main +outboard_from=cradioz +outboard_to=boards/shields/cradioz + diff --git a/config/outboards/ferris_rev02.env b/config/outboards/ferris_rev02.env deleted file mode 100644 index 9bbcd1d..0000000 --- a/config/outboards/ferris_rev02.env +++ /dev/null @@ -1,4 +0,0 @@ -outboard_repository=petejohanson/zmk -outboard_ref=boards/ferris-02-bling-basics -outboard_from=app/boards/arm/ferris -outboard_to=boards/arm/ferris diff --git a/config/outboards/sweepv2.env b/config/outboards/sweepv2.env new file mode 100644 index 0000000..68864b8 --- /dev/null +++ b/config/outboards/sweepv2.env @@ -0,0 +1,5 @@ +outboard_repository=davidphilipbarr/zmk-shields +outboard_ref=main +outboard_from=sweepv2beta +outboard_to=boards/shields/sweepv2 + diff --git a/config/outboards/tbkmini.env b/config/outboards/tbkmini.env new file mode 100644 index 0000000..5b28726 --- /dev/null +++ b/config/outboards/tbkmini.env @@ -0,0 +1,5 @@ +outboard_repository=cwebster2/zmk-config +outboard_ref=main +outboard_from=config/boards/shields/tbkmini +outboard_to=boards/shields/tbkmini + diff --git a/config/sweepv2.keymap b/config/sweepv2.keymap new file mode 100644 index 0000000..620a1e6 --- /dev/null +++ b/config/sweepv2.keymap @@ -0,0 +1,3 @@ + +#include "../miryoku/mapping/34-ferris.h" +#include "../miryoku/miryoku.dtsi" diff --git a/config/tbkmini.keymap b/config/tbkmini.keymap new file mode 100644 index 0000000..0bb4606 --- /dev/null +++ b/config/tbkmini.keymap @@ -0,0 +1,4 @@ +// https://github.com/manna-harbour/miryoku-zmk/ + +#include "../miryoku/mapping/42-corne.h" +#include "../miryoku/miryoku.dtsi" diff --git a/miryoku/mapping/58-bastyl.h b/miryoku/mapping/58-bastyl.h new file mode 100644 index 0000000..7709d42 --- /dev/null +++ b/miryoku/mapping/58-bastyl.h @@ -0,0 +1,22 @@ +// https://github.com/manna-harbour/miryoku-zmk/ + +#define XXX &none + +#define MIRYOKU_MAPPING( \ + K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ + K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ + K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ + N30, N31, K32, K33, K34, K35, K36, K37, N38, N39 \ +) \ +XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX \ +XXX K00 K01 K02 K03 K04 K05 K06 K07 K08 K09 XXX \ +XXX K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 XXX \ +XXX K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 XXX \ + K32 K33 K34 K35 K36 K37 \ + XXX XXX XXX XXX + +#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo + +#define MIRYOKU_COMBO_TPSL 49 50 +#define MIRYOKU_COMBO_TPSR 51 52 +