1
0
Fork 0

Adds Planck Rev 7 & Updates rev6_drop to Matrix Lite Implementation (#21175)

* adds planck/rev7

* Remove config.h include

Co-authored-by: Drashna Jaelre <drashna@live.com>

* convert planck matrices to lite implementation

---------

Co-authored-by: Drashna Jaelre <drashna@live.com>
This commit is contained in:
Jack Humbert 2023-06-08 21:46:09 -04:00 committed by GitHub
parent a9f677b518
commit 232281946d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 1166 additions and 132 deletions

View file

@ -1,5 +1,5 @@
/*
* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
* Copyright 2018-2023 Jack Humbert <jack.humb@gmail.com>
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -17,155 +17,58 @@
#include "quantum.h"
#ifndef DEBOUNCE
# define DEBOUNCE 5
#endif
/*
* col: { B11, B10, B2, B1, A7, B0 }
* row: { A10, A9, A8, B15, C13, C14, C15, A2 }
*/
/* matrix state(1:on, 0:off) */
static matrix_row_t matrix[MATRIX_ROWS];
static matrix_row_t matrix_debouncing[MATRIX_COLS];
static bool debouncing = false;
static uint16_t debouncing_time = 0;
static pin_t matrix_row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
static pin_t matrix_col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
__attribute__((weak)) void matrix_init_user(void) {}
static matrix_row_t matrix_inverted[MATRIX_COLS];
__attribute__((weak)) void matrix_scan_user(void) {}
void matrix_init_custom(void) {
// actual matrix setup - cols
for (int i = 0; i < MATRIX_COLS; i++) {
setPinOutput(matrix_col_pins[i]);
}
__attribute__((weak)) void matrix_init_kb(void) {
matrix_init_user();
// rows
for (int i = 0; i < MATRIX_ROWS; i++) {
setPinInputLow(matrix_row_pins[i]);
}
}
__attribute__((weak)) void matrix_scan_kb(void) {
matrix_scan_user();
}
bool matrix_scan_custom(matrix_row_t current_matrix[]) {
bool changed = false;
void matrix_init(void) {
dprintf("matrix init\n");
// debug_matrix = true;
// actual matrix setup
palSetPadMode(GPIOB, 11, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 10, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 2, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 1, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOA, 7, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOB, 0, PAL_MODE_OUTPUT_PUSHPULL);
palSetPadMode(GPIOA, 10, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOA, 9, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOA, 8, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOB, 15, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOC, 13, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOC, 14, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOC, 15, PAL_MODE_INPUT_PULLDOWN);
palSetPadMode(GPIOA, 2, PAL_MODE_INPUT_PULLDOWN);
memset(matrix, 0, MATRIX_ROWS * sizeof(matrix_row_t));
memset(matrix_debouncing, 0, MATRIX_COLS * sizeof(matrix_row_t));
matrix_init_kb();
}
uint8_t matrix_scan(void) {
// actual matrix
for (int col = 0; col < MATRIX_COLS; col++) {
matrix_row_t data = 0;
// strobe col { B11, B10, B2, B1, A7, B0 }
switch (col) {
case 0:
palSetPad(GPIOB, 11);
break;
case 1:
palSetPad(GPIOB, 10);
break;
case 2:
palSetPad(GPIOB, 2);
break;
case 3:
palSetPad(GPIOB, 1);
break;
case 4:
palSetPad(GPIOA, 7);
break;
case 5:
palSetPad(GPIOB, 0);
break;
}
// strobe col
writePinHigh(matrix_col_pins[col]);
// need wait to settle pin state
wait_us(20);
// read row data { A10, A9, A8, B15, C13, C14, C15, A2 }
data = ((palReadPad(GPIOA, 10) << 0) | (palReadPad(GPIOA, 9) << 1) | (palReadPad(GPIOA, 8) << 2) | (palReadPad(GPIOB, 15) << 3) | (palReadPad(GPIOC, 13) << 4) | (palReadPad(GPIOC, 14) << 5) | (palReadPad(GPIOC, 15) << 6) | (palReadPad(GPIOA, 2) << 7));
// unstrobe col { B11, B10, B2, B1, A7, B0 }
switch (col) {
case 0:
palClearPad(GPIOB, 11);
break;
case 1:
palClearPad(GPIOB, 10);
break;
case 2:
palClearPad(GPIOB, 2);
break;
case 3:
palClearPad(GPIOB, 1);
break;
case 4:
palClearPad(GPIOA, 7);
break;
case 5:
palClearPad(GPIOB, 0);
break;
}
if (matrix_debouncing[col] != data) {
matrix_debouncing[col] = data;
debouncing = true;
debouncing_time = timer_read();
}
}
if (debouncing && timer_elapsed(debouncing_time) > DEBOUNCE) {
// read row data
for (int row = 0; row < MATRIX_ROWS; row++) {
matrix[row] = 0;
for (int col = 0; col < MATRIX_COLS; col++) {
matrix[row] |= ((matrix_debouncing[col] & (1 << row) ? 1 : 0) << col);
}
data |= (readPin(matrix_row_pins[row]) << row);
}
// unstrobe col
writePinLow(matrix_col_pins[col]);
if (matrix_inverted[col] != data) {
matrix_inverted[col] = data;
}
debouncing = false;
}
matrix_scan_kb();
return 1;
}
bool matrix_is_on(uint8_t row, uint8_t col) {
return (matrix[row] & (1 << col));
}
matrix_row_t matrix_get_row(uint8_t row) {
return matrix[row];
}
void matrix_print(void) {
dprintf("\nr/c 01234567\n");
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
dprintf("%X0: ", row);
matrix_row_t data = matrix_get_row(row);
for (int row = 0; row < MATRIX_ROWS; row++) {
matrix_row_t old = current_matrix[row];
current_matrix[row] = 0;
for (int col = 0; col < MATRIX_COLS; col++) {
if (data & (1 << col))
dprintf("1");
else
dprintf("0");
current_matrix[row] |= ((matrix_inverted[col] & (1 << row) ? 1 : 0) << col);
}
dprintf("\n");
changed |= old != current_matrix[row];
}
return changed;
}