Remove matrix_key_count() from matrix.h
parent
9e9a85c142
commit
81d2753ab0
|
@ -49,8 +49,6 @@ bool matrix_is_modified(void);
|
||||||
bool matrix_is_on(uint8_t row, uint8_t col);
|
bool matrix_is_on(uint8_t row, uint8_t col);
|
||||||
/* matrix state on row */
|
/* matrix state on row */
|
||||||
matrix_row_t matrix_get_row(uint8_t row);
|
matrix_row_t matrix_get_row(uint8_t row);
|
||||||
/* count keys pressed */
|
|
||||||
uint8_t matrix_key_count(void);
|
|
||||||
/* print matrix for debug */
|
/* print matrix for debug */
|
||||||
void matrix_print(void);
|
void matrix_print(void);
|
||||||
|
|
||||||
|
|
|
@ -182,19 +182,6 @@ void matrix_print(void)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
uint8_t matrix_key_count(void)
|
|
||||||
{
|
|
||||||
uint8_t count = 0;
|
|
||||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
|
||||||
#if (MATRIX_COLS <= 8)
|
|
||||||
count += bitpop(matrix[i]);
|
|
||||||
#else
|
|
||||||
count += bitpop16(matrix[i]);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef MATRIX_HAS_GHOST
|
#ifdef MATRIX_HAS_GHOST
|
||||||
inline
|
inline
|
||||||
static bool matrix_has_ghost_in_row(uint8_t row)
|
static bool matrix_has_ghost_in_row(uint8_t row)
|
||||||
|
@ -205,7 +192,6 @@ static bool matrix_has_ghost_in_row(uint8_t row)
|
||||||
|
|
||||||
// ghost exists in case same state as other row
|
// ghost exists in case same state as other row
|
||||||
for (uint8_t i=0; i < MATRIX_ROWS; i++) {
|
for (uint8_t i=0; i < MATRIX_ROWS; i++) {
|
||||||
//if (i != row && (matrix[i] & matrix[row]) == matrix[row])
|
|
||||||
if (i != row && (matrix[i] & matrix[row]))
|
if (i != row && (matrix[i] & matrix[row]))
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue