From 0e11b511e4a3c48a67de6414b0907ec26dfcdf49 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 31 May 2022 03:08:56 +0100 Subject: Convert ergodone to use core mcp23018 driver (#17005) --- keyboards/ktec/ergodone/matrix.c | 388 +++++++++++++++++++-------------------- 1 file changed, 188 insertions(+), 200 deletions(-) (limited to 'keyboards/ktec/ergodone/matrix.c') diff --git a/keyboards/ktec/ergodone/matrix.c b/keyboards/ktec/ergodone/matrix.c index 529974532a..cb845db1bc 100644 --- a/keyboards/ktec/ergodone/matrix.c +++ b/keyboards/ktec/ergodone/matrix.c @@ -1,161 +1,76 @@ -#include -#include -#include +// Copyright 2022 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include "gpio.h" +#include "matrix.h" +#include "mcp23018.h" +#include "util.h" #include "wait.h" -#include "action_layer.h" -#include "print.h" #include "debug.h" -#include "util.h" -#include "matrix.h" -#include "ergodone.h" -#include "expander.h" - -/* - * This constant define not debouncing time in msecs, but amount of matrix - * scan loops which should be made to get stable debounced results. - * - * On Ergodox matrix scan rate is relatively low, because of slow I2C. - * Now it's only 317 scans/second, or about 3.15 msec/scan. - * According to Cherry specs, debouncing time is 5 msec. - * - * And so, there is no sense to have DEBOUNCE higher than 2. - */ - -#ifndef DEBOUNCE -# define DEBOUNCE 5 -#endif - -/* matrix state(1:on, 0:off) */ -static matrix_row_t matrix[MATRIX_ROWS]; - -// 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 -// already changed in the last DEBOUNCE scans. -static uint8_t debounce_matrix[MATRIX_ROWS * MATRIX_COLS]; -static matrix_row_t read_cols(uint8_t row); -static void init_cols(void); -static void unselect_rows(void); -static void select_row(uint8_t row); +#define I2C_ADDR 0x20 -__attribute__ ((weak)) -void matrix_init_user(void) {} +static uint8_t mcp23018_errors = 0; -__attribute__ ((weak)) -void matrix_scan_user(void) {} - -__attribute__ ((weak)) -void matrix_init_kb(void) { - matrix_init_user(); -} - -__attribute__ ((weak)) -void matrix_scan_kb(void) { - matrix_scan_user(); +static void expander_init(void) { + mcp23018_init(I2C_ADDR); } -inline -uint8_t matrix_rows(void) -{ - return MATRIX_ROWS; +static void expander_init_cols(void) { + mcp23018_errors += !mcp23018_set_config(I2C_ADDR, mcp23018_PORTA, ALL_INPUT); + mcp23018_errors += !mcp23018_set_config(I2C_ADDR, mcp23018_PORTB, ALL_INPUT); } -inline -uint8_t matrix_cols(void) -{ - return MATRIX_COLS; -} - -void matrix_init(void) -{ - unselect_rows(); - init_cols(); - - // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - matrix[i] = 0; - for (uint8_t j=0; j < MATRIX_COLS; ++j) { - debounce_matrix[i * MATRIX_COLS + j] = 0; +static void expander_select_row(uint8_t row) { + if (mcp23018_errors) { + // wait to mimic i2c interactions + wait_us(100); + return; } - } - matrix_init_quantum(); + mcp23018_errors += !mcp23018_set_config(I2C_ADDR, mcp23018_PORTB, ~(1 << (row + 1))); } -void matrix_power_up(void) { - unselect_rows(); - init_cols(); - - // initialize matrix state: all keys off - for (uint8_t i=0; i < MATRIX_ROWS; i++) { - matrix[i] = 0; - } +static void expander_unselect_row(uint8_t row) { + // No need to unselect row as the next `select_row` will blank everything anyway } -// Returns a matrix_row_t whose bits are set if the corresponding key should be -// eligible to change in this scan. -matrix_row_t debounce_mask(uint8_t row) { - matrix_row_t result = 0; - for (uint8_t j=0; j < MATRIX_COLS; ++j) { - if (debounce_matrix[row * MATRIX_COLS + j]) { - --debounce_matrix[row * MATRIX_COLS + j]; - } else { - result |= (1 << j); +static void expander_unselect_rows(void) { + if (mcp23018_errors) { + return; } - } - return result; -} -// Report changed keys in the given row. Resets the debounce countdowns -// corresponding to each set bit in 'change' to DEBOUNCE. -void debounce_report(matrix_row_t change, uint8_t row) { - for (uint8_t i = 0; i < MATRIX_COLS; ++i) { - if (change & (1 << i)) { - debounce_matrix[row * MATRIX_COLS + i] = DEBOUNCE; - } - } + mcp23018_errors += !mcp23018_set_config(I2C_ADDR, mcp23018_PORTB, ALL_INPUT); } -uint8_t matrix_scan(void) -{ - expander_scan(); - - for (uint8_t i = 0; i < MATRIX_ROWS; i++) { - select_row(i); - wait_us(30); // without this wait read unstable value. - matrix_row_t mask = debounce_mask(i); - matrix_row_t cols = (read_cols(i) & mask) | (matrix[i] & ~mask); - debounce_report(cols ^ matrix[i], i); - matrix[i] = cols; - - unselect_rows(); - } +static matrix_row_t expander_read_row(void) { + if (mcp23018_errors) { + return 0; + } - matrix_scan_quantum(); + uint8_t ret = 0xFF; + mcp23018_errors += !mcp23018_readPins(I2C_ADDR, mcp23018_PORTA, &ret); - return 1; -} + ret = bitrev(~ret); + ret = ((ret & 0b11111000) >> 1) | (ret & 0b00000011); -inline -bool matrix_is_on(uint8_t row, uint8_t col) -{ - return (matrix[row] & ((matrix_row_t)1< 0x1FFF) { + // tuned to about 5s given the current scan rate + dprintf("trying to reset mcp23018\n"); + mcp23018_reset_loop = 0; + mcp23018_errors = 0; + expander_unselect_rows(); + expander_init_cols(); + } } /* Column pin configuration @@ -165,32 +80,31 @@ void matrix_print(void) * * Expander: 13 12 11 10 9 8 7 */ -static void init_cols(void) -{ - // Pro Micro - DDRE &= ~(1<