Added Bulegiga iWRAP support into HHKB.(Bluetooth)

3 files changed, 20 insertions, 12 deletions

diff --git a/adb_usb/Makefile b/adb_usb/Makefile
index 802b4248c..56b342df9 100644
--- a/adb_usb/Makefile
+++ b/adb_usb/Makefile
@@ -8,11 +8,11 @@ COMMON_DIR = ..
 TARGET_DIR = .
 
 # keyboard dependent files
-TARGET_SRC =    main_pjrc.c \
-                keymap.c \
-                matrix.c \
-                led.c \
-                adb.c
+SRC =   main.c \
+        keymap.c \
+        matrix.c \
+        led.c \
+        adb.c
 
 CONFIG_H = config.h
 
@@ -36,10 +36,10 @@ F_CPU = 16000000
 # Build Options
 #   comment out to disable the options.
 #
-MOUSEKEY_ENABLE = yes   # Mouse keys
+#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
 
 
 
@@ -48,5 +48,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/adb_usb/README b/adb_usb/README
index b4bd35bb3..5d0e1bc86 100644
--- a/adb_usb/README
+++ b/adb_usb/README
@@ -59,4 +59,12 @@ effort at this time.
     ),
 
 
+Notes
+-----
+Many ADB keyboards has no discrimination between right modifier and left one,
+you will always see left control even if you press right control key.
+Apple Extended Keyboard and Apple Extended Keyboard II are the examples.
+Though ADB protocol itsef has the ability of distinction between right and left.
+And most ADB keyboard has no NKRO functionality, though ADB protocol itsef has that. 
+
 EOF
diff --git a/adb_usb/config.h b/adb_usb/config.h
index 27f31ca9e..6431ede4c 100644
--- a/adb_usb/config.h
+++ b/adb_usb/config.h
@@ -37,8 +37,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* key combination for command */
 #define IS_COMMAND() ( \
-    keyboard_report->mods == (BIT_LSHIFT | BIT_LCTRL | BIT_LALT | BIT_LGUI) || \
-    keyboard_report->mods == (BIT_LSHIFT | 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)) \
 )