Diff: USBHostHID/USBHostMouse.h

Revision:

8:6463cd1964c0

Parent:

3:a3872f7593e2

Child:

9:7f9f64cf5ded

--- a/USBHostHID/USBHostMouse.h	Tue Jan 28 06:50:12 2014 +0000
+++ b/USBHostHID/USBHostMouse.h	Fri Jan 31 13:45:07 2014 +0000
@@ -1,16 +1,88 @@
-// Simple USBHost Mouse for FRDM-KL46Z
+/* mbed USBHost Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
 #include "USBHost.h"
 
-class USBHostMouse {
+class USBHostMouse : public IUSBEnumerator {
 public:
-    USBHostMouse() {
-        host = USBHost::getHostInst();
+
+    /**
+    * Constructor
+    */
+    USBHostMouse();
+
+    /**
+     * Try to connect a mouse device
+     *
+     * @return true if connection was successful
+     */
+    bool connect();
+
+    /**
+    * Check if a mouse is connected
+    *
+    * @returns true if a mouse is connected
+    */
+    bool connected();
+
+    int readReport(uint8_t* data) {
+        int rc = host->interruptRead(dev, int_in, data, 4);
+        return rc == USB_TYPE_OK ? 4 : 0;
     }
-    int readReport(uint8_t* data) {
-        return host->InterruptRead(data, 4);
+    void attachEvent(void (*ptr)(uint8_t* data, int size)) {
+        if (ptr != NULL) {
+            onUpdate = ptr;
+        }
     }
+    void poll() {
+        USB_TYPE rc = host->interruptRead(dev, int_in, report, sizeof(report));
+        if (rc == USB_TYPE_OK) {
+            if (onUpdate) {
+                (*onUpdate)(report, int_in->getLengthTransferred());
+            }
+        }
+    }
+
+protected:
+    //From IUSBEnumerator
+    virtual void setVidPid(uint16_t vid, uint16_t pid);
+    virtual bool parseInterface(uint8_t intf_nb, uint8_t intf_class, uint8_t intf_subclass, uint8_t intf_protocol); //Must return true if the interface should be parsed
+    virtual bool useEndpoint(uint8_t intf_nb, ENDPOINT_TYPE type, ENDPOINT_DIRECTION dir); //Must return true if the endpoint will be used
 
 private:
     USBHost * host;
+    USBDeviceConnected * dev;
+    USBEndpoint * int_in;
+    uint8_t report[4];
+    
+    bool dev_connected;
+    bool mouse_device_found;
+    int mouse_intf;
+
+    uint8_t buttons;
+    int8_t x;
+    int8_t y;
+    int8_t z;
+
+    void (*onUpdate)(uint8_t* data, int size);
+    void (*onButtonUpdate)(uint8_t buttons);
+    void (*onXUpdate)(int8_t x);
+    void (*onYUpdate)(int8_t y);
+    void (*onZUpdate)(int8_t z);
+    int report_id;
+    void init();
 };