Changeset 847

Timestamp:

08/25/08 13:58:20 (5 months ago)

Author:

liamstask

Message:

Adding in EBo's patch for Linux USB enumeration

Location:

mchelper/branches/v25

Files:

• mchelper.pro (modified) (4 diffs)
• src/MainWindow.cpp (modified) (7 diffs)
• src/UsbMonitor.cpp (modified) (3 diffs)

mchelper/branches/v25/mchelper.pro

@@ -10 +10 @@
 
 HEADERS = include/MainWindow.h \
-          # src/bonjour/BonjourRecord.h \
-          # src/bonjour/BonjourServiceBrowser.h \
-          # src/bonjour/BonjourServiceRegister.h \
-          # src/bonjour/BonjourServiceResolver.h \
           include/OscXmlServer.h \
           include/Osc.h \
@@ -31 +27 @@
 SOURCES = src/main.cpp \
           src/MainWindow.cpp \
-          # src/bonjour/BonjourServiceBrowser.cpp \
-          # src/bonjour/BonjourServiceRegister.cpp \
-          # src/bonjour/BonjourServiceResolver.cpp \
           src/OscXmlServer.cpp \
           src/Osc.cpp \
@@ -64 +57 @@
 }
 
-# OS X links Bonjour all by itself
-# !mac:LIBS += -ldns_sd
-
 # *******************************************
 #              qextserialport
@@ -83 +73 @@
 unix:DEFINES  += _TTY_POSIX_
 macx: LIBS += -framework IOKit # use IOKit on OS X
-unix{ !macx: LIBS += -lusb } # use libusb on other unices
+unix{ 
+  !macx{
+    CONFIG += link_pkgconfig
+    PKGCONFIG += dbus-1 hal
+  }
+}
 
 win32:HEADERS += src/qextserialport/win_qextserialport.h

mchelper/branches/v25/src/MainWindow.cpp

@@ -174 +174 @@
   board->setIcon(QIcon(":icons/network_icon.gif"));
   board->setToolTip("Ethernet Device: " + pi->key());
+  
   if(noUi())
   {
@@ -179 +180 @@
     out << "network device discovered: " + pi->key() << endl;
   }
-  deviceList->addItem(board);
+  
   boardInit(board);
   boardList.append(board);
@@ -206 +207 @@
       board->setToolTip("USB Serial Device: " + key);
       noUiString = "usb device discovered: " + key;
+      actionUpload->setEnabled(false);
     }
     else if(type == BoardType::UsbSamba)
@@ -214 +216 @@
       board->setToolTip("Unprogrammed device");
       noUiString = "sam-ba device discovered: " + key;
+      actionUpload->setEnabled(true);
     }
     
@@ -221 +224 @@
       out << noUiString << endl;
     }
-    deviceList->addItem(board);
+    
     boardInit(board);
     boardList.append(board);
@@ -238 +241 @@
   if( placeholderRow >= 0 )
     deviceList->takeItem( placeholderRow );
+  deviceList->addItem(board);
+  // if no other boards are selected, select this new one
+  if( !getCurrentBoard() )
+    deviceList->setCurrentRow (deviceList->count()-1);
+  board->sendMessage("/system/info-internal"); // get the board's info
 }
 
@@ -356 +364 @@
 }
 
+/*
+  Return the currently selected board in the UI list of boards,
+  or NULL if none are selected.
+*/
 Board* MainWindow::getCurrentBoard( )
 {

mchelper/branches/v25/src/UsbMonitor.cpp

@@ -19 +19 @@
 #include "PacketUsbSerial.h"
 #include "qextserialenumerator.h"
+
+#define MAKE_CONTROLLER_VID 0xEB03
+#define MAKE_CONTROLLER_PID 0x0920
+#define SAM_BA_VID          0xEB03
+#define SAM_BA_PID          0x6124
 
 /*
@@ -50 +55 @@
     foreach(QextPortInfo port, ports)
     {
-      if(!usbSerialList.contains(port.portName) && port.friendName.startsWith("Make Controller Ki"))
+      // the portname needs to be tweeked 
+      if( !usbSerialList.contains(port.portName) )
       {
-        usbSerialList.append(port.portName); // keep our internal list, the portName is the unique key
-        newSerialPorts.append(port.portName); // on the list to be posted to the UI
+        if( port.friendName.startsWith("Make Controller Ki") ||
+           (port.vendorID == MAKE_CONTROLLER_VID && port.productID == MAKE_CONTROLLER_PID))
+        {
+          usbSerialList.append(port.portName);  // keep our internal list, the portName is the unique key
+          newSerialPorts.append(port.portName); // on the list to be posted to the UI
+        }
+      }
+      
+      if( !usbSambaList.contains(port.portName) )
+      {
+        if( port.vendorID == SAM_BA_VID && port.productID == SAM_BA_PID )
+        {
+          usbSambaList.append(port.portName);  // keep our internal list, the portName is the unique key
+          newSambaPorts.append(port.portName); // on the list to be posted to the UI
+        }
       }
       // check for samba boards...
       portNames << port.portName;
     }
+    
     if(newSerialPorts.count())
       emit newBoards(newSerialPorts, BoardType::UsbSerial);
@@ -73 +93 @@
     }
     
-    // then check the samba boards
+    // same thing for the samba boards
     foreach(QString key, usbSambaList)
     {