From c4990646c7b67db10054cad578bd17c856976d82 Mon Sep 17 00:00:00 2001 From: Pavol Rusnak Date: Wed, 7 Feb 2018 16:04:44 +0100 Subject: [PATCH] src/main: reorder interfaces, so debug+vcp are after regular interfaces endpoints 0x05 and 0x85 cause halt for now, allocate them to yet unused debug interface --- src/main.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main.py b/src/main.py index 357b3dbf..44023375 100644 --- a/src/main.py +++ b/src/main.py @@ -19,9 +19,9 @@ usb_wire = io.WebUSB( ) usb_u2f = io.HID( - iface_num=3, - ep_in=0x84, - ep_out=0x03, + iface_num=1, + ep_in=0x82, + ep_out=0x02, report_desc=bytes([ 0x06, 0xd0, 0xf1, # USAGE_PAGE (FIDO Alliance) 0x09, 0x01, # USAGE (U2F HID Authenticator Device) @@ -44,16 +44,16 @@ usb_u2f = io.HID( if __debug__: usb_debug = io.WebUSB( - iface_num=4, + iface_num=2, ep_in=0x85, - ep_out=0x04, + ep_out=0x05, ) usb_vcp = io.VCP( - iface_num=1, - data_iface_num=2, - ep_in=0x82, - ep_out=0x02, - ep_cmd=0x83, + iface_num=3, + data_iface_num=4, + ep_in=0x83, + ep_out=0x03, + ep_cmd=0x84, ) usb = io.USB(