aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorxyzz <1065521+xyzz@users.noreply.github.com>2020-12-29 16:45:04 -0500
committerGitHub <noreply@github.com>2020-12-29 21:45:04 +0000
commit2573ed8c6bc3ce5dcccbd3fddc2e8fe5a0377eac (patch)
tree95c494e0005de4c970bef4d838c5f0dbf27acc06
parent25d9cdc88fa990251c5528d07027448c7c801f58 (diff)
downloadqmk_firmware-2573ed8c6bc3ce5dcccbd3fddc2e8fe5a0377eac.tar.gz
qmk_firmware-2573ed8c6bc3ce5dcccbd3fddc2e8fe5a0377eac.zip
Remove MATRIX_IS_ON macro (#11330)
* Remove MATRIX_IS_ON macro this macro is both incorrect and excessive given that macro_is_on() exists * Remove massdrop matrix.h
Diffstat
-rw-r--r--keyboards/massdrop/alt/matrix.h77
-rw-r--r--keyboards/massdrop/ctrl/matrix.h77
-rw-r--r--tmk_core/common/matrix.h2
3 files changed, 0 insertions, 156 deletions
diff --git a/keyboards/massdrop/alt/matrix.h b/keyboards/massdrop/alt/matrix.h
deleted file mode 100644
index 3eab6dece..000000000
--- a/keyboards/massdrop/alt/matrix.h
+++ /dev/null
@@ -1,77 +0,0 @@
1/*
2Copyright 2011 Jun Wako <wakojun@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17#ifndef MATRIX_H
18#define MATRIX_H
19
20#include <stdint.h>
21#include <stdbool.h>
22#include "keyboard.h"
23
24#if (MATRIX_COLS <= 8)
25typedef uint8_t matrix_row_t;
26#elif (MATRIX_COLS <= 16)
27typedef uint16_t matrix_row_t;
28#elif (MATRIX_COLS <= 32)
29typedef uint32_t matrix_row_t;
30#else
31#error "MATRIX_COLS: invalid value"
32#endif
33
34#define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1<<col))
35
36#ifdef __cplusplus
37extern "C" {
38#endif
39
40/* number of matrix rows */
41uint8_t matrix_rows(void);
42/* number of matrix columns */
43uint8_t matrix_cols(void);
44/* should be called at early stage of startup before matrix_init.(optional) */
45void matrix_setup(void);
46/* intialize matrix for scaning. */
47void matrix_init(void);
48/* scan all key states on matrix */
49uint8_t matrix_scan(void);
50/* whether modified from previous scan. used after matrix_scan. */
51bool matrix_is_modified(void) __attribute__ ((deprecated));
52/* whether a switch is on */
53bool matrix_is_on(uint8_t row, uint8_t col);
54/* matrix state on row */
55matrix_row_t matrix_get_row(uint8_t row);
56/* print matrix for debug */
57void matrix_print(void);
58
59/* power control */
60void matrix_power_up(void);
61void matrix_power_down(void);
62
63/* executes code for Quantum */
64void matrix_init_quantum(void);
65void matrix_scan_quantum(void);
66
67void matrix_init_kb(void);
68void matrix_scan_kb(void);
69
70void matrix_init_user(void);
71void matrix_scan_user(void);
72
73#ifdef __cplusplus
74}
75#endif
76
77#endif
diff --git a/keyboards/massdrop/ctrl/matrix.h b/keyboards/massdrop/ctrl/matrix.h
deleted file mode 100644
index 3eab6dece..000000000
--- a/keyboards/massdrop/ctrl/matrix.h
+++ /dev/null
@@ -1,77 +0,0 @@
1/*
2Copyright 2011 Jun Wako <wakojun@gmail.com>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17#ifndef MATRIX_H
18#define MATRIX_H
19
20#include <stdint.h>
21#include <stdbool.h>
22#include "keyboard.h"
23
24#if (MATRIX_COLS <= 8)
25typedef uint8_t matrix_row_t;
26#elif (MATRIX_COLS <= 16)
27typedef uint16_t matrix_row_t;
28#elif (MATRIX_COLS <= 32)
29typedef uint32_t matrix_row_t;
30#else
31#error "MATRIX_COLS: invalid value"
32#endif
33
34#define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1<<col))
35
36#ifdef __cplusplus
37extern "C" {
38#endif
39
40/* number of matrix rows */
41uint8_t matrix_rows(void);
42/* number of matrix columns */
43uint8_t matrix_cols(void);
44/* should be called at early stage of startup before matrix_init.(optional) */
45void matrix_setup(void);
46/* intialize matrix for scaning. */
47void matrix_init(void);
48/* scan all key states on matrix */
49uint8_t matrix_scan(void);
50/* whether modified from previous scan. used after matrix_scan. */
51bool matrix_is_modified(void) __attribute__ ((deprecated));
52/* whether a switch is on */
53bool matrix_is_on(uint8_t row, uint8_t col);
54/* matrix state on row */
55matrix_row_t matrix_get_row(uint8_t row);
56/* print matrix for debug */
57void matrix_print(void);
58
59/* power control */
60void matrix_power_up(void);
61void matrix_power_down(void);
62
63/* executes code for Quantum */
64void matrix_init_quantum(void);
65void matrix_scan_quantum(void);
66
67void matrix_init_kb(void);
68void matrix_scan_kb(void);
69
70void matrix_init_user(void);
71void matrix_scan_user(void);
72
73#ifdef __cplusplus
74}
75#endif
76
77#endif
diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h
index e36f01460..b570227a3 100644
--- a/tmk_core/common/matrix.h
+++ b/tmk_core/common/matrix.h
@@ -32,8 +32,6 @@ typedef uint32_t matrix_row_t;
32 32
33#define MATRIX_ROW_SHIFTER ((matrix_row_t)1) 33#define MATRIX_ROW_SHIFTER ((matrix_row_t)1)
34 34
35#define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1 << col))
36
37#ifdef __cplusplus 35#ifdef __cplusplus
38extern "C" { 36extern "C" {
39#endif 37#endif
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-15 20:50:18 +0000