Merge branch 'master' of github.com:UltimateHackingKeyboard/firmware

This commit is contained in:
László Monda
2018-07-24 14:50:53 +02:00
+5 -6
View File
@@ -323,16 +323,14 @@ static void updateActiveUsbReports(void)
bool layerGotReleased = previousLayer != LayerId_Base && activeLayer == LayerId_Base; bool layerGotReleased = previousLayer != LayerId_Base && activeLayer == LayerId_Base;
LedDisplay_SetLayer(activeLayer); LedDisplay_SetLayer(activeLayer);
static bool simulateKeypresses = false; if (TestUsbStack) {
static bool isEven = false; static bool simulateKeypresses, isEven, isEvenMedia;
static bool isEvenMedia = false;
static uint32_t mediaCounter = 0; static uint32_t mediaCounter = 0;
key_state_t *testKeyState = &KeyStates[SlotId_LeftKeyboardHalf][0]; key_state_t *testKeyState = &KeyStates[SlotId_LeftKeyboardHalf][0];
if (TestUsbStack && !testKeyState->previous && testKeyState->current && activeLayer == LayerId_Fn) {
if (activeLayer == LayerId_Fn && testKeyState->current && !testKeyState->previous) {
simulateKeypresses = !simulateKeypresses; simulateKeypresses = !simulateKeypresses;
} }
if (simulateKeypresses) { if (simulateKeypresses) {
isEven = !isEven; isEven = !isEven;
ActiveUsbBasicKeyboardReport->scancodes[basicScancodeIndex++] = isEven ? HID_KEYBOARD_SC_A : HID_KEYBOARD_SC_BACKSPACE; ActiveUsbBasicKeyboardReport->scancodes[basicScancodeIndex++] = isEven ? HID_KEYBOARD_SC_A : HID_KEYBOARD_SC_BACKSPACE;
@@ -342,6 +340,7 @@ static void updateActiveUsbReports(void)
} }
MouseMoveState.xOut = isEven ? -1 : 1; MouseMoveState.xOut = isEven ? -1 : 1;
} }
}
for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) { for (uint8_t slotId=0; slotId<SLOT_COUNT; slotId++) {
for (uint8_t keyId=0; keyId<MAX_KEY_COUNT_PER_MODULE; keyId++) { for (uint8_t keyId=0; keyId<MAX_KEY_COUNT_PER_MODULE; keyId++) {