fern/qmk-firmware
1
0
Fork 0
mirror of https://github.com/firewalkwithm3/qmk_firmware.git synced 2024-11-22 11:30:30 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Allow 30us matrix delay to be keyboard/user overridable (#8216)

Browse source 
* Allow 30us matrix delay to be configurable via define

* Move wait logic to matrix_common

* Move wait logic to matrix_common - fix wait includes
This commit is contained in:
Joel Challis 2020-02-21 03:49:33 +00:00 committed by GitHub
parent 42d6270f28
commit 7707724dc4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/config_options.md
View file

@ -53,6 +53,8 @@ This is a C header file that is one of the first things included, and will persi
* pins of the rows, from top to bottom * pins of the rows, from top to bottom
* `#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }` * `#define MATRIX_COL_PINS { F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }`
* pins of the columns, from left to right * pins of the columns, from left to right
* `#define MATRIX_IO_DELAY 30`
* the delay in microseconds when between changing matrix pin state and reading values
* `#define UNUSED_PINS { D1, D2, D3, B1, B2, B3 }` * `#define UNUSED_PINS { D1, D2, D3, B1, B2, B3 }`
* pins unused by the keyboard for reference * pins unused by the keyboard for reference
* `#define MATRIX_HAS_GHOST` * `#define MATRIX_HAS_GHOST`

5
quantum/matrix.c
View file

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "wait.h"
#include "util.h" #include "util.h"
#include "matrix.h" #include "matrix.h"
#include "debounce.h" #include "debounce.h"
@ -94,7 +93,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
// Select row and wait for row selecton to stabilize // Select row and wait for row selecton to stabilize
select_row(current_row); select_row(current_row);
wait_us(30); matrix_io_delay();
// For each col... // For each col...
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
@ -138,7 +137,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
// Select col and wait for col selecton to stabilize // Select col and wait for col selecton to stabilize
select_col(current_col); select_col(current_col);
wait_us(30); matrix_io_delay();
// For each row... // For each row...
for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) { for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {

7
quantum/matrix_common.c
View file

@ -1,8 +1,13 @@
#include "matrix.h" #include "matrix.h"
#include "debounce.h" #include "debounce.h"
#include "wait.h"
#include "print.h" #include "print.h"
#include "debug.h" #include "debug.h"
#ifndef MATRIX_IO_DELAY
# define MATRIX_IO_DELAY 30
#endif
/* matrix state(1:on, 0:off) */ /* matrix state(1:on, 0:off) */
matrix_row_t raw_matrix[MATRIX_ROWS]; matrix_row_t raw_matrix[MATRIX_ROWS];
matrix_row_t matrix[MATRIX_ROWS]; matrix_row_t matrix[MATRIX_ROWS];
@ -78,6 +83,8 @@ uint8_t matrix_key_count(void) {
return count; return count;
} }
__attribute__((weak)) void matrix_io_delay(void) { wait_us(MATRIX_IO_DELAY); }
// CUSTOM MATRIX 'LITE' // CUSTOM MATRIX 'LITE'
__attribute__((weak)) void matrix_init_custom(void) {} __attribute__((weak)) void matrix_init_custom(void) {}

5
quantum/split_common/matrix.c
View file

@ -16,7 +16,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include <stdint.h> #include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "wait.h"
#include "util.h" #include "util.h"
#include "matrix.h" #include "matrix.h"
#include "debounce.h" #include "debounce.h"
@ -111,7 +110,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
// Select row and wait for row selecton to stabilize // Select row and wait for row selecton to stabilize
select_row(current_row); select_row(current_row);
wait_us(30); matrix_io_delay();
// For each col... // For each col...
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) { for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
@ -155,7 +154,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
// Select col and wait for col selecton to stabilize // Select col and wait for col selecton to stabilize
select_col(current_col); select_col(current_col);
wait_us(30); matrix_io_delay();
// For each row... // For each row...
for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) { for (uint8_t row_index = 0; row_index < ROWS_PER_HAND; row_index++) {

2
tmk_core/common/matrix.h
View file

@ -66,6 +66,8 @@ bool matrix_is_on(uint8_t row, uint8_t col);
matrix_row_t matrix_get_row(uint8_t row); matrix_row_t matrix_get_row(uint8_t row);
/* print matrix for debug */ /* print matrix for debug */
void matrix_print(void); void matrix_print(void);
/* delay between changing matrix pin state and reading values */
void matrix_io_delay(void);
/* power control */ /* power control */
void matrix_power_up(void); void matrix_power_up(void);