X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=common%2Fkeyboard.c;h=42c57ac96fad956d8ed323afb2f10443538ab14e;hb=0142e20bf0012eada5ba40caaa63466bfbb095a2;hp=2206f16759353743c44fa513f77571843afffb8b;hpb=359b68d35f0763ab0cafa2fb800e0a3497291f95;p=max%2Ftmk_keyboard.git

diff --git a/common/keyboard.c b/common/keyboard.c
index 2206f167..42c57ac9 100644
--- a/common/keyboard.c
+++ b/common/keyboard.c
@@ -28,11 +28,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "command.h"
 #include "util.h"
 #include "sendchar.h"
-#include "bootloader.h"
-#ifdef MOUSEKEY_ENABLE
-#include "mousekey.h"
-#endif
+#include "bootmagic.h"
 #include "eeconfig.h"
+#include "mousekey.h"
 
 
 #ifdef MATRIX_HAS_GHOST
@@ -64,39 +62,21 @@ void keyboard_init(void)
     ps2_mouse_init();
 #endif
 
-    /* matrix scan for boot magic keys */
-#ifdef DEBOUNCE
-    uint8_t scan = DEBOUNCE * 2;
-    while (scan--) { matrix_scan(); _delay_ms(1); }
-#else
-    matrix_scan();
-#endif
+#ifdef BOOTMAGIC_ENABLE
+    bootmagic();
 
-    /* boot magic keys */
-#ifdef IS_BOOTMAGIC_BOOTLOADER
-    /* kick up bootloader */
-    if (IS_BOOTMAGIC_BOOTLOADER()) bootloader_jump();
-#endif
-#ifdef IS_BOOTMAGIC_DEBUG
-    if (IS_BOOTMAGIC_DEBUG()) {
-        eeconfig_write_debug(eeconfig_read_debug() ^ EECONFIG_DEBUG_ENABLE);
-    }
-#endif
-#ifdef IS_BOOTMAGIC_EEPROM_CLEAR
-    if (IS_BOOTMAGIC_EEPROM_CLEAR()) eeconfig_init();
-#endif
-
-    if (eeconfig_initialized()) {
+    if (eeconfig_is_enabled()) {
         uint8_t config;
         config = eeconfig_read_debug();
-        debug_enable = (config & EECONFIG_DEBUG_ENABLE);
-        debug_matrix = (config & EECONFIG_DEBUG_MATRIX);
-        debug_keyboard = (config & EECONFIG_DEBUG_KEYBOARD);
-        debug_mouse = (config & EECONFIG_DEBUG_MOUSE);
+        // ignored if debug is enabled by program before.
+        if (!debug_enable)   debug_enable   = (config & EECONFIG_DEBUG_ENABLE);
+        if (!debug_matrix)   debug_matrix   = (config & EECONFIG_DEBUG_MATRIX);
+        if (!debug_keyboard) debug_keyboard = (config & EECONFIG_DEBUG_KEYBOARD);
+        if (!debug_mouse)    debug_mouse    = (config & EECONFIG_DEBUG_MOUSE);
     } else {
         eeconfig_init();
     }
-
+#endif
 }
 
 /*
@@ -154,5 +134,6 @@ MATRIX_LOOP_END:
 
 void keyboard_set_leds(uint8_t leds)
 {
+    if (debug_keyboard) { debug("keyboard_set_led: "); debug_hex8(leds); debug("\n"); }
     led_set(leds);
 }