uhk/firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
László Monda
2018-07-24 14:50:53 +02:00
parent 0248a0e79f 0e5ec29433
commit 456f0e9e58
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
right/src/usb_report_updater.c
View File

@@ -323,24 +323,23 @@ 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 (activeLayer == LayerId_Fn && testKeyState->current && !testKeyState->previous) {
if (TestUsbStack && !testKeyState->previous && testKeyState->current && activeLayer == LayerId_Fn) { simulateKeypresses = !simulateKeypresses;
simulateKeypresses = !simulateKeypresses; }
} if (simulateKeypresses) {
isEven = !isEven;
if (simulateKeypresses) { ActiveUsbBasicKeyboardReport->scancodes[basicScancodeIndex++] = isEven ? HID_KEYBOARD_SC_A : HID_KEYBOARD_SC_BACKSPACE;
isEven = !isEven; if (++mediaCounter % 200 == 0) {
ActiveUsbBasicKeyboardReport->scancodes[basicScancodeIndex++] = isEven ? HID_KEYBOARD_SC_A : HID_KEYBOARD_SC_BACKSPACE; isEvenMedia = !isEvenMedia;
if (++mediaCounter % 200 == 0) { ActiveUsbMediaKeyboardReport->scancodes[mediaScancodeIndex++] = isEvenMedia ? MEDIA_VOLUME_DOWN : MEDIA_VOLUME_UP;
isEvenMedia = !isEvenMedia; }
ActiveUsbMediaKeyboardReport->scancodes[mediaScancodeIndex++] = isEvenMedia ? MEDIA_VOLUME_DOWN : MEDIA_VOLUME_UP; 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++) {