From b3e025f443f0b86f56e2ed2945579f564d3ac57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Monda?= Date: Mon, 16 Oct 2017 23:26:37 +0200 Subject: [PATCH] Make reenumerate() set Wormhole.timeoutMs based on GenericHidInBuffer+2 --- lib/bootloader | 2 +- right/src/usb_protocol_handler.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/bootloader b/lib/bootloader index b754ecb..40cbba1 160000 --- a/lib/bootloader +++ b/lib/bootloader @@ -1 +1 @@ -Subproject commit b754ecbe686ff8f622d658f6a5768c9ef1d89995 +Subproject commit 40cbba1da1107d8adc320a130b661c28c8087f62 diff --git a/right/src/usb_protocol_handler.c b/right/src/usb_protocol_handler.c index 6f8d97b..d3c8042 100644 --- a/right/src/usb_protocol_handler.c +++ b/right/src/usb_protocol_handler.c @@ -72,6 +72,7 @@ void reenumerate(void) { Wormhole.magicNumber = WORMHOLE_MAGIC_NUMBER; Wormhole.enumerationMode = GenericHidInBuffer[1]; + Wormhole.timeoutMs = *((uint32_t*)(GenericHidInBuffer+2)); SCB->AIRCR = 0x5FA<