From 87f3595d09c80320092757aeab2f35b61153359b Mon Sep 17 00:00:00 2001 From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com> Date: Mon, 14 Mar 2022 21:29:19 +1100 Subject: [PATCH] Add hillside --- .github/workflows/outboards/hillside.outboard | 7 ++++ .github/workflows/test-all-shields.yml | 2 +- config/hillside.keymap | 6 ++++ miryoku/mapping/48-hillside.h | 32 +++++++++++++++++++ 4 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/outboards/hillside.outboard create mode 100644 config/hillside.keymap create mode 100644 miryoku/mapping/48-hillside.h diff --git a/.github/workflows/outboards/hillside.outboard b/.github/workflows/outboards/hillside.outboard new file mode 100644 index 0000000..3113230 --- /dev/null +++ b/.github/workflows/outboards/hillside.outboard @@ -0,0 +1,7 @@ +# Copyright 2022 Manna Harbour +# https://github.com/manna-harbour/miryoku + +outboard_repository=mmccoyd/zmk-config +outboard_ref=master +outboard_from=config/boards/shields/hillside +outboard_to=boards/shields/hillside diff --git a/.github/workflows/test-all-shields.yml b/.github/workflows/test-all-shields.yml index 57a6359..0bcfeb2 100644 --- a/.github/workflows/test-all-shields.yml +++ b/.github/workflows/test-all-shields.yml @@ -10,4 +10,4 @@ jobs: uses: manna-harbour/zmk-config/.github/workflows/main.yml@ce28dc6609bff042dfcf68e03c9a0c201129cbce with: board: '["nice_nano"]' - shield: '["absolem","a_dux_left","a_dux_right","ahokore","arch36_left","arch36_right","bastyl_left","bastyl_right","bat43","berylline_left","berylline_right","boardsource5x12","chocv","contra","corne_left","corne_right","cradio_left","cradio_right","crbn","draculad_left","draculad_right","eek","ergodash_left","ergodash_right","ergotravel_left","ergotravel_right","gatoraid40","helix_left","helix_right","iris_left","iris_right","jian_left","jian_right","jiran_left","jiran_right","jorne_left","jorne_right","kyria_left","kyria_right","kyria_rev2_left","kyria_rev2_right","levinson_left","levinson_right","lily58_left","lily58_right","lotus58_left","lotus58_right","microdox_left","microdox_right","microdox_mod_left","microdox_mod_right","naked60","osprette","pockettype","pteron36_left","pteron36_right","rebound_v4","reviung39","reviung41","scylla_dmmpcb_left","scylla_dmmpcb_right","sofle_left","sofle_right","sofle_rgb_left","sofle_rgb_right","splitreus62_left","splitreus62_right","tbkmini_left","tbkmini_right","tightyl_left","tightyl_right","viterbi_left","viterbi_right","zodiark_left","zodiark_right"]' + shield: '["absolem","a_dux_left","a_dux_right","ahokore","arch36_left","arch36_right","bastyl_left","bastyl_right","bat43","berylline_left","berylline_right","boardsource5x12","chocv","contra","corne_left","corne_right","cradio_left","cradio_right","crbn","draculad_left","draculad_right","eek","ergodash_left","ergodash_right","ergotravel_left","ergotravel_right","gatoraid40","helix_left","helix_right","hillside_left","hillside_right","iris_left","iris_right","jian_left","jian_right","jiran_left","jiran_right","jorne_left","jorne_right","kyria_left","kyria_right","kyria_rev2_left","kyria_rev2_right","levinson_left","levinson_right","lily58_left","lily58_right","lotus58_left","lotus58_right","microdox_left","microdox_right","microdox_mod_left","microdox_mod_right","naked60","osprette","pockettype","pteron36_left","pteron36_right","rebound_v4","reviung39","reviung41","scylla_dmmpcb_left","scylla_dmmpcb_right","sofle_left","sofle_right","sofle_rgb_left","sofle_rgb_right","splitreus62_left","splitreus62_right","tbkmini_left","tbkmini_right","tightyl_left","tightyl_right","viterbi_left","viterbi_right","zodiark_left","zodiark_right"]' diff --git a/config/hillside.keymap b/config/hillside.keymap new file mode 100644 index 0000000..29dc0e9 --- /dev/null +++ b/config/hillside.keymap @@ -0,0 +1,6 @@ +// Copyright 2022 Manna Harbour +// https://github.com/manna-harbour/miryoku + +#include "../miryoku/config.h" +#include "../miryoku/mapping/48-hillside.h" +#include "../miryoku/miryoku.dtsi" diff --git a/miryoku/mapping/48-hillside.h b/miryoku/mapping/48-hillside.h new file mode 100644 index 0000000..1b4efb8 --- /dev/null +++ b/miryoku/mapping/48-hillside.h @@ -0,0 +1,32 @@ +// Copyright 2022 Manna Harbour +// https://github.com/manna-harbour/miryoku + +#define XXX &none + +#if defined MIRYOKU_MAPPING_EXTENDED_THUMBS +#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 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 XXX XXX K25 K26 K27 K28 K29 XXX \ + XXX XXX K32 K33 K34 K35 K36 K37 XXX XXX +#define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 41 42 +#define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 43 44 +#else +#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 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 XXX XXX K25 K26 K27 K28 K29 XXX \ + XXX K32 K33 K34 XXX XXX K35 K36 K37 XXX +#define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 40 41 +#define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 44 45 +#endif