marco/qmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix HHKB iWRAP build

Browse Source
This commit is contained in:
tmk 2012-10-17 14:25:08 +09:00
parent bbff8ae1c1
commit 8570c25379
3 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
keyboard/hhkb/Makefile.iwrap
View File

@ -13,7 +13,7 @@ TOP_DIR = ../..
TARGET_DIR = . TARGET_DIR = .
# keyboard dependent files # keyboard dependent files
SRC = main.c \ SRC = \
keymap.c \ keymap.c \
matrix.c \ matrix.c \
led.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 # 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 # type "make clean" after changing this, so all files will be rebuilt
MCU = atmega168p MCU = atmega328p
# avrdude doesn't know atmega168p # avrdude doesn't know atmega168p
AVRDUDE_MCU = atmega168 AVRDUDE_MCU = $(MCU)
# Processor frequency. # Processor frequency.
@ -84,10 +84,11 @@ PROGRAM_CMD = $(AVRDUDE) $(AVRDUDE_FLAGS) $(AVRDUDE_WRITE_FLASH) $(AVRDUDE_WRITE
# Search Path # Search Path
VPATH = $(TARGET_DIR) 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. # 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/vusb.mk
include $(TOP_DIR)/protocol.mk #include $(TOP_DIR)/protocol.mk
include $(TOP_DIR)/common.mk include $(TOP_DIR)/common.mk
include $(TOP_DIR)/rules.mk include $(TOP_DIR)/rules.mk

2
keyboard/hhkb/config_iwrap.h
View File

@ -33,7 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* key combination for command */ /* 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 */ /* mouse keys */
#ifdef MOUSEKEY_ENABLE #ifdef MOUSEKEY_ENABLE

10
protocol/iwrap.mk
View File

@ -1,9 +1,11 @@
IWRAP_DIR = protocol/iwrap
OPT_DEFS += -DHOST_IWRAP OPT_DEFS += -DHOST_IWRAP
SRC += iwrap.c \ SRC += $(IWRAP_DIR)/iwrap.c \
suart.S \ $(IWRAP_DIR)/suart.S \
sendchar_uart.c \ $(IWRAP_DIR)/sendchar_uart.c \
uart.c $(IWRAP_DIR)/uart.c
# Search Path # Search Path