From bcc9b518f51e07d9720e2f1dd4422b6a2cbd28ce Mon Sep 17 00:00:00 2001 From: Kai Ryu Date: Thu, 21 Nov 2013 12:41:09 +0900 Subject: [PATCH] Add support for GH60 PCB revB and revC --- keyboard/gh60/matrix.c | 99 +++++++++++++++++++++++++++++++----------- 1 file changed, 73 insertions(+), 26 deletions(-) diff --git a/keyboard/gh60/matrix.c b/keyboard/gh60/matrix.c index a2bd70e4..516afe3b 100644 --- a/keyboard/gh60/matrix.c +++ b/keyboard/gh60/matrix.c @@ -135,40 +135,87 @@ uint8_t matrix_key_count(void) } /* Column pin configuration - * col: 0 1 2 3 4 5 6 7 8 9 10 11 12 13 - * pin: F0 F1 E6 C7 C6 B6 D4 B1 B0 B5 B4 D7 D6 B3 + * revC pin: F1 F0 E6 D7 D6 D4 C7 C6 B7 B5 B4 B3 B1 B0 + * revB pin: F1 F0 E6 D7 D6 D4 C7 C6 B7 B6 B5 B4 B3 B1 + * revA pin: F1 F0 E6 D7 D6 D4 C7 C6 B6 B5 B4 B3 B1 B0 */ static void init_cols(void) { // Input with pull-up(DDR:0, PORT:1) - DDRF &= ~(1<<0 | 1<<1); - PORTF |= (1<<0 | 1<<1); - DDRE &= ~(1<<6); - PORTE |= (1<<6); - DDRD &= ~(1<<7 | 1<<6 | 1<<4); - PORTD |= (1<<7 | 1<<6 | 1<<4); - DDRC &= ~(1<<7 | 1<<6); - PORTC |= (1<<7 | 1<<6); - DDRB &= ~(1<<6 | 1<< 5 | 1<<4 | 1<<3 | 1<<1 | 1<<0); - PORTB |= (1<<6 | 1<< 5 | 1<<4 | 1<<3 | 1<<1 | 1<<0); + DDRF &= ~(1<