g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup after merge 

- remove a superfluous parenthesis
- wrap lines longer than 80 characters
- add const specifiers where appropriate
- remove unnecessary casts
daktil_thumb_popravljen
Wojciech Siewierski 2016-04-02 18:00:28 +02:00
parent 97cc44e063
commit 4dce7258d1
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tmk_core/common/action.c
View File

@ -82,20 +82,26 @@ action_t store_or_get_action(bool pressed, keypos_t key)
if (disable_action_cache) { if (disable_action_cache) {
return layer_switch_get_action(key); return layer_switch_get_action(key);
} }
uint8_t key_number = key.col + (key.row * MATRIX_COLS); const uint8_t key_number = key.col + (key.row * MATRIX_COLS);
uint8_t storage_row = key_number / 8; const uint8_t storage_row = key_number / 8;
uint8_t storage_bit = key_number % 8; const uint8_t storage_bit = key_number % 8;
uint8_t layer; uint8_t layer;
if (pressed) { if (pressed) {
layer = layer_switch_get_layer(key); layer = layer_switch_get_layer(key);
for (uint8_t bit_number = 0; bit_number <= 4; bit_number++) { for (uint8_t bit_number = 0; bit_number < 5; 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); source_layers_cache[bit_number][storage_row] ^=
(-((layer & (1U << bit_number)) != 0)
^ source_layers_cache[bit_number][storage_row])
& (1U << storage_bit);
} }
} }
else { else {
layer = 0; layer = 0;
for (uint8_t bit_number = 0; bit_number <= 4; bit_number++) { for (uint8_t bit_number = 0; bit_number < 5; bit_number++) {
layer |= (uint8_t)((source_layers_cache[bit_number][storage_row] & (1U << storage_bit)) != 0) << bit_number; layer |=
((source_layers_cache[bit_number][storage_row]
& (1U << storage_bit)) != 0)
<< bit_number;
} }
} }
return action_for_key(layer, key); return action_for_key(layer, key);