Parcourir la source

Merge branch 'usb_usb_hub'

core
Jun Wako il y a 9 ans
Parent
révision
3d41f69b53
3 fichiers modifiés avec 5 ajouts et 4 suppressions
  1. 3
    3
      .gitmodules
  2. 1
    0
      protocol/usb_hid.mk
  3. 1
    1
      protocol/usb_hid/USB_Host_Shield_2.0

+ 3
- 3
.gitmodules Voir le fichier

@@ -1,6 +1,6 @@
[submodule "protocol/usb_hid/USB_Host_Shield_2.0"]
path = protocol/usb_hid/USB_Host_Shield_2.0
url = [email protected]:tmk/USB_Host_Shield_2.0.git
[submodule "protocol/lufa/LUFA-git"]
path = protocol/lufa/LUFA-git
url = https://github.com/abcminiuser/lufa.git
[submodule "protocol/usb_hid/USB_Host_Shield_2.0"]
path = protocol/usb_hid/USB_Host_Shield_2.0
url = https://github.com/felis/USB_Host_Shield_2.0.git

+ 1
- 0
protocol/usb_hid.mk Voir le fichier

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


+ 1
- 1
protocol/usb_hid/USB_Host_Shield_2.0

@@ -1 +1 @@
Subproject commit 8bb790f83af298b5f3e5516259c9d8ec27efe522
Subproject commit 2b4a56de3d090686f62d25ea34042759dc4352d6