From 05aec2d3e5b0a5e308bc25fdef159f257fbf17c3 Mon Sep 17 00:00:00 2001 From: Todd Sedano Date: Sun, 1 Feb 2015 06:38:19 -0800 Subject: [PATCH 1/2] Solve Arduino IDE issue 'KeyboardCombiner.ino' needs to be in package 'KeyboardCombiner' --- KeyboardCombiner.ino => KeyboardCombinerArduinoSketch.ino | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename KeyboardCombiner.ino => KeyboardCombinerArduinoSketch.ino (100%) diff --git a/KeyboardCombiner.ino b/KeyboardCombinerArduinoSketch.ino similarity index 100% rename from KeyboardCombiner.ino rename to KeyboardCombinerArduinoSketch.ino From 6b7434f372e7fa6edbf102fcf619f247cd2e1f2c Mon Sep 17 00:00:00 2001 From: Todd Sedano Date: Tue, 3 Feb 2015 19:44:35 -0800 Subject: [PATCH 2/2] Moving mouse methods near each other --- KeyboardCombinerArduinoSketch.ino | 155 +++++++++++++++--------------- 1 file changed, 76 insertions(+), 79 deletions(-) diff --git a/KeyboardCombinerArduinoSketch.ino b/KeyboardCombinerArduinoSketch.ino index 6b645a7..a4a6005 100644 --- a/KeyboardCombinerArduinoSketch.ino +++ b/KeyboardCombinerArduinoSketch.ino @@ -63,49 +63,6 @@ uint8_t keyPressCount[256]; const uint8_t modifier_keys[] = {KEY_LEFT_CTRL, KEY_LEFT_SHIFT, KEY_LEFT_ALT, KEY_LEFT_GUI, KEY_RIGHT_CTRL, KEY_RIGHT_SHIFT, KEY_RIGHT_ALT, KEY_RIGHT_GUI}; - -class MouseRptParser : public MouseReportParser -{ -protected: - virtual void OnMouseMove (MOUSEINFO *mi); - virtual void OnLeftButtonUp (MOUSEINFO *mi); - virtual void OnLeftButtonDown (MOUSEINFO *mi); - virtual void OnRightButtonUp (MOUSEINFO *mi); - virtual void OnRightButtonDown (MOUSEINFO *mi); - virtual void OnMiddleButtonUp (MOUSEINFO *mi); - virtual void OnMiddleButtonDown (MOUSEINFO *mi); -}; - -void MouseRptParser::OnMouseMove(MOUSEINFO *mi) -{ - moveMouse(mi->dX, mi->dY); -}; -void MouseRptParser::OnLeftButtonUp (MOUSEINFO *mi) -{ - mouseRelease(MOUSE_LEFT); -}; -void MouseRptParser::OnLeftButtonDown (MOUSEINFO *mi) -{ - mousePress(MOUSE_LEFT); -}; -void MouseRptParser::OnRightButtonUp (MOUSEINFO *mi) -{ - mouseRelease(MOUSE_RIGHT); -}; -void MouseRptParser::OnRightButtonDown (MOUSEINFO *mi) -{ - mousePress(MOUSE_RIGHT); -}; -void MouseRptParser::OnMiddleButtonUp (MOUSEINFO *mi) -{ - mouseRelease(MOUSE_MIDDLE); -}; -void MouseRptParser::OnMiddleButtonDown (MOUSEINFO *mi) -{ - mousePress(MOUSE_MIDDLE); -}; - - class KbdRptParser : public KeyboardReportParser { uint8_t mapToAscii(uint8_t); @@ -232,6 +189,82 @@ void KbdRptParser::OnKeyUp(uint8_t mod, uint8_t key) } } +void pressKey(uint8_t key) +{ + if (!keyboardInitialized) { + keyboardInitialized = true; + if (debug) { + Serial.println("Initializing keyboard"); + } else { + Keyboard.begin(); + } + } + + keyPressCount[key]++; + if (keyPressCount[key] == 1) { + if (debug) { + Serial.print("Press: "); + Serial.println(key, HEX); + } else { + Keyboard.press(key); + } + } +}; + +void releaseKey(uint8_t key) +{ + keyPressCount[key]--; + if (keyPressCount[key] == 0) { + if (debug) { + Serial.print("Release: "); + Serial.println(key, HEX); + } else { + Keyboard.release(key); + } + } +}; + +class MouseRptParser : public MouseReportParser +{ +protected: + virtual void OnMouseMove (MOUSEINFO *mi); + virtual void OnLeftButtonUp (MOUSEINFO *mi); + virtual void OnLeftButtonDown (MOUSEINFO *mi); + virtual void OnRightButtonUp (MOUSEINFO *mi); + virtual void OnRightButtonDown (MOUSEINFO *mi); + virtual void OnMiddleButtonUp (MOUSEINFO *mi); + virtual void OnMiddleButtonDown (MOUSEINFO *mi); +}; + +void MouseRptParser::OnMouseMove(MOUSEINFO *mi) +{ + moveMouse(mi->dX, mi->dY); +}; +void MouseRptParser::OnLeftButtonUp (MOUSEINFO *mi) +{ + mouseRelease(MOUSE_LEFT); +}; +void MouseRptParser::OnLeftButtonDown (MOUSEINFO *mi) +{ + mousePress(MOUSE_LEFT); +}; +void MouseRptParser::OnRightButtonUp (MOUSEINFO *mi) +{ + mouseRelease(MOUSE_RIGHT); +}; +void MouseRptParser::OnRightButtonDown (MOUSEINFO *mi) +{ + mousePress(MOUSE_RIGHT); +}; +void MouseRptParser::OnMiddleButtonUp (MOUSEINFO *mi) +{ + mouseRelease(MOUSE_MIDDLE); +}; +void MouseRptParser::OnMiddleButtonDown (MOUSEINFO *mi) +{ + mousePress(MOUSE_MIDDLE); +}; + void ensureMouseInitialized() { if (!mouseInitialized) { mouseInitialized = true; @@ -274,42 +307,6 @@ void mouseRelease(char button) { } } - -void pressKey(uint8_t key) -{ - if (!keyboardInitialized) { - keyboardInitialized = true; - if (debug) { - Serial.println("Initializing keyboard"); - } else { - Keyboard.begin(); - } - } - - keyPressCount[key]++; - if (keyPressCount[key] == 1) { - if (debug) { - Serial.print("Press: "); - Serial.println(key, HEX); - } else { - Keyboard.press(key); - } - } -}; - -void releaseKey(uint8_t key) -{ - keyPressCount[key]--; - if (keyPressCount[key] == 0) { - if (debug) { - Serial.print("Release: "); - Serial.println(key, HEX); - } else { - Keyboard.release(key); - } - } -}; - USB usb; USBHub hub(&usb); USBHub hub2(&usb);