From a2e0ac1f5ea6f2bec745258d74c165167fc4fe89 Mon Sep 17 00:00:00 2001 From: Dustin Bosveld Date: Thu, 16 Dec 2021 13:01:11 -0700 Subject: [PATCH] Add osprette Co-authored-by: Manna Harbour <51143715+manna-harbour@users.noreply.github.com> --- .github/workflows/test-all-shields.yml | 3 +-- config/osprette.keymap | 6 ++++++ miryoku/mapping/34-osprette.h | 18 ++++++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 config/osprette.keymap create mode 100644 miryoku/mapping/34-osprette.h diff --git a/.github/workflows/test-all-shields.yml b/.github/workflows/test-all-shields.yml index 9096e5e..68d1c64 100644 --- a/.github/workflows/test-all-shields.yml +++ b/.github/workflows/test-all-shields.yml @@ -10,5 +10,4 @@ jobs: uses: manna-harbour/zmk-config/.github/workflows/main.yml@master with: board: '["nice_nano"]' - shield: '["absolem","a_dux_left","a_dux_right","ahokore","arch36_left","arch36_right","bastyl_left","bastyl_right","bat43","boardsource5x12","contra","corne_left","corne_right","cradio36_left","cradio36_right","cradio_left","cradio_right","cradios_left","cradios_right","crbn","eek","ergodash_left","ergodash_right","gatoraid40","helix_left","helix_right","iris_left","iris_right","jian_left","jian_right","jorne_left","jorne_right","kyria_left","kyria_right","levinson_left","levinson_right","lily58_left","lily58_right","microdox_left","microdox_right","microdox_mod_left","microdox_mod_right","naked60","pockettype","pteron36_left","pteron36_right","rebound_v4","reviung39","reviung41","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","boardsource5x12","contra","corne_left","corne_right","cradio36_left","cradio36_right","cradio_left","cradio_right","cradios_left","cradios_right","crbn","eek","ergodash_left","ergodash_right","gatoraid40","helix_left","helix_right","iris_left","iris_right","jian_left","jian_right","jorne_left","jorne_right","kyria_left","kyria_right","levinson_left","levinson_right","lily58_left","lily58_right","microdox_left","microdox_right","microdox_mod_left","microdox_mod_right","naked60","osprette","pockettype","pteron36_left","pteron36_right","rebound_v4","reviung39","reviung41","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/osprette.keymap b/config/osprette.keymap new file mode 100644 index 0000000..0c47f44 --- /dev/null +++ b/config/osprette.keymap @@ -0,0 +1,6 @@ +// Copyright 2021 Manna Harbour +// https://github.com/manna-harbour/miryoku + +#include "../miryoku/config.h" +#include "../miryoku/mapping/34-osprette.h" +#include "../miryoku/miryoku.dtsi" diff --git a/miryoku/mapping/34-osprette.h b/miryoku/mapping/34-osprette.h new file mode 100644 index 0000000..6cdfe77 --- /dev/null +++ b/miryoku/mapping/34-osprette.h @@ -0,0 +1,18 @@ +// Copyright 2021 Manna Harbour +// https://github.com/manna-harbour/miryoku + +#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 \ +) \ + K01 K02 K03 K04 K05 K06 K07 K08 \ +K00 K10 K11 K12 K13 K14 K15 K16 K17 K18 K19 K09 \ + K20 K21 K22 K23 K24 K25 K26 K27 K28 K29 \ + K33 K34 K35 K36 + +#define MIRYOKU_COMBO_TPSL 30 31 +#define MIRYOKU_COMBO_TPSR 32 33 + +#define MIRYOKU_COMBO_TPS_ENABLE