summaryrefslogtreecommitdiffstats
path: root/tmk_core/common/bootmagic.c
diff options
context:
space:
mode:
authorJoshua Colbeck <Skrymir@users.noreply.github.com>2016-07-07 03:29:29 +0200
committerGitHub <noreply@github.com>2016-07-07 03:29:29 +0200
commite0e1c119f0c54ff7b69bf8eaa9e641b60610b4d9 (patch)
tree67aebd55b1538035a1e5839eff3bb66f89d2aca2 /tmk_core/common/bootmagic.c
parent21ee3eb569caffdf2ad581c668682c0109c978e5 (diff)
parent5ed673d82d6cf91aa966a3e903ac37adb519f12c (diff)
downloadqmk_firmware-e0e1c119f0c54ff7b69bf8eaa9e641b60610b4d9.tar.gz
qmk_firmware-e0e1c119f0c54ff7b69bf8eaa9e641b60610b4d9.tar.xz
Merge pull request #1 from Skrymir/patch-1
add ergodox layout
Diffstat (limited to 'tmk_core/common/bootmagic.c')
-rw-r--r--tmk_core/common/bootmagic.c16
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