diff options
| author | Pete Johanson <peter@peterjohanson.com> | 2020-06-27 00:21:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-27 00:21:14 -0400 |
| commit | 7944835ecfa3d019e4c2afeb12de80f36f4e16d1 (patch) | |
| tree | 5d408f352d8fe8267c9d917e254d331b23b4e236 /app/src/matrix_transform.c | |
| parent | f84a41de3e72c022edebc1a3e90df0aa140451e6 (diff) | |
| parent | 5ffd95694fafa4fb424c9f0122d6f07a486cd81f (diff) | |
Merge pull request #41 from petejohanson/boards/kyria-left-right-matrix-transform-fixes
Kyria left/right overlays, matrix transform fixes
Diffstat (limited to 'app/src/matrix_transform.c')
| -rw-r--r-- | app/src/matrix_transform.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/app/src/matrix_transform.c b/app/src/matrix_transform.c index 7e8b481..7ecf1ae 100644 --- a/app/src/matrix_transform.c +++ b/app/src/matrix_transform.c @@ -4,11 +4,7 @@ #include <zmk/matrix.h> #include <dt-bindings/zmk/matrix-transform.h> -#define HAS_TRANSFORM DT_HAS_CHOSEN(zmk_matrix_transform) - -#if HAS_TRANSFORM -#define ZMK_KEYMAP_TRANSFORM_NODE DT_CHOSEN(zmk_matrix_transform) -#define ZMK_KEYMAP_LEN DT_PROP_LEN(ZMK_KEYMAP_TRANSFORM_NODE, map) +#ifdef ZMK_KEYMAP_TRANSFORM_NODE #define _TRANSFORM_ENTRY(i, _) \ [(KT_ROW(DT_PROP_BY_IDX(ZMK_KEYMAP_TRANSFORM_NODE, map, i)) * ZMK_MATRIX_COLS) + KT_COL(DT_PROP_BY_IDX(ZMK_KEYMAP_TRANSFORM_NODE, map, i))] = i, @@ -20,11 +16,21 @@ static u32_t transform[] = u32_t zmk_matrix_transform_row_column_to_position(u32_t row, u32_t column) { - u32_t matrix_index = (row * ZMK_MATRIX_COLS) + column; + u32_t matrix_index; + +#if DT_NODE_HAS_PROP(ZMK_KEYMAP_TRANSFORM_NODE, col_offset) + column += DT_PROP(ZMK_KEYMAP_TRANSFORM_NODE, col_offset); +#endif + +#if DT_NODE_HAS_PROP(ZMK_KEYMAP_TRANSFORM_NODE, row_offset) + row += DT_PROP(ZMK_KEYMAP_TRANSFORM_NODE, row_offset); +#endif + + matrix_index = (row * ZMK_MATRIX_COLS) + column; -#if HAS_TRANSFORM +#ifdef ZMK_KEYMAP_TRANSFORM_NODE return transform[matrix_index]; #else return matrix_index; -#endif /* HAS_TRANSFORM */ +#endif /* ZMK_KEYMAP_TRANSFORM_NODE */ }; |