diff options
| author | tmk <nobody@nowhere> | 2014-11-24 15:36:53 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-11-24 15:36:53 +0900 |
| commit | ed52ebb9870a26496b13a0565c1aaca8ded3465b (patch) | |
| tree | cddad806a3408e05bc29310254c564ee94e3e710 /common/bootmagic.c | |
| parent | eb90ed6238426db9367e294abfaefb5de07564f5 (diff) | |
| parent | e2077cad45f1736e878e317c43bd94117c61b5e0 (diff) | |
| download | firmware-ed52ebb9870a26496b13a0565c1aaca8ded3465b.tar.gz firmware-ed52ebb9870a26496b13a0565c1aaca8ded3465b.tar.bz2 firmware-ed52ebb9870a26496b13a0565c1aaca8ded3465b.zip | |
Merge branch 'merge_rn42'
Diffstat (limited to 'common/bootmagic.c')
| -rw-r--r-- | common/bootmagic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/common/bootmagic.c b/common/bootmagic.c index 642d5face..b002a5856 100644 --- a/common/bootmagic.c +++ b/common/bootmagic.c @@ -111,7 +111,7 @@ static bool scan_keycode(uint8_t keycode) matrix_row_t matrix_row = matrix_get_row(r); for (uint8_t c = 0; c < MATRIX_COLS; c++) { if (matrix_row & ((matrix_row_t)1<<c)) { - if (keycode == keymap_key_to_keycode(0, (key_t){ .row = r, .col = c })) { + if (keycode == keymap_key_to_keycode(0, (keypos_t){ .row = r, .col = c })) { return true; } } |