Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix the layer-dependent modifiers handling #182

Merged
merged 25 commits into from
Apr 6, 2016
Merged

Fix the layer-dependent modifiers handling #182

Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
c248088
Fix the layer-dependent modifiers handling
vifon Mar 5, 2016
8d55a12
Document the issue of stuck modifiers
vifon Mar 8, 2016
20dd9c0
process_action may be called either with key cache or without it
vifon Mar 12, 2016
73cb877
Always provide an implementation of process_action_nocache
vifon Mar 15, 2016
a5cdc3a
Expose the pressed_actions_cache global variable
vifon Mar 15, 2016
b4f442d
Cut the memory consumption of PREVENT_STUCK_MODIFIERS in half
vifon Mar 27, 2016
36103ed
Update the memory consumption of PREVENT_STUCK_MODIFIERS in README
vifon Mar 27, 2016
1a09e96
Update the memory consumption total value in README
vifon Mar 28, 2016
3174551
Update action.c
Apr 1, 2016
cd8dd1b
Update action.h
Apr 1, 2016
9a35f01
Update action.c
Apr 1, 2016
420fc86
Update action.c
Apr 2, 2016
307f1de
Update action.c
Apr 2, 2016
f5365d1
Update action.c
Apr 2, 2016
680301e
Update action.c
Apr 2, 2016
fddccc9
Update action.c
Apr 2, 2016
da101b8
Update action.c
Apr 2, 2016
f4f5929
Update action.c
Apr 2, 2016
6c8e374
Update action.c
Apr 2, 2016
5a90916
Update action.c
Apr 2, 2016
97cc44e
Merge branch 'modifier-release-fix' of https://github.com/eltang/qmk_…
vifon Apr 2, 2016
4dce725
Cleanup after merge
vifon Apr 2, 2016
8ef14d0
Update PREVENT_STUCK_MODIFIERS documentation in README
vifon Apr 2, 2016
47dd295
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware …
vifon Apr 3, 2016
567f256
Refactor the source layer cache encoding
vifon Apr 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 16 additions & 4 deletions tmk_core/common/action.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ void action_exec(keyevent_t event)

#if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS)
bool disable_action_cache = false;
int8_t pressed_actions_cache[MATRIX_ROWS][MATRIX_COLS];
uint8_t source_layers_cache[5][(MATRIX_ROWS * MATRIX_COLS + 7) / 8] = {0};

void process_action_nocache(keyrecord_t *record)
{
Expand All @@ -82,11 +82,23 @@ action_t store_or_get_action(bool pressed, keypos_t key)
if (disable_action_cache) {
return layer_switch_get_action(key);
}

uint8_t key_number = key.col + (key.row * MATRIX_COLS);
uint8_t storage_row = key_number / 8;
uint8_t storage_bit = key_number % 8;
uint8_t layer;
if (pressed) {
pressed_actions_cache[key.row][key.col] = layer_switch_get_layer(key);
layer = layer_switch_get_layer(key);
for (uint8_t bit_number = 0; bit_number <= 4; bit_number++) {
source_layers_cache[bit_number][storage_row] ^= (-(bool)((layer & (1U << bit_number)) != 0) ^ source_layers_cache[bit_number][storage_row])) & (1U << storage_bit);
}
}
else {
layer = 0;
for (uint8_t bit_number = 0; bit_number <= 4; bit_number++) {
layer |= (uint8_t)((source_layers_cache[bit_number][storage_row] & (1U << storage_bit)) != 0) << bit_number;
}
}
return action_for_key(pressed_actions_cache[key.row][key.col], key);
return action_for_key(layer, key);
#else
return layer_switch_get_action(key);
#endif
Expand Down
1 change: 0 additions & 1 deletion tmk_core/common/action.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ void action_function(keyrecord_t *record, uint8_t id, uint8_t opt);
/* Utilities for actions. */
#if !defined(NO_ACTION_LAYER) && defined(PREVENT_STUCK_MODIFIERS)
extern bool disable_action_cache;
extern int8_t pressed_actions_cache[MATRIX_ROWS][MATRIX_COLS];
#endif
void process_action_nocache(keyrecord_t *record);
void process_action(keyrecord_t *record);
Expand Down