From: tmk <nobody@nowhere>
Date: Fri, 26 Oct 2012 18:07:37 +0000 (+0900)
Subject: Fix usage of debug flag
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;h=16a583d7fd057c3ebcb859db44f097fd8073ec49;p=max%2Ftmk_keyboard.git

Fix usage of debug flag
---

diff --git a/common/debug.h b/common/debug.h
index c12f2cb0..648f0e09 100644
--- a/common/debug.h
+++ b/common/debug.h
@@ -46,7 +46,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define debug_bin_reverse16(data) do { if (debug_enable) print_bin_reverse16(data); } while (0)
 #define debug_bin_reverse32(data) do { if (debug_enable) print_bin_reverse32(data); } while (0)
 
-#define debug_dec(data)           debug_dec(data)
 #define debug_hex(data)           debug_hex8(data)
 #define debug_bin(data)           debug_bin8(data)
 #define debug_bin_reverse(data)   debug_bin8(data)
diff --git a/common/keyboard.c b/common/keyboard.c
index bda7c062..fa22116f 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -544,7 +544,7 @@ static inline void process_key(keyevent_t event)
 
 void keyboard_init(void)
 {
-    debug_keyboard = true;
+    // TODO: to enable debug print magic key bind on boot time
 
     // TODO: configuration of sendchar impl
     print_sendchar_func = sendchar;
diff --git a/common/print.c b/common/print.c
index 6a8a725b..d8a899b4 100644
--- a/common/print.c
+++ b/common/print.c
@@ -31,7 +31,7 @@
 
 
 int8_t (*print_sendchar_func)(uint8_t) = 0;
-bool print_enable = false;
+bool print_enable = true;
 
 
 /* print string stored in data memory(SRAM)
diff --git a/protocol/iwrap/main.c b/protocol/iwrap/main.c
index c11ff7ab..05a67337 100644
--- a/protocol/iwrap/main.c
+++ b/protocol/iwrap/main.c
@@ -131,9 +131,6 @@ int main(void)
     //pullup_pins();
     //set_prr();
 
-    print_enable = true;
-    debug_enable = false;
-
 #ifdef HOST_VUSB
     disable_vusb();
 #endif
diff --git a/protocol/lufa/lufa.c b/protocol/lufa/lufa.c
index bff1f5e8..68f30dd1 100644
--- a/protocol/lufa/lufa.c
+++ b/protocol/lufa/lufa.c
@@ -461,19 +461,12 @@ int main(void)  __attribute__ ((weak));
 int main(void)
 {
     SetupHardware();
+    keyboard_init();
+    host_set_driver(&lufa_driver);
     sei();
 
-    print_enable = true;
-    debug_enable = true;
-    debug_matrix = true;
-    debug_keyboard = true;
-    debug_mouse = true;
-
     // TODO: can't print here
     debug("LUFA init\n");
-
-    keyboard_init();
-    host_set_driver(&lufa_driver);
     while (1) {
         keyboard_task();
 
diff --git a/protocol/pjrc/main.c b/protocol/pjrc/main.c
index e0f600fe..9f664bc4 100644
--- a/protocol/pjrc/main.c
+++ b/protocol/pjrc/main.c
@@ -57,33 +57,6 @@ int main(void)
     while (!usb_configured()) /* wait */ ;
 
     keyboard_init();
-    matrix_scan();
-    if (matrix_key_count() >= 3) {
-#ifdef DEBUG_LED
-        for (int i = 0; i < 6; i++) {
-            DEBUG_LED_CONFIG;
-            DEBUG_LED_ON;
-            _delay_ms(500);
-            DEBUG_LED_OFF;
-            _delay_ms(500);
-        }
-#else
-        _delay_ms(5000);
-#endif
-        print_enable = true;
-        debug_enable = true;
-        debug_matrix = true;
-        debug_keyboard = true;
-        debug_mouse = true;
-        print("debug enabled.\n");
-    }
-    if (matrix_key_count() >= 4) {
-        print("jump to bootloader...\n");
-        _delay_ms(1000);
-        bootloader_jump(); // not return
-    }
-
-
     host_set_driver(pjrc_driver());
     while (1) {
        keyboard_task(); 
diff --git a/protocol/vusb/main.c b/protocol/vusb/main.c
index e964a69a..8e4a266e 100644
--- a/protocol/vusb/main.c
+++ b/protocol/vusb/main.c
@@ -53,10 +53,6 @@ int main(void)
     uart_init(UART_BAUD_RATE);
 #endif
 
-    debug_enable = true;
-    print_enable = true;
-
-    debug("keyboard_init()\n");
     keyboard_init();
     host_set_driver(vusb_driver());