Move some common matrix code to a common location (#7699)
* Move some common matrix code to a common location * Refactor some 'custom_matrix_helper' logic to use custom matrix lite * Fix build for kinesis/stapelberg - abuse of vpath was picking up matrix.c from core when custom matrix was enabled * Add validation for CUSTOM_MATRIXmaster
parent
c1feeaa57f
commit
dcb7ca3f79
|
@ -374,12 +374,28 @@ QUANTUM_SRC:= \
|
||||||
$(QUANTUM_DIR)/keymap_common.c \
|
$(QUANTUM_DIR)/keymap_common.c \
|
||||||
$(QUANTUM_DIR)/keycode_config.c
|
$(QUANTUM_DIR)/keycode_config.c
|
||||||
|
|
||||||
# Include the standard or split matrix code if needed
|
|
||||||
|
|
||||||
|
VALID_CUSTOM_MATRIX_TYPES:= yes lite no
|
||||||
|
|
||||||
|
CUSTOM_MATRIX ?= no
|
||||||
|
|
||||||
ifneq ($(strip $(CUSTOM_MATRIX)), yes)
|
ifneq ($(strip $(CUSTOM_MATRIX)), yes)
|
||||||
ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
|
ifeq ($(filter $(CUSTOM_MATRIX),$(VALID_CUSTOM_MATRIX_TYPES)),)
|
||||||
QUANTUM_SRC += $(QUANTUM_DIR)/split_common/matrix.c
|
$(error CUSTOM_MATRIX="$(CUSTOM_MATRIX)" is not a valid custom matrix type)
|
||||||
else
|
endif
|
||||||
QUANTUM_SRC += $(QUANTUM_DIR)/matrix.c
|
|
||||||
|
# Include common stuff for all non custom matrix users
|
||||||
|
QUANTUM_SRC += $(QUANTUM_DIR)/matrix_common.c
|
||||||
|
|
||||||
|
# if 'lite' then skip the actual matrix implementation
|
||||||
|
ifneq ($(strip $(CUSTOM_MATRIX)), lite)
|
||||||
|
# Include the standard or split matrix code if needed
|
||||||
|
ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
|
||||||
|
QUANTUM_SRC += $(QUANTUM_DIR)/split_common/matrix.c
|
||||||
|
else
|
||||||
|
QUANTUM_SRC += $(QUANTUM_DIR)/matrix.c
|
||||||
|
endif
|
||||||
endif
|
endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
CUSTOM_MATRIX = yes # need to do our own thing with the matrix
|
||||||
|
|
||||||
|
# Project specific files
|
||||||
|
SRC += matrix.c
|
|
@ -28,9 +28,5 @@ MIDI_ENABLE = no # MIDI controls
|
||||||
UNICODE_ENABLE = no # Unicode
|
UNICODE_ENABLE = no # Unicode
|
||||||
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
|
||||||
AUDIO_ENABLE = no # Audio output should be port E6, current quantum library hardcodes C6, which we use for programming
|
AUDIO_ENABLE = no # Audio output should be port E6, current quantum library hardcodes C6, which we use for programming
|
||||||
CUSTOM_MATRIX=yes # need to do our own thing with the matrix
|
|
||||||
|
|
||||||
DEFAULT_FOLDER = kinesis/alvicstep
|
DEFAULT_FOLDER = kinesis/alvicstep
|
||||||
|
|
||||||
# Project specific files
|
|
||||||
SRC = matrix.c
|
|
||||||
|
|
|
@ -23,72 +23,16 @@
|
||||||
#include "debounce.h"
|
#include "debounce.h"
|
||||||
#include "quantum.h"
|
#include "quantum.h"
|
||||||
|
|
||||||
//_____COMMON__________________________________________________________________
|
|
||||||
// user-defined overridable functions
|
|
||||||
__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
|
|
||||||
__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
|
|
||||||
__attribute__((weak)) void matrix_init_user(void) {}
|
|
||||||
__attribute__((weak)) void matrix_scan_user(void) {}
|
|
||||||
|
|
||||||
|
|
||||||
//_____COULD BE COMMON_________________________________________________________
|
//_____COULD BE COMMON_________________________________________________________
|
||||||
/* matrix state(1:on, 0:off) */
|
/* matrix state(1:on, 0:off) */
|
||||||
/*static*/ matrix_row_t raw_matrix[MATRIX_ROWS];
|
/*static*/ matrix_row_t raw_matrix[MATRIX_ROWS];
|
||||||
/*static*/ matrix_row_t matrix[MATRIX_ROWS];
|
/*static*/ matrix_row_t matrix[MATRIX_ROWS];
|
||||||
|
|
||||||
#if (MATRIX_COLS <= 8)
|
|
||||||
# define print_matrix_header() print("\nr/c 01234567\n")
|
|
||||||
# define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
|
|
||||||
# define matrix_bitpop(i) bitpop(matrix[i])
|
|
||||||
# define ROW_SHIFTER ((uint8_t)1)
|
|
||||||
#elif (MATRIX_COLS <= 16)
|
|
||||||
# define print_matrix_header() print("\nr/c 0123456789ABCDEF\n")
|
|
||||||
# define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row))
|
|
||||||
# define matrix_bitpop(i) bitpop16(matrix[i])
|
|
||||||
# define ROW_SHIFTER ((uint16_t)1)
|
|
||||||
#elif (MATRIX_COLS <= 32)
|
|
||||||
# define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
|
|
||||||
# define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row))
|
|
||||||
# define matrix_bitpop(i) bitpop32(matrix[i])
|
|
||||||
# define ROW_SHIFTER ((uint32_t)1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
uint8_t matrix_rows(void) {
|
|
||||||
return MATRIX_ROWS;
|
|
||||||
}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
uint8_t matrix_cols(void) {
|
|
||||||
return MATRIX_COLS;
|
|
||||||
}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
__attribute__ ((weak))
|
||||||
matrix_row_t matrix_get_row(uint8_t row) {
|
matrix_row_t matrix_get_row(uint8_t row) {
|
||||||
return matrix[row];
|
return matrix[row];
|
||||||
}
|
}
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
uint8_t matrix_key_count(void) {
|
|
||||||
uint8_t count = 0;
|
|
||||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
|
||||||
count += matrix_bitpop(i);
|
|
||||||
}
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void matrix_print(void) {
|
|
||||||
print_matrix_header();
|
|
||||||
|
|
||||||
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
|
||||||
phex(row); print(": ");
|
|
||||||
print_matrix_row(row);
|
|
||||||
print("\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//_____CUSTOM MATRIX 'LITE'____________________________________________________
|
//_____CUSTOM MATRIX 'LITE'____________________________________________________
|
||||||
__attribute__ ((weak))
|
__attribute__ ((weak))
|
||||||
void custom_matrix_init(void) {
|
void custom_matrix_init(void) {
|
||||||
|
|
|
@ -34,7 +34,7 @@ HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
|
||||||
LINK_TIME_OPTIMIZATION_ENABLE = yes
|
LINK_TIME_OPTIMIZATION_ENABLE = yes
|
||||||
|
|
||||||
# custom matrix setup
|
# custom matrix setup
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = lite
|
||||||
|
|
||||||
VPATH += drivers/gpio
|
VPATH += drivers/gpio
|
||||||
SRC += custom_matrix_helper.c pca9555.c matrix.c
|
SRC += custom_matrix_helper.c pca9555.c matrix.c
|
||||||
|
|
|
@ -23,72 +23,16 @@
|
||||||
#include "debounce.h"
|
#include "debounce.h"
|
||||||
#include "quantum.h"
|
#include "quantum.h"
|
||||||
|
|
||||||
//_____COMMON__________________________________________________________________
|
|
||||||
// user-defined overridable functions
|
|
||||||
__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
|
|
||||||
__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
|
|
||||||
__attribute__((weak)) void matrix_init_user(void) {}
|
|
||||||
__attribute__((weak)) void matrix_scan_user(void) {}
|
|
||||||
|
|
||||||
|
|
||||||
//_____COULD BE COMMON_________________________________________________________
|
//_____COULD BE COMMON_________________________________________________________
|
||||||
/* matrix state(1:on, 0:off) */
|
/* matrix state(1:on, 0:off) */
|
||||||
/*static*/ matrix_row_t raw_matrix[MATRIX_ROWS];
|
/*static*/ matrix_row_t raw_matrix[MATRIX_ROWS];
|
||||||
/*static*/ matrix_row_t matrix[MATRIX_ROWS];
|
/*static*/ matrix_row_t matrix[MATRIX_ROWS];
|
||||||
|
|
||||||
#if (MATRIX_COLS <= 8)
|
|
||||||
# define print_matrix_header() print("\nr/c 01234567\n")
|
|
||||||
# define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
|
|
||||||
# define matrix_bitpop(i) bitpop(matrix[i])
|
|
||||||
# define ROW_SHIFTER ((uint8_t)1)
|
|
||||||
#elif (MATRIX_COLS <= 16)
|
|
||||||
# define print_matrix_header() print("\nr/c 0123456789ABCDEF\n")
|
|
||||||
# define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row))
|
|
||||||
# define matrix_bitpop(i) bitpop16(matrix[i])
|
|
||||||
# define ROW_SHIFTER ((uint16_t)1)
|
|
||||||
#elif (MATRIX_COLS <= 32)
|
|
||||||
# define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
|
|
||||||
# define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row))
|
|
||||||
# define matrix_bitpop(i) bitpop32(matrix[i])
|
|
||||||
# define ROW_SHIFTER ((uint32_t)1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
uint8_t matrix_rows(void) {
|
|
||||||
return MATRIX_ROWS;
|
|
||||||
}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
uint8_t matrix_cols(void) {
|
|
||||||
return MATRIX_COLS;
|
|
||||||
}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
__attribute__ ((weak))
|
||||||
matrix_row_t matrix_get_row(uint8_t row) {
|
matrix_row_t matrix_get_row(uint8_t row) {
|
||||||
return matrix[row];
|
return matrix[row];
|
||||||
}
|
}
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
uint8_t matrix_key_count(void) {
|
|
||||||
uint8_t count = 0;
|
|
||||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
|
||||||
count += matrix_bitpop(i);
|
|
||||||
}
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
__attribute__ ((weak))
|
|
||||||
void matrix_print(void) {
|
|
||||||
print_matrix_header();
|
|
||||||
|
|
||||||
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
|
||||||
phex(row); print(": ");
|
|
||||||
print_matrix_row(row);
|
|
||||||
print("\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
//_____CUSTOM MATRIX 'LITE'____________________________________________________
|
//_____CUSTOM MATRIX 'LITE'____________________________________________________
|
||||||
__attribute__ ((weak))
|
__attribute__ ((weak))
|
||||||
void custom_matrix_init(void) {
|
void custom_matrix_init(void) {
|
||||||
|
|
|
@ -34,7 +34,7 @@ HD44780_ENABLE = no # Enable support for HD44780 based LCDs (+400)
|
||||||
LINK_TIME_OPTIMIZATION_ENABLE = yes
|
LINK_TIME_OPTIMIZATION_ENABLE = yes
|
||||||
|
|
||||||
# custom matrix setup
|
# custom matrix setup
|
||||||
CUSTOM_MATRIX = yes
|
CUSTOM_MATRIX = lite
|
||||||
|
|
||||||
VPATH += drivers/gpio
|
VPATH += drivers/gpio
|
||||||
SRC += custom_matrix_helper.c pca9555.c matrix.c
|
SRC += custom_matrix_helper.c pca9555.c matrix.c
|
||||||
|
|
|
@ -17,30 +17,11 @@ 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 "wait.h"
|
||||||
#include "print.h"
|
|
||||||
#include "debug.h"
|
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "matrix.h"
|
#include "matrix.h"
|
||||||
#include "debounce.h"
|
#include "debounce.h"
|
||||||
#include "quantum.h"
|
#include "quantum.h"
|
||||||
|
|
||||||
#if (MATRIX_COLS <= 8)
|
|
||||||
# define print_matrix_header() print("\nr/c 01234567\n")
|
|
||||||
# define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
|
|
||||||
# define matrix_bitpop(i) bitpop(matrix[i])
|
|
||||||
# define ROW_SHIFTER ((uint8_t)1)
|
|
||||||
#elif (MATRIX_COLS <= 16)
|
|
||||||
# define print_matrix_header() print("\nr/c 0123456789ABCDEF\n")
|
|
||||||
# define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row))
|
|
||||||
# define matrix_bitpop(i) bitpop16(matrix[i])
|
|
||||||
# define ROW_SHIFTER ((uint16_t)1)
|
|
||||||
#elif (MATRIX_COLS <= 32)
|
|
||||||
# define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
|
|
||||||
# define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row))
|
|
||||||
# define matrix_bitpop(i) bitpop32(matrix[i])
|
|
||||||
# define ROW_SHIFTER ((uint32_t)1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef MATRIX_MASKED
|
#ifdef MATRIX_MASKED
|
||||||
extern const matrix_row_t matrix_mask[];
|
extern const matrix_row_t matrix_mask[];
|
||||||
#endif
|
#endif
|
||||||
|
@ -56,27 +37,7 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
|
||||||
static matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
|
static matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
|
||||||
static matrix_row_t matrix[MATRIX_ROWS]; // debounced values
|
static matrix_row_t matrix[MATRIX_ROWS]; // debounced values
|
||||||
|
|
||||||
__attribute__((weak)) void matrix_init_quantum(void) { matrix_init_kb(); }
|
// helper functions
|
||||||
|
|
||||||
__attribute__((weak)) void matrix_scan_quantum(void) { matrix_scan_kb(); }
|
|
||||||
|
|
||||||
__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
|
|
||||||
|
|
||||||
__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
|
|
||||||
|
|
||||||
__attribute__((weak)) void matrix_init_user(void) {}
|
|
||||||
|
|
||||||
__attribute__((weak)) void matrix_scan_user(void) {}
|
|
||||||
|
|
||||||
inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
|
|
||||||
|
|
||||||
inline uint8_t matrix_cols(void) { return MATRIX_COLS; }
|
|
||||||
|
|
||||||
// Deprecated.
|
|
||||||
bool matrix_is_modified(void) {
|
|
||||||
if (debounce_active()) return false;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
|
inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
|
||||||
|
|
||||||
|
@ -90,24 +51,7 @@ inline matrix_row_t matrix_get_row(uint8_t row) {
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void matrix_print(void) {
|
// matrix code
|
||||||
print_matrix_header();
|
|
||||||
|
|
||||||
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
|
||||||
phex(row);
|
|
||||||
print(": ");
|
|
||||||
print_matrix_row(row);
|
|
||||||
print("\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t matrix_key_count(void) {
|
|
||||||
uint8_t count = 0;
|
|
||||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
|
||||||
count += matrix_bitpop(i);
|
|
||||||
}
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef DIRECT_PINS
|
#ifdef DIRECT_PINS
|
||||||
|
|
||||||
|
@ -129,7 +73,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
|
||||||
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
|
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
|
||||||
pin_t pin = direct_pins[current_row][col_index];
|
pin_t pin = direct_pins[current_row][col_index];
|
||||||
if (pin != NO_PIN) {
|
if (pin != NO_PIN) {
|
||||||
current_matrix[current_row] |= readPin(pin) ? 0 : (ROW_SHIFTER << col_index);
|
current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -175,7 +119,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
|
||||||
uint8_t pin_state = readPin(col_pins[col_index]);
|
uint8_t pin_state = readPin(col_pins[col_index]);
|
||||||
|
|
||||||
// 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 : (MATRIX_ROW_SHIFTER << col_index);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unselect row
|
// Unselect row
|
||||||
|
@ -221,10 +165,10 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
|
||||||
// Check row pin state
|
// Check row pin state
|
||||||
if (readPin(row_pins[row_index]) == 0) {
|
if (readPin(row_pins[row_index]) == 0) {
|
||||||
// Pin LO, set col bit
|
// Pin LO, set col bit
|
||||||
current_matrix[row_index] |= (ROW_SHIFTER << current_col);
|
current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
|
||||||
} else {
|
} else {
|
||||||
// Pin HI, clear col bit
|
// Pin HI, clear col bit
|
||||||
current_matrix[row_index] &= ~(ROW_SHIFTER << current_col);
|
current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Determine if the matrix changed state
|
// Determine if the matrix changed state
|
||||||
|
|
|
@ -0,0 +1,59 @@
|
||||||
|
#include "matrix.h"
|
||||||
|
#include "debounce.h"
|
||||||
|
#include "print.h"
|
||||||
|
#include "debug.h"
|
||||||
|
|
||||||
|
// user-defined overridable functions
|
||||||
|
|
||||||
|
__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
|
||||||
|
|
||||||
|
__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
|
||||||
|
|
||||||
|
__attribute__((weak)) void matrix_init_user(void) {}
|
||||||
|
|
||||||
|
__attribute__((weak)) void matrix_scan_user(void) {}
|
||||||
|
|
||||||
|
// helper functions
|
||||||
|
|
||||||
|
inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
|
||||||
|
|
||||||
|
inline uint8_t matrix_cols(void) { return MATRIX_COLS; }
|
||||||
|
|
||||||
|
// Deprecated.
|
||||||
|
bool matrix_is_modified(void) {
|
||||||
|
if (debounce_active()) return false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
#if (MATRIX_COLS <= 8)
|
||||||
|
# define print_matrix_header() print("\nr/c 01234567\n")
|
||||||
|
# define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
|
||||||
|
# define matrix_bitpop(row) bitpop(matrix_get_row(row))
|
||||||
|
#elif (MATRIX_COLS <= 16)
|
||||||
|
# define print_matrix_header() print("\nr/c 0123456789ABCDEF\n")
|
||||||
|
# define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row))
|
||||||
|
# define matrix_bitpop(row) bitpop16(matrix_get_row(row))
|
||||||
|
#elif (MATRIX_COLS <= 32)
|
||||||
|
# define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
|
||||||
|
# define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row))
|
||||||
|
# define matrix_bitpop(row) bitpop32(matrix_get_row(row))
|
||||||
|
#endif
|
||||||
|
|
||||||
|
void matrix_print(void) {
|
||||||
|
print_matrix_header();
|
||||||
|
|
||||||
|
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
||||||
|
phex(row);
|
||||||
|
print(": ");
|
||||||
|
print_matrix_row(row);
|
||||||
|
print("\n");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
uint8_t matrix_key_count(void) {
|
||||||
|
uint8_t count = 0;
|
||||||
|
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
||||||
|
count += matrix_bitpop(i);
|
||||||
|
}
|
||||||
|
return count;
|
||||||
|
}
|
|
@ -14,10 +14,6 @@ GNU General Public License for more details.
|
||||||
You should have received a copy of the GNU General Public License
|
You should have received a copy of the GNU General Public License
|
||||||
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/*
|
|
||||||
* scan matrix
|
|
||||||
*/
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
#include <stdbool.h>
|
#include <stdbool.h>
|
||||||
#include "wait.h"
|
#include "wait.h"
|
||||||
|
@ -33,23 +29,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
# include "encoder.h"
|
# include "encoder.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if (MATRIX_COLS <= 8)
|
|
||||||
# define print_matrix_header() print("\nr/c 01234567\n")
|
|
||||||
# define print_matrix_row(row) print_bin_reverse8(matrix_get_row(row))
|
|
||||||
# define matrix_bitpop(i) bitpop(matrix[i])
|
|
||||||
# define ROW_SHIFTER ((uint8_t)1)
|
|
||||||
#elif (MATRIX_COLS <= 16)
|
|
||||||
# define print_matrix_header() print("\nr/c 0123456789ABCDEF\n")
|
|
||||||
# define print_matrix_row(row) print_bin_reverse16(matrix_get_row(row))
|
|
||||||
# define matrix_bitpop(i) bitpop16(matrix[i])
|
|
||||||
# define ROW_SHIFTER ((uint16_t)1)
|
|
||||||
#elif (MATRIX_COLS <= 32)
|
|
||||||
# define print_matrix_header() print("\nr/c 0123456789ABCDEF0123456789ABCDEF\n")
|
|
||||||
# define print_matrix_row(row) print_bin_reverse32(matrix_get_row(row))
|
|
||||||
# define matrix_bitpop(i) bitpop32(matrix[i])
|
|
||||||
# define ROW_SHIFTER ((uint32_t)1)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#define ERROR_DISCONNECT_COUNT 5
|
#define ERROR_DISCONNECT_COUNT 5
|
||||||
|
|
||||||
#define ROWS_PER_HAND (MATRIX_ROWS / 2)
|
#define ROWS_PER_HAND (MATRIX_ROWS / 2)
|
||||||
|
@ -62,58 +41,21 @@ static pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/* matrix state(1:on, 0:off) */
|
/* matrix state(1:on, 0:off) */
|
||||||
static matrix_row_t matrix[MATRIX_ROWS];
|
static matrix_row_t raw_matrix[MATRIX_ROWS]; // raw values
|
||||||
static matrix_row_t raw_matrix[ROWS_PER_HAND];
|
static matrix_row_t matrix[MATRIX_ROWS]; // debounced values
|
||||||
|
|
||||||
// row offsets for each hand
|
// row offsets for each hand
|
||||||
uint8_t thisHand, thatHand;
|
uint8_t thisHand, thatHand;
|
||||||
|
|
||||||
// user-defined overridable functions
|
// user-defined overridable functions
|
||||||
|
|
||||||
__attribute__((weak)) void matrix_init_kb(void) { matrix_init_user(); }
|
|
||||||
|
|
||||||
__attribute__((weak)) void matrix_scan_kb(void) { matrix_scan_user(); }
|
|
||||||
|
|
||||||
__attribute__((weak)) void matrix_init_user(void) {}
|
|
||||||
|
|
||||||
__attribute__((weak)) void matrix_scan_user(void) {}
|
|
||||||
|
|
||||||
__attribute__((weak)) void matrix_slave_scan_user(void) {}
|
__attribute__((weak)) void matrix_slave_scan_user(void) {}
|
||||||
|
|
||||||
// helper functions
|
// helper functions
|
||||||
|
|
||||||
inline uint8_t matrix_rows(void) { return MATRIX_ROWS; }
|
|
||||||
|
|
||||||
inline uint8_t matrix_cols(void) { return MATRIX_COLS; }
|
|
||||||
|
|
||||||
bool matrix_is_modified(void) {
|
|
||||||
if (debounce_active()) return false;
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
|
inline bool matrix_is_on(uint8_t row, uint8_t col) { return (matrix[row] & ((matrix_row_t)1 << col)); }
|
||||||
|
|
||||||
inline matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
|
inline matrix_row_t matrix_get_row(uint8_t row) { return matrix[row]; }
|
||||||
|
|
||||||
void matrix_print(void) {
|
|
||||||
print_matrix_header();
|
|
||||||
|
|
||||||
for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
|
|
||||||
phex(row);
|
|
||||||
print(": ");
|
|
||||||
print_matrix_row(row);
|
|
||||||
print("\n");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t matrix_key_count(void) {
|
|
||||||
uint8_t count = 0;
|
|
||||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
|
||||||
count += matrix_bitpop(i);
|
|
||||||
}
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
// matrix code
|
// matrix code
|
||||||
|
|
||||||
#ifdef DIRECT_PINS
|
#ifdef DIRECT_PINS
|
||||||
|
@ -136,7 +78,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
|
||||||
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
|
for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
|
||||||
pin_t pin = direct_pins[current_row][col_index];
|
pin_t pin = direct_pins[current_row][col_index];
|
||||||
if (pin != NO_PIN) {
|
if (pin != NO_PIN) {
|
||||||
current_matrix[current_row] |= readPin(pin) ? 0 : (ROW_SHIFTER << col_index);
|
current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -179,7 +121,7 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
|
||||||
// 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++) {
|
||||||
// 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] |= readPin(col_pins[col_index]) ? 0 : (ROW_SHIFTER << col_index);
|
current_matrix[current_row] |= readPin(col_pins[col_index]) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Unselect row
|
// Unselect row
|
||||||
|
@ -225,10 +167,10 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
|
||||||
// Check row pin state
|
// Check row pin state
|
||||||
if (readPin(row_pins[row_index])) {
|
if (readPin(row_pins[row_index])) {
|
||||||
// Pin HI, clear col bit
|
// Pin HI, clear col bit
|
||||||
current_matrix[row_index] &= ~(ROW_SHIFTER << current_col);
|
current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
|
||||||
} else {
|
} else {
|
||||||
// Pin LO, set col bit
|
// Pin LO, set col bit
|
||||||
current_matrix[row_index] |= (ROW_SHIFTER << current_col);
|
current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Determine if the matrix changed state
|
// Determine if the matrix changed state
|
||||||
|
@ -280,7 +222,8 @@ void matrix_init(void) {
|
||||||
|
|
||||||
// initialize matrix state: all keys off
|
// initialize matrix state: all keys off
|
||||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
||||||
matrix[i] = 0;
|
raw_matrix[i] = 0;
|
||||||
|
matrix[i] = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
debounce_init(ROWS_PER_HAND);
|
debounce_init(ROWS_PER_HAND);
|
||||||
|
@ -288,29 +231,7 @@ void matrix_init(void) {
|
||||||
matrix_init_quantum();
|
matrix_init_quantum();
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8_t _matrix_scan(void) {
|
void matrix_post_scan(void) {
|
||||||
bool changed = false;
|
|
||||||
|
|
||||||
#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
|
|
||||||
// Set row, read cols
|
|
||||||
for (uint8_t current_row = 0; current_row < ROWS_PER_HAND; current_row++) {
|
|
||||||
changed |= read_cols_on_row(raw_matrix, current_row);
|
|
||||||
}
|
|
||||||
#elif (DIODE_DIRECTION == ROW2COL)
|
|
||||||
// Set col, read rows
|
|
||||||
for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
|
|
||||||
changed |= read_rows_on_col(raw_matrix, current_col);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed);
|
|
||||||
|
|
||||||
return (uint8_t)changed;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t matrix_scan(void) {
|
|
||||||
uint8_t ret = _matrix_scan();
|
|
||||||
|
|
||||||
if (is_keyboard_master()) {
|
if (is_keyboard_master()) {
|
||||||
static uint8_t error_count;
|
static uint8_t error_count;
|
||||||
|
|
||||||
|
@ -335,6 +256,25 @@ uint8_t matrix_scan(void) {
|
||||||
#endif
|
#endif
|
||||||
matrix_slave_scan_user();
|
matrix_slave_scan_user();
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return ret;
|
|
||||||
|
uint8_t matrix_scan(void) {
|
||||||
|
bool changed = false;
|
||||||
|
|
||||||
|
#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
|
||||||
|
// Set row, read cols
|
||||||
|
for (uint8_t current_row = 0; current_row < ROWS_PER_HAND; current_row++) {
|
||||||
|
changed |= read_cols_on_row(raw_matrix, current_row);
|
||||||
|
}
|
||||||
|
#elif (DIODE_DIRECTION == ROW2COL)
|
||||||
|
// Set col, read rows
|
||||||
|
for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
|
||||||
|
changed |= read_rows_on_col(raw_matrix, current_col);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
debounce(raw_matrix, matrix + thisHand, ROWS_PER_HAND, changed);
|
||||||
|
|
||||||
|
matrix_post_scan();
|
||||||
|
return (uint8_t)changed;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,3 +0,0 @@
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <common/matrix.h>
|
|
|
@ -40,6 +40,8 @@ typedef uint32_t matrix_col_t;
|
||||||
# error "MATRIX_ROWS: invalid value"
|
# error "MATRIX_ROWS: invalid value"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#define MATRIX_ROW_SHIFTER ((matrix_row_t)1)
|
||||||
|
|
||||||
#define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1 << col))
|
#define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1 << col))
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
|
@ -79,11 +81,6 @@ void matrix_scan_kb(void);
|
||||||
void matrix_init_user(void);
|
void matrix_init_user(void);
|
||||||
void matrix_scan_user(void);
|
void matrix_scan_user(void);
|
||||||
|
|
||||||
#ifdef I2C_SPLIT
|
|
||||||
void slave_matrix_init(void);
|
|
||||||
uint8_t slave_matrix_scan(void);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue