From: tmk <hasu@tmk-kbd.com>
Date: Mon, 6 May 2019 14:01:18 +0000 (+0900)
Subject: usb_hid: Change to USB_Host_Shield_2.0 of tmk repo
X-Git-Url: https://git.friedersdorff.com/?a=commitdiff_plain;ds=inline;h=4e83400fc6f67a0559cf343ba5846b505c35fd30;p=max%2Ftmk_keyboard.git

usb_hid: Change to USB_Host_Shield_2.0 of tmk repo

- Fix SOF/Keep Alive start timing
- Disable bus detection during settling after attach
- Remove keyboard LED blinking at configuring
---

diff --git a/.gitmodules b/.gitmodules
index 3ae861fb..c688aa84 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "tmk_core/protocol/usb_hid/USB_Host_Shield_2.0-git"]
-	path = tmk_core/protocol/usb_hid/USB_Host_Shield_2.0-git
-	url = https://github.com/felis/USB_Host_Shield_2.0.git
+[submodule "tmk_core/protocol/usb_hid/USB_Host_Shield_2.0-tmk"]
+	path = tmk_core/protocol/usb_hid/USB_Host_Shield_2.0-tmk
+	url = https://github.com/tmk/USB_Host_Shield_2.0.git
diff --git a/tmk_core/protocol/usb_hid.mk b/tmk_core/protocol/usb_hid.mk
index 495c4bee..bba4292f 100644
--- a/tmk_core/protocol/usb_hid.mk
+++ b/tmk_core/protocol/usb_hid.mk
@@ -4,7 +4,7 @@ USB_HID_DIR = protocol/usb_hid
 #
 # USB Host Shield
 #
-USB_HOST_SHIELD_DIR = $(USB_HID_DIR)/USB_Host_Shield_2.0-git
+USB_HOST_SHIELD_DIR = $(USB_HID_DIR)/USB_Host_Shield_2.0-tmk
 USB_HOST_SHIELD_SRC = \
 	$(USB_HOST_SHIELD_DIR)/Usb.cpp \
 	$(USB_HOST_SHIELD_DIR)/usbhid.cpp \
diff --git a/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0-git b/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0-git
deleted file mode 160000
index ed08df7e..00000000
--- a/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0-git
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ed08df7e68af06a5612d938b1bbf55cc4458518a
diff --git a/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0-tmk b/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0-tmk
new file mode 160000
index 00000000..48b2a095
--- /dev/null
+++ b/tmk_core/protocol/usb_hid/USB_Host_Shield_2.0-tmk
@@ -0,0 +1 @@
+Subproject commit 48b2a0950496c7b8ba1bb6ddb937b6f00a6de781