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

Suppress pressed keys upon layer switcher key release.

Browse Source
This commit is contained in:
László Monda
2017-11-07 02:21:36 +01:00
parent f6beeecec1
commit 4fa2304e4b
1 changed files with 23 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
right/src/usb_report_updater.c
View File

@@ -80,6 +80,10 @@ static uint8_t systemScancodeIndex = 0;
void applyKeyAction(key_state_t *keyState, key_action_t *action) void applyKeyAction(key_state_t *keyState, key_action_t *action)
{ {
if (keyState->suppressed) {
return;
}
switch (action->type) { switch (action->type) {
case KeyActionType_Keystroke: case KeyActionType_Keystroke:
ActiveUsbBasicKeyboardReport->modifiers |= action->keystroke.modifiers; ActiveUsbBasicKeyboardReport->modifiers |= action->keystroke.modifiers;
@@ -116,6 +120,7 @@ void applyKeyAction(key_state_t *keyState, key_action_t *action)
} }
} }
static layer_id_t previousLayer = LayerId_Base;
static uint8_t secondaryRoleState = SecondaryRoleState_Released; static uint8_t secondaryRoleState = SecondaryRoleState_Released;
static uint8_t secondaryRoleSlotId; static uint8_t secondaryRoleSlotId;
static uint8_t secondaryRoleKeyId; static uint8_t secondaryRoleKeyId;
@@ -139,6 +144,7 @@ void UpdateActiveUsbReports(void)
if (activeLayer == LayerId_Base) { if (activeLayer == LayerId_Base) {
activeLayer = GetActiveLayer(); activeLayer = GetActiveLayer();
} }
bool suppressKeys = previousLayer != LayerId_Base && activeLayer == LayerId_Base;
LedDisplay_SetLayer(activeLayer); LedDisplay_SetLayer(activeLayer);
if (MacroPlaying) { if (MacroPlaying) {
@@ -156,6 +162,10 @@ void UpdateActiveUsbReports(void)
key_action_t *action = &CurrentKeymap[activeLayer][slotId][keyId]; key_action_t *action = &CurrentKeymap[activeLayer][slotId][keyId];
if (keyState->current) { if (keyState->current) {
if (suppressKeys) {
keyState->suppressed = true;
}
if (action->type == KeyActionType_Keystroke && action->keystroke.secondaryRole) { if (action->type == KeyActionType_Keystroke && action->keystroke.secondaryRole) {
// Press released secondary role key. // Press released secondary role key.
if (!keyState->previous && action->type == KeyActionType_Keystroke && action->keystroke.secondaryRole && secondaryRoleState == SecondaryRoleState_Released) { if (!keyState->previous && action->type == KeyActionType_Keystroke && action->keystroke.secondaryRole && secondaryRoleState == SecondaryRoleState_Released) {
@@ -171,13 +181,19 @@ void UpdateActiveUsbReports(void)
} }
applyKeyAction(keyState, action); applyKeyAction(keyState, action);
} }
// Release secondary role key. } else {
} else if (keyState->previous && secondaryRoleSlotId == slotId && secondaryRoleKeyId == keyId) { if (keyState->suppressed) {
// Trigger primary role. keyState->suppressed = false;
if (secondaryRoleState == SecondaryRoleState_Pressed) { }
applyKeyAction(keyState, action);
// Release secondary role key.
if (keyState->previous && secondaryRoleSlotId == slotId && secondaryRoleKeyId == keyId) {
// Trigger primary role.
if (secondaryRoleState == SecondaryRoleState_Pressed) {
applyKeyAction(keyState, action);
}
secondaryRoleState = SecondaryRoleState_Released;
} }
secondaryRoleState = SecondaryRoleState_Released;
} }
keyState->previous = keyState->current; keyState->previous = keyState->current;
@@ -196,4 +212,5 @@ void UpdateActiveUsbReports(void)
} }
previousModifiers = ActiveUsbBasicKeyboardReport->modifiers; previousModifiers = ActiveUsbBasicKeyboardReport->modifiers;
previousLayer = activeLayer;
} }