Update action.c

This commit is contained in:
Eric-L-T 2016-04-01 19:54:02 -07:00
parent 420fc8620b
commit 307f1dee21

View File

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