diff options
| author | tmk <nobody@nowhere> | 2013-03-09 11:22:27 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-03-09 11:22:27 +0900 |
| commit | 4d64fd8faa8b1a0ceb9019446ba6915aaf1812ea (patch) | |
| tree | 25410ede4bbf7d5a8994bb385e6c7ee4ad2f4c0c /keyboard/gh60 | |
| parent | 359b68d35f0763ab0cafa2fb800e0a3497291f95 (diff) | |
| download | qmk_firmware-4d64fd8faa8b1a0ceb9019446ba6915aaf1812ea.tar.gz qmk_firmware-4d64fd8faa8b1a0ceb9019446ba6915aaf1812ea.zip | |
Add bootmagic.c and fix bootloader_jump
Diffstat (limited to 'keyboard/gh60')
| -rw-r--r-- | keyboard/gh60/keymap.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/keyboard/gh60/keymap.c b/keyboard/gh60/keymap.c index 1f5344d4c..d6af16961 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) | |||
| 231 | if (layer < OVERLAYS_SIZE) { | 231 | if (layer < OVERLAYS_SIZE) { |
| 232 | return pgm_read_byte(&overlays[(layer)][(key.row)][(key.col)]); | 232 | return pgm_read_byte(&overlays[(layer)][(key.row)][(key.col)]); |
| 233 | } else { | 233 | } else { |
| 234 | debug("key_to_keycode: overlay "); debug_dec(layer); debug(" is invalid.\n"); | 234 | // XXX: this may cuaes bootlaoder_jump incositent fail. |
| 235 | //debug("key_to_keycode: overlay "); debug_dec(layer); debug(" is invalid.\n"); | ||
| 235 | return KC_TRANSPARENT; | 236 | return KC_TRANSPARENT; |
| 236 | } | 237 | } |
| 237 | } | 238 | } |
| @@ -240,8 +241,9 @@ uint8_t keymap_key_to_keycode(uint8_t layer, key_t key) | |||
| 240 | if (layer < KEYMAPS_SIZE) { | 241 | if (layer < KEYMAPS_SIZE) { |
| 241 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); | 242 | return pgm_read_byte(&keymaps[(layer)][(key.row)][(key.col)]); |
| 242 | } else { | 243 | } else { |
| 244 | // XXX: this may cuaes bootlaoder_jump incositent fail. | ||
| 245 | //debug("key_to_keycode: base "); debug_dec(layer); debug(" is invalid.\n"); | ||
| 243 | // fall back to layer 0 | 246 | // fall back to layer 0 |
| 244 | debug("key_to_keycode: base "); debug_dec(layer); debug(" is invalid.\n"); | ||
| 245 | return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]); | 247 | return pgm_read_byte(&keymaps[0][(key.row)][(key.col)]); |
| 246 | } | 248 | } |
| 247 | } | 249 | } |
