marco/qmk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HHKB scan matrix: fix wait time on power on

Browse Source
This commit is contained in:
tmk 2012-10-17 14:23:31 +09:00
parent 30eb3e3520
commit bc5ee91d14
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
keyboard/hhkb/matrix.c
View File

@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <avr/io.h> #include <avr/io.h>
#include <avr/interrupt.h> #include <avr/interrupt.h>
#include <util/delay.h> #include <util/delay.h>
#include "print.h" #include "debug.h"
#include "util.h" #include "util.h"
#include "timer.h" #include "timer.h"
#include "matrix.h" #include "matrix.h"
@ -107,7 +107,7 @@ static matrix_row_t _matrix1[MATRIX_ROWS];
#define KEY_POWER_ON() do { \ #define KEY_POWER_ON() do { \
KEY_INIT(); \ KEY_INIT(); \
PORTB &= ~(1<<5); \ PORTB &= ~(1<<5); \
_delay_us(200); \ _delay_ms(1); \
} while (0) } while (0)
#define KEY_POWER_OFF() do { \ #define KEY_POWER_OFF() do { \
DDRB &= ~0x3F; \ DDRB &= ~0x3F; \
@ -228,21 +228,24 @@ uint16_t matrix_get_row(uint8_t row)
return matrix[row]; return matrix[row];
} }
void matrix_print(void) void matrix_debug(void)
{ {
if (!debug_matrix)
return;
#if (MATRIX_COLS <= 8) #if (MATRIX_COLS <= 8)
print("\nr/c 01234567\n"); debug("\nr/c 01234567\n");
#else #else
print("\nr/c 0123456789ABCDEF\n"); debug("\nr/c 0123456789ABCDEF\n");
#endif #endif
for (uint8_t row = 0; row < matrix_rows(); row++) { for (uint8_t row = 0; row < matrix_rows(); row++) {
phex(row); print(": "); debug_hex(row); debug(": ");
#if (MATRIX_COLS <= 8) #if (MATRIX_COLS <= 8)
pbin_reverse(matrix_get_row(row)); debug_bin_reverse(matrix_get_row(row));
#else #else
pbin_reverse16(matrix_get_row(row)); debug_bin_reverse16(matrix_get_row(row));
#endif #endif
print("\n"); debug("\n");
} }
} }