#include "print.h"
#include "debug.h"
#include "util.h"
+#include "timer.h"
#include "matrix.h"
#ifndef DEBOUNCE
# define DEBOUNCE 5
#endif
-static uint8_t debouncing = DEBOUNCE;
+static bool debouncing = false;
+static uint16_t debouncing_time = 0;
-// matrix state buffer(1:on, 0:off)
-static uint16_t *matrix;
-static uint16_t *matrix_prev;
-static uint16_t _matrix0[MATRIX_ROWS];
-static uint16_t _matrix1[MATRIX_ROWS];
-static uint16_t read_cols(void);
+/* matrix state(1:on, 0:off) */
+static matrix_row_t matrix[MATRIX_ROWS];
+static matrix_row_t matrix_debouncing[MATRIX_ROWS];
+
+static matrix_row_t read_cols(void);
static void init_cols(void);
static void unselect_rows(void);
static void select_row(uint8_t row);
-inline
-uint8_t matrix_rows(void)
-{
- return MATRIX_ROWS;
-}
-
-inline
-uint8_t matrix_cols(void)
-{
- return MATRIX_COLS;
-}
-
void matrix_init(void)
{
// initialize row and col
init_cols();
// initialize matrix state: all keys off
- for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix0[i] = 0;
- for (uint8_t i=0; i < MATRIX_ROWS; i++) _matrix1[i] = 0;
- matrix = _matrix0;
- matrix_prev = _matrix1;
+ for (uint8_t i=0; i < MATRIX_ROWS; i++) {
+ matrix[i] = 0;
+ matrix_debouncing[i] = 0;
+ }
}
uint8_t matrix_scan(void)
{
- if (!debouncing) {
- uint16_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(1); // without this wait read unstable value.
- uint16_t cols = ~read_cols();
- if (matrix[i] != cols) {
- matrix[i] = cols;
+ _delay_us(1); // delay for settling
+ matrix_row_t cols = read_cols();
+ if (matrix_debouncing[i] != cols) {
if (debouncing) {
- debug("bounce!: "); debug_hex(debouncing); print("\n");
+ dprintf("bounce: %d %d@%02X\n", timer_elapsed(debouncing_time), i, matrix_debouncing[i]^cols);
}
- debouncing = DEBOUNCE;
+ matrix_debouncing[i] = cols;
+ debouncing = true;
+ debouncing_time = timer_read();
}
+ unselect_rows();
}
- unselect_rows();
-
- if (debouncing) {
- debouncing--;
- _delay_ms(1); // improved affect on bouncing
- }
-
- return 1;
-}
-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;
+ if (debouncing && timer_elapsed(debouncing_time) >= DEBOUNCE) {
+ for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+ matrix[i] = matrix_debouncing[i];
}
+ debouncing = false;
}
- return false;
-}
-
-inline
-bool matrix_has_ghost(void)
-{
- return false;
-}
-inline
-bool matrix_is_on(uint8_t row, uint8_t col)
-{
- return (matrix[row] & (1<<col));
+ return 1;
}
inline
-uint16_t matrix_get_row(uint8_t row)
+matrix_row_t matrix_get_row(uint8_t row)
{
return matrix[row];
}
-void matrix_print(void)
-{
- print("\nr/c 01234567\n");
- for (uint8_t row = 0; row < MATRIX_ROWS; row++) {
- phex(row); print(": ");
- pbin_reverse16(matrix_get_row(row));
- print("\n");
- }
-}
-
-uint8_t matrix_key_count(void)
-{
- uint8_t count = 0;
- for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- count += bitpop16(matrix[i]);
- }
- return count;
-}
-
/* Column pin configuration
* col: 0 1 2 3 4 5 6 7 8 9 10 11 12 13
- * pin: F0 F1 E6 C7 C6 B6 D4 B1 B0 B5 B4 D7 D6 B3
+ * pin: F0 F1 E6 C7 C6 B6 D4 B1 B0 B5 B4 D7 D6 B3 (Rev.A)
+ * pin: B7 (Rev.B)
*/
static void init_cols(void)
{
PORTD |= (1<<7 | 1<<6 | 1<<4);
DDRC &= ~(1<<7 | 1<<6);
PORTC |= (1<<7 | 1<<6);
- DDRB &= ~(1<<6 | 1<< 5 | 1<<4 | 1<<3 | 1<<1 | 1<<0);
- PORTB |= (1<<6 | 1<< 5 | 1<<4 | 1<<3 | 1<<1 | 1<<0);
+ DDRB &= ~(1<<7 | 1<<6 | 1<< 5 | 1<<4 | 1<<3 | 1<<1 | 1<<0);
+ PORTB |= (1<<7 | 1<<6 | 1<< 5 | 1<<4 | 1<<3 | 1<<1 | 1<<0);
}
-static uint16_t read_cols(void)
+static matrix_row_t read_cols(void)
{
- return (PINF&(1<<0) ? (1<<0) : 0) |
- (PINF&(1<<1) ? (1<<1) : 0) |
- (PINE&(1<<6) ? (1<<2) : 0) |
- (PINC&(1<<7) ? (1<<3) : 0) |
- (PINC&(1<<6) ? (1<<4) : 0) |
- (PINB&(1<<6) ? (1<<5) : 0) |
- (PIND&(1<<4) ? (1<<6) : 0) |
- (PINB&(1<<1) ? (1<<7) : 0) |
- (PINB&(1<<0) ? (1<<8) : 0) |
- (PINB&(1<<5) ? (1<<9) : 0) |
- (PINB&(1<<4) ? (1<<10) : 0) |
- (PIND&(1<<7) ? (1<<11) : 0) |
- (PIND&(1<<6) ? (1<<12) : 0) |
- (PINB&(1<<3) ? (1<<13) : 0);
+ return (PINF&(1<<0) ? 0 : (1<<0)) |
+ (PINF&(1<<1) ? 0 : (1<<1)) |
+ (PINE&(1<<6) ? 0 : (1<<2)) |
+ (PINC&(1<<7) ? 0 : (1<<3)) |
+ (PINC&(1<<6) ? 0 : (1<<4)) |
+ (PINB&(1<<6) ? 0 : (1<<5)) |
+ (PIND&(1<<4) ? 0 : (1<<6)) |
+ (PINB&(1<<1) ? 0 : (1<<7)) |
+ ((PINB&(1<<0) && PINB&(1<<7)) ? 0 : (1<<8)) | // Rev.A and B
+ (PINB&(1<<5) ? 0 : (1<<9)) |
+ (PINB&(1<<4) ? 0 : (1<<10)) |
+ (PIND&(1<<7) ? 0 : (1<<11)) |
+ (PIND&(1<<6) ? 0 : (1<<12)) |
+ (PINB&(1<<3) ? 0 : (1<<13));
}
/* Row pin configuration
projects / max / tmk_keyboard.git / blobdiff