summaryrefslogtreecommitdiffstats
path: root/keyboard
diff options
context:
space:
mode:
authortmk <nobody@nowhere>2013-03-09 11:22:27 +0900
committertmk <nobody@nowhere>2013-03-09 11:22:27 +0900
commit4d64fd8faa8b1a0ceb9019446ba6915aaf1812ea (patch)
tree25410ede4bbf7d5a8994bb385e6c7ee4ad2f4c0c /keyboard
parent359b68d35f0763ab0cafa2fb800e0a3497291f95 (diff)
Add bootmagic.c and fix bootloader_jump
Diffstat (limited to 'keyboard')
-rw-r--r--keyboard/gh60/keymap.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/keyboard/gh60/keymap.c b/keyboard/gh60/keymap.c
index 1f5344d4c6..d6af16961c 100644
--- a/keyboard/gh60/keymap.c
+++ b/keyboard/gh60/keymap.c
@@ -231,7 +231,8 @@ uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
if (layer < OVERLAYS_SIZE) {
return pgm_read_byte(&overlays[(layer)][(key.row)][(key.col)]);
} else {
- debug("key_to_keycode: overlay "); debug_dec(layer); debug(" is invalid.\n");
+ // XXX: this may cuaes bootlaoder_jump incositent fail.
+ //debug("key_to_keycode: overlay "); debug_dec(layer); debug(" is invalid.\n");
return KC_TRANSPARENT;
}
}
@@ -240,8 +241,9 @@ uint8_t keymap_key_to_keycode(uint8_t layer, key_t key)
if (layer < KEYMAPS_SIZE) {
return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]);
} else {
+ // XXX: this may cuaes bootlaoder_jump incositent fail.
+ //debug("key_to_keycode: base "); debug_dec(layer); debug(" is invalid.\n");
// fall back to layer 0
- debug("key_to_keycode: base "); debug_dec(layer); debug(" is invalid.\n");
return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]);
}
}