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.2.3-24-g4f1b