diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2016-07-04 17:45:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-04 17:45:58 +0200 |
| commit | 8e88d55bfd7c88cb15845e0c6415e4e892532861 (patch) | |
| tree | 281f82e47a34c9c7176537cdd85c76c387a8286d /tmk_core/common/bootmagic.c | |
| parent | 21ee3eb569caffdf2ad581c668682c0109c978e5 (diff) | |
| download | qmk_firmware-8e88d55bfd7c88cb15845e0c6415e4e892532861.tar.gz qmk_firmware-8e88d55bfd7c88cb15845e0c6415e4e892532861.tar.xz | |
reverts #343 for the most part (#474)
Diffstat (limited to 'tmk_core/common/bootmagic.c')
| -rw-r--r-- | tmk_core/common/bootmagic.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/tmk_core/common/bootmagic.c b/tmk_core/common/bootmagic.c index 90275a18b..6730a2a4a 100644 --- a/tmk_core/common/bootmagic.c +++ b/tmk_core/common/bootmagic.c @@ -106,13 +106,15 @@ void bootmagic(void) } } -static bool scan_keycode(uint8_t keycode) { - for (int8_t r = MATRIX_ROWS - 1; r >= 0; --r) { +static bool scan_keycode(uint8_t keycode) +{ + for (uint8_t r = 0; r < MATRIX_ROWS; r++) { matrix_row_t matrix_row = matrix_get_row(r); - for (int8_t c = MATRIX_COLS - 1; c >= 0; --c) { - if (matrix_row & (matrix_row_t)1 << c) { - keypos_t key = (keypos_t){ .row = r, .col = c }; - if (keycode == keymap_key_to_keycode(0, key)) return true; + for (uint8_t c = 0; c < MATRIX_COLS; c++) { + if (matrix_row & ((matrix_row_t)1<<c)) { + if (keycode == keymap_key_to_keycode(0, (keypos_t){ .row = r, .col = c })) { + return true; + } } } } @@ -124,4 +126,4 @@ bool bootmagic_scan_keycode(uint8_t keycode) if (!scan_keycode(BOOTMAGIC_KEY_SALT)) return false; return scan_keycode(keycode); -} +}
\ No newline at end of file |