diff options
| author | tmk <nobody@nowhere> | 2012-10-17 14:25:08 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2012-10-17 15:55:38 +0900 |
| commit | 8570c25379e168874fb4cdc7ee0590829a0f0d2c (patch) | |
| tree | 8633b65fffc14d763cd630e95ecbbe38162f64d6 | |
| parent | bbff8ae1c1e78f719aaec47b844c1511cfdcb774 (diff) | |
| download | qmk_firmware-8570c25379e168874fb4cdc7ee0590829a0f0d2c.tar.gz qmk_firmware-8570c25379e168874fb4cdc7ee0590829a0f0d2c.zip | |
Fix HHKB iWRAP build
| -rw-r--r-- | keyboard/hhkb/Makefile.iwrap | 11 | ||||
| -rw-r--r-- | keyboard/hhkb/config_iwrap.h | 2 | ||||
| -rw-r--r-- | protocol/iwrap.mk | 10 |
3 files changed, 13 insertions, 10 deletions
diff --git a/keyboard/hhkb/Makefile.iwrap b/keyboard/hhkb/Makefile.iwrap index ef7ad2eac2..f87df0d2bb 100644 --- a/keyboard/hhkb/Makefile.iwrap +++ b/keyboard/hhkb/Makefile.iwrap @@ -13,7 +13,7 @@ TOP_DIR = ../.. TARGET_DIR = . # keyboard dependent files -SRC = main.c \ +SRC = \ keymap.c \ matrix.c \ led.c @@ -28,9 +28,9 @@ 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 = atmega168p +MCU = atmega328p # avrdude doesn't know atmega168p -AVRDUDE_MCU = atmega168 +AVRDUDE_MCU = $(MCU) # Processor frequency. @@ -84,10 +84,11 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE # Search Path VPATH = $(TARGET_DIR) +VPATH += $(TOP_DIR) -include $(TOP_DIR)/protocol/iwrap.mk +#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.mk include $(TOP_DIR)/common.mk include $(TOP_DIR)/rules.mk diff --git a/keyboard/hhkb/config_iwrap.h b/keyboard/hhkb/config_iwrap.h index 80ab64398b..734d669774 100644 --- a/keyboard/hhkb/config_iwrap.h +++ b/keyboard/hhkb/config_iwrap.h @@ -33,7 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. /* key combination for command */ -#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_RSHIFT))) +#define IS_COMMAND() (keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT))) /* mouse keys */ #ifdef MOUSEKEY_ENABLE diff --git a/protocol/iwrap.mk b/protocol/iwrap.mk index d9906fd1b4..9c83075a4a 100644 --- a/protocol/iwrap.mk +++ b/protocol/iwrap.mk @@ -1,9 +1,11 @@ +IWRAP_DIR = protocol/iwrap + OPT_DEFS += -DHOST_IWRAP -SRC += iwrap.c \ - suart.S \ - sendchar_uart.c \ - uart.c +SRC += $(IWRAP_DIR)/iwrap.c \ + $(IWRAP_DIR)/suart.S \ + $(IWRAP_DIR)/sendchar_uart.c \ + $(IWRAP_DIR)/uart.c # Search Path |