Merge branch 'master' of ssh://github.com/keyboardio/Kaleidoscope

pull/839/head
Jesse Vincent 5 years ago
commit 04f67a6504

@ -193,8 +193,12 @@ class Keyboard {
} }
void releaseAllKeys() __attribute__((noinline)) { void releaseAllKeys() __attribute__((noinline)) {
resetModifierTracking(); resetModifierTracking();
nkro_keyboard_.releaseAll(); if (boot_keyboard_.getProtocol() == HID_BOOT_PROTOCOL) {
consumer_control_.releaseAll(); boot_keyboard_.releaseAll();
} else {
nkro_keyboard_.releaseAll();
consumer_control_.releaseAll();
}
} }
void pressConsumerControl(Key mapped_key) { void pressConsumerControl(Key mapped_key) {
consumer_control_.press(CONSUMER(mapped_key)); consumer_control_.press(CONSUMER(mapped_key));

Loading…
Cancel
Save