diff options
| author | Nick <nick.win999@gmail.com> | 2020-09-19 19:15:05 -0500 |
|---|---|---|
| committer | Nick <nick.win999@gmail.com> | 2020-09-19 19:15:05 -0500 |
| commit | da0fb965f6b6a67154e20a3fddda48f5bc392d77 (patch) | |
| tree | f7f9aa9a45b39bb4d943eb7d2ba6e71d516ab40c /app/src/matrix_transform.c | |
| parent | 844f2c76749cbc5ff611d8e69819af82b698089a (diff) | |
| parent | c0806d27f1d048db335ecc854eab61b59e23ea7a (diff) | |
Merge remote-tracking branch 'upstream/main' into bluetooth/battery-reporting
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) |