From e67c988824f5ec0c965beb412f8ee5953dfd3c8c Mon Sep 17 00:00:00 2001 From: tmk Date: Sat, 17 Sep 2011 22:39:50 +0900 Subject: Added Bulegiga iWRAP support into HHKB.(Bluetooth) --- macway/Makefile | 16 ++++++++-------- macway/config.h | 4 ++-- macway/doc/back.jpg | Bin macway/doc/case.jpg | Bin macway/doc/keys.jpg | Bin macway/doc/side.jpg | Bin macway/doc/switch.jpg | Bin macway/doc/teensy.jpg | Bin macway/doc/wiring.jpg | Bin macway/doc/withHHKB.jpg | Bin macway/doc/withThinkPad.jpg | Bin 11 files changed, 10 insertions(+), 10 deletions(-) mode change 100755 => 100644 macway/doc/back.jpg mode change 100755 => 100644 macway/doc/case.jpg mode change 100755 => 100644 macway/doc/keys.jpg mode change 100755 => 100644 macway/doc/side.jpg mode change 100755 => 100644 macway/doc/switch.jpg mode change 100755 => 100644 macway/doc/teensy.jpg mode change 100755 => 100644 macway/doc/wiring.jpg mode change 100755 => 100644 macway/doc/withHHKB.jpg mode change 100755 => 100644 macway/doc/withThinkPad.jpg (limited to 'macway') diff --git a/macway/Makefile b/macway/Makefile index 6e7fa7fd9..b8b0a85e1 100644 --- a/macway/Makefile +++ b/macway/Makefile @@ -8,10 +8,10 @@ COMMON_DIR = .. TARGET_DIR = . # keyboard dependent files -TARGET_SRC = main_pjrc.c \ - keymap.c \ - matrix.c \ - led.c +SRC = main.c \ + keymap.c \ + matrix.c \ + led.c CONFIG_H = config.h @@ -37,8 +37,8 @@ F_CPU = 16000000 # MOUSEKEY_ENABLE = yes # Mouse keys #PS2_MOUSE_ENABLE = yes # PS/2 mouse(TrackPoint) support -USB_EXTRA_ENABLE = yes # Audio control and System control -#USB_NKRO_ENABLE = yes # USB Nkey Rollover +EXTRAKEY_ENABLE = yes # Audio control and System control +#NKRO_ENABLE = yes # USB Nkey Rollover @@ -47,5 +47,5 @@ PROGRAM_CMD = teensy_loader_cli -mmcu=$(MCU) -w -v $(TARGET).hex -include $(COMMON_DIR)/Makefile.pjrc -include $(COMMON_DIR)/Makefile.common +include $(COMMON_DIR)/pjrc.mk +include $(COMMON_DIR)/common.mk diff --git a/macway/config.h b/macway/config.h index ff62bfdb0..546067beb 100644 --- a/macway/config.h +++ b/macway/config.h @@ -37,8 +37,8 @@ along with this program. If not, see . /* key combination for command */ #define IS_COMMAND() ( \ - keyboard_report->mods == (BIT_LSHIFT | BIT_RSHIFT) || \ - keyboard_report->mods == (BIT_LCTRL | BIT_RSHIFT) \ + keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_LCTRL) | MOD_BIT(KB_LALT) | MOD_BIT(KB_LGUI)) || \ + keyboard_report->mods == (MOD_BIT(KB_LSHIFT) | MOD_BIT(KB_RSHIFT)) \ ) diff --git a/macway/doc/back.jpg b/macway/doc/back.jpg old mode 100755 new mode 100644 diff --git a/macway/doc/case.jpg b/macway/doc/case.jpg old mode 100755 new mode 100644 diff --git a/macway/doc/keys.jpg b/macway/doc/keys.jpg old mode 100755 new mode 100644 diff --git a/macway/doc/side.jpg b/macway/doc/side.jpg old mode 100755 new mode 100644 diff --git a/macway/doc/switch.jpg b/macway/doc/switch.jpg old mode 100755 new mode 100644 diff --git a/macway/doc/teensy.jpg b/macway/doc/teensy.jpg old mode 100755 new mode 100644 diff --git a/macway/doc/wiring.jpg b/macway/doc/wiring.jpg old mode 100755 new mode 100644 diff --git a/macway/doc/withHHKB.jpg b/macway/doc/withHHKB.jpg old mode 100755 new mode 100644 diff --git a/macway/doc/withThinkPad.jpg b/macway/doc/withThinkPad.jpg old mode 100755 new mode 100644 -- cgit v1.2.3-24-g4f1b