Port to new HID facade

pull/365/head
Jesse Vincent 8 years ago
parent 6b850c140d
commit cf08f96d1c
No known key found for this signature in database
GPG Key ID: 122F5DF7108E4046

@ -1,4 +1,5 @@
#include "Kaleidoscope-Macros.h" #include "Kaleidoscope-Macros.h"
#include "kaleidoscope/hid.h"
__attribute__((weak)) __attribute__((weak))
const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) { const macro_t *macroAction(uint8_t macroIndex, uint8_t keyState) {
@ -14,11 +15,11 @@ static void readKeyCodeAndPlay(const macro_t *macro_p, uint8_t flags, uint8_t ke
if (keyIsPressed(keyStates)) { if (keyIsPressed(keyStates)) {
handleKeyswitchEvent(key, UNKNOWN_KEYSWITCH_LOCATION, IS_PRESSED | INJECTED); handleKeyswitchEvent(key, UNKNOWN_KEYSWITCH_LOCATION, IS_PRESSED | INJECTED);
Keyboard.sendReport(); kaleidoscope::hid::sendKeyboardReport();
} }
if (keyWasPressed(keyStates)) { if (keyWasPressed(keyStates)) {
handleKeyswitchEvent(key, UNKNOWN_KEYSWITCH_LOCATION, WAS_PRESSED | INJECTED); handleKeyswitchEvent(key, UNKNOWN_KEYSWITCH_LOCATION, WAS_PRESSED | INJECTED);
Keyboard.sendReport(); kaleidoscope::hid::sendKeyboardReport();
} }
} }
@ -163,9 +164,9 @@ void Macros_::type(const char *string) {
continue; continue;
handleKeyswitchEvent(key, UNKNOWN_KEYSWITCH_LOCATION, IS_PRESSED | INJECTED); handleKeyswitchEvent(key, UNKNOWN_KEYSWITCH_LOCATION, IS_PRESSED | INJECTED);
Keyboard.sendReport(); kaleidoscope::hid::sendKeyboardReport();
handleKeyswitchEvent(key, UNKNOWN_KEYSWITCH_LOCATION, WAS_PRESSED | INJECTED); handleKeyswitchEvent(key, UNKNOWN_KEYSWITCH_LOCATION, WAS_PRESSED | INJECTED);
Keyboard.sendReport(); kaleidoscope::hid::sendKeyboardReport();
} }
} }

Loading…
Cancel
Save