Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

gboards/gergoplex: fix matrix pins #18999

Merged
merged 1 commit into from
Nov 8, 2022
Merged

gboards/gergoplex: fix matrix pins #18999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions keyboards/gboards/gergoplex/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* COLS: AVR pins used for columns, left to right
* ROWS: AVR pins used for rows, top to bottom
*/
#define MATRIX_ROW_PINS { F6, F5, F4, F1 }
#define MATRIX_COL_PINS { B1, B2, B3, D2, D3 }
#define MATRIX_COL_PINS { F6, F5, F4, F1 }
#define MATRIX_ROW_PINS { B1, B2, B3, D2, D3 }
#define IGNORE_MOD_TAP_INTERRUPT

#define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || get_mods() == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)))
Expand Down
28 changes: 14 additions & 14 deletions keyboards/gboards/gergoplex/matrix.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,10 +38,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#endif

// ATmega pin defs
#define ROW1 (1 << 6)
#define ROW2 (1 << 5)
#define ROW3 (1 << 4)
#define ROW4 (1 << 1)
#define COL1 (1 << 6)
#define COL2 (1 << 5)
#define COL3 (1 << 4)
#define COL4 (1 << 1)

/* matrix state(1:on, 0:off) */
static matrix_row_t matrix[MATRIX_ROWS];
Expand All @@ -51,9 +51,9 @@ static matrix_row_t matrix[MATRIX_ROWS];
*/
static matrix_row_t raw_matrix[MATRIX_ROWS];

static const pin_t row_pins[MATRIX_COLS] = MATRIX_ROW_PINS;
static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
// Right-hand side only pins, the left side is controlled my MCP
static const pin_t col_pins[MATRIX_ROWS_PER_SIDE] = MATRIX_COL_PINS;
static const pin_t row_pins[MATRIX_ROWS_PER_SIDE] = MATRIX_ROW_PINS;

// Debouncing: store for each key the number of scans until it's eligible to
// change. When scanning the matrix, ignore any changes in keys that have
Expand Down Expand Up @@ -167,8 +167,8 @@ void matrix_print(void) {

// Remember this means ROWS
static void init_cols(void) {
for (uint8_t row = 0; row < MATRIX_COLS; row++) {
setPinInputHigh(row_pins[row]);
for (uint8_t col = 0; col < MATRIX_COLS; col++) {
setPinInputHigh(col_pins[col]);
}
}

Expand All @@ -193,7 +193,7 @@ static matrix_row_t read_cols(uint8_t row) {
return data;
}
} else {
return ~((((PINF & ROW4) >> 1) | ((PINF & (ROW1 | ROW2 | ROW3)) >> 3)) & 0xF);
return ~((((PINF & COL4) >> 1) | ((PINF & (COL1 | COL2 | COL3)) >> 3)) & 0xF);
}
}

Expand All @@ -202,9 +202,9 @@ static void unselect_rows(void) {
// no need to unselect on mcp23018, because the select step sets all
// the other row bits high, and it's not changing to a different direction

for (uint8_t col = 0; col < MATRIX_ROWS_PER_SIDE; col++) {
setPinInput(col_pins[col]);
writePinLow(col_pins[col]);
for (uint8_t row = 0; row < MATRIX_ROWS_PER_SIDE; row++) {
setPinInput(row_pins[row]);
writePinLow(row_pins[row]);
}
}

Expand All @@ -223,7 +223,7 @@ static void select_row(uint8_t row) {
i2c_stop();
}
} else {
setPinOutput(col_pins[row - MATRIX_ROWS_PER_SIDE]);
writePinLow(col_pins[row - MATRIX_ROWS_PER_SIDE]);
setPinOutput(row_pins[row - MATRIX_ROWS_PER_SIDE]);
writePinLow(row_pins[row - MATRIX_ROWS_PER_SIDE]);
}
}