diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2015-01-14 22:48:54 -0500 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2015-01-14 22:48:54 -0500 |
| commit | a54da1b92663606f5e5c18bc1eaec30c06847da1 (patch) | |
| tree | a1b7485debf62a8c52d1db3199436cac2f3ce346 /common/matrix.h | |
| parent | 4225f0353c2eb85fbd8ca0622eb89757975093e4 (diff) | |
| parent | 10a6b2c7d8bc9c5d2657acdeefa1102be5035280 (diff) | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'common/matrix.h')
| -rw-r--r-- | common/matrix.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/common/matrix.h b/common/matrix.h index 23fef78f74..107ee72653 100644 --- a/common/matrix.h +++ b/common/matrix.h @@ -35,6 +35,10 @@ typedef uint32_t matrix_row_t; #define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1<<col)) +#ifdef __cplusplus +extern "C" { +#endif + /* number of matrix rows */ uint8_t matrix_rows(void); /* number of matrix columns */ @@ -48,7 +52,7 @@ bool matrix_is_modified(void) __attribute__ ((deprecated)); /* whether a swtich is on */ bool matrix_is_on(uint8_t row, uint8_t col); /* matrix state on row */ -matrix_row_t matrix_get_row(uint8_t row); +matrix_row_t matrix_get_row(uint8_t row); /* print matrix for debug */ void matrix_print(void); @@ -57,5 +61,8 @@ void matrix_print(void); void matrix_power_up(void); void matrix_power_down(void); +#ifdef __cplusplus +} +#endif #endif |