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

Merge pull request #203 from UltimateHackingKeyboard/sticky-modifiers

Browse Source 
Adjust the behavior of sticky modifiers
This commit is contained in:
László Monda
2018-12-26 03:42:47 +01:00
committed by GitHub
parent fb220038b7 e5ac605b4c
commit 2e73bb9ea1
4 changed files with 86 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
right/src/key_states.h
View File

@@ -13,7 +13,6 @@
uint8_t timestamp; uint8_t timestamp;
bool previous : 1; bool previous : 1;
bool current : 1; bool current : 1;
bool suppressed : 1;
bool debouncing : 1; bool debouncing : 1;
} key_state_t; } key_state_t;

13
right/src/layer.c
View File

@@ -15,7 +15,7 @@ void updateLayerStates(void)
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++) {
key_state_t *keyState = &KeyStates[slotId][keyId]; key_state_t *keyState = &KeyStates[slotId][keyId];
if (keyState->current && !keyState->suppressed) { if (keyState->current) {
key_action_t action = CurrentKeymap[LayerId_Base][slotId][keyId]; key_action_t action = CurrentKeymap[LayerId_Base][slotId][keyId];
if (action.type == KeyActionType_SwitchLayer) { if (action.type == KeyActionType_SwitchLayer) {
if (action.switchLayer.mode != SwitchLayerMode_Toggle) { if (action.switchLayer.mode != SwitchLayerMode_Toggle) {
@@ -70,3 +70,14 @@ layer_id_t GetActiveLayer()
return heldLayer; return heldLayer;
} }
bool IsLayerHeld(void)
{
for (layer_id_t layerId = LayerId_Mod; layerId <= LayerId_Mouse; layerId++) {
if (heldLayers[layerId]) {
return true;
}
}
return false;
}

3
right/src/layer.h
View File

@@ -25,6 +25,7 @@
// Functions: // Functions:
layer_id_t GetActiveLayer(); layer_id_t GetActiveLayer(void);
bool IsLayerHeld(void);
#endif #endif

132
right/src/usb_report_updater.c
View File

@@ -237,72 +237,84 @@ static void handleSwitchLayerAction(key_state_t *keyState, key_action_t *action)
static uint8_t basicScancodeIndex = 0; static uint8_t basicScancodeIndex = 0;
static uint8_t mediaScancodeIndex = 0; static uint8_t mediaScancodeIndex = 0;
static uint8_t systemScancodeIndex = 0; static uint8_t systemScancodeIndex = 0;
static uint8_t stickyModifiers; static uint8_t stickyModifiers, stickySlotId, stickyKeyId;
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;
static secondary_role_t secondaryRole; static secondary_role_t secondaryRole;
static void applyKeyAction(key_state_t *keyState, key_action_t *action) static void applyKeyAction(key_state_t *keyState, key_action_t *action, uint8_t slotId, uint8_t keyId)
{ {
if (keyState->suppressed) { if (keyState->current) {
return; handleSwitchLayerAction(keyState, action);
}
handleSwitchLayerAction(keyState, action); switch (action->type) {
case KeyActionType_Keystroke:
switch (action->type) { if (action->keystroke.scancode) {
case KeyActionType_Keystroke: if (!keyState->previous) {
if (action->keystroke.scancode) { stickyModifiers = action->keystroke.modifiers;
if (!keyState->previous) { stickySlotId = slotId;
stickyModifiers = action->keystroke.modifiers; stickyKeyId = keyId;
}
} else {
ActiveUsbBasicKeyboardReport->modifiers |= action->keystroke.modifiers;
} }
} else { switch (action->keystroke.keystrokeType) {
ActiveUsbBasicKeyboardReport->modifiers |= action->keystroke.modifiers; case KeystrokeType_Basic:
} if (basicScancodeIndex >= USB_BASIC_KEYBOARD_MAX_KEYS || action->keystroke.scancode == 0) {
switch (action->keystroke.keystrokeType) { break;
case KeystrokeType_Basic: }
if (basicScancodeIndex >= USB_BASIC_KEYBOARD_MAX_KEYS || action->keystroke.scancode == 0) { ActiveUsbBasicKeyboardReport->scancodes[basicScancodeIndex++] = action->keystroke.scancode;
break; break;
} case KeystrokeType_Media:
ActiveUsbBasicKeyboardReport->scancodes[basicScancodeIndex++] = action->keystroke.scancode; if (mediaScancodeIndex >= USB_MEDIA_KEYBOARD_MAX_KEYS) {
break; break;
case KeystrokeType_Media: }
if (mediaScancodeIndex >= USB_MEDIA_KEYBOARD_MAX_KEYS) { ActiveUsbMediaKeyboardReport->scancodes[mediaScancodeIndex++] = action->keystroke.scancode;
break; break;
} case KeystrokeType_System:
ActiveUsbMediaKeyboardReport->scancodes[mediaScancodeIndex++] = action->keystroke.scancode; if (systemScancodeIndex >= USB_SYSTEM_KEYBOARD_MAX_KEYS) {
break; break;
case KeystrokeType_System: }
if (systemScancodeIndex >= USB_SYSTEM_KEYBOARD_MAX_KEYS) { ActiveUsbSystemKeyboardReport->scancodes[systemScancodeIndex++] = action->keystroke.scancode;
break; break;
}
break;
case KeyActionType_Mouse:
if (!keyState->previous) {
stickyModifiers = 0;
}
activeMouseStates[action->mouseAction] = true;
break;
case KeyActionType_SwitchLayer:
// Handled by handleSwitchLayerAction()
break;
case KeyActionType_SwitchKeymap:
if (!keyState->previous) {
stickyModifiers = 0;
secondaryRoleState = SecondaryRoleState_Released;
SwitchKeymapById(action->switchKeymap.keymapId);
}
break;
case KeyActionType_PlayMacro:
if (!keyState->previous) {
stickyModifiers = 0;
Macros_StartMacro(action->playMacro.macroId);
}
break;
}
} else {
switch (action->type) {
case KeyActionType_Keystroke:
if (keyState->previous) {
if (slotId == stickySlotId && keyId == stickyKeyId) {
if (!IsLayerHeld() && !(secondaryRoleState == SecondaryRoleState_Triggered && IS_SECONDARY_ROLE_LAYER_SWITCHER(secondaryRole))) {
stickyModifiers = 0;
}
} }
ActiveUsbSystemKeyboardReport->scancodes[systemScancodeIndex++] = action->keystroke.scancode; }
break; break;
} }
break;
case KeyActionType_Mouse:
if (!keyState->previous) {
stickyModifiers = 0;
}
activeMouseStates[action->mouseAction] = true;
break;
case KeyActionType_SwitchLayer:
// Handled by handleSwitchLayerAction()
break;
case KeyActionType_SwitchKeymap:
if (!keyState->previous) {
stickyModifiers = 0;
secondaryRoleState = SecondaryRoleState_Released;
SwitchKeymapById(action->switchKeymap.keymapId);
}
break;
case KeyActionType_PlayMacro:
if (!keyState->previous) {
stickyModifiers = 0;
Macros_StartMacro(action->playMacro.macroId);
}
break;
} }
} }
@@ -394,22 +406,22 @@ static void updateActiveUsbReports(void)
secondaryRoleSlotId = slotId; secondaryRoleSlotId = slotId;
secondaryRoleKeyId = keyId; secondaryRoleKeyId = keyId;
secondaryRole = action->keystroke.secondaryRole; secondaryRole = action->keystroke.secondaryRole;
keyState->suppressed = true;
} }
} else { } else {
applyKeyAction(keyState, action); applyKeyAction(keyState, action, slotId, keyId);
} }
} else { } else {
keyState->suppressed = false;
// Release secondary role key. // Release secondary role key.
if (keyState->previous && secondaryRoleSlotId == slotId && secondaryRoleKeyId == keyId) { if (keyState->previous && secondaryRoleSlotId == slotId && secondaryRoleKeyId == keyId && secondaryRoleState != SecondaryRoleState_Released) {
// Trigger primary role. // Trigger primary role.
if (secondaryRoleState == SecondaryRoleState_Pressed) { if (secondaryRoleState == SecondaryRoleState_Pressed) {
keyState->previous = false; keyState->previous = false;
applyKeyAction(keyState, action); keyState->current = true;
applyKeyAction(keyState, action, slotId, keyId);
} }
secondaryRoleState = SecondaryRoleState_Released; secondaryRoleState = SecondaryRoleState_Released;
} else {
applyKeyAction(keyState, action, slotId, keyId);
} }
} }