tmk
hace 11 años
Se han modificado 3 ficheros con 13 adiciones y 5 borrados
+ 6
- 2
common.mk
Ver fichero
| @@ -10,12 +10,16 @@ SRC += $(COMMON_DIR)/host.c \ | |||
| $(COMMON_DIR)/print.c \ | |||
| $(COMMON_DIR)/debug.c \ | |||
| $(COMMON_DIR)/bootloader.c \ | |||
| $(COMMON_DIR)/bootmagic.c \ | |||
| $(COMMON_DIR)/eeconfig.c \ | |||
| $(COMMON_DIR)/util.c | |||
| # Option modules | |||
| ifdef BOOTMAGIC_ENABLE | |||
| SRC += $(COMMON_DIR)/bootmagic.c | |||
| SRC += $(COMMON_DIR)/eeconfig.c | |||
| OPT_DEFS += -DBOOTMAGIC_ENABLE | |||
| endif | |||
| ifdef MOUSEKEY_ENABLE | |||
| SRC += $(COMMON_DIR)/mousekey.c | |||
| OPT_DEFS += -DMOUSEKEY_ENABLE | |||
+ 4
- 0
common/command.c
Ver fichero
| @@ -123,6 +123,7 @@ static void command_common_help(void) | |||
| print("Paus: jump to bootloader\n"); | |||
| } | |||
| #ifdef BOOTMAGIC_ENABLE | |||
| static void print_eeprom_config(void) | |||
| { | |||
| 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_backslash_backspace: "); print_hex8(kc.swap_backslash_backspace); print("\n"); | |||
| } | |||
| #endif | |||
| static bool command_common(uint8_t code) | |||
| { | |||
| static host_driver_t *host_driver = 0; | |||
| switch (code) { | |||
| #ifdef BOOTMAGIC_ENABLE | |||
| case KC_E: | |||
| print("eeprom config\n"); | |||
| print_eeprom_config(); | |||
| break; | |||
| #endif | |||
| case KC_CAPSLOCK: | |||
| if (host_get_driver()) { | |||
| host_driver = host_get_driver(); | |||
+ 3
- 3
common/keyboard.c
Ver fichero
| @@ -29,10 +29,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| #include "util.h" | |||
| #include "sendchar.h" | |||
| #include "bootmagic.h" | |||
| #ifdef MOUSEKEY_ENABLE | |||
| #include "mousekey.h" | |||
| #endif | |||
| #include "eeconfig.h" | |||
| #include "mousekey.h" | |||
| #ifdef MATRIX_HAS_GHOST | |||
| @@ -64,6 +62,7 @@ void keyboard_init(void) | |||
| ps2_mouse_init(); | |||
| #endif | |||
| #ifdef BOOTMAGIC_ENABLE | |||
| bootmagic(); | |||
| if (eeconfig_is_enabled()) { | |||
| @@ -77,6 +76,7 @@ void keyboard_init(void) | |||
| } else { | |||
| eeconfig_init(); | |||
| } | |||
| #endif | |||
| } | |||
| /* | |||