Browse Source

Fix HHKB iWRAP build

tags/v1.9
tmk 11 years ago
parent
commit
8570c25379
3 changed files with 13 additions and 10 deletions
  1. 6
    5
      keyboard/hhkb/Makefile.iwrap
  2. 1
    1
      keyboard/hhkb/config_iwrap.h
  3. 6
    4
      protocol/iwrap.mk

+ 6
- 5
keyboard/hhkb/Makefile.iwrap View File

@@ -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

+ 1
- 1
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 */
#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

+ 6
- 4
protocol/iwrap.mk View File

@@ -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

Loading…
Cancel
Save