Instead of implementing the HID adaptors within Kaleidoscope, provide an API only (by marking the symbols `extern`). For the sake of backwards compatibility, pull in `Kaleidoscope-HIDAdaptor-KeyboardioHID`, a new shim library implementing the status quo. Signed-off-by: Gergely Nagy <algernon@keyboard.io>pull/279/head
Gergely Nagy
7 years ago
parent
a5eb6320c8
commit
6867ff3ba8
@ -1,188 +0,0 @@
|
||||
#include "hid.h"
|
||||
|
||||
#ifdef ARDUINO_VIRTUAL
|
||||
#include "VirtualHID/VirtualHID.h"
|
||||
#else
|
||||
#include "KeyboardioHID.h"
|
||||
#endif
|
||||
|
||||
namespace kaleidoscope {
|
||||
namespace hid {
|
||||
void initializeKeyboard() {
|
||||
Keyboard.begin();
|
||||
}
|
||||
|
||||
void pressRawKey(Key mappedKey) {
|
||||
Keyboard.press(mappedKey.keyCode);
|
||||
|
||||
}
|
||||
|
||||
void _pressModifierKey(Key mappedKey) {
|
||||
pressRawKey(mappedKey);
|
||||
|
||||
/* On at least ChromeOS 51-60, first sending a "press shift" key event in the same report
|
||||
* as the key report for some shifted keys causes the shift event to be missed.
|
||||
*
|
||||
* Specifically, Shift + [ in the same key report do not genereate a {
|
||||
*
|
||||
* This workaround causes an extra key report to be sent to toggle on the modifier key
|
||||
* before sending the key event we're trying to modify as part of a key report
|
||||
*
|
||||
* I (Jesse) don't believe we need a similar workaround for toggling the modifer _off_
|
||||
*/
|
||||
|
||||
if (!wasModifierKeyActive(mappedKey)) {
|
||||
sendKeyboardReport();
|
||||
}
|
||||
}
|
||||
|
||||
void pressKey(Key mappedKey) {
|
||||
if (mappedKey.flags & SHIFT_HELD) {
|
||||
_pressModifierKey(Key_LeftShift);
|
||||
}
|
||||
if (mappedKey.flags & CTRL_HELD) {
|
||||
_pressModifierKey(Key_LeftControl);
|
||||
}
|
||||
if (mappedKey.flags & LALT_HELD) {
|
||||
_pressModifierKey(Key_LeftAlt);
|
||||
}
|
||||
if (mappedKey.flags & RALT_HELD) {
|
||||
_pressModifierKey(Key_RightAlt);
|
||||
}
|
||||
if (mappedKey.flags & GUI_HELD) {
|
||||
_pressModifierKey(Key_LeftGui);
|
||||
}
|
||||
|
||||
pressRawKey(mappedKey);
|
||||
}
|
||||
|
||||
void releaseRawKey(Key mappedKey) {
|
||||
Keyboard.release(mappedKey.keyCode);
|
||||
|
||||
}
|
||||
|
||||
void releaseAllKeys() {
|
||||
Keyboard.releaseAll();
|
||||
ConsumerControl.releaseAll();
|
||||
}
|
||||
|
||||
void releaseKey(Key mappedKey) {
|
||||
if (mappedKey.flags & SHIFT_HELD) {
|
||||
releaseRawKey(Key_LeftShift);
|
||||
}
|
||||
if (mappedKey.flags & CTRL_HELD) {
|
||||
releaseRawKey(Key_LeftControl);
|
||||
}
|
||||
if (mappedKey.flags & LALT_HELD) {
|
||||
releaseRawKey(Key_LeftAlt);
|
||||
}
|
||||
if (mappedKey.flags & RALT_HELD) {
|
||||
releaseRawKey(Key_RightAlt);
|
||||
}
|
||||
if (mappedKey.flags & GUI_HELD) {
|
||||
releaseRawKey(Key_LeftGui);
|
||||
}
|
||||
releaseRawKey(mappedKey);
|
||||
}
|
||||
|
||||
boolean isModifierKeyActive(Key mappedKey) {
|
||||
return Keyboard.isModifierActive(mappedKey.keyCode);
|
||||
}
|
||||
|
||||
boolean wasModifierKeyActive(Key mappedKey) {
|
||||
return Keyboard.wasModifierActive(mappedKey.keyCode);
|
||||
}
|
||||
|
||||
uint8_t getKeyboardLEDs() {
|
||||
return Keyboard.getLEDs();
|
||||
}
|
||||
|
||||
|
||||
void sendKeyboardReport() {
|
||||
Keyboard.sendReport();
|
||||
ConsumerControl.sendReport();
|
||||
}
|
||||
|
||||
void initializeConsumerControl() {
|
||||
ConsumerControl.begin();
|
||||
}
|
||||
|
||||
void pressConsumerControl(Key mappedKey) {
|
||||
ConsumerControl.press(CONSUMER(mappedKey));
|
||||
}
|
||||
|
||||
void releaseConsumerControl(Key mappedKey) {
|
||||
ConsumerControl.release(CONSUMER(mappedKey));
|
||||
}
|
||||
|
||||
|
||||
void initializeSystemControl() {
|
||||
SystemControl.begin();
|
||||
}
|
||||
|
||||
void pressSystemControl(Key mappedKey) {
|
||||
SystemControl.press(mappedKey.keyCode);
|
||||
}
|
||||
|
||||
void releaseSystemControl(Key mappedKey) {
|
||||
SystemControl.release();
|
||||
}
|
||||
|
||||
|
||||
// Mouse events
|
||||
|
||||
void initializeMouse() {
|
||||
Mouse.begin();
|
||||
}
|
||||
|
||||
void moveMouse(signed char x, signed char y, signed char vWheel, signed char hWheel) {
|
||||
Mouse.move(x, y, vWheel, hWheel);
|
||||
}
|
||||
|
||||
void clickMouseButtons(uint8_t buttons) {
|
||||
Mouse.click(buttons);
|
||||
}
|
||||
|
||||
void pressMouseButtons(uint8_t buttons) {
|
||||
Mouse.press(buttons);
|
||||
}
|
||||
|
||||
void releaseMouseButtons(uint8_t buttons) {
|
||||
Mouse.release(buttons);
|
||||
}
|
||||
|
||||
void releaseAllMouseButtons(void) {
|
||||
Mouse.releaseAll();
|
||||
}
|
||||
|
||||
void sendMouseReport(void) {
|
||||
Mouse.sendReport();
|
||||
}
|
||||
|
||||
/** SingleAbsolute mouse (grapahics tablet) events */
|
||||
|
||||
void initializeAbsoluteMouse() {
|
||||
SingleAbsoluteMouse.begin();
|
||||
}
|
||||
|
||||
void moveAbsoluteMouse(signed char x, signed char y, signed char wheel) {
|
||||
SingleAbsoluteMouse.move(x, y, wheel);
|
||||
}
|
||||
void moveAbsoluteMouseTo(uint16_t x, uint16_t y, signed char wheel) {
|
||||
SingleAbsoluteMouse.moveTo(x, y, wheel);
|
||||
}
|
||||
|
||||
void clickAbsoluteMouseButtons(uint8_t buttons) {
|
||||
SingleAbsoluteMouse.click(buttons);
|
||||
}
|
||||
|
||||
void pressAbsoluteMouseButtons(uint8_t buttons) {
|
||||
SingleAbsoluteMouse.press(buttons);
|
||||
}
|
||||
|
||||
void releaseAbsoluteMouseButtons(uint8_t buttons) {
|
||||
SingleAbsoluteMouse.release(buttons);
|
||||
}
|
||||
|
||||
}
|
||||
};
|
||||
Loading…
Reference in new issue