From 461e0d3d8c82cc78d29d3115af3c417bb51bb50f Mon Sep 17 00:00:00 2001 From: tmk Date: Tue, 26 Oct 2010 21:32:45 +0900 Subject: ADD: keymap macro for human to read easier ADD: controller.h for controller board definition(teensy) ADD: debug toggle --- hhkb/matrix.c | 44 ++++++++++++++++++++++++++++++-------------- 1 file changed, 30 insertions(+), 14 deletions(-) (limited to 'hhkb/matrix.c') diff --git a/hhkb/matrix.c b/hhkb/matrix.c index a64065560..d8dc9a7f8 100644 --- a/hhkb/matrix.c +++ b/hhkb/matrix.c @@ -35,12 +35,14 @@ static int bit_pop(uint8_t bits); inline -int matrix_rows(void) { +int matrix_rows(void) +{ return MATRIX_ROWS; } inline -int matrix_cols(void) { +int matrix_cols(void) +{ return MATRIX_COLS; } @@ -55,8 +57,8 @@ void matrix_init(void) PORTE = 0xC0; // initialize matrix state: all keys off - for (int i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0xFF; - for (int i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0xFF; + for (int i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00; + for (int i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00; matrix = _matrix0; matrix_prev = _matrix1; } @@ -76,9 +78,9 @@ int matrix_scan(void) KEY_ENABLE; _delay_us(10); // from logic analyzer chart if (KEY_ON) { - matrix[row] &= ~(1<