aboutsummaryrefslogtreecommitdiffstats
path: root/keyboards/xd96
diff options
context:
space:
mode:
authorJoel Challis <git@zvecr.com>2020-01-15 01:58:32 +0000
committerGitHub <noreply@github.com>2020-01-15 01:58:32 +0000
commit48cac9e3c8710ae3e27c66fbd7043f38e7c6535e (patch)
treea34180fc73b535f3d2b8508f7267b872f0ddcb32 /keyboards/xd96
parent537b8713e5bc9690dca3c1ad8733132892d48ea2 (diff)
downloadfirmware-48cac9e3c8710ae3e27c66fbd7043f38e7c6535e.tar.gz
firmware-48cac9e3c8710ae3e27c66fbd7043f38e7c6535e.tar.bz2
firmware-48cac9e3c8710ae3e27c66fbd7043f38e7c6535e.zip
Migrate more custom matrix 'lite' code to core (#7863)
* Migrate more custom matrix lite code to core * Align function names * fix up MATRIX_MASKED
Diffstat (limited to 'keyboards/xd96')
-rw-r--r--keyboards/xd96/custom_matrix_helper.c71
-rw-r--r--keyboards/xd96/matrix.c4
-rw-r--r--keyboards/xd96/rules.mk2
3 files changed, 3 insertions, 74 deletions
diff --git a/keyboards/xd96/custom_matrix_helper.c b/keyboards/xd96/custom_matrix_helper.c
deleted file mode 100644
index e4e256381..000000000
--- a/keyboards/xd96/custom_matrix_helper.c
+++ /dev/null
@@ -1,71 +0,0 @@
-/* Copyright 2019
- *
- * 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
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-#include <stdint.h>
-#include <stdbool.h>
-#include "wait.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
-#include "matrix.h"
-#include "debounce.h"
-#include "quantum.h"
-
-//_____COULD BE COMMON_________________________________________________________
-/* matrix state(1:on, 0:off) */
-/*static*/ matrix_row_t raw_matrix[MATRIX_ROWS];
-/*static*/ matrix_row_t matrix[MATRIX_ROWS];
-
-__attribute__ ((weak))
-matrix_row_t matrix_get_row(uint8_t row) {
- return matrix[row];
-}
-
-//_____CUSTOM MATRIX 'LITE'____________________________________________________
-__attribute__ ((weak))
-void custom_matrix_init(void) {
-}
-
-__attribute__ ((weak))
-bool custom_matrix_scan(matrix_row_t current_matrix[]) {
- bool changed = true;
- return changed;
-}
-
-__attribute__ ((weak))
-void matrix_init(void) {
-
- custom_matrix_init();
-
- // initialize matrix state: all keys off
- for (uint8_t i=0; i < MATRIX_ROWS; i++) {
- raw_matrix[i] = 0;
- matrix[i] = 0;
- }
-
- debounce_init(MATRIX_ROWS);
-
- matrix_init_quantum();
-}
-
-__attribute__ ((weak))
-uint8_t matrix_scan(void) {
- bool changed = custom_matrix_scan(raw_matrix);
-
- debounce(raw_matrix, matrix, MATRIX_ROWS, changed);
-
- matrix_scan_quantum();
- return 1;
-}
diff --git a/keyboards/xd96/matrix.c b/keyboards/xd96/matrix.c
index e8fd850ed..8cecc79c2 100644
--- a/keyboards/xd96/matrix.c
+++ b/keyboards/xd96/matrix.c
@@ -80,14 +80,14 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
//_____CUSTOM MATRIX IMPLEMENTATION____________________________________________________
-void custom_matrix_init(void) {
+void matrix_init_custom(void) {
pca9555_init(IC1);
pca9555_init(IC2);
init_pins();
}
-bool custom_matrix_scan(matrix_row_t current_matrix[]) {
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
bool changed = false;
for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
changed |= read_cols_on_row(current_matrix, current_row);
diff --git a/keyboards/xd96/rules.mk b/keyboards/xd96/rules.mk
index d5ac5df36..9afd4eec4 100644
--- a/keyboards/xd96/rules.mk
+++ b/keyboards/xd96/rules.mk
@@ -37,5 +37,5 @@ LINK_TIME_OPTIMIZATION_ENABLE = yes
CUSTOM_MATRIX = lite
VPATH += drivers/gpio
-SRC += custom_matrix_helper.c pca9555.c matrix.c
+SRC += pca9555.c matrix.c
QUANTUM_LIB_SRC += i2c_master.c