Changed Makefile and config.h for new options

master
tmk 2013-03-21 15:34:36 +09:00
parent 74aea627e7
commit b2a19328ad
6 changed files with 34 additions and 17 deletions

View File

@ -73,6 +73,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_KEYMAP //#define NO_ACTION_KEYMAP
//#define NO_ACTION_OVERLAY //#define NO_ACTION_OVERLAY
//#define NO_ACTION_TAPPING //#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO //#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION //#define NO_ACTION_FUNCTION

View File

@ -44,8 +44,11 @@ F_CPU = 12000000
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control 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 #NKRO_ENABLE = yes # USB Nkey Rollover
@ -83,7 +86,7 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
# Search Path # Search Path
VPATH = $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TOP_DIR)
#include $(TOP_DIR)/protocol/iwrap.mk #include $(TOP_DIR)/protocol/iwrap.mk

View File

@ -104,6 +104,7 @@ BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control EXTRAKEY_ENABLE = yes # Audio control and System control
CONSOLE_ENABLE = yes # Console for debug CONSOLE_ENABLE = yes # Console for debug
COMMAND_ENABLE = yes # Commands for debug and configuration
#NKRO_ENABLE = yes # USB Nkey Rollover #NKRO_ENABLE = yes # USB Nkey Rollover

View File

@ -38,9 +38,12 @@ F_CPU = 16000000
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
#
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys MOUSEKEY_ENABLE = yes # Mouse keys
#PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support
EXTRAKEY_ENABLE = yes # Audio control and System control 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 NKRO_ENABLE = yes # USB Nkey Rollover
@ -51,8 +54,8 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex
# Search Path # Search Path
VPATH = $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH = $(TOP_DIR) VPATH += $(TOP_DIR)
include $(TOP_DIR)/protocol/pjrc.mk include $(TOP_DIR)/protocol/pjrc.mk
include $(TOP_DIR)/common.mk include $(TOP_DIR)/common.mk

View File

@ -44,8 +44,11 @@ F_CPU = 12000000
# Build Options # Build Options
# comment out to disable the options. # comment out to disable the options.
# #
BOOTMAGIC_ENABLE = yes # Virtual DIP switch configuration
MOUSEKEY_ENABLE = yes # Mouse keys MOUSEKEY_ENABLE = yes # Mouse keys
EXTRAKEY_ENABLE = yes # Audio control and System control 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 #NKRO_ENABLE = yes # USB Nkey Rollover
@ -83,7 +86,7 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
# Search Path # Search Path
VPATH = $(TARGET_DIR) VPATH += $(TARGET_DIR)
VPATH += $(TOP_DIR) VPATH += $(TOP_DIR)
include $(TOP_DIR)/protocol/vusb.mk include $(TOP_DIR)/protocol/vusb.mk

View File

@ -71,18 +71,24 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* tap count needed for toggling a feature */ /* tap count needed for toggling a feature */
#define TAPPING_TOGGLE 5 #define TAPPING_TOGGLE 5
/* PS/2 mouse */
#ifdef PS2_MOUSE_ENABLE
/* /*
# define PS2_CLOCK_PORT PORTF * Feature disable options
# define PS2_CLOCK_PIN PINF * These options are also useful to firmware size reduction.
# define PS2_CLOCK_DDR DDRF */
# define PS2_CLOCK_BIT 0
# define PS2_DATA_PORT PORTF /* disable debug print */
# define PS2_DATA_PIN PINF //#define NO_DEBUG
# define PS2_DATA_DDR DDRF
# define PS2_DATA_BIT 1 /* disable print */
*/ //#define NO_PRINT
#endif
/* 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 #endif