/*
-Copyright 2012 Jun Wako
-Copyright 2014 Jack Humbert
+Copyright 2012-2017 Jun Wako, Jack Humbert
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#include "debug.h"
#include "util.h"
#include "matrix.h"
+#include "timer.h"
+
+
+/* Set 0 if debouncing isn't needed */
+
+#ifndef DEBOUNCING_DELAY
+# define DEBOUNCING_DELAY 5
+#endif
+
+#if (DEBOUNCING_DELAY > 0)
+ static uint16_t debouncing_time;
+ static bool debouncing = false;
+#endif
#if (MATRIX_COLS <= 8)
# define print_matrix_header() print("\nr/c 01234567\n")
#endif
#ifdef MATRIX_MASKED
-extern const matrix_row_t matrix_mask[];
-#endif
-
-/* Set 0 if debouncing isn't needed */
-
-#ifndef DEBOUNCING_DELAY
-# define DEBOUNCING_DELAY 5
+ extern const matrix_row_t matrix_mask[];
#endif
-static uint8_t debouncing = DEBOUNCING_DELAY;
+#if (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
static const uint8_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
static const uint8_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+#endif
/* matrix state(1:on, 0:off) */
static matrix_row_t matrix[MATRIX_ROWS];
-static matrix_row_t matrix_raw[MATRIX_ROWS];
-
+static matrix_row_t matrix_debouncing[MATRIX_ROWS];
-#if DIODE_DIRECTION == COL2ROW
- static matrix_row_t matrix_debouncing[MATRIX_ROWS];
-#else // ROW2COL
- static matrix_col_t matrix_transposed[MATRIX_COLS];
- static matrix_col_t matrix_transposed_debouncing[MATRIX_COLS];
-#endif
#if (DIODE_DIRECTION == COL2ROW)
static void init_cols(void);
- static void read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
+ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row);
static void unselect_rows(void);
static void select_row(uint8_t row);
static void unselect_row(uint8_t row);
-#else // ROW2COL
+#elif (DIODE_DIRECTION == ROW2COL)
static void init_rows(void);
- static void read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
+ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col);
static void unselect_cols(void);
static void unselect_col(uint8_t col);
static void select_col(uint8_t col);
// /* PORTxn */
// _SFR_IO8((col_pins[c] >> 4) + 2) |= _BV(col_pins[c] & 0xF);
// }
-// #else
+// #elif (DIODE_DIRECTION == ROW2COL)
// for (int8_t c = MATRIX_COLS - 1; c >= 0; --c) {
// /* DDRxn */
// _SFR_IO8((col_pins[c] >> 4) + 1) |= _BV(col_pins[c] & 0xF);
#if (DIODE_DIRECTION == COL2ROW)
unselect_rows();
init_cols();
-
- // initialize matrix state: all keys off
- for (uint8_t i=0; i < MATRIX_ROWS; i++) {
- matrix[i] = 0;
- matrix_raw[i] = 0;
- matrix_debouncing[i] = 0;
- }
-
-#else // ROW2COL
+#elif (DIODE_DIRECTION == ROW2COL)
unselect_cols();
init_rows();
+#endif
// initialize matrix state: all keys off
for (uint8_t i=0; i < MATRIX_ROWS; i++) {
- matrix_raw[i] = 0;
matrix[i] = 0;
+ matrix_debouncing[i] = 0;
}
- // initialize matrix state: all keys off
- for (uint8_t i=0; i < MATRIX_COLS; i++) {
- matrix_transposed_debouncing[i] = 0;
- }
-#endif
-
matrix_init_quantum();
}
// Set row, read cols
for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
- read_cols_on_row(matrix, current_row);
+# if (DEBOUNCING_DELAY > 0)
+ bool matrix_changed = read_cols_on_row(matrix_debouncing, current_row);
+
+ if (matrix_changed) {
+ debouncing = true;
+ debouncing_time = timer_read();
+ }
+
+# else
+ read_cols_on_row(matrix, current_row);
+# endif
+
}
- // select_row(i);
- // wait_us(30); // without this wait read unstable value.
- // matrix_row_t current_row = read_cols();
- // if (matrix_debouncing[i] != current_row) {
- // matrix_debouncing[i] = current_row;
- // if (debouncing) {
- // debug("bounce!: "); debug_hex(debouncing); debug("\n");
- // }
- // debouncing = DEBOUNCING_DELAY;
- // }
- // unselect_row(i);
- // }
-
- // if (debouncing) {
- // if (--debouncing) {
- // wait_ms(1);
- // } else {
- // for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
- // matrix[i] = matrix_debouncing[i];
- // }
- // }
- // }
-
-#else // ROW2COL
+#elif (DIODE_DIRECTION == ROW2COL)
// Set col, read rows
for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
- read_rows_on_col(matrix, current_col);
- }
-
+# if (DEBOUNCING_DELAY > 0)
+ bool matrix_changed = read_rows_on_col(matrix_debouncing, current_col);
+ if (matrix_changed) {
+ debouncing = true;
+ debouncing_time = timer_read();
+ }
+# else
+ read_rows_on_col(matrix, current_col);
+# endif
- // for (uint8_t i = 0; i < MATRIX_COLS; i++) {
- // select_col(i);
- // wait_us(30); // without this wait read unstable value.
- // matrix_col_t current_col = read_rows();
- // if (matrix_transposed_debouncing[i] != current_col) {
- // matrix_transposed_debouncing[i] = current_col;
- // if (debouncing) {
- // debug("bounce!: "); debug_hex(debouncing); debug("\n");
- // }
- // debouncing = DEBOUNCING_DELAY;
- // }
- // unselect_col(i);
- // }
-
- // if (debouncing) {
- // if (--debouncing) {
- // wait_ms(1);
- // } else {
- // for (uint8_t i = 0; i < MATRIX_COLS; i++) {
- // matrix_transposed[i] = matrix_transposed_debouncing[i];
- // }
- // }
- // }
-
- // // Untranspose matrix
- // for (uint8_t y = 0; y < MATRIX_ROWS; y++) {
- // matrix_row_t row = 0;
- // for (uint8_t x = 0; x < MATRIX_COLS; x++) {
- // row |= ((matrix_transposed[x] & (1<<y)) >> y) << x;
- // }
- // matrix[y] = row;
- // }
+ }
#endif
- matrix_scan_quantum();
+# if (DEBOUNCING_DELAY > 0)
+ if (debouncing && (timer_elapsed(debouncing_time) > DEBOUNCING_DELAY)) {
+ for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+ matrix[i] = matrix_debouncing[i];
+ }
+ debouncing = false;
+ }
+# endif
+ matrix_scan_quantum();
return 1;
}
bool matrix_is_modified(void)
{
+#if (DEBOUNCING_DELAY > 0)
if (debouncing) return false;
+#endif
return true;
}
}
}
-static void read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
{
+ // Store last value of row prior to reading
+ matrix_row_t last_row_value = current_matrix[current_row];
+
// Clear data in matrix row
current_matrix[current_row] = 0;
// Populate the matrix row with the state of the col pin
current_matrix[current_row] |= pin_state ? 0 : (ROW_SHIFTER << col_index);
}
+
+ // Unselect row
+ unselect_row(current_row);
+
+ return (last_row_value != current_matrix[current_row]);
}
static void select_row(uint8_t row)
}
}
-#else // ROW2COL
+#elif (DIODE_DIRECTION == ROW2COL)
static void init_rows(void)
{
}
}
-static void read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
{
+ bool matrix_changed = false;
// Select col and wait for col selecton to stabilize
select_col(current_col);
wait_us(30);
// For each row...
- for(uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
+ for(uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++)
+ {
+
+ // Store last value of row prior to reading
+ matrix_row_t last_row_value = current_matrix[row_index];
+
+ // Check row pin state
+ if ((_SFR_IO8(row_pins[row_index] >> 4) & _BV(row_pins[row_index] & 0xF)) == 0)
+ {
+ // Pin LO, set col bit
+ current_matrix[row_index] |= (ROW_SHIFTER << current_col);
+ }
+ else
+ {
+ // Pin HI, clear col bit
+ current_matrix[row_index] &= ~(ROW_SHIFTER << current_col);
+ }
+
+ // Determine if the matrix changed state
+ if ((last_row_value != current_matrix[row_index]) && !(matrix_changed))
+ {
+ matrix_changed = true;
+ }
+ }
- // Select the row pin to read (active low)
- uint8_t pin = row_pins[row_index];
- uint8_t pin_state = (_SFR_IO8(pin >> 4) & _BV(pin & 0xF));
+ // Unselect col
+ unselect_col(current_col);
- // Populate the matrix row with the state of the col pin
- current_matrix[row_index] &= pin_state ? ~(ROW_SHIFTER << current_col) : 0;
- }
+ return matrix_changed;
}
static void select_col(uint8_t col)