pwarren/zmk_mf68
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Tweaks to remove "helper macros"

Browse source 
* 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.
This commit is contained in:
Pete Johanson 2020-06-16 21:32:11 -04:00
parent a65cdea66b
commit 6b6ecb3b0c
2 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/boards/shields/kyria/keymaps/default/keymap.overlay
View file

@ -21,10 +21,10 @@
// | MX20 | MX19 | MX18 | MX17 | MX16 | MX15 | MX14 | MX13 | | MX13 | MX14 | MX15 | MX16 | MX17 | MX18 | MX19 | MX20 | // | 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 | // | MX25 | MX24 | MX23 | MX22 | MX21 | | MX21 | MX22 | MX23 | MX24 | MX25 |
map = < map = <
KT_ID_ROW(0, 6) KT_OFFSET_ROW(6, 0, 6) 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)
KT_ID_ROW(1, 6) KT_OFFSET_ROW(6, 1, 6) 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)
KT_ID_ROW(2, 8) KT_OFFSET_ROW(8, 2, 8) 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)
KT_OFFSET_ROW(3, 3, 5) KT_OFFSET_ROW(8, 3, 5) 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 { five_column_transform: keymap_transform_1 {
compatible = "zmk,keymap-transform"; compatible = "zmk,keymap-transform";
map = < map = <
KT_ID_ROW(0, 5) KT_OFFSET_ROW(5, 0, 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)
KT_ID_ROW(1, 5) KT_OFFSET_ROW(6, 1, 5) 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)
KT_ID_ROW(2, 7) KT_OFFSET_ROW(7, 2, 7) 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)
KT_OFFSET_ROW(2, 3, 5) KT_OFFSET_ROW(7, 3, 5) 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)
>; >;
}; };

8
app/include/dt-bindings/zmk/keymap-transform.h
View file

@ -4,10 +4,4 @@
#define KT_ROW(item) (item >> 8) #define KT_ROW(item) (item >> 8)
#define KT_COL(item) (item & 0xFF) #define KT_COL(item) (item & 0xFF)
#define KT_ROW_COL(row, col) (((row) << 8) + (col)) #define RC(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)