Skip to content

Commit

Permalink
blackhawk: moved col-10 from D2 to F4
Browse files Browse the repository at this point in the history
  • Loading branch information
alonswartz committed Apr 8, 2017
1 parent fdf1f31 commit 368ccad
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions keyboard/blackhawk/matrix.c
Original file line number Diff line number Diff line change
Expand Up @@ -136,14 +136,14 @@ uint8_t matrix_key_count(void)


// col: 0 1 2 3 4 5 6 7 8 9 10 11 12 13
// pin: D7 B4 B5 B6 F7 F6 F5 C7 C6 D3 D2 D1 D0 B7
// pin: D7 B4 B5 B6 F7 F6 F5 C7 C6 D3 F4 D1 D0 B7
static void init_cols(void)
{
// Input with pull-up(DDR:0, PORT:1)
DDRF &= ~(1<<7 | 1<<6 | 1<<5);
PORTF |= (1<<7 | 1<<6 | 1<<5);
DDRD &= ~(1<<7 | 1<<3 | 1<<2 | 1<<1 | 1<<0);
PORTD |= (1<<7 | 1<<3 | 1<<2 | 1<<1 | 1<<0);
DDRF &= ~(1<<7 | 1<<6 | 1<<5 | 1<<4);
PORTF |= (1<<7 | 1<<6 | 1<<5 | 1<<4);
DDRD &= ~(1<<7 | 1<<3 | 1<<1 | 1<<0);
PORTD |= (1<<7 | 1<<3 | 1<<1 | 1<<0);
DDRC &= ~(1<<7 | 1<<6);
PORTC |= (1<<7 | 1<<6);
DDRB &= ~(1<<7 | 1<<6 | 1<<5 | 1<<4);
Expand All @@ -162,7 +162,7 @@ static matrix_row_t read_cols(void)
(PINC&(1<<7) ? 0 : (1<<7)) |
(PINC&(1<<6) ? 0 : (1<<8)) |
(PIND&(1<<3) ? 0 : (1<<9)) |
(PIND&(1<<2) ? 0 : (1<<10)) |
(PINF&(1<<4) ? 0 : (1<<10)) |
(PIND&(1<<1) ? 0 : (1<<11)) |
(PIND&(1<<0) ? 0 : (1<<12)) |
(PINB&(1<<7) ? 0 : (1<<13));
Expand Down

0 comments on commit 368ccad

Please sign in to comment.