forksand
/
qmk_firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

making qmk a bit more agnostic

Browse Source 
if any of this ever works...
ps2avrgb
Ethan Madden 7 years ago
parent 34b0029b1e
commit ba132db308
2 changed files with 75 additions and 66 deletions
Show Stats Download Patch File Download Diff File

97
quantum/config_common.h
Unescape View File

@ -24,54 +24,55 @@
/* I/O pins */ /* I/O pins */
#ifndef F0 #ifndef F0
#define B0 0x30 #define PINDEF(port, pin) (uint8_t)((((uint16_t)&PORT##port) << 4) + PIN##port##pin)
#define B1 0x31 #define A0 PINDEF(A, 0)
#define B2 0x32 #define A1 PINDEF(A, 1)
#define B3 0x33 #define A2 PINDEF(A, 1)
#define B4 0x34 #define A3 PINDEF(A, 3)
#define B5 0x35 #define A4 PINDEF(A, 4)
#define B6 0x36 #define A5 PINDEF(A, 5)
#define B7 0x37 #define A6 PINDEF(A, 6)
#define C0 0x60 #define A7 PINDEF(A, 7)
#define C1 0x61 #define B0 PINDEF(B, 0)
#define C2 0x62 #define B1 PINDEF(B, 1)
#define C3 0x63 #define B2 PINDEF(B, 2)
#define C4 0x64 #define B3 PINDEF(B, 3)
#define C5 0x65 #define B4 PINDEF(B, 4)
#define C6 0x66 #define B5 PINDEF(B, 5)
#define C7 0x67 #define B6 PINDEF(B, 6)
#define D0 0x90 #define B7 PINDEF(B, 7)
#define D1 0x91 #define C0 PINDEF(C, 0)
#define D2 0x92 #define C1 PINDEF(C, 1)
#define D3 0x93 #define C2 PINDEF(C, 2)
#define D4 0x94 #define C3 PINDEF(C, 3)
#define D5 0x95 #define C4 PINDEF(C, 4)
#define D6 0x96 #define C5 PINDEF(C, 5)
#define D7 0x97 #define C6 PINDEF(C, 6)
#define E0 0xC0 #define C7 PINDEF(C, 7)
#define E1 0xC1 #define D0 PINDEF(D, 0)
#define E2 0xC2 #define D1 PINDEF(D, 1)
#define E3 0xC3 #define D2 PINDEF(D, 2)
#define E4 0xC4 #define D3 PINDEF(D, 3)
#define E5 0xC5 #define D4 PINDEF(D, 4)
#define E6 0xC6 #define D5 PINDEF(D, 5)
#define E7 0xC7 #define D6 PINDEF(D, 6)
#define F0 0xF0 #define D7 PINDEF(D, 7)
#define F1 0xF1 #define E0 PINDEF(E, 0)
#define F2 0xF2 #define E1 PINDEF(E, 1)
#define F3 0xF3 #define E2 PINDEF(E, 2)
#define F4 0xF4 #define E3 PINDEF(E, 3)
#define F5 0xF5 #define E4 PINDEF(E, 4)
#define F6 0xF6 #define E5 PINDEF(E, 5)
#define F7 0xF7 #define E6 PINDEF(E, 6)
#define A0 0x00 #define E7 PINDEF(E, 7)
#define A1 0x01 #define F0 PINDEF(F, 0)
#define A2 0x02 #define F1 PINDEF(F, 1)
#define A3 0x03 #define F2 PINDEF(F, 2)
#define A4 0x04 #define F3 PINDEF(F, 3)
#define A5 0x05 #define F4 PINDEF(F, 4)
#define A6 0x06 #define F5 PINDEF(F, 5)
#define A7 0x07 #define F6 PINDEF(F, 6)
#define F7 PINDEF(F, 7)
#endif #endif
/* USART configuration */ /* USART configuration */

44
quantum/matrix.c
Unescape View File

@ -271,6 +271,14 @@ uint8_t matrix_key_count(void)
} }
#define PIN(p) (*((volatile uint8_t*)(p >> 4) + 0))
#define DDR(p) (*((volatile uint8_t*)(p >> 4) + 1))
#define PORT(p) (*((volatile uint8_t*)(p >> 4) + 2))
_Static_assert(1==2, "wat");
_Static_assert(PIN(F0)==PINC, "Pin does not match");
_Static_assert(PIN(D0)==PIND, "Pin does not match");
_Static_assert(PIN(E0)==PINE, "Pin does not match");
#if (DIODE_DIRECTION == COL2ROW) #if (DIODE_DIRECTION == COL2ROW)
@ -278,8 +286,8 @@ static void init_cols(void)
{ {
for(uint8_t x = 0; x < MATRIX_COLS; x++) { for(uint8_t x = 0; x < MATRIX_COLS; x++) {
uint8_t pin = col_pins[x]; uint8_t pin = col_pins[x];
_SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN DDR(pin) &= ~_BV(pin & 0xF); // IN
_SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI PORT(pin) |= _BV(pin & 0xF); // HI
} }
} }
@ -300,7 +308,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
// Select the col pin to read (active low) // Select the col pin to read (active low)
uint8_t pin = col_pins[col_index]; uint8_t pin = col_pins[col_index];
uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF)); uint8_t pin_state = (PIN(pin) & _BV(pin & 0xF));
// Populate the matrix row with the state of the col pin // Populate the matrix row with the state of the col pin
current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index); current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index);
@ -315,23 +323,23 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
static void select_row(uint8_t row) static void select_row(uint8_t row)
{ {
uint8_t pin = row_pins[row]; uint8_t pin = row_pins[row];
_SFR_IO8((pin >> 4) + 1) |= _BV(pin & 0xF); // OUT DDR(pin) |= _BV(pin & 0xF); // OUT
_SFR_IO8((pin >> 4) + 2) &= ~_BV(pin & 0xF); // LOW PORT(pin) &= ~_BV(pin & 0xF); // LOW
} }
static void unselect_row(uint8_t row) static void unselect_row(uint8_t row)
{ {
uint8_t pin = row_pins[row]; uint8_t pin = row_pins[row];
_SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN DDR(pin) &= ~_BV(pin & 0xF); // IN
_SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI PORT(pin) |= _BV(pin & 0xF); // HI
} }
static void unselect_rows(void) static void unselect_rows(void)
{ {
for(uint8_t x = 0; x < MATRIX_ROWS; x++) { for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
uint8_t pin = row_pins[x]; uint8_t pin = row_pins[x];
_SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN DDR(pin) &= ~_BV(pin & 0xF); // IN
_SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI PORT(pin) |= _BV(pin & 0xF); // HI
} }
} }
@ -341,8 +349,8 @@ static void init_rows(void)
{ {
for(uint8_t x = 0; x < MATRIX_ROWS; x++) { for(uint8_t x = 0; x < MATRIX_ROWS; x++) {
uint8_t pin = row_pins[x]; uint8_t pin = row_pins[x];
_SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN DDR(pin) &= ~_BV(pin & 0xF); // IN
_SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI PORT(pin) |= _BV(pin & 0xF); // HI
} }
} }
@ -362,7 +370,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
matrix_row_t last_row_value = current_matrix[row_index]; matrix_row_t last_row_value = current_matrix[row_index];
// Check row pin state // Check row pin state
if ((_SFR_IO8(row_pins[row_index] >> 4) & _BV(row_pins[row_index] & 0xF)) == 0) if ((PIN(row_pins[row_index]) & _BV(row_pins[row_index] & 0xF)) == 0)
{ {
// Pin LO, set col bit // Pin LO, set col bit
current_matrix[row_index] |= (ROW_SHIFTER << current_col); current_matrix[row_index] |= (ROW_SHIFTER << current_col);
@ -389,23 +397,23 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
static void select_col(uint8_t col) static void select_col(uint8_t col)
{ {
uint8_t pin = col_pins[col]; uint8_t pin = col_pins[col];
_SFR_IO8((pin >> 4) + 1) |= _BV(pin & 0xF); // OUT DDR(pin) |= _BV(pin & 0xF); // OUT
_SFR_IO8((pin >> 4) + 2) &= ~_BV(pin & 0xF); // LOW PORT(pin) &= ~_BV(pin & 0xF); // LOW
} }
static void unselect_col(uint8_t col) static void unselect_col(uint8_t col)
{ {
uint8_t pin = col_pins[col]; uint8_t pin = col_pins[col];
_SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN DDR(pin) &= ~_BV(pin & 0xF); // IN
_SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI PORT(pin) |= _BV(pin & 0xF); // HI
} }
static void unselect_cols(void) static void unselect_cols(void)
{ {
for(uint8_t x = 0; x < MATRIX_COLS; x++) { for(uint8_t x = 0; x < MATRIX_COLS; x++) {
uint8_t pin = col_pins[x]; uint8_t pin = col_pins[x];
_SFR_IO8((pin >> 4) + 1) &= ~_BV(pin & 0xF); // IN DDR(pin) &= ~_BV(pin & 0xF); // IN
_SFR_IO8((pin >> 4) + 2) |= _BV(pin & 0xF); // HI PORT(pin) |= _BV(pin & 0xF); // HI
} }
} }

Write Preview
Loading…
Cancel
Save