diff options
| author | tmk <nobody@nowhere> | 2013-02-11 13:56:05 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2013-02-11 14:14:44 +0900 |
| commit | b60f9c6ac6fa9f63cba7ffb6872095a8f0788e42 (patch) | |
| tree | afb7e6a962220c5cf0e60713489c9ae86251cfe4 /common/keyboard.c | |
| parent | 8c80deb775ac151001dc1592a2e94e8677b49964 (diff) | |
| download | qmk_firmware-b60f9c6ac6fa9f63cba7ffb6872095a8f0788e42.tar.gz qmk_firmware-b60f9c6ac6fa9f63cba7ffb6872095a8f0788e42.zip | |
Boot Magic key for gh60
Diffstat (limited to 'common/keyboard.c')
| -rw-r--r-- | common/keyboard.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/common/keyboard.c b/common/keyboard.c index 5e9945baf..2c88b3e43 100644 --- a/common/keyboard.c +++ b/common/keyboard.c | |||
| @@ -14,6 +14,8 @@ GNU General Public License for more details. | |||
| 14 | You should have received a copy of the GNU General Public License | 14 | You should have received a copy of the GNU General Public License |
| 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. | 15 | along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 16 | */ | 16 | */ |
| 17 | #include <stdint.h> | ||
| 18 | #include <util/delay.h> | ||
| 17 | #include "keyboard.h" | 19 | #include "keyboard.h" |
| 18 | #include "matrix.h" | 20 | #include "matrix.h" |
| 19 | #include "keymap.h" | 21 | #include "keymap.h" |
| @@ -40,8 +42,15 @@ void keyboard_init(void) | |||
| 40 | timer_init(); | 42 | timer_init(); |
| 41 | matrix_init(); | 43 | matrix_init(); |
| 42 | 44 | ||
| 43 | /* boot magic keys goes here */ | 45 | /* matrix scan for boot magic keys */ |
| 46 | #ifdef DEBOUNCE | ||
| 47 | uint8_t scan = DEBOUNCE * 2; | ||
| 48 | while (scan--) { matrix_scan(); _delay_ms(1); } | ||
| 49 | #else | ||
| 44 | matrix_scan(); | 50 | matrix_scan(); |
| 51 | #endif | ||
| 52 | |||
| 53 | /* boot magic keys */ | ||
| 45 | #ifdef IS_BOOTMAGIC_BOOTLOADER | 54 | #ifdef IS_BOOTMAGIC_BOOTLOADER |
| 46 | /* kick up bootloader */ | 55 | /* kick up bootloader */ |
| 47 | if (IS_BOOTMAGIC_BOOTLOADER()) bootloader_jump(); | 56 | if (IS_BOOTMAGIC_BOOTLOADER()) bootloader_jump(); |
