Changeset 32c7682 in thomson for elec/CrO2/software/device.cpp

Timestamp:

Jan 28, 2012, 3:13:17 PM (12 years ago)

Author:

Adrien Destugues <pulkomandy@…>

Branches:

main

Children:

c7b4218

Parents:

96bc8fa

Message:

• Poll motor on pin status and report it in the GUI.
• Some cleanup of device class.

git-svn-id: ​svn://localhost/thomson@12 85ae3b6b-dc8f-4344-a89d-598714f2e4e5

File:

• elec/CrO2/software/device.cpp (modified) (8 diffs)

elec/CrO2/software/device.cpp

@@ -9 +9 @@
 #include "device.h"
 
-#include <iostream> // TODO remove
-
 bool Device::initOnce = false;
+Device* Device::instance = NULL;
 
 const uint32_t Device::vid = 0x16C0;
@@ -24 +23 @@
 #define PSCMD_STATUS   3
 
-/* USB device lookup by VID and PID, then Vendor and Product strings, as we use V-USB shared ID. */
-static int  usbGetStringAscii(usb_dev_handle *dev, int index, int langid, char *buf, int buflen)
+
+// Gets the device instance. Throws an error message if something bad happens.
+Device& Device::getDevice() throw(const char*)
+{
+        if (instance == NULL)
+                instance = new Device();
+
+        return *instance;
+}
+
+
+/* USB device lookup by VID and PID, then Vendor and Product strings, as we use
+ * V-USB shared ID. */
+static int  usbGetStringAscii(usb_dev_handle *dev, int index, int langid,
+        char *buf, int buflen)
 {
 char    buffer[256];
 int     rval, i;
 
-    if((rval = usb_control_msg(dev, USB_ENDPOINT_IN, USB_REQ_GET_DESCRIPTOR, (USB_DT_STRING << 8) + index, langid, buffer, sizeof(buffer), 1000)) < 0)
+    if((rval = usb_control_msg(dev, USB_ENDPOINT_IN, USB_REQ_GET_DESCRIPTOR,
+                        (USB_DT_STRING << 8) + index, langid, buffer, sizeof(buffer), 1000)) < 0)
         return rval;
     if(buffer[1] != USB_DT_STRING)
@@ -49 +62 @@
 }
 
-Device::Device()
+Device::Device() throw(const char*)
 {
         handle = NULL;
@@ -69 +82 @@
                                 continue;
 
-                        // Found device with correct VID and PID. Now try to match the strings
+                        // Found device with correct VID and PID. Now try to match the 
+                        // vendor and product strings
                         char    string[256];
                         int     len;
-                        handle = usb_open(dev); /* we need to open the device in order to query strings */
+                        handle = usb_open(dev);
+                                /* we need to open the device in order to query strings */
                         if(!handle){
-                                std::cerr << "Warning: cannot open USB device: " << usb_strerror() << std::endl;
                                 continue;
                         }
                         /* now check whether the names match: */
-                        len = usbGetStringAscii(handle, dev->descriptor.iManufacturer, 0x0409, string, sizeof(string));
-                        if(len < 0)
-                        {
-                                std::cerr << "Warning: cannot query manufacturer for device: " << usb_strerror() << std::endl;
-                        }
-                        else
+                        len = usbGetStringAscii(handle, dev->descriptor.iManufacturer,
+                                0x0409, string, sizeof(string));
+                        if(len >= 0)
                         {
                                 if(strcmp(string, vendor) == 0){
-                                        len = usbGetStringAscii(handle, dev->descriptor.iProduct, 0x0409, string, sizeof(string));
-                                        if(len < 0){
-                                                std::cerr << "Warning: cannot query product for device: " << usb_strerror() << std::endl;
-                                        }else{
+                                        len = usbGetStringAscii(handle, dev->descriptor.iProduct,
+                                                0x0409, string, sizeof(string));
+                                        if(len >= 0){
                                                 if(strcmp(string, product) == 0)
                                                         break;
@@ -104 +114 @@
         // At this point, either we have found a device and handle is pointing to it,
         // or we failed and handle is NULL.
-        //
-        // TODO : use exceptions for error handling; instead of fprintf (not useable in GUI mode).
         if (!handle)
-        std::cerr << "Could not find USB device \"" << product << "\" with vid=0x" << std::hex << vid << " pid=0x" << pid << std::endl;
+                throw "Device not found. Is the USB cable plugged correctly?";
 }
 
@@ -119 +127 @@
 int Device::read(uint8_t* buffer, size_t max)
 {
-        return usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN, PSCMD_GET, 0,0, (char*)buffer, max, 5000);
+        return usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN,
+                PSCMD_GET, 0,0, (char*)buffer, max, 5000);
 
 }
@@ -127 +136 @@
 {
         int rqtype = (size == 0) ? USB_ENDPOINT_IN:USB_ENDPOINT_OUT;
-        return usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | rqtype, PSCMD_PUT, blktype,0 /*checksum*/, (char*)buffer, size, 5000);
+        return usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | rqtype,
+                PSCMD_PUT, blktype,0 /*checksum*/, (char*)buffer, size, 5000);
 
 }
@@ -134 +144 @@
 {
         uint8_t status;
-        usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN, PSCMD_STATUS, 0,0, (char*)&status, 1, 5000);
+        usb_control_msg(handle, USB_TYPE_VENDOR | USB_RECIP_DEVICE | USB_ENDPOINT_IN,
+                PSCMD_STATUS, 0,0, (char*)&status, 1, 5000);
                 // TODO handle errors (return value)
         return status;