~ruther/qmk_firmware

b2a19328ad35f51dcc9cef7c4d2801acd143582a — tmk 12 years ago 74aea62
Changed Makefile and config.h for new options
M keyboard/gh60/config.h => keyboard/gh60/config.h +1 -0
@@ 73,6 73,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
//#define NO_ACTION_KEYMAP
//#define NO_ACTION_OVERLAY
//#define NO_ACTION_TAPPING
//#define NO_ACTION_ONESHOT
//#define NO_ACTION_MACRO
//#define NO_ACTION_FUNCTION


M keyboard/hhkb/Makefile.iwrap => keyboard/hhkb/Makefile.iwrap +4 -1
@@ 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

M keyboard/hhkb/Makefile.lufa => keyboard/hhkb/Makefile.lufa +1 -0
@@ 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



M keyboard/hhkb/Makefile.pjrc => keyboard/hhkb/Makefile.pjrc +6 -3
@@ 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

M keyboard/hhkb/Makefile.vusb => keyboard/hhkb/Makefile.vusb +4 -1
@@ 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

M keyboard/hhkb/config.h => keyboard/hhkb/config.h +18 -12
@@ 71,18 71,24 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
/* 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