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 38d88eecc4..64a080e1c2 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.2.3 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 --- keyboard/gh60/Makefile.lufa | 1 + 1 file changed, 1 insertion(+) (limited to 'keyboard') diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa index 8042ff3f49..f740dea848 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.2.3 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 --- keyboard/gh60/config.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'keyboard') diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h index 64a080e1c2..bb4277ae66 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.2.3 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 --- keyboard/gh60/config.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'keyboard') diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h index bb4277ae66..bf58076442 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.2.3 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 --- keyboard/gh60/config.h | 1 + 1 file changed, 1 insertion(+) (limited to 'keyboard') diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h index bf58076442..2e2387aa29 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.2.3 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 --- keyboard/gh60/config.h | 1 + 1 file changed, 1 insertion(+) (limited to 'keyboard') diff --git a/keyboard/gh60/config.h b/keyboard/gh60/config.h index 2e2387aa29..7da5c6bbff 100644 --- a/keyboard/gh60/config.h +++ b/keyboard/gh60/config.h @@ -61,6 +61,7 @@ along with this program. If not, see . /* disable print */ //#define NO_PRINT +#define NO_ACTION_KEYMAP #define NO_ACTION_OVERLAY #define NO_ACTION_TAPPING #define NO_ACTION_MACRO -- cgit v1.2.3 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 --- keyboard/gh60/Makefile.lufa | 4 ++-- keyboard/gh60/Makefile.pjrc | 3 ++- keyboard/gh60/config.h | 19 ++++++++++++++----- 3 files changed, 18 insertions(+), 8 deletions(-) (limited to 'keyboard') diff --git a/keyboard/gh60/Makefile.lufa b/keyboard/gh60/Makefile.lufa index f740dea848..f153bc311d 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 f03ca9416d..290f7cb877 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 7da5c6bbff..679ff36626 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.2.3 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 679ff36626..7fe28470dd 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 f87df0d2bb..8d7f4fc66e 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 2755c9004e..3e621c2b41 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 f8836a2ca1..f64cd9be4d 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 0e0e4a8cd6..4343b210d9 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 ef2958981c..e34d9a6ba1 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