diff options
| author | Pete Johanson <peter@peterjohanson.com> | 2020-06-16 21:32:11 -0400 |
|---|---|---|
| committer | Pete Johanson <peter@peterjohanson.com> | 2020-06-16 21:32:11 -0400 |
| commit | 6b6ecb3b0c0cabdeb7f320e6b469f28de2a60664 (patch) | |
| tree | 224f8d11029c8854f50e51376ccb2d6e7a748f64 | |
| parent | a65cdea66b412a5afeaa25a75801e69eb76212f4 (diff) | |
Tweaks to remove "helper macros"
* More direct transform maps were agreed to be clearer.
* Remove helpers, just use simple `RC` macro to map a
logical location to a row/column pair.
| -rw-r--r-- | app/boards/shields/kyria/keymaps/default/keymap.overlay | 16 | ||||
| -rw-r--r-- | app/include/dt-bindings/zmk/keymap-transform.h | 8 |
2 files changed, 9 insertions, 15 deletions
diff --git a/app/boards/shields/kyria/keymaps/default/keymap.overlay b/app/boards/shields/kyria/keymaps/default/keymap.overlay index d01d8ba..3786bec 100644 --- a/app/boards/shields/kyria/keymaps/default/keymap.overlay +++ b/app/boards/shields/kyria/keymaps/default/keymap.overlay @@ -21,10 +21,10 @@ // | MX20 | MX19 | MX18 | MX17 | MX16 | MX15 | MX14 | MX13 | | MX13 | MX14 | MX15 | MX16 | MX17 | MX18 | MX19 | MX20 | // | MX25 | MX24 | MX23 | MX22 | MX21 | | MX21 | MX22 | MX23 | MX24 | MX25 | map = < - KT_ID_ROW(0, 6) KT_OFFSET_ROW(6, 0, 6) - KT_ID_ROW(1, 6) KT_OFFSET_ROW(6, 1, 6) - KT_ID_ROW(2, 8) KT_OFFSET_ROW(8, 2, 8) - KT_OFFSET_ROW(3, 3, 5) KT_OFFSET_ROW(8, 3, 5) +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,5) RC(0,10) RC(0,11) RC(0,12) RC(0,13) RC(0,14) RC(0,15) +RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,5) RC(1,10) RC(1,11) RC(1,12) RC(1,13) RC(1,14) RC(1,15) +RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13) RC(2,14) RC(2,15) + RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) RC(3,12) >; }; @@ -35,10 +35,10 @@ five_column_transform: keymap_transform_1 { compatible = "zmk,keymap-transform"; map = < - KT_ID_ROW(0, 5) KT_OFFSET_ROW(5, 0, 5) - KT_ID_ROW(1, 5) KT_OFFSET_ROW(6, 1, 5) - KT_ID_ROW(2, 7) KT_OFFSET_ROW(7, 2, 7) - KT_OFFSET_ROW(2, 3, 5) KT_OFFSET_ROW(7, 3, 5) +RC(0,0) RC(0,1) RC(0,2) RC(0,3) RC(0,4) RC(0,9) RC(0,10) RC(0,11) RC(0,12) RC(0,13) +RC(1,0) RC(1,1) RC(1,2) RC(1,3) RC(1,4) RC(1,9) RC(1,10) RC(1,11) RC(1,12) RC(1,13) +RC(2,0) RC(2,1) RC(2,2) RC(2,3) RC(2,4) RC(2,5) RC(2,6) RC(2,7) RC(2,8) RC(2,9) RC(2,10) RC(2,11) RC(2,12) RC(2,13) + RC(3,2) RC(3,3) RC(3,4) RC(3,5) RC(3,6) RC(3,7) RC(3,8) RC(3,9) RC(3,10) RC(3,11) >; }; diff --git a/app/include/dt-bindings/zmk/keymap-transform.h b/app/include/dt-bindings/zmk/keymap-transform.h index 6b12845..1ca0b9c 100644 --- a/app/include/dt-bindings/zmk/keymap-transform.h +++ b/app/include/dt-bindings/zmk/keymap-transform.h @@ -4,10 +4,4 @@ #define KT_ROW(item) (item >> 8) #define KT_COL(item) (item & 0xFF) -#define KT_ROW_COL(row, col) (((row) << 8) + (col)) - -#define _IDENTITY_ENTRY(col, row) KT_ROW_COL(row, col) -#define KT_ID_ROW(row, count) UTIL_LISTIFY(count, _IDENTITY_ENTRY, row) - -#define _OFFSET_ENTRY(col, offset, row) KT_ROW_COL(row, col + offset) -#define KT_OFFSET_ROW(offset, row, count) UTIL_LISTIFY(count, _OFFSET_ENTRY, offset, row)
\ No newline at end of file +#define RC(row, col) (((row) << 8) + (col))
\ No newline at end of file |