add debouncing into macway/matrix.c.
This commit is contained in:
parent
e65575d4a5
commit
6284b147c2
2 changed files with 28 additions and 7 deletions
|
@ -33,6 +33,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#define MATRIX_COLS 8
|
#define MATRIX_COLS 8
|
||||||
/* define if matrix has ghost */
|
/* define if matrix has ghost */
|
||||||
#define MATRIX_HAS_GHOST
|
#define MATRIX_HAS_GHOST
|
||||||
|
/* Set 0 if need no debouncing */
|
||||||
|
#define DEBOUNCE 5
|
||||||
|
|
||||||
|
|
||||||
/* key combination for command */
|
/* key combination for command */
|
||||||
|
|
|
@ -23,6 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#include <avr/io.h>
|
#include <avr/io.h>
|
||||||
#include <util/delay.h>
|
#include <util/delay.h>
|
||||||
#include "print.h"
|
#include "print.h"
|
||||||
|
#include "debug.h"
|
||||||
#include "util.h"
|
#include "util.h"
|
||||||
#include "matrix.h"
|
#include "matrix.h"
|
||||||
|
|
||||||
|
@ -35,6 +36,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
#ifndef DEBOUNCE
|
||||||
|
# define DEBOUNCE 0
|
||||||
|
#endif
|
||||||
|
static uint8_t debouncing = DEBOUNCE;
|
||||||
|
|
||||||
// matrix state buffer(1:on, 0:off)
|
// matrix state buffer(1:on, 0:off)
|
||||||
#if (MATRIX_COLS <= 8)
|
#if (MATRIX_COLS <= 8)
|
||||||
static uint8_t *matrix;
|
static uint8_t *matrix;
|
||||||
|
@ -85,27 +91,40 @@ void matrix_init(void)
|
||||||
|
|
||||||
uint8_t matrix_scan(void)
|
uint8_t matrix_scan(void)
|
||||||
{
|
{
|
||||||
uint8_t *tmp;
|
if (!debouncing) {
|
||||||
|
uint8_t *tmp = matrix_prev;
|
||||||
tmp = matrix_prev;
|
matrix_prev = matrix;
|
||||||
matrix_prev = matrix;
|
matrix = tmp;
|
||||||
matrix = tmp;
|
}
|
||||||
|
|
||||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
||||||
unselect_rows();
|
unselect_rows();
|
||||||
select_row(i);
|
select_row(i);
|
||||||
_delay_us(30); // without this wait read unstable value.
|
_delay_us(30); // without this wait read unstable value.
|
||||||
matrix[i] = ~read_col();
|
if (matrix[i] != (uint8_t)~read_col()) {
|
||||||
|
matrix[i] = (uint8_t)~read_col();
|
||||||
|
if (debouncing) {
|
||||||
|
debug("bounce!: "); debug_hex(debouncing); print("\n");
|
||||||
|
}
|
||||||
|
debouncing = DEBOUNCE;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
unselect_rows();
|
unselect_rows();
|
||||||
|
|
||||||
|
if (debouncing) {
|
||||||
|
debouncing--;
|
||||||
|
}
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool matrix_is_modified(void)
|
bool matrix_is_modified(void)
|
||||||
{
|
{
|
||||||
|
if (debouncing) return false;
|
||||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
||||||
if (matrix[i] != matrix_prev[i])
|
if (matrix[i] != matrix_prev[i]) {
|
||||||
return true;
|
return true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue