mouse and cdc fixes

This commit is contained in:
Erik Tylek Kettenburg
2015-01-06 14:27:24 -08:00
parent 56dda1007d
commit a9864c18e8
4 changed files with 26 additions and 30 deletions

View File

@@ -150,33 +150,25 @@ void clearMove() {
class DigiMouseDevice {
public:
DigiMouseDevice () {
}
char isConnected()
{
return usb_hasCommed;
}
void begin(){
cli();
PORTB &= ~(_BV(USB_CFG_DMINUS_BIT) | _BV(USB_CFG_DPLUS_BIT));
usbDeviceDisconnect();
_delay_ms(250);
usbDeviceConnect();
rt_usbHidReportDescriptor = mouse_usbHidReportDescriptor;
rt_usbHidReportDescriptorSize = sizeof(mouse_usbHidReportDescriptor);
rt_usbDeviceDescriptor = usbDescrDevice;
rt_usbDeviceDescriptorSize = sizeof(usbDescrDevice);
}
void begin() {
cli();
usbDeviceDisconnect();
_delay_ms(200);
usbDeviceConnect();
usbInit();
sei();
last_report_time = millis();
}
void refresh() {
@@ -293,7 +285,6 @@ extern "C"{
// USB_PUBLIC uchar usbFunctionSetup
uchar usbFunctionSetup(uchar data[8]) {
usb_hasCommed = 1;
usbRequest_t *rq = (usbRequest_t *)data;
usbMsgPtr = reportBuffer;
@@ -344,4 +335,4 @@ extern "C"{
#endif
#endif // __DigiKeyboard_h__
#endif // __DigiMouse_h__

View File

@@ -6,7 +6,6 @@
void setup() {
DigiMouse.begin(); //start or reenumerate USB - BREAKING CHANGE from old versions that didn't require this
//while(!DigiMouse.isConnected()) {} //don't run sketch until USB is connected
}
void loop() {
@@ -32,8 +31,11 @@ void loop() {
//or you can use these functions to click
DigiMouse.rightClick();
DigiMouse.delay(500);
DigiMouse.leftClick();
DigiMouse.delay(500);
DigiMouse.middleClick();
DigiMouse.delay(500);
//for compatability with other libraries you can also use DigiMouse.move(X, Y, scroll, buttons)
}