From 71fabf72e04bbcc3d3d758bb1d20f95804edefc8 Mon Sep 17 00:00:00 2001 From: Mathias Andersson Date: Sun, 28 Apr 2013 18:57:06 +0200 Subject: Improve matrix print for Phantom. --- keyboard/phantom/matrix.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboard/phantom/matrix.c') diff --git a/keyboard/phantom/matrix.c b/keyboard/phantom/matrix.c index 7b2461dcc7..92db6817c0 100644 --- a/keyboard/phantom/matrix.c +++ b/keyboard/phantom/matrix.c @@ -220,10 +220,10 @@ matrix_row_t matrix_get_row(uint8_t row) void matrix_print(void) { - print("\nr/c 01234567\n"); + print("\nr/c 0123456789ABCDEF\n"); for (uint8_t row = 0; row < MATRIX_ROWS; row++) { phex(row); print(": "); - pbin_reverse(matrix_get_row(row)); + print_bin_reverse32(matrix_get_row(row)); print("\n"); } } -- cgit v1.2.3 From 2d31fcf187ab3a334d39d55c622d8b5bd75a487e Mon Sep 17 00:00:00 2001 From: Mathias Andersson Date: Sun, 28 Apr 2013 20:03:12 +0200 Subject: Change Phantom matrix scan to be similar to GH60. --- keyboard/phantom/matrix.c | 219 ++++++++++++++++++++++++++-------------------- 1 file changed, 125 insertions(+), 94 deletions(-) (limited to 'keyboard/phantom/matrix.c') diff --git a/keyboard/phantom/matrix.c b/keyboard/phantom/matrix.c index 92db6817c0..e9606ef5d5 100644 --- a/keyboard/phantom/matrix.c +++ b/keyboard/phantom/matrix.c @@ -27,91 +27,10 @@ static uint8_t debouncing = DEBOUNCE; static matrix_row_t matrix[MATRIX_ROWS]; static matrix_row_t matrix_debouncing[MATRIX_ROWS]; - -#define _DDRA (uint8_t *const)&DDRA -#define _DDRB (uint8_t *const)&DDRB -#define _DDRC (uint8_t *const)&DDRC -#define _DDRD (uint8_t *const)&DDRD -#define _DDRE (uint8_t *const)&DDRE -#define _DDRF (uint8_t *const)&DDRF - -#define _PINA (uint8_t *const)&PINA -#define _PINB (uint8_t *const)&PINB -#define _PINC (uint8_t *const)&PINC -#define _PIND (uint8_t *const)&PIND -#define _PINE (uint8_t *const)&PINE -#define _PINF (uint8_t *const)&PINF - -#define _PORTA (uint8_t *const)&PORTA -#define _PORTB (uint8_t *const)&PORTB -#define _PORTC (uint8_t *const)&PORTC -#define _PORTD (uint8_t *const)&PORTD -#define _PORTE (uint8_t *const)&PORTE -#define _PORTF (uint8_t *const)&PORTF - -#define _BIT0 0x01 -#define _BIT1 0x02 -#define _BIT2 0x04 -#define _BIT3 0x08 -#define _BIT4 0x10 -#define _BIT5 0x20 -#define _BIT6 0x40 -#define _BIT7 0x80 - -/* Specifies the ports and pin numbers for the rows */ -static -uint8_t *const row_ddr[MATRIX_ROWS] = {_DDRB, _DDRB, _DDRB, _DDRB, _DDRB, _DDRB}; - -static -uint8_t *const row_port[MATRIX_ROWS] = {_PORTB, _PORTB, _PORTB, _PORTB, _PORTB, _PORTB}; - -static -uint8_t *const row_pin[MATRIX_ROWS] = {_PINB, _PINB, _PINB, _PINB, _PINB, _PINB}; - -static -const uint8_t row_bit[MATRIX_ROWS] = { _BIT0, _BIT1, _BIT2, _BIT3, _BIT4, _BIT5}; - -/* Specifies the ports and pin numbers for the columns */ -static -uint8_t *const col_ddr[MATRIX_COLS] = { _DDRD, _DDRC, _DDRC, _DDRD, _DDRD, _DDRE, - _DDRF, _DDRF, _DDRF, _DDRF, _DDRF, _DDRF, - _DDRD, _DDRD, _DDRD, _DDRD, _DDRD}; - -static -uint8_t *const col_port[MATRIX_COLS] = {_PORTD, _PORTC, _PORTC, _PORTD, _PORTD, _PORTE, - _PORTF, _PORTF, _PORTF, _PORTF, _PORTF, _PORTF, - _PORTD, _PORTD, _PORTD, _PORTD, _PORTD}; - -static -const uint8_t col_bit[MATRIX_COLS] = { _BIT5, _BIT7, _BIT6, _BIT4, _BIT0, _BIT6, - _BIT0, _BIT1, _BIT4, _BIT5, _BIT6, _BIT7, - _BIT7, _BIT6, _BIT1, _BIT2, _BIT3}; - -static -inline void pull_column(int col) { - *col_port[col] &= ~col_bit[col]; -} - -static -inline void release_column(int col) { - *col_port[col] |= col_bit[col]; -} - -/* PORTB is set as input with pull-up resistors - PORTC,D,E,F are set to high output */ - -static -void setup_io_pins(void) { - uint8_t row, col; - for(row = 0; row < MATRIX_ROWS; row++) { - *row_ddr[row] &= ~row_bit[row]; - *row_port[row] |= row_bit[row]; - } - for(col = 0; col < MATRIX_COLS; col++) { - *col_ddr[col] |= col_bit[col]; - *col_port[col] |= col_bit[col]; - } -} +static uint8_t read_rows(void); +static void init_rows(void); +static void unselect_cols(void); +static void select_col(uint8_t col); /* LEDs are on output compare pins OC1B OC1C This activates fast PWM mode on them. @@ -158,7 +77,8 @@ void matrix_init(void) MCUCR |= (1< Date: Wed, 1 May 2013 11:30:01 +0200 Subject: Code style fixes for Phantom matrix. --- keyboard/phantom/matrix.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'keyboard/phantom/matrix.c') diff --git a/keyboard/phantom/matrix.c b/keyboard/phantom/matrix.c index e9606ef5d5..386feea41f 100644 --- a/keyboard/phantom/matrix.c +++ b/keyboard/phantom/matrix.c @@ -42,22 +42,22 @@ static void select_col(uint8_t col); reaches the value in the output compare register, and are turned on when it reaches TOP (=256). */ static -void setup_leds(void) { - TCCR1A |= // Timer control register 1A - (1< PORTB6, LED_B -> PORTB7 - DDRB &= 0x3F; - PORTB &= 0x3F; +void setup_leds(void) +{ + TCCR1A |= // Timer control register 1A + (1< PORTB6, LED_B -> PORTB7 + DDRB &= 0x3F; + PORTB &= 0x3F; } - inline uint8_t matrix_rows(void) { @@ -82,7 +82,7 @@ void matrix_init(void) setup_leds(); // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_ROWS; i++) { + for (uint8_t i = 0; i < MATRIX_ROWS; i++) { matrix[i] = 0; matrix_debouncing[i] = 0; } -- cgit v1.2.3