Updated USB endpoints for Nucleo boards.

fpoussin · Jun 16, 2014 · 025da6b · 025da6b
1 parent 5f519d8
commit 025da6b
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/QStlink2.pro b/QStlink2.pro
@@ -26,7 +26,7 @@ win32:CONFIG += winusb
 
 TEMPLATE = app
 TARGET = qstlink2
-VERSION = 1.1.3
+VERSION = 1.1.4
 
 message(Version $$VERSION)
 

diff --git a/QtUsb b/QtUsb
diff --git a/inc/stlinkv2.h b/inc/stlinkv2.h
@@ -34,6 +34,7 @@ const quint16 USB_NUCLEO_PID = 0x374b;
 const quint8 USB_CONFIGURATION = 1;   /* The sole configuration. */
 const quint8 USB_PIPE_IN = 0x81;   /* Bulk output endpoint for responses */
 const quint8 USB_PIPE_OUT = 0x02;	   /* Bulk input endpoint for commands */
+const quint8 USB_PIPE_OUT_NUCLEO = 0x01;	   /* Bulk input endpoint for commands */
 const quint8 USB_PIPE_ERR = 0x83;	   /* An apparently-unused bulk endpoint. */
 const quint16 USB_TIMEOUT_MSEC = 300;
 const QString USB_STLINK_GUID = "DBCE1CD9-A320-4b51-A365-A0C3F3C5FB29";

diff --git a/src/stlinkv2.cpp b/src/stlinkv2.cpp
@@ -43,6 +43,12 @@ stlinkv2::~stlinkv2()
 
 qint32 stlinkv2::connect()
 {
+    if (mUsb->getPid() == USB_STLINKv2_PID)
+        mUsb->setEndPoints(USB_PIPE_IN, USB_PIPE_OUT);
+
+    else if (mUsb->getPid() == USB_NUCLEO_PID)
+        mUsb->setEndPoints(USB_PIPE_IN, USB_PIPE_OUT_NUCLEO);
+
     qint32 open = mUsb->open();
     if ((open >= 0)) {
         mUsb->read(&mRecvBuf, 2048); // We clean the usb buffer
+1 −1		qbaseusb.cpp
+7 −0		qbaseusb.h
+10 −3		qlibusb.cpp
+33 −13		qwinusb.cpp