X-Git-Url: https://git.friedersdorff.com/?a=blobdiff_plain;f=keyboard%2Fhhkb%2FMakefile.iwrap;h=2d9d82c48115840eb7a90894f32369eacbcd07ba;hb=363950982a291c3bfa03ac6362061b1d37dc06b0;hp=3ec1a31645ca9fa863d13b0fc901a0720faf90bc;hpb=f55c677ba46a8243f077195ef4f39cde1babf560;p=max%2Ftmk_keyboard.git

diff --git a/keyboard/hhkb/Makefile.iwrap b/keyboard/hhkb/Makefile.iwrap
index 3ec1a316..2d9d82c4 100644
--- a/keyboard/hhkb/Makefile.iwrap
+++ b/keyboard/hhkb/Makefile.iwrap
@@ -29,8 +29,6 @@ OPT_DEFS = -DDEBUG_LEVEL=0
 # MCU name, you MUST set this to match the board you are using
 # type "make clean" after changing this, so all files will be rebuilt
 MCU = atmega328p
-# avrdude doesn't know atmega168p
-AVRDUDE_MCU = $(MCU)
 
 
 # Processor frequency.
@@ -41,23 +39,26 @@ AVRDUDE_MCU = $(MCU)
 F_CPU = 12000000
 
 
+# Boot Section Size in *bytes*
+#   Teensy halfKay   512
+#   Teensy++ halfKay 1024
+#   Atmel DFU loader 4096
+#   LUFA bootloader  4096
+#   USBaspLoader     2048
+OPT_DEFS += -DBOOTLOADER_SIZE=2048
+
+
 # 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
 
 
-# Boot Section Size in *BYTEs*
-#   Teensy   halfKay    512
-#   Teensy++ halfKay    1024
-#   Atmel DFU loader    4096
-#   LUFA bootloader     4096
-#   USBaspLoader        2048
-OPT_DEFS += -DBOOT_SIZE=2048
-
-
 
 #---------------- Programming Options --------------------------
 AVRDUDE = avrdude
@@ -81,8 +82,8 @@ AVRDUDE_WRITE_FLASH = -U flash:w:$(TARGET).hex
 # to submit bug reports.
 #AVRDUDE_VERBOSE = -v -v
 
-#AVRDUDE_FLAGS = -p $(AVRDUDE_MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
-AVRDUDE_FLAGS = -p $(AVRDUDE_MCU) -c $(AVRDUDE_PROGRAMMER)
+#AVRDUDE_FLAGS = -p $(MCU) -P $(AVRDUDE_PORT) -c $(AVRDUDE_PROGRAMMER)
+AVRDUDE_FLAGS = -p $(MCU) -c $(AVRDUDE_PROGRAMMER)
 AVRDUDE_FLAGS += $(AVRDUDE_NO_VERIFY)
 AVRDUDE_FLAGS += $(AVRDUDE_VERBOSE)
 AVRDUDE_FLAGS += $(AVRDUDE_ERASE_COUNTER)
@@ -92,12 +93,11 @@ 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
-# To be swatchable btween Bluetooth and USB. Comment out if you don't need USB.
-include $(TOP_DIR)/protocol/vusb.mk
-#include $(TOP_DIR)/protocol.mk
+include $(TOP_DIR)/protocol/iwrap.mk
+# TODO: to be selectable: V-USB, LUFA or PJRC
+#include $(TOP_DIR)/protocol/vusb.mk
 include $(TOP_DIR)/common.mk
 include $(TOP_DIR)/rules.mk