switch to raw usb

UsbRaw.cpp

@@ -0,0 +1,83 @@
+//
+// Created by robin on 1/8/16.
+//
+
+#include "UsbRaw.h"
+
+UsbRawDevice UsbRaw = UsbRawDevice();
+
+UsbRawDevice::UsbRawDevice()
+    : _dataSend(0),
+      _dataSendLen(0),
+      _callback(0),
+      _dataReceived(0),
+      _dataReceivedLen(0)
+{
+}
+
+void UsbRawDevice::init()
+{
+    PORTD = 0; // TODO: Only for USB pins?
+    DDRD |= ~USBMASK;
+
+    cli();
+    usbDeviceDisconnect();
+    usbDeviceConnect();
+    usbInit();
+    sei();
+}
+
+void UsbRawDevice::poll()
+{
+    usbPoll();
+}
+
+void UsbRawDevice::setData(const uchar* data, uchar len)
+{
+    _dataSend = data;
+    _dataSendLen = len;
+}
+
+void UsbRawDevice::setDataString(const char* data)
+{
+    setData((const uchar*)data, strlen(data));
+}
+
+usbMsgLen_t UsbRawDevice::_usbFunctionSetup(usbRequest_t* rq)
+{
+    _rq = rq;
+    if (_callback)
+    {
+        _callback(rq, this, 0, 0);
+    }
+    usbMsgPtr = (uchar*)_dataSend;
+    uchar len = _dataSendLen;
+    setData(0, 0);
+    return len;
+}
+
+uchar UsbRawDevice::_usbFunctionWrite(uchar *data, uchar len)
+{
+    free(_dataReceived);
+    _dataReceived = (uchar*)memcpy(malloc(len), data, _dataReceivedLen = len);
+    if (_callback)
+    {
+        _callback(_rq, this, _dataReceived, len);
+    }
+    return 1;
+}
+
+void UsbRawDevice::setCallback(void (*callback)(CALLBACK_ARGS))
+{
+    _callback = callback;
+}
+
+uchar usbFunctionWrite(uchar *data, uchar len)
+{
+    return UsbRaw._usbFunctionWrite(data, len);
+}
+
+usbMsgLen_t usbFunctionSetup(uchar data[8])
+{
+    return UsbRaw._usbFunctionSetup((usbRequest_t*)(void*)data);
+}

UsbRaw.h

@@ -0,0 +1,51 @@
+/*
+ * Based on Obdev's AVRUSB code and under the same license.
+ * Modified by Robin Thoni <robin@rthoni.com>
+ */
+#ifndef __UsbRaw_h__
+#define __UsbRaw_h__
+
+#include <avr/pgmspace.h>
+#include <avr/interrupt.h>
+#include <Arduino.h>
+
+#include "usbdrv.h"
+
+#define CALLBACK_ARGS usbRequest_t* rq, UsbRawDevice* dev, uchar* data, uchar len
+
+class UsbRawDevice {
+public:
+    UsbRawDevice();
+
+    void init();
+    
+    void poll();
+
+    void setData(const uchar* data, uchar len);
+
+    void setDataString(const char* data);
+
+    usbMsgLen_t _usbFunctionSetup(usbRequest_t* rq);
+
+    uchar _usbFunctionWrite(uchar *data, uchar len);
+
+    void setCallback(void (*callback)(CALLBACK_ARGS));
+
+private:
+
+    const uchar* _dataSend;
+
+    uchar _dataSendLen;
+
+    void (*_callback)(CALLBACK_ARGS);
+
+    uchar* _dataReceived;
+
+    uchar _dataReceivedLen;
+
+    usbRequest_t* _rq;
+};
+
+extern UsbRawDevice UsbRaw;
+
+#endif // __UsbRaw_h__

UsbRawHid.h

@@ -1,54 +0,0 @@
-/*
- * Based on Obdev's AVRUSB code and under the same license.
- * Modified by Robin Thoni <robin@rthoni.com>
- */
-#ifndef __UsbKeyboard_h__
-#define __UsbKeyboard_h__
-
-#include <avr/pgmspace.h>
-#include <avr/interrupt.h>
-#include <string.h>
-
-#include "usbdrv.h"
-
-// TODO: Work around Arduino 12 issues better.
-//#include <WConstants.h>
-//#undef int()
-
-typedef uint8_t byte;
-
-#define WAIT_USB do {           \
-  UsbRawHid.update();           \
-  if (!usbInterruptIsReady())   \
-  {                             \
-    return;                     \
-  }                             \
-} while(0)
-
-#define BUFFER_SIZE 64
-
-
-static uchar    idleRate;/* repeat rate for keyboards, never used for mice */
-
-class UsbRawHidDevice {
-public:
-    UsbRawHidDevice();
-
-    bool isUsbReady();
-    
-    void update() {
-        usbPoll();
-    }
-
-    void sendData(const char* data, unsigned size = 0);
-    
-    //private: TODO: Make friend?
-    byte reportBuffer[BUFFER_SIZE];    // buffer for HID reports [ 1 modifier byte + (len-1) key strokes]
-
-private:
-
-};
-
-#include "UsbRawHid.hxx"
-
-#endif // __UsbKeyboard_h__

UsbRawHid.hxx

@@ -1,85 +0,0 @@
-//
-// Created by robin on 1/8/16.
-//
-
-UsbRawHidDevice UsbRawHid = UsbRawHidDevice();
-
-
-/* We use a simplifed keyboard report descriptor which does not support the
- * boot protocol. We don't allow setting status LEDs and but we do allow
- * simultaneous key presses.
- * The report descriptor has been created with usb.org's "HID Descriptor Tool"
- * which can be downloaded from http://www.usb.org/developers/hidpage/.
- * Redundant entries (such as LOGICAL_MINIMUM and USAGE_PAGE) have been omitted
- * for the second INPUT item.
- */
-PROGMEM const char usbHidReportDescriptor[32] = {
-        0x06, 0x42, 0xff,
-        0x0A, 0x42, 0xff,
-        0xA1, 0x01,				// Collection 0x01
-        0x75, 0x08,				// report size = 8 bits
-        0x15, 0x00,				// logical minimum = 0
-        0x26, 0xFF, 0x00,			// logical maximum = 255
-        0x95, RAWHID_TX_SIZE,			// report count
-        0x09, 0x01,				// usage
-        0x81, 0x02,				// Input (array)
-        0x95, RAWHID_RX_SIZE,			// report count
-        0x09, 0x02,				// usage
-        0x91, 0x02,				// Output (array)
-        0xC0					// end collection
-};
-
-UsbRawHidDevice::UsbRawHidDevice()
-{
-    PORTD = 0; // TODO: Only for USB pins?
-    DDRD |= ~USBMASK;
-
-    cli();
-    usbDeviceDisconnect();
-    usbDeviceConnect();
-    usbInit();
-    sei();
-    //sendData("", 0);
-}
-
-bool UsbRawHidDevice::isUsbReady()
-{
-    update();
-    return usbInterruptIsReady();
-}
-
-void UsbRawHidDevice::sendData(const char* data, unsigned size)
-{
-    if (size > RAWHID_TX_SIZE || size == 0)
-    {
-        size = RAWHID_TX_SIZE;
-    }
-    memcpy(reportBuffer, data, size);
-    memset(reportBuffer + size, 0, RAWHID_TX_SIZE - size);
-
-    usbSetInterrupt((unsigned char*)(void *)&reportBuffer, sizeof(reportBuffer));
-}
-
-usbMsgLen_t usbFunctionSetup(uchar data[8])
-{
-    usbRequest_t    *rq = (usbRequest_t*)(void*)data;
-
-    /* The following requests are never used. But since they are required by
-     * the specification, we implement them in this example.
-     */
-    if((rq->bmRequestType & USBRQ_TYPE_MASK) == USBRQ_TYPE_CLASS){    /* class request type */
-        if(rq->bRequest == USBRQ_HID_GET_REPORT){  /* wValue: ReportType (highbyte), ReportID (lowbyte) */
-            /* we only have one report type, so don't look at wValue */
-            usbMsgPtr = (unsigned char*)(void *)&UsbRawHid.reportBuffer;
-            return sizeof(UsbRawHid.reportBuffer);
-        }else if(rq->bRequest == USBRQ_HID_GET_IDLE){
-            usbMsgPtr = &idleRate;
-            return 1;
-        }else if(rq->bRequest == USBRQ_HID_SET_IDLE){
-            idleRate = rq->wValue.bytes[1];
-        }
-    }else{
-        /* no vendor specific requests implemented */
-    }
-    return 0;   /* default for not implemented requests: return no data back to host */
-}

examples/UsbRawHidDemo1/CMakeLists.txt → examples/UsbRawDemo1/CMakeLists.txt

@@ -1,6 +1,6 @@
 cmake_minimum_required(VERSION 2.8.4)
 set(CMAKE_TOOLCHAIN_FILE ${CMAKE_SOURCE_DIR}/cmake/ArduinoToolchain.cmake)
-set(PROJECT_NAME rawhid)
+set(PROJECT_NAME usbraw)
 project(${PROJECT_NAME})
 
 set(${CMAKE_PROJECT_NAME}_BOARD nano328)

examples/UsbRawDemo1/main.ino

@@ -0,0 +1,60 @@
+#define ARD_UTILS_DELAYMS
+#include "ArdUtils/ArdUtils.h"
+
+#include "UsbRaw.h"
+
+#define ledPin 13
+
+uchar buffer[50];
+
+void callback(CALLBACK_ARGS)
+{
+    if (rq->bRequest == 0)
+    {
+        digitalWrite(ledPin, !digitalRead(ledPin));
+    }
+    else if (rq->bRequest == 1)
+    {
+        digitalWrite(ledPin, 1);
+    }
+    else if (rq->bRequest == 4)
+    {
+        digitalWrite(ledPin, !digitalRead(ledPin));
+        /*if (!data)
+        {
+            dev->setData(0, USB_NO_MSG);
+        }
+        else
+        {
+            dev->setData(data, sizeof(data));
+        }*/
+        if (data)
+        {
+            dev->setDataString("response");
+        }
+    }
+    else
+    {
+        dev->setData(data, strlen((const char*)data) + 1);
+    }
+}
+
+void setup()
+{
+    strcpy((char*)buffer, "test");
+    UsbRaw.init();
+    UsbRaw.setCallback(callback);
+    pinMode(ledPin, OUTPUT);
+    digitalWrite(ledPin, HIGH);
+}
+
+void loop()
+{
+    UsbRaw.poll();
+    //WAIT_USB;
+
+    //UsbRawHid.sendData("test", 4);
+
+    //ArdUtils::delayMs(1000);
+    //digitalWrite(ledPin, !digitalRead(ledPin));
+}

examples/UsbRawHidDemo1/main.ino

@@ -1,24 +0,0 @@
-#define ARD_UTILS_DELAYMS
-#include "ArdUtils/ArdUtils.h"
-
-#define RAWHID_TX_SIZE       64
-#define RAWHID_RX_SIZE       64
-#include "UsbRawHid.h"
-
-#define ledPin 13
-
-void setup()
-{
-    pinMode (ledPin, OUTPUT);
-    digitalWrite (ledPin, HIGH);
-}
-
-void loop()
-{
-    WAIT_USB;
-
-    //UsbRawHid.sendData("test", 4);
-
-    ArdUtils::delayMs(1000);
-    digitalWrite(ledPin, !digitalRead(ledPin));
-}

usbconfig.h

@@ -122,7 +122,7 @@ section at the end of this file).
  * The value is in milliamperes. [It will be divided by two since USB
  * communicates power requirements in units of 2 mA.]
  */
-#define USB_CFG_IMPLEMENT_FN_WRITE      0
+#define USB_CFG_IMPLEMENT_FN_WRITE      1
 /* Set this to 1 if you want usbFunctionWrite() to be called for control-out
  * transfers. Set it to 0 if you don't need it and want to save a couple of
  * bytes.
@@ -212,7 +212,7 @@ section at the end of this file).
 
 /* -------------------------- Device Description --------------------------- */
 
-#define  USB_CFG_VENDOR_ID       0x42, 0x42
+#define  USB_CFG_VENDOR_ID       0xc0, 0x16
 /* USB vendor ID for the device, low byte first. If you have registered your
  * own Vendor ID, define it here. Otherwise you may use one of obdev's free
  * shared VID/PID pairs. Be sure to read USB-IDs-for-free.txt for rules!
@@ -221,7 +221,7 @@ section at the end of this file).
  * with libusb: 0x16c0/0x5dc.  Use this VID/PID pair ONLY if you understand
  * the implications!
  */
-#define  USB_CFG_DEVICE_ID       0x31, 0xe1
+#define  USB_CFG_DEVICE_ID       0xdc, 0x05
 /* This is the ID of the product, low byte first. It is interpreted in the
  * scope of the vendor ID. If you have registered your own VID with usb.org
  * or if you have licensed a PID from somebody else, define it here. Otherwise
@@ -265,7 +265,7 @@ section at the end of this file).
 /* See USB specification if you want to conform to an existing device class.
  * Class 0xff is "vendor specific".
  */
-#define USB_CFG_INTERFACE_CLASS     0x03  /* HID */ /* define class here if not at device level */
+#define USB_CFG_INTERFACE_CLASS     0
 #define USB_CFG_INTERFACE_SUBCLASS  0
 #define USB_CFG_INTERFACE_PROTOCOL  0
 /* See USB specification if you want to conform to an existing device class or
@@ -273,7 +273,7 @@ section at the end of this file).
  * HID class is 3, no subclass and protocol required (but may be useful!)
  * CDC class is 2, use subclass 2 and protocol 1 for ACM
  */
-#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH    32
+#define USB_CFG_HID_REPORT_DESCRIPTOR_LENGTH    0
 /* Define this to the length of the HID report descriptor, if you implement
  * an HID device. Otherwise don't define it or define it to 0.
  * If you use this define, you must add a PROGMEM character array named