From d055e0633e36e97802d60554f6002e47021ba5fd Mon Sep 17 00:00:00 2001 From: tmk Date: Mon, 11 Mar 2013 15:10:56 +0900 Subject: Fix debug parameter setting in eeconfig --- common/keyboard.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'common/keyboard.c') diff --git a/common/keyboard.c b/common/keyboard.c index 0a0bacd43..1acb79861 100644 --- a/common/keyboard.c +++ b/common/keyboard.c @@ -66,13 +66,14 @@ void keyboard_init(void) bootmagic(); - 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(); } -- cgit v1.2.3