diff options
| author | Nathan Ross Powell <nathanrosspowell@gmail.com> | 2015-03-18 23:33:42 -0400 |
|---|---|---|
| committer | Nathan Ross Powell <nathanrosspowell@gmail.com> | 2015-03-18 23:33:42 -0400 |
| commit | 80c4cdb245a3ff55627d40a3a164073b30382def (patch) | |
| tree | e134969a2fc20979101a7e9e7aa06c1877bf82eb /common/matrix.h | |
| parent | e7289bb029b28b824eb0ef7be23dba279057d7ac (diff) | |
| parent | 9c3a95663410a294f2c85ad2d1c016f328730e0b (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 |