g1smo
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Poskus pravilnejšega mapiranja: 

Rows: PB6-PF6
Cols: PB5-PD4

(Od desne proti leve gledano oboje)
daktil_thumb_popravljen
Jure Podgoršek 2018-04-13 19:51:52 +02:00
parent b8fdf46f77
commit df8eab83e9
1 changed files with 42 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
keyboards/handwired/daktil/matrix.c
View File

@ -268,8 +268,25 @@ static void init_cols(void)
// init on teensy // init on teensy
// Input with pull-up(DDR:0, PORT:1) // Input with pull-up(DDR:0, PORT:1)
DDRF &= ~(1<<7 | 1<<6 | 1<<5 | 1<<4 | 1<<1 | 1<<0);
PORTF |= (1<<7 | 1<<6 | 1<<5 | 1<<4 | 1<<1 | 1<<0); // To je za stran vrec
//DDRF &= ~(1<<7 | 1<<6 | 1<<5 | 1<<4 | 1<<1 | 1<<0);
//PORTF |= (1<<7 | 1<<6 | 1<<5 | 1<<4 | 1<<1 | 1<<0);
// Cist mimo
DDRB &= ~(1<<5 | 1<<4)
PORTB |= (1<<5 | 1<<4)
// Evo to je ze boljse
DDRE &= ~(1<<6)
PORTE |= (1<<6)
DDRD &= ~(1<<4 | 1<<7)
PORTD |= (1<<4 | 1<<7)
DDRC &= ~(1<<6)
PORTC |= (1<<6)
} }
static matrix_row_t read_cols(uint8_t row) static matrix_row_t read_cols(uint8_t row)
@ -291,12 +308,20 @@ static matrix_row_t read_cols(uint8_t row)
} else { } else {
// read from teensy // read from teensy
return return
/* OLOSH
(PINF&(1<<0) ? 0 : (1<<0)) | (PINF&(1<<0) ? 0 : (1<<0)) |
(PINF&(1<<1) ? 0 : (1<<1)) | (PINF&(1<<1) ? 0 : (1<<1)) |
(PINF&(1<<4) ? 0 : (1<<2)) | (PINF&(1<<4) ? 0 : (1<<2)) |
(PINF&(1<<5) ? 0 : (1<<3)) | (PINF&(1<<5) ? 0 : (1<<3)) |
(PINF&(1<<6) ? 0 : (1<<4)) | (PINF&(1<<6) ? 0 : (1<<4)) |
(PINF&(1<<7) ? 0 : (1<<5)) ; (PINF&(1<<7) ? 0 : (1<<5)) ;
*/
(PINB&(1<<4) ? 0 : (1<<0)) |
(PINB&(1<<5) ? 0 : (1<<1)) |
(PINE&(1<<6) ? 0 : (1<<2)) |
(PIND&(1<<4) ? 0 : (1<<3)) |
(PIND&(1<<7) ? 0 : (1<<4)) |
(PINC&(1<<6) ? 0 : (1<<5)) ;
} }
} }
@ -326,12 +351,19 @@ static void unselect_rows(void)
// unselect on teensy // unselect on teensy
// Hi-Z(DDR:0, PORT:0) to unselect // Hi-Z(DDR:0, PORT:0) to unselect
/* spet mimo jojoj
DDRB &= ~(1<<1 | 1<<2 | 1<<3); DDRB &= ~(1<<1 | 1<<2 | 1<<3);
PORTB &= ~(1<<1 | 1<<2 | 1<<3); PORTB &= ~(1<<1 | 1<<2 | 1<<3);
DDRD &= ~(1<<2 | 1<<3); DDRD &= ~(1<<2 | 1<<3);
PORTD &= ~(1<<2 | 1<<3); PORTD &= ~(1<<2 | 1<<3);
DDRC &= ~(1<<6); DDRC &= ~(1<<6);
PORTC &= ~(1<<6); PORTC &= ~(1<<6);
*/
DDRB &= ~(1<<1 | 1<<2 | 1<<3 | 1<<6);
PORTB &= ~(1<<1 | 1<<2 | 1<<3 | 1<<6);
DDRF &= ~(1<<7 | 1<<6);
PORTF &= ~(1<<7 | 1<<6);
} }
/* Row pin configuration /* Row pin configuration
@ -364,8 +396,8 @@ static void select_row(uint8_t row)
// Output low(DDR:1, PORT:0) to select // Output low(DDR:1, PORT:0) to select
switch (row) { switch (row) {
case 6: case 6:
DDRB |= (1<<1); DDRB |= (1<<6);
PORTB &= ~(1<<1); PORTB &= ~(1<<6);
break; break;
case 7: case 7:
DDRB |= (1<<2); DDRB |= (1<<2);
@ -376,18 +408,17 @@ static void select_row(uint8_t row)
PORTB &= ~(1<<3); PORTB &= ~(1<<3);
break; break;
case 9: case 9:
DDRD |= (1<<2); DDRB |= (1<<1);
PORTD &= ~(1<<3); PORTB &= ~(1<<1);
break; break;
case 10: case 10:
DDRD |= (1<<3); DDRF |= (1<<7);
PORTD &= ~(1<<3); PORTF &= ~(1<<7);
break; break;
case 11: case 11:
DDRC |= (1<<6); DDRF |= (1<<6);
PORTC &= ~(1<<6); PORTF &= ~(1<<6);
break; break;
} }
} }
} }