Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Fixes from Tranquilite@GH.

Browse source 
- Fix keyboard_task() when matrix column size > 16
- Add clear_keyboard() in NKRO command to avoid stucking keys.
- Fix function name in print.c.
This commit is contained in:
tmk 2012-11-23 12:33:42 +09:00
parent 613fdb24fc
commit 6caefe9649
3 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
common/command.c
View file

@ -234,6 +234,7 @@ static bool command_common(uint8_t code)
break; break;
#ifdef NKRO_ENABLE #ifdef NKRO_ENABLE
case KC_N: case KC_N:
clear_keyboard(); //Prevents stuck keys.
keyboard_nkro = !keyboard_nkro; keyboard_nkro = !keyboard_nkro;
if (keyboard_nkro) if (keyboard_nkro)
print("NKRO: enabled\n"); print("NKRO: enabled\n");

10
common/keyboard.c
View file

@ -564,20 +564,20 @@ void keyboard_task(void)
matrix_row_t matrix_change = 0; matrix_row_t matrix_change = 0;
matrix_scan(); matrix_scan();
for (int r = 0; r < MATRIX_ROWS; r++) { for (uint8_t r = 0; r < MATRIX_ROWS; r++) {
matrix_row = matrix_get_row(r); matrix_row = matrix_get_row(r);
matrix_change = matrix_row ^ matrix_prev[r]; matrix_change = matrix_row ^ matrix_prev[r];
if (matrix_change) { if (matrix_change) {
if (debug_matrix) matrix_print(); if (debug_matrix) matrix_print();
for (int c = 0; c < MATRIX_COLS; c++) { for (uint8_t c = 0; c < MATRIX_COLS; c++) {
if (matrix_change & (1<<c)) { if (matrix_change & ((matrix_row_t)1<<c)) {
process_key((keyevent_t){ process_key((keyevent_t){
.key = (key_t){ .row = r, .col = c }, .key = (key_t){ .row = r, .col = c },
.pressed = (matrix_row & (1<<c)) .pressed = (matrix_row & ((matrix_row_t)1<<c))
}); });
// record a processed key // record a processed key
matrix_prev[r] ^= (1<<c); matrix_prev[r] ^= ((matrix_row_t)1<<c);
// process a key per task call // process a key per task call
goto MATRIX_LOOP_END; goto MATRIX_LOOP_END;
} }

2
common/print.c
View file

@ -138,7 +138,7 @@ void print_hex32(uint32_t data)
} }
void print_bin(uint8_t data) void print_bin8(uint8_t data)
{ {
for (int i = 7; i >= 0; i--) { for (int i = 7; i >= 0; i--) {
sendchar((data & (1<<i)) ? '1' : '0'); sendchar((data & (1<<i)) ? '1' : '0');