diff options
author | IBNobody <ibnobody@gmail.com> | 2016-05-24 17:57:40 -0500 |
---|---|---|
committer | IBNobody <ibnobody@gmail.com> | 2016-05-24 17:57:40 -0500 |
commit | 26277dbdf40ba7247981361c956ea44c92bf76ea (patch) | |
tree | 59e800a739797cb86d9345d01f73fceee4c32030 /tmk_core/common/matrix.h | |
parent | 76e36a787a58ad0e72fac579e4a02aa66ce26be1 (diff) | |
parent | 287eb7ad148abc8fe3fb014218d71e205fd9131d (diff) |
Merge remote-tracking branch 'remotes/jackhumbert/master'
Diffstat (limited to 'tmk_core/common/matrix.h')
-rw-r--r-- | tmk_core/common/matrix.h | 61 |
1 files changed, 35 insertions, 26 deletions
diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h index ad0871bfb7..5f380aaaba 100644 --- a/tmk_core/common/matrix.h +++ b/tmk_core/common/matrix.h @@ -14,59 +14,68 @@ 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/>. */ - #ifndef MATRIX_H #define MATRIX_H #include <stdint.h> #include <stdbool.h> - -#if (MATRIX_COLS <= 8) -typedef uint8_t matrix_row_t; -#elif (MATRIX_COLS <= 16) -typedef uint16_t matrix_row_t; -#elif (MATRIX_COLS <= 32) -typedef uint32_t matrix_row_t; +#if MATRIX_COLS <= 8 +typedef uint8_t matrix_row_t; +#elif MATRIX_COLS <= 16 +typedef uint16_t matrix_row_t; +#elif MATRIX_COLS <= 32 +typedef uint32_t matrix_row_t; #else -#error "MATRIX_COLS: invalid value" +# error "There are too many columns." #endif -#define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1<<col)) +#if DIODE_DIRECTION == ROW2COL +# if MATRIX_ROWS <= 8 +typedef uint8_t matrix_col_t; +# elif MATRIX_ROWS <= 16 +typedef uint16_t matrix_col_t; +# elif MATRIX_ROWS <= 32 +typedef uint32_t matrix_col_t; +# else +# error "There are too many rows." +# endif +#endif +typedef struct { + uint8_t input_addr:4; + uint8_t bit:4; +} io_pin_t; #ifdef __cplusplus extern "C" { #endif - -/* number of matrix rows */ +/* counts the number of rows in the matrix */ uint8_t matrix_rows(void); -/* number of matrix columns */ +/* counts the number of columns in the matrix */ uint8_t matrix_cols(void); -/* should be called at early stage of startup before matrix_init.(optional) */ +/* sets up the matrix before matrix_init */ void matrix_setup(void); -/* intialize matrix for scaning. */ +/* intializes the matrix */ void matrix_init(void); -/* scan all key states on matrix */ +/* scans the entire matrix */ uint8_t matrix_scan(void); -/* whether modified from previous scan. used after matrix_scan. */ +/* checks if the matrix has been modified */ bool matrix_is_modified(void) __attribute__ ((deprecated)); -/* whether a swtich is on */ +/* checks if a key is pressed */ bool matrix_is_on(uint8_t row, uint8_t col); -/* matrix state on row */ +/* inspects the state of a row in the matrix */ matrix_row_t matrix_get_row(uint8_t row); -/* print matrix for debug */ +/* prints the matrix for debugging */ void matrix_print(void); - - -/* power control */ +/* counts the total number of keys pressed */ +uint8_t matrix_key_count(void); +/* controls power to the matrix */ void matrix_power_up(void); void matrix_power_down(void); - -/* keyboard-specific setup/loop functionality */ +/* executes code for Quantum */ void matrix_init_quantum(void); void matrix_scan_quantum(void); - #ifdef __cplusplus } #endif |