summaryrefslogtreecommitdiff
path: root/keyboard/hbkb/matrix.c
diff options
context:
space:
mode:
Diffstat (limited to 'keyboard/hbkb/matrix.c')
-rw-r--r--keyboard/hbkb/matrix.c65
1 files changed, 21 insertions, 44 deletions
diff --git a/keyboard/hbkb/matrix.c b/keyboard/hbkb/matrix.c
index a24d24b8c3..f6830a0f71 100644
--- a/keyboard/hbkb/matrix.c
+++ b/keyboard/hbkb/matrix.c
@@ -32,32 +32,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
* COL: PD0-7
* ROW: PB0-7, PF4-7
*/
-
-#if (MATRIX_COLS > 16)
-# error "MATRIX_COLS must not exceed 16"
-#endif
-#if (MATRIX_ROWS > 255)
-# error "MATRIX_ROWS must not exceed 255"
-#endif
-
-
#ifndef DEBOUNCE
-# define DEBOUNCE 0
+# define DEBOUNCE 10
#endif
static uint8_t debouncing = DEBOUNCE;
// matrix state buffer(1:on, 0:off)
-#if (MATRIX_COLS <= 8)
static uint8_t *matrix;
-static uint8_t *matrix_prev;
-static uint8_t _matrix0[MATRIX_ROWS];
-static uint8_t _matrix1[MATRIX_ROWS];
-#else
-static uint16_t *matrix;
-static uint16_t *matrix_prev;
-static uint16_t _matrix0[MATRIX_ROWS];
-static uint16_t _matrix1[MATRIX_ROWS];
-#endif
+static uint8_t *matrix_debouncing;
+static uint8_t matrix0[MATRIX_ROWS];
+static uint8_t matrix1[MATRIX_ROWS];
#ifdef MATRIX_HAS_GHOST
static bool matrix_has_ghost_in_row(uint8_t row);
@@ -100,37 +84,35 @@ void matrix_init(void)
PORTD = 0xFF;
// initialize matrix state: all keys off
- for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0x00;
- for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0x00;
- matrix = _matrix0;
- matrix_prev = _matrix1;
+ for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix0[i] = 0x00;
+ for (uint8_t i=0; i < MATRIX_ROWS; i++) matrix1[i] = 0x00;
+ matrix = matrix0;
+ matrix_debouncing = matrix1;
}
uint8_t matrix_scan(void)
{
- if (!debouncing) {
- uint8_t *tmp = matrix_prev;
- matrix_prev = matrix;
- matrix = tmp;
- }
-
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- unselect_rows();
select_row(i);
_delay_us(30); // without this wait read unstable value.
- if (matrix[i] != (uint8_t)~read_col()) {
- matrix[i] = (uint8_t)~read_col();
+ if (matrix_debouncing[i] != read_col()) {
+ matrix_debouncing[i] = read_col();
if (debouncing) {
- debug("bounce!: "); debug_hex(debouncing); print("\n");
+ debug("bounce!: "); debug_hex(debouncing); debug("\n");
}
- _delay_ms(1); // TODO: work around. HAHAHAHAHAAHA
debouncing = DEBOUNCE;
}
+ unselect_rows();
}
- unselect_rows();
if (debouncing) {
- debouncing--;
+ if (--debouncing) {
+ _delay_ms(1);
+ } else {
+ uint8_t *tmp = matrix;
+ matrix = matrix_debouncing;
+ matrix_debouncing = tmp;
+ }
}
return 1;
@@ -139,12 +121,7 @@ uint8_t matrix_scan(void)
bool matrix_is_modified(void)
{
if (debouncing) return false;
- for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- if (matrix[i] != matrix_prev[i]) {
- return true;
- }
- }
- return false;
+ return true;
}
inline
@@ -202,7 +179,7 @@ static bool matrix_has_ghost_in_row(uint8_t row)
inline
static uint8_t read_col(void)
{
- return PIND;
+ return ~PIND;
}
inline