mostly done

UsbRaw.cpp

@@ -9,9 +9,7 @@ UsbRawDevice UsbRaw = UsbRawDevice();
 UsbRawDevice::UsbRawDevice()
     : _dataSend(0),
       _dataSendLen(0),
-      _callback(0),
-      _dataReceived(0),
-      _dataReceivedLen(0)
+      _callback(0)
 {
 }
 
@@ -40,12 +38,17 @@ void UsbRawDevice::setData(const uchar* data, uchar len)
 
 void UsbRawDevice::setDataString(const char* data)
 {
-    setData((const uchar*)data, strlen(data));
+    setData((const uchar*)data, strlen(data) + 1);
+}
+
+void UsbRawDevice::setDataUsbNoMsg()
+{
+    setData(0, USB_NO_MSG);
 }
 
 usbMsgLen_t UsbRawDevice::_usbFunctionSetup(usbRequest_t* rq)
 {
-    _rq = rq;
+    _rq = *rq;
     if (_callback)
     {
         _callback(rq, this, 0, 0);
@@ -58,11 +61,9 @@ usbMsgLen_t UsbRawDevice::_usbFunctionSetup(usbRequest_t* rq)
 
 uchar UsbRawDevice::_usbFunctionWrite(uchar *data, uchar len)
 {
-    free(_dataReceived);
-    _dataReceived = (uchar*)memcpy(malloc(len), data, _dataReceivedLen = len);
     if (_callback)
     {
-        _callback(_rq, this, _dataReceived, len);
+        _callback(&_rq, this, data, len);
     }
     return 1;
 }

UsbRaw.h

@@ -25,6 +25,8 @@ public:
 
     void setDataString(const char* data);
 
+    void setDataUsbNoMsg();
+
     usbMsgLen_t _usbFunctionSetup(usbRequest_t* rq);
 
     uchar _usbFunctionWrite(uchar *data, uchar len);
@@ -39,11 +41,7 @@ private:
 
     void (*_callback)(CALLBACK_ARGS);
 
-    uchar* _dataReceived;
-
-    uchar _dataReceivedLen;
-
-    usbRequest_t* _rq;
+    usbRequest_t _rq;
 };
 
 extern UsbRawDevice UsbRaw;

examples/UsbRawDemo1/main.ino

@@ -9,9 +9,21 @@ uchar buffer[50];
 
 void callback(CALLBACK_ARGS)
 {
-    if (rq->bRequest == 0)
+    /*digitalWrite(ledPin, !digitalRead(ledPin));
+    delay(100);*/
+
+    /*if (data)
     {
+        strcpy((char *) buffer, (const char *) data);
+
         digitalWrite(ledPin, !digitalRead(ledPin));
+        delay(200);
+        digitalWrite(ledPin, !digitalRead(ledPin));
+    }*/
+
+    if (rq->bRequest == 0)
+    {
+        digitalWrite(ledPin, 0);
     }
     else if (rq->bRequest == 1)
     {
@@ -19,23 +31,21 @@ void callback(CALLBACK_ARGS)
     }
     else if (rq->bRequest == 4)
     {
-        digitalWrite(ledPin, !digitalRead(ledPin));
-        /*if (!data)
+        if (data)
         {
-            dev->setData(0, USB_NO_MSG);
+            digitalWrite(ledPin, !digitalRead(ledPin));
+            delay(200);
+            digitalWrite(ledPin, !digitalRead(ledPin));
+            strcpy((char *) buffer, (const char *) data);
         }
         else
         {
-            dev->setData(data, sizeof(data));
-        }*/
-        if (data)
-        {
-            dev->setDataString("response");
+            dev->setDataUsbNoMsg();
         }
     }
     else
     {
-        dev->setData(data, strlen((const char*)data) + 1);
+        dev->setData(buffer, strlen((const char*)buffer) + 1);
     }
 }