diff options
| author | Nick <nick.win999@gmail.com> | 2020-09-15 14:41:59 -0500 |
|---|---|---|
| committer | Nick <nick.win999@gmail.com> | 2020-09-15 14:41:59 -0500 |
| commit | 18d21b0362c5c09902836ed4791bd13e1efd9a9a (patch) | |
| tree | 3f78a0ef43fc23e93195e1205a31f77154af7e76 /app/src/matrix_transform.c | |
| parent | 81bc157f539235ad032fde78b6f6cec7a16d2c39 (diff) | |
| parent | c0806d27f1d048db335ecc854eab61b59e23ea7a (diff) | |
Merge remote-tracking branch 'upstream/main' into underglow/state-persistence
Diffstat (limited to 'app/src/matrix_transform.c')
| -rw-r--r-- | app/src/matrix_transform.c | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/app/src/matrix_transform.c b/app/src/matrix_transform.c index 7ecf1ae..4e68a56 100644 --- a/app/src/matrix_transform.c +++ b/app/src/matrix_transform.c @@ -1,3 +1,8 @@ +/* + * Copyright (c) 2020 The ZMK Contributors + * + * SPDX-License-Identifier: MIT + */ #include <zephyr.h> #include <zmk/matrix_transform.h> @@ -6,16 +11,15 @@ #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, +#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, -static u32_t transform[] = - { UTIL_LISTIFY(ZMK_KEYMAP_LEN, _TRANSFORM_ENTRY, 0) }; +static u32_t transform[] = {UTIL_LISTIFY(ZMK_KEYMAP_LEN, _TRANSFORM_ENTRY, 0)}; #endif -u32_t zmk_matrix_transform_row_column_to_position(u32_t row, u32_t column) -{ +u32_t zmk_matrix_transform_row_column_to_position(u32_t row, u32_t column) { u32_t matrix_index; #if DT_NODE_HAS_PROP(ZMK_KEYMAP_TRANSFORM_NODE, col_offset) |