1
0

Add build option BOOTMAGIC_ENABLE

This commit is contained in:
tmk 2013-03-11 15:28:14 +09:00
parent f0ffb79683
commit 9c363dc9a3
3 changed files with 13 additions and 5 deletions

View File

@ -10,12 +10,16 @@ SRC += $(COMMON_DIR)/host.c \
$(COMMON_DIR)/print.c \ $(COMMON_DIR)/print.c \
$(COMMON_DIR)/debug.c \ $(COMMON_DIR)/debug.c \
$(COMMON_DIR)/bootloader.c \ $(COMMON_DIR)/bootloader.c \
$(COMMON_DIR)/bootmagic.c \
$(COMMON_DIR)/eeconfig.c \
$(COMMON_DIR)/util.c $(COMMON_DIR)/util.c
# Option modules # Option modules
ifdef BOOTMAGIC_ENABLE
SRC += $(COMMON_DIR)/bootmagic.c
SRC += $(COMMON_DIR)/eeconfig.c
OPT_DEFS += -DBOOTMAGIC_ENABLE
endif
ifdef MOUSEKEY_ENABLE ifdef MOUSEKEY_ENABLE
SRC += $(COMMON_DIR)/mousekey.c SRC += $(COMMON_DIR)/mousekey.c
OPT_DEFS += -DMOUSEKEY_ENABLE OPT_DEFS += -DMOUSEKEY_ENABLE

View File

@ -123,6 +123,7 @@ static void command_common_help(void)
print("Paus: jump to bootloader\n"); print("Paus: jump to bootloader\n");
} }
#ifdef BOOTMAGIC_ENABLE
static void print_eeprom_config(void) static void print_eeprom_config(void)
{ {
uint8_t eebyte; uint8_t eebyte;
@ -145,15 +146,18 @@ static void print_eeprom_config(void)
print("keyconf.swap_grave_esc: "); print_hex8(kc.swap_grave_esc); print("\n"); print("keyconf.swap_grave_esc: "); print_hex8(kc.swap_grave_esc); print("\n");
print("keyconf.swap_backslash_backspace: "); print_hex8(kc.swap_backslash_backspace); print("\n"); print("keyconf.swap_backslash_backspace: "); print_hex8(kc.swap_backslash_backspace); print("\n");
} }
#endif
static bool command_common(uint8_t code) static bool command_common(uint8_t code)
{ {
static host_driver_t *host_driver = 0; static host_driver_t *host_driver = 0;
switch (code) { switch (code) {
#ifdef BOOTMAGIC_ENABLE
case KC_E: case KC_E:
print("eeprom config\n"); print("eeprom config\n");
print_eeprom_config(); print_eeprom_config();
break; break;
#endif
case KC_CAPSLOCK: case KC_CAPSLOCK:
if (host_get_driver()) { if (host_get_driver()) {
host_driver = host_get_driver(); host_driver = host_get_driver();

View File

@ -29,10 +29,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include "util.h" #include "util.h"
#include "sendchar.h" #include "sendchar.h"
#include "bootmagic.h" #include "bootmagic.h"
#ifdef MOUSEKEY_ENABLE
#include "mousekey.h"
#endif
#include "eeconfig.h" #include "eeconfig.h"
#include "mousekey.h"
#ifdef MATRIX_HAS_GHOST #ifdef MATRIX_HAS_GHOST
@ -64,6 +62,7 @@ void keyboard_init(void)
ps2_mouse_init(); ps2_mouse_init();
#endif #endif
#ifdef BOOTMAGIC_ENABLE
bootmagic(); bootmagic();
if (eeconfig_is_enabled()) { if (eeconfig_is_enabled()) {
@ -77,6 +76,7 @@ void keyboard_init(void)
} else { } else {
eeconfig_init(); eeconfig_init();
} }
#endif
} }
/* /*