diff options
| author | tmk <nobody@nowhere> | 2014-07-30 14:37:05 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2014-07-30 14:37:05 +0900 |
| commit | adbb86b1ec8b07e86ae7425374e95b82122e48a7 (patch) | |
| tree | 0a02e89376f69ef975096af9490034725d8eb751 /common/bootmagic.c | |
| parent | 79840c678e13f9a737f80048bc3b9c9c55e3fc77 (diff) | |
| parent | a9f5f201ad6b009675fdf16c4447033cc2ac0995 (diff) | |
| download | firmware-adbb86b1ec8b07e86ae7425374e95b82122e48a7.tar.gz firmware-adbb86b1ec8b07e86ae7425374e95b82122e48a7.tar.bz2 firmware-adbb86b1ec8b07e86ae7425374e95b82122e48a7.zip | |
Merge branch 'mbed' into dev
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; } } |