add build option USB_12KRO.

[max/tmk_keyboard.git] / tmk.c

diff --git a/tmk.c b/tmk.c
index 53da9aa8604ae37d7b433b2bc23754b4b4cf78b4..f7042bd6fbe2754267d8d48e0c41c72f4c7be1b1 100644 (file)
--- a/tmk.c
+++ b/tmk.c
@@ -36,6 +36,7 @@
 #include "util.h"
 #include "controller.h"
 #include "timer.h"
+#include "jump_bootloader.h"
 
 
 #define CPU_PRESCALE(n)    (CLKPR = 0x80, CLKPR = (n))
@@ -49,6 +50,9 @@ bool debug_mouse = false;
 
 int main(void)
 {
+    DEBUG_LED_CONFIG;
+    DEBUG_LED_OFF;
+
     // set for 16 MHz clock
     CPU_PRESCALE(0);
 
@@ -62,14 +66,8 @@ int main(void)
 
     matrix_init();
     matrix_scan();
-    // debug on by pressing down any 4 or more keys during boot time.
+    // bootloader comes up when any 4 or more keys are pressed at startup
     if (matrix_key_count() >= 4) {
-        print_enable = true;
-        debug_enable = true;
-    }
-
-    /* wait for debug pipe ready */
-    if (print_enable) {
 #ifdef DEBUG_LED
         for (int i = 0; i < 6; i++) {
             DEBUG_LED_CONFIG;
@@ -79,11 +77,13 @@ int main(void)
             _delay_ms(500);
         }
 #else
-            _delay_ms(6000);
+        _delay_ms(5000);
 #endif
+        print_enable = true;
+        print("jump to bootloader...\n");
+        _delay_ms(1000);
+        jump_bootloader(); // not return
     }
-    // print description
-    print(STR(DESCRIPTION) "\n");
 
     while (1) {
        proc_matrix();