Skip to content

Commit

Permalink
Add willis (#70)
Browse files Browse the repository at this point in the history
  • Loading branch information
krikun98 authored Oct 30, 2024
1 parent e6683e9 commit b7596c7
Show file tree
Hide file tree
Showing 5 changed files with 91 additions and 0 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/outboards/boards/willis
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
# Copyright 2024 Manna Harbour
# https://github.com/manna-harbour/miryoku

outboard_modules=krikun98/willis-zmk-module/main
1 change: 1 addition & 0 deletions .github/workflows/test-all-boards.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ jobs:
"sporkus_le_capybara",
"technikable",
"tipper_tf",
"willis",
"zaphod"
]'

6 changes: 6 additions & 0 deletions config/willis.keymap
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
// Copyright 2024 Manna Harbour
// https://github.com/manna-harbour/miryoku

#include "../miryoku/custom_config.h"
#include "../miryoku/mapping/36/willis.h"
#include "../miryoku/miryoku.dtsi"
65 changes: 65 additions & 0 deletions miryoku/mapping/36/willis.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
// Copyright 2024 Manna Harbour
// https://github.com/manna-harbour/miryoku

#if !defined (MIRYOKU_LAYOUTMAPPING_WILLIS)

#define XXX &none

#if defined (MIRYOKU_MAPPING_2X2U)
#define MIRYOKU_LAYOUTMAPPING_WILLIS( \
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 \
) \
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 \
K34 K33 K36 K35

#define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 30 31
#define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 32 33

#define MIRYOKU_KLUDGE_THUMBCOMBOS

#else
#define MIRYOKU_LAYOUTMAPPING_WILLIS( \
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 \
) \
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 \
K32 K33 K34 K35 K36 K37

#define MIRYOKU_KLUDGE_TOPROWCOMBOS_LEFTPINKIE 1 2
#define MIRYOKU_KLUDGE_TOPROWCOMBOS_LEFTINNERINDEX 2 3
#define MIRYOKU_KLUDGE_TOPROWCOMBOS_RIGHTINNERINDEX 6 7
#define MIRYOKU_KLUDGE_TOPROWCOMBOS_RIGHTPINKIE 7 8

#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_LEFTPINKIE 21 22
#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_LEFTINNERINDEX 22 23
#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_RIGHTINNERINDEX 26 27
#define MIRYOKU_KLUDGE_BOTTOMROWCOMBOS_RIGHTPINKIE 27 28

#define MIRYOKU_KLUDGE_THUMBCOMBOS_LEFT 31 32
#define MIRYOKU_KLUDGE_THUMBCOMBOS_RIGHT 33 34

#endif

/ {
chosen {
zmk,physical-layout =
#if defined MIRYOKU_MAPPING_2X2U
&willis_bruce_layout;
#else
&willis_minidox_layout;
#endif
};
};

#endif

#define MIRYOKU_MAPPING MIRYOKU_LAYOUTMAPPING_WILLIS
15 changes: 15 additions & 0 deletions readme.org
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,21 @@ Notes or diagrams are provided below where the selection of keys is not obvious
[[#thumb-combos][Thumb combos]] are enabled.


**** 36/willis

***** Bruce

~MIRYOKU_MAPPING=2X2U~

Supports Bruce/Le Chiffre 2x2u configuration.
[[#thumb-combos][Thumb combos]] are enabled.

***** Minidox

Default.
3x1U thumb keys.


**** 38/draculad


Expand Down

0 comments on commit b7596c7

Please sign in to comment.