diff options
| author | luc wastiaux <luc.wastiaux@airpost.net> | 2017-02-13 07:44:28 +0800 |
|---|---|---|
| committer | luc wastiaux <luc.wastiaux@airpost.net> | 2017-02-13 07:44:28 +0800 |
| commit | 352d79e1fbbd7eea65793abb261dd544fec7bb1c (patch) | |
| tree | e006ee8098826054d93939b2a59521f6c032e10d /tmk_core/common/matrix.h | |
| parent | 5f8535b356e66975e20f1a573ab104db75f8b33c (diff) | |
| parent | 4505db5d0e0c2423645cc9117f29b942d4841c5b (diff) | |
| download | qmk_firmware-352d79e1fbbd7eea65793abb261dd544fec7bb1c.tar.gz qmk_firmware-352d79e1fbbd7eea65793abb261dd544fec7bb1c.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'tmk_core/common/matrix.h')
| -rw-r--r-- | tmk_core/common/matrix.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tmk_core/common/matrix.h b/tmk_core/common/matrix.h index cee3593ee..2543f5abc 100644 --- a/tmk_core/common/matrix.h +++ b/tmk_core/common/matrix.h | |||
| @@ -50,7 +50,7 @@ void matrix_init(void); | |||
| 50 | uint8_t matrix_scan(void); | 50 | uint8_t matrix_scan(void); |
| 51 | /* whether modified from previous scan. used after matrix_scan. */ | 51 | /* whether modified from previous scan. used after matrix_scan. */ |
| 52 | bool matrix_is_modified(void) __attribute__ ((deprecated)); | 52 | bool matrix_is_modified(void) __attribute__ ((deprecated)); |
| 53 | /* whether a swtich is on */ | 53 | /* whether a switch is on */ |
| 54 | bool matrix_is_on(uint8_t row, uint8_t col); | 54 | bool matrix_is_on(uint8_t row, uint8_t col); |
| 55 | /* matrix state on row */ | 55 | /* matrix state on row */ |
| 56 | matrix_row_t matrix_get_row(uint8_t row); | 56 | matrix_row_t matrix_get_row(uint8_t row); |