From 9a106537f64fe61af6048b41262f002ce6a716d9 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 19 Mar 2013 14:08:40 +0900 Subject: Add NO_PRINT and NO_DEBUG config options. - NO_PRINT: disable print.h API(also disable debug.h) - NO_DEBUG: disable debug.h API --- keyboard/gh60/config.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'keyboard') diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h index 38d88eecc..64a080e1c 100644 --- a/keyboard/gh60/config.h +++ b/keyboard/gh60/config.h @@ -56,5 +56,10 @@ along with this program. If not, see . */ #define BOOTLOADER_SIZE 4096 +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT #endif -- cgit v1.3.1 From 16870412679225d1a3b46c78928757deb713ae08 Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 19 Mar 2013 16:05:53 +0900 Subject: Add COMMAND_ENABLE build option --- common.mk | 6 +++++- common/command.h | 4 ++++ keyboard/gh60/Makefile.lufa | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) (limited to 'keyboard') diff --git a/common.mk b/common.mk index 2ce4e32da..e4c9fb269 100644 --- a/common.mk +++ b/common.mk @@ -5,7 +5,6 @@ SRC += $(COMMON_DIR)/host.c \ $(COMMON_DIR)/action_macro.c \ $(COMMON_DIR)/layer_switch.c \ $(COMMON_DIR)/keymap.c \ - $(COMMON_DIR)/command.c \ $(COMMON_DIR)/timer.c \ $(COMMON_DIR)/print.c \ $(COMMON_DIR)/debug.c \ @@ -36,6 +35,11 @@ else OPT_DEFS += -DNO_DEBUG endif +ifdef COMMAND_ENABLE + SRC += $(COMMON_DIR)/command.c + OPT_DEFS += -DCOMMAND_ENABLE +endif + ifdef NKRO_ENABLE OPT_DEFS += -DNKRO_ENABLE endif diff --git a/common/command.h b/common/command.h index dafd4d0f3..be739fafe 100644 --- a/common/command.h +++ b/common/command.h @@ -18,8 +18,12 @@ along with this program. If not, see . #ifndef COMMAND_H #define COMMAND +#ifdef COMMAND_ENABLE bool command_proc(uint8_t code); /* This allows to extend commands. Return 0 when command is not processed. */ bool command_extra(uint8_t code); +#else +#define command_proc(code) false +#endif #endif diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa index 8042ff3f4..f740dea84 100644 --- a/keyboard/gh60/Makefile.lufa +++ b/keyboard/gh60/Makefile.lufa @@ -103,6 +103,7 @@ BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = yes # Console for debug(+400) +COMMAND_ENABLE = yes # Magic command SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend #NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support -- cgit v1.3.1 From b057511f45de020c43021f2991569a53c2b929c9 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 20 Mar 2013 00:26:01 +0900 Subject: Add NO_ACTION_OVERLAY config option --- common/action.c | 2 ++ common/layer_switch.c | 4 ++++ common/layer_switch.h | 15 +++++++++++++++ keyboard/gh60/config.h | 3 ++- 4 files changed, 23 insertions(+), 1 deletion(-) (limited to 'keyboard') diff --git a/common/action.c b/common/action.c index 4fafbfa79..1b84d1e88 100644 --- a/common/action.c +++ b/common/action.c @@ -517,6 +517,7 @@ static void process_action(keyrecord_t *record) } break; +#ifndef NO_ACTION_OVERLAY case ACT_OVERLAY: switch (action.layer.code) { // Overlay Invert bit4 @@ -670,6 +671,7 @@ static void process_action(keyrecord_t *record) break; } break; +#endif /* Extentions */ case ACT_MACRO: diff --git a/common/layer_switch.c b/common/layer_switch.c index 19e286f88..815d1e5f2 100644 --- a/common/layer_switch.c +++ b/common/layer_switch.c @@ -98,6 +98,7 @@ void keymap_debug(void) +#ifndef NO_ACTION_OVERLAY /* * Overlay Layer (16-31 = 0-15|0x10) */ @@ -169,12 +170,14 @@ void overlay_debug(void) { debug_hex16(overlay_stat); debug("("); debug_dec(overlay_get_layer()); debug(")"); } +#endif action_t layer_switch_get_action(key_t key) { action_t action; action.code = ACTION_TRANSPARENT; +#ifndef NO_ACTION_OVERLAY /* overlay: top layer first */ for (int8_t i = 15; i >= 0; i--) { if (overlay_stat & (1<= 0; i--) { diff --git a/common/layer_switch.h b/common/layer_switch.h index a566ab12b..5de6cb01c 100644 --- a/common/layer_switch.h +++ b/common/layer_switch.h @@ -57,6 +57,7 @@ void keymap_debug(void); /* * Overlay Layer */ +#ifndef NO_ACTION_OVERLAY extern uint16_t overlay_stat; /* return current active layer */ uint8_t overlay_get_layer(void); @@ -71,6 +72,20 @@ void overlay_or(uint16_t stat); void overlay_and(uint16_t stat); void overlay_xor(uint16_t stat); void overlay_debug(void); +#else +#define overlay_stat 0 +#define overlay_get_layer() +#define overlay_clear() +#define overlay_set(stat) +#define overlay_move(layer) +#define overlay_on(layer) +#define overlay_off(layer) +#define overlay_invert(layer) +#define overlay_or(stat) +#define overlay_and(stat) +#define overlay_xor(stat) +#define overlay_debug() +#endif diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h index 64a080e1c..bb4277ae6 100644 --- a/keyboard/gh60/config.h +++ b/keyboard/gh60/config.h @@ -58,8 +58,9 @@ along with this program. If not, see . /* disable debug print */ //#define NO_DEBUG - /* disable print */ //#define NO_PRINT +#define NO_ACTION_OVERLAY + #endif -- cgit v1.3.1 From 9757f960f9f50841df6651a1a52f63eb9aae242b Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 20 Mar 2013 00:28:13 +0900 Subject: Add NO_ACTION_TAPPING and NO_ACTION_MACRO config options --- common/action.c | 33 +++++++++++++++++++++++++++------ common/action_macro.c | 3 +++ common/action_macro.h | 4 ++++ keyboard/gh60/config.h | 2 ++ 4 files changed, 36 insertions(+), 6 deletions(-) (limited to 'keyboard') diff --git a/common/action.c b/common/action.c index 1b84d1e88..eda3a6d32 100644 --- a/common/action.c +++ b/common/action.c @@ -30,14 +30,18 @@ along with this program. If not, see . static void process_action(keyrecord_t *record); +#ifndef NO_ACTION_TAPPING static bool process_tapping(keyrecord_t *record); static void waiting_buffer_scan_tap(void); +#endif static void debug_event(keyevent_t event); static void debug_record(keyrecord_t record); static void debug_action(action_t action); +#ifndef NO_ACTION_TAPPING static void debug_tapping_key(void); static void debug_waiting_buffer(void); +#endif /* @@ -53,6 +57,7 @@ static void debug_waiting_buffer(void); #define TAPPING_TOGGLE 5 #endif +#ifndef NO_ACTION_TAPPING /* stores a key event of current tap. */ static keyrecord_t tapping_key = {}; @@ -158,7 +163,7 @@ static void oneshot_toggle(void) { oneshot_state.disabled = !oneshot_state.disabled; } - +#endif void action_exec(keyevent_t event) @@ -170,6 +175,7 @@ void action_exec(keyevent_t event) keyrecord_t record = { .event = event }; +#ifndef NO_ACTION_TAPPING // pre-process on tapping if (process_tapping(&record)) { if (!IS_NOEVENT(record.event)) { @@ -202,6 +208,12 @@ void action_exec(keyevent_t event) if (!IS_NOEVENT(event)) { debug("\n"); } +#else + process_action(&record); + if (!IS_NOEVENT(record.event)) { + debug("processed: "); debug_record(record); debug("\n"); + } +#endif } static void process_action(keyrecord_t *record) @@ -244,6 +256,7 @@ static void process_action(keyrecord_t *record) } } break; +#ifndef NO_ACTION_TAPPING case ACT_LMODS_TAP: case ACT_RMODS_TAP: { @@ -319,10 +332,11 @@ static void process_action(keyrecord_t *record) } } break; +#endif +#ifdef EXTRAKEY_ENABLE /* other HID usage */ case ACT_USAGE: -#ifdef EXTRAKEY_ENABLE switch (action.usage.page) { case PAGE_SYSTEM: if (event.pressed) { @@ -339,12 +353,12 @@ static void process_action(keyrecord_t *record) } break; } -#endif break; +#endif +#ifdef MOUSEKEY_ENABLE /* Mouse key */ case ACT_MOUSEKEY: -#ifdef MOUSEKEY_ENABLE if (event.pressed) { mousekey_on(action.key.code); mousekey_send(); @@ -352,8 +366,8 @@ static void process_action(keyrecord_t *record) mousekey_off(action.key.code); mousekey_send(); } -#endif break; +#endif case ACT_KEYMAP: switch (action.layer.code) { @@ -687,6 +701,7 @@ static void process_action(keyrecord_t *record) } } +#ifndef NO_ACTION_TAPPING /* Tapping * * Rule: Tap key is typed(pressed and released) within TAPPING_TERM. @@ -881,6 +896,7 @@ static void waiting_buffer_scan_tap(void) } } } +#endif @@ -908,6 +924,7 @@ void register_code(uint8_t code) // TODO: should push command_proc out of this block? if (command_proc(code)) return; +#ifndef NO_ACTION_TAPPING if (oneshot_state.mods && oneshot_state.ready && !oneshot_state.disabled) { uint8_t tmp_mods = host_get_mods(); host_add_mods(oneshot_state.mods); @@ -916,7 +933,9 @@ void register_code(uint8_t code) host_set_mods(tmp_mods); oneshot_state.ready = false; - } else { + } else +#endif + { host_add_key(code); host_send_keyboard_report(); } @@ -1064,6 +1083,7 @@ static void debug_action(action_t action) debug_hex8(action.kind.param & 0xff); debug("]"); } +#ifndef NO_ACTION_TAPPING static void debug_tapping_key(void) { debug("TAPPING_KEY="); debug_record(tapping_key); debug("\n"); @@ -1076,3 +1096,4 @@ static void debug_waiting_buffer(void) } debug("}\n"); } +#endif diff --git a/common/action_macro.c b/common/action_macro.c index ca7ffa822..6d81a1efb 100644 --- a/common/action_macro.c +++ b/common/action_macro.c @@ -20,6 +20,8 @@ along with this program. If not, see . #include "action_macro.h" +#ifndef NO_ACTION_MACRO + #define MACRO_READ() (macro = pgm_read_byte(macro_p++)) void action_macro_play(const prog_macro_t *macro_p) { @@ -64,3 +66,4 @@ void action_macro_play(const prog_macro_t *macro_p) { uint8_t ms = interval; while (ms--) _delay_ms(1); } } } +#endif diff --git a/common/action_macro.h b/common/action_macro.h index db6577959..ee5c7c426 100644 --- a/common/action_macro.h +++ b/common/action_macro.h @@ -28,7 +28,11 @@ typedef uint8_t macro_t; typedef macro_t prog_macro_t PROGMEM; +#ifndef NO_ACTION_MACRO void action_macro_play(const prog_macro_t *macro); +#else +#define action_macro_play(macro) +#endif diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h index bb4277ae6..bf5807644 100644 --- a/keyboard/gh60/config.h +++ b/keyboard/gh60/config.h @@ -62,5 +62,7 @@ along with this program. If not, see . //#define NO_PRINT #define NO_ACTION_OVERLAY +#define NO_ACTION_TAPPING +#define NO_ACTION_MACRO #endif -- cgit v1.3.1 From ecb7550a91a7fb9a2e7e717f3c0d40d30fd92121 Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 20 Mar 2013 00:37:32 +0900 Subject: Add NO_ACTION_FUNCTION config option --- common/action.c | 4 ++++ keyboard/gh60/config.h | 1 + 2 files changed, 5 insertions(+) (limited to 'keyboard') diff --git a/common/action.c b/common/action.c index eda3a6d32..51b11d1bc 100644 --- a/common/action.c +++ b/common/action.c @@ -688,14 +688,18 @@ static void process_action(keyrecord_t *record) #endif /* Extentions */ +#ifndef NO_ACTION_MACRO case ACT_MACRO: action_macro_play(action_get_macro(record, action.func.id, action.func.opt)); break; +#endif case ACT_COMMAND: break; +#ifndef NO_ACTION_FUNCTION case ACT_FUNCTION: action_function(record, action.func.id, action.func.opt); break; +#endif default: break; } diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h index bf5807644..2e2387aa2 100644 --- a/keyboard/gh60/config.h +++ b/keyboard/gh60/config.h @@ -64,5 +64,6 @@ along with this program. If not, see . #define NO_ACTION_OVERLAY #define NO_ACTION_TAPPING #define NO_ACTION_MACRO +#define NO_ACTION_FUNCTION #endif -- cgit v1.3.1 From dbcac865b9faef2286ca2b0195ea08cf550d83ae Mon Sep 17 00:00:00 2001 From: tmk Date: Wed, 20 Mar 2013 00:56:54 +0900 Subject: Add NO_ACTION_KEYMAP config option --- common/action.c | 2 ++ common/layer_switch.c | 4 ++++ common/layer_switch.h | 15 +++++++++++++++ keyboard/gh60/config.h | 1 + 4 files changed, 22 insertions(+) (limited to 'keyboard') diff --git a/common/action.c b/common/action.c index 51b11d1bc..3d81318a9 100644 --- a/common/action.c +++ b/common/action.c @@ -369,6 +369,7 @@ static void process_action(keyrecord_t *record) break; #endif +#ifndef NO_ACTION_KEYMAP case ACT_KEYMAP: switch (action.layer.code) { /* Keymap clear */ @@ -530,6 +531,7 @@ static void process_action(keyrecord_t *record) break; } break; +#endif #ifndef NO_ACTION_OVERLAY case ACT_OVERLAY: diff --git a/common/layer_switch.c b/common/layer_switch.c index 815d1e5f2..a5d426a89 100644 --- a/common/layer_switch.c +++ b/common/layer_switch.c @@ -24,6 +24,7 @@ void default_layer_set(uint8_t layer) } +#ifndef NO_ACTION_KEYMAP /* * Keymap Layer (0-15) */ @@ -95,6 +96,7 @@ void keymap_debug(void) { debug_hex16(keymap_stat); debug("("); debug_dec(keymap_get_layer()); debug(")"); } +#endif @@ -189,6 +191,7 @@ action_t layer_switch_get_action(key_t key) } #endif +#ifndef NO_ACTION_KEYMAP /* keymap: top layer first */ for (int8_t i = 15; i >= 0; i--) { if (keymap_stat & (1<. /* disable print */ //#define NO_PRINT +#define NO_ACTION_KEYMAP #define NO_ACTION_OVERLAY #define NO_ACTION_TAPPING #define NO_ACTION_MACRO -- cgit v1.3.1 From 9a3edb897ab8549bae089645c0d7f27df8fa15b7 Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 21 Mar 2013 01:36:59 +0900 Subject: Fix Makefile and config.h of gh60 for new options --- README.md | 1 + keyboard/gh60/Makefile.lufa | 4 ++-- keyboard/gh60/Makefile.pjrc | 3 ++- keyboard/gh60/config.h | 19 ++++++++++++++----- 4 files changed, 19 insertions(+), 8 deletions(-) (limited to 'keyboard') diff --git a/README.md b/README.md index e0b837df4..3b700970f 100644 --- a/README.md +++ b/README.md @@ -171,6 +171,7 @@ Note that ***comment out*** to disable them. MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = yes # Console for debug(+400) + COMMAND_ENABLE = yes # Commands for debug and configuration SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend #NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa index f740dea84..f153bc311 100644 --- a/keyboard/gh60/Makefile.lufa +++ b/keyboard/gh60/Makefile.lufa @@ -103,14 +103,14 @@ BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) MOUSEKEY_ENABLE = yes # Mouse keys(+4700) EXTRAKEY_ENABLE = yes # Audio control and System control(+450) CONSOLE_ENABLE = yes # Console for debug(+400) -COMMAND_ENABLE = yes # Magic command +COMMAND_ENABLE = yes # Commands for debug and configuration SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend #NKRO_ENABLE = yes # USB Nkey Rollover - not yet supported in LUFA #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support # Optimize size but this may cause error "relocation truncated to fit" -EXTRALDFLAGS = -Wl,--relax +#EXTRALDFLAGS = -Wl,--relax # Search Path VPATH += $(TARGET_DIR) diff --git a/keyboard/gh60/Makefile.pjrc b/keyboard/gh60/Makefile.pjrc index f03ca9416..290f7cb87 100644 --- a/keyboard/gh60/Makefile.pjrc +++ b/keyboard/gh60/Makefile.pjrc @@ -80,8 +80,9 @@ OPT_DEFS += -DBOOT_SIZE=4096 BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration(+1000) MOUSEKEY_ENABLE = yes # Mouse keys(+5000) EXTRAKEY_ENABLE = yes # Audio control and System control(+600) -NKRO_ENABLE = yes # USB Nkey Rollover(+500) CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = yes # USB Nkey Rollover(+500) #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h index 7da5c6bbf..679ff3662 100644 --- a/keyboard/gh60/config.h +++ b/keyboard/gh60/config.h @@ -56,15 +56,24 @@ along with this program. If not, see . */ #define BOOTLOADER_SIZE 4096 + + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + /* disable debug print */ //#define NO_DEBUG + /* disable print */ //#define NO_PRINT -#define NO_ACTION_KEYMAP -#define NO_ACTION_OVERLAY -#define NO_ACTION_TAPPING -#define NO_ACTION_MACRO -#define NO_ACTION_FUNCTION +/* disable action features */ +//#define NO_ACTION_KEYMAP +//#define NO_ACTION_OVERLAY +//#define NO_ACTION_TAPPING +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION #endif -- cgit v1.3.1 From b2a19328ad35f51dcc9cef7c4d2801acd143582a Mon Sep 17 00:00:00 2001 From: tmk Date: Thu, 21 Mar 2013 15:34:36 +0900 Subject: Changed Makefile and config.h for new options --- keyboard/gh60/config.h | 1 + keyboard/hhkb/Makefile.iwrap | 5 ++++- keyboard/hhkb/Makefile.lufa | 1 + keyboard/hhkb/Makefile.pjrc | 9 ++++++--- keyboard/hhkb/Makefile.vusb | 5 ++++- keyboard/hhkb/config.h | 30 ++++++++++++++++++------------ 6 files changed, 34 insertions(+), 17 deletions(-) (limited to 'keyboard') diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h index 679ff3662..7fe28470d 100644 --- a/keyboard/gh60/config.h +++ b/keyboard/gh60/config.h @@ -73,6 +73,7 @@ along with this program. If not, see . //#define NO_ACTION_KEYMAP //#define NO_ACTION_OVERLAY //#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT //#define NO_ACTION_MACRO //#define NO_ACTION_FUNCTION diff --git a/keyboard/hhkb/Makefile.iwrap b/keyboard/hhkb/Makefile.iwrap index f87df0d2b..8d7f4fc66 100644 --- a/keyboard/hhkb/Makefile.iwrap +++ b/keyboard/hhkb/Makefile.iwrap @@ -44,8 +44,11 @@ F_CPU = 12000000 # Build Options # comment out to disable the options. # +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration #NKRO_ENABLE = yes # USB Nkey Rollover @@ -83,7 +86,7 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE # Search Path -VPATH = $(TARGET_DIR) +VPATH += $(TARGET_DIR) VPATH += $(TOP_DIR) #include $(TOP_DIR)/protocol/iwrap.mk diff --git a/keyboard/hhkb/Makefile.lufa b/keyboard/hhkb/Makefile.lufa index 2755c9004..3e621c2b4 100644 --- a/keyboard/hhkb/Makefile.lufa +++ b/keyboard/hhkb/Makefile.lufa @@ -104,6 +104,7 @@ BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration #NKRO_ENABLE = yes # USB Nkey Rollover diff --git a/keyboard/hhkb/Makefile.pjrc b/keyboard/hhkb/Makefile.pjrc index f8836a2ca..f64cd9be4 100644 --- a/keyboard/hhkb/Makefile.pjrc +++ b/keyboard/hhkb/Makefile.pjrc @@ -38,9 +38,12 @@ F_CPU = 16000000 # Build Options # comment out to disable the options. +# +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys -#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration NKRO_ENABLE = yes # USB Nkey Rollover @@ -51,8 +54,8 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex # Search Path -VPATH = $(TARGET_DIR) -VPATH = $(TOP_DIR) +VPATH += $(TARGET_DIR) +VPATH += $(TOP_DIR) include $(TOP_DIR)/protocol/pjrc.mk include $(TOP_DIR)/common.mk diff --git a/keyboard/hhkb/Makefile.vusb b/keyboard/hhkb/Makefile.vusb index 0e0e4a8cd..4343b210d 100644 --- a/keyboard/hhkb/Makefile.vusb +++ b/keyboard/hhkb/Makefile.vusb @@ -44,8 +44,11 @@ F_CPU = 12000000 # Build Options # comment out to disable the options. # +BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration MOUSEKEY_ENABLE = yes # Mouse keys EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration #NKRO_ENABLE = yes # USB Nkey Rollover @@ -83,7 +86,7 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE # Search Path -VPATH = $(TARGET_DIR) +VPATH += $(TARGET_DIR) VPATH += $(TOP_DIR) include $(TOP_DIR)/protocol/vusb.mk diff --git a/keyboard/hhkb/config.h b/keyboard/hhkb/config.h index ef2958981..e34d9a6ba 100644 --- a/keyboard/hhkb/config.h +++ b/keyboard/hhkb/config.h @@ -71,18 +71,24 @@ along with this program. If not, see . /* tap count needed for toggling a feature */ #define TAPPING_TOGGLE 5 -/* PS/2 mouse */ -#ifdef PS2_MOUSE_ENABLE + /* -# define PS2_CLOCK_PORT PORTF -# define PS2_CLOCK_PIN PINF -# define PS2_CLOCK_DDR DDRF -# define PS2_CLOCK_BIT 0 -# define PS2_DATA_PORT PORTF -# define PS2_DATA_PIN PINF -# define PS2_DATA_DDR DDRF -# define PS2_DATA_BIT 1 -*/ -#endif + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_KEYMAP +//#define NO_ACTION_OVERLAY +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT +//#define NO_ACTION_MACRO +//#define NO_ACTION_FUNCTION #endif -- cgit v1.3.1