Skip to content

Solve Arduino IDE issue 'KeyboardCombiner.ino' needs to be in package 'K... #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
professor wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Solve Arduino IDE issue 'KeyboardCombiner.ino' needs to be in package 'K... #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05aec2d
Solve Arduino IDE issue 'KeyboardCombiner.ino' needs to be in package…
professor Feb 1, 2015
6b7434f
Moving mouse methods near each other
professor Feb 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
155 changes: 76 additions & 79 deletions KeyboardCombiner.ino → KeyboardCombinerArduinoSketch.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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);
Expand Down