move cursor, move wheel, press/release button

UsbMouse.h

@@ -34,23 +34,40 @@ typedef struct{
     char    dWheel;
 }report_t;
 
+#define MOUSE_BUTTON_LEFT   1
+#define MOUSE_BUTTON_RIGHT  2
+#define MOUSE_BUTTON_MIDDLE 4
+
 static uchar    idleRate;/* repeat rate for keyboards, never used for mice */
 
 class UsbMouseDevice {
- public:
-  UsbMouseDevice();
+public:
+    UsbMouseDevice();
 
-  bool isUsbReady();
+    bool isUsbReady();
     
-  void update() {
-    usbPoll();
-  }
-  void move(char dx, char dy);
+    void update() {
+        usbPoll();
+    }
+
+    void move(char dx, char dy);
+
+    void moveWheel(char dy);
+
+    void pressButton(char button);
+
+    void releaseButton(char button);
+
+    void setButtonState(char button, bool pressed);
+
+    //void clickButton(char button);
+
+    void updateStatus();
 
-  void updateStatus();
+    void resetStatus();
     
-  //private: TODO: Make friend?
-  report_t    reportBuffer;    // buffer for HID reports [ 1 modifier byte + (len-1) key strokes]
+    //private: TODO: Make friend?
+    report_t reportBuffer;    // buffer for HID reports [ 1 modifier byte + (len-1) key strokes]
 
 private:
 

UsbMouse.hxx

@@ -51,17 +51,10 @@ UsbMouseDevice::UsbMouseDevice()
     cli();
     usbDeviceDisconnect();
     usbDeviceConnect();
-
-
     usbInit();
-
     sei();
 
-    reportBuffer.buttonMask = 0;
-    reportBuffer.dx = 0;
-    reportBuffer.dy = 0;
-    reportBuffer.dWheel = 0;
-
+    resetStatus();
 }
 
 bool UsbMouseDevice::isUsbReady()
@@ -77,10 +70,52 @@ void UsbMouseDevice::move(char dx, char dy)
     updateStatus();
 }
 
+void UsbMouseDevice::moveWheel(char dy)
+{
+    reportBuffer.dWheel += dy;
+    updateStatus();
+}
+
+void UsbMouseDevice::pressButton(char button)
+{
+    reportBuffer.buttonMask |= button;
+    updateStatus();
+}
+
+void UsbMouseDevice::releaseButton(char button)
+{
+    reportBuffer.buttonMask &= ~button;
+    updateStatus();
+}
+
+void UsbMouseDevice::setButtonState(char button, bool pressed)
+{
+    if (pressed)
+    {
+        pressButton(button);
+    }
+    else
+    {
+        releaseButton(button);
+    }
+}
+
+/*void UsbMouseDevice::clickButton(char button)
+{
+    pressButton(button);
+    while (!usbInterruptIsReady()) {
+    }
+    releaseButton(button);
+}*/
+
 void UsbMouseDevice::updateStatus()
 {
     usbSetInterrupt((unsigned char*)(void *)&reportBuffer, sizeof(reportBuffer));
+    resetStatus();
+}
 
+void UsbMouseDevice::resetStatus()
+{
     reportBuffer.buttonMask = 0;
     reportBuffer.dx = 0;
     reportBuffer.dy = 0;

examples/UsbMouseDemo1/main.ino

@@ -16,17 +16,10 @@ void loop()
     WAIT_USB;
 
     UsbMouse.move(50, 0);
+    //UsbMouse.moveWheel(1);
+    //UsbMouse.pressButton(MOUSE_BUTTON_LEFT);
+    //UsbMouse.releaseButton(MOUSE_BUTTON_LEFT);
 
-    /*reportBuffer.buttonMask = 0;
-    reportBuffer.dx = 50;
-    reportBuffer.dy = 0;
-    reportBuffer.dWheel = 0;
-
-    usbSetInterrupt((unsigned char*)(void *)&reportBuffer, sizeof(reportBuffer));
     ArdUtils::delayMs(1000);
-    usbSetInterrupt((unsigned char*)(void *)&reportBuffer, sizeof(reportBuffer));*/
-
-    //ArdUtils::delayMs(1000);
     digitalWrite(ledPin, !digitalRead(ledPin));
-    //while(1);
 }