diff options
| author | Jun Wako <wakojun@gmail.com> | 2014-12-11 01:00:32 +0900 |
|---|---|---|
| committer | Jun Wako <wakojun@gmail.com> | 2014-12-11 01:00:32 +0900 |
| commit | b47450da9ffc1c296b3ba6ecd189fced0b7b8ed9 (patch) | |
| tree | 75f6876b9fa3baedb4970c44bed726168bf7c149 /protocol | |
| parent | f6f698dda0a1cc9e92b75927b0273205402de9e2 (diff) | |
| parent | 30864ea5e48c15796cc2e3e2ba4a9b50322d82a4 (diff) | |
Merge branch 'usb_usb_hub'
Diffstat (limited to 'protocol')
| -rw-r--r-- | protocol/usb_hid.mk | 1 | ||||
| m--------- | protocol/usb_hid/USB_Host_Shield_2.0 | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/protocol/usb_hid.mk b/protocol/usb_hid.mk index 6914dce809..8fda76c2e5 100644 --- a/protocol/usb_hid.mk +++ b/protocol/usb_hid.mk @@ -8,6 +8,7 @@ USB_HOST_SHIELD_DIR = $(USB_HID_DIR)/USB_Host_Shield_2.0 USB_HOST_SHIELD_SRC = \ $(USB_HOST_SHIELD_DIR)/Usb.cpp \ $(USB_HOST_SHIELD_DIR)/hid.cpp \ + $(USB_HOST_SHIELD_DIR)/usbhub.cpp \ $(USB_HOST_SHIELD_DIR)/parsetools.cpp \ $(USB_HOST_SHIELD_DIR)/message.cpp diff --git a/protocol/usb_hid/USB_Host_Shield_2.0 b/protocol/usb_hid/USB_Host_Shield_2.0 -Subproject 8bb790f83af298b5f3e5516259c9d8ec27efe52 +Subproject 2b4a56de3d090686f62d25ea34042759dc4352d |