diff options
| author | tmk <nobody@nowhere> | 2012-10-06 02:23:12 +0900 |
|---|---|---|
| committer | tmk <nobody@nowhere> | 2012-10-17 15:55:37 +0900 |
| commit | 4ae979f6ef8dbf9e1d1f35be15322ad6d02e2958 (patch) | |
| tree | 9f5132005c27ef04ae793b77d4699cb285479466 /common/matrix.h | |
| parent | 93e33fb8f694c9685accd72ed0458a2cf3d3f04a (diff) | |
| download | qmk_firmware-4ae979f6ef8dbf9e1d1f35be15322ad6d02e2958.tar.gz qmk_firmware-4ae979f6ef8dbf9e1d1f35be15322ad6d02e2958.zip | |
Initial version of new code for layer switch is added.
Diffstat (limited to 'common/matrix.h')
| -rw-r--r-- | common/matrix.h | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/common/matrix.h b/common/matrix.h index c4b2cab518..b3332d5ff9 100644 --- a/common/matrix.h +++ b/common/matrix.h @@ -18,8 +18,23 @@ 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; +#else +#error "MATRIX_COLS: invalid value" +#endif + +#define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1<<col)) + + /* number of matrix rows */ uint8_t matrix_rows(void); /* number of matrix columns */ @@ -35,11 +50,7 @@ bool matrix_has_ghost(void); /* whether a swtich is on */ bool matrix_is_on(uint8_t row, uint8_t col); /* matrix state on row */ -#if (MATRIX_COLS <= 8) -uint8_t matrix_get_row(uint8_t row); -#else -uint16_t matrix_get_row(uint8_t row); -#endif +matrix_row_t matrix_get_row(uint8_t row); /* count keys pressed */ uint8_t matrix_key_count(void); /* print matrix for debug */ |