Replace DEBOUNCING_DELAY (deprecated) with DEBOUNCE (#5997)
This commit is contained in:
committed by
MechMerlin
parent
fe6b8edd58
commit
faaaa134fd
@@ -30,6 +30,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#define MATRIX_COLS 8
|
||||
|
||||
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
|
||||
#define DEBOUNCING_DELAY 5
|
||||
|
||||
|
||||
#define DEBOUNCE 5
|
||||
|
@@ -34,18 +34,18 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include "config.h"
|
||||
|
||||
|
||||
#ifndef DEBOUNCING_DELAY
|
||||
# define DEBOUNCING_DELAY 5
|
||||
#ifndef DEBOUNCE
|
||||
# define DEBOUNCE 5
|
||||
#endif
|
||||
|
||||
#if ( DEBOUNCING_DELAY > 0 )
|
||||
#if ( DEBOUNCE > 0 )
|
||||
static uint16_t debouncing_time ;
|
||||
static bool debouncing = false ;
|
||||
#endif
|
||||
|
||||
static uint8_t matrix [MATRIX_ROWS] = {0};
|
||||
|
||||
#if ( DEBOUNCING_DELAY > 0 )
|
||||
#if ( DEBOUNCE > 0 )
|
||||
static uint8_t matrix_debounce_old [MATRIX_ROWS] = {0};
|
||||
static uint8_t matrix_debounce_new [MATRIX_ROWS] = {0};
|
||||
#endif
|
||||
@@ -172,7 +172,7 @@ uint8_t matrix_scan(void) {
|
||||
// the first byte of the keyboard's output data can be ignored
|
||||
Matrix_ThrowByte();
|
||||
|
||||
#if ( DEBOUNCING_DELAY > 0 )
|
||||
#if ( DEBOUNCE > 0 )
|
||||
|
||||
for ( uint8_t row = 0 ; row < MATRIX_ROWS ; ++row ) {
|
||||
//transfer old debouncing values
|
||||
@@ -194,8 +194,8 @@ uint8_t matrix_scan(void) {
|
||||
#endif
|
||||
|
||||
|
||||
#if ( DEBOUNCING_DELAY > 0 )
|
||||
if ( debouncing && ( timer_elapsed( debouncing_time ) > DEBOUNCING_DELAY ) ) {
|
||||
#if ( DEBOUNCE > 0 )
|
||||
if ( debouncing && ( timer_elapsed( debouncing_time ) > DEBOUNCE ) ) {
|
||||
|
||||
for ( uint8_t row = 0 ; row < MATRIX_ROWS ; ++row ) {
|
||||
matrix[row] = matrix_debounce_new[row] ;
|
||||
|
@@ -37,6 +37,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
|
||||
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
|
||||
#define DEBOUNCING_DELAY 0
|
||||
|
||||
|
||||
#define DEBOUNCE 0
|
||||
|
@@ -33,8 +33,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#include "config.h"
|
||||
|
||||
|
||||
#ifndef DEBOUNCING_DELAY
|
||||
# define DEBOUNCING_DELAY 5
|
||||
#ifndef DEBOUNCE
|
||||
# define DEBOUNCE 5
|
||||
#endif
|
||||
|
||||
#define print_matrix_header() print("\nr/c 01234567\n")
|
||||
@@ -49,14 +49,14 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
static const uint8_t row_pins [NUM_ROW_PINS] = MATRIX_ROW_PINS ;
|
||||
static const uint8_t col_pins [NUM_ROW_PINS] = MATRIX_COL_PINS ;
|
||||
|
||||
#if ( DEBOUNCING_DELAY > 0 )
|
||||
#if ( DEBOUNCE > 0 )
|
||||
static uint16_t debouncing_time ;
|
||||
static bool debouncing = false ;
|
||||
#endif
|
||||
|
||||
static uint8_t matrix [MATRIX_ROWS] = {0};
|
||||
|
||||
#if ( DEBOUNCING_DELAY > 0 )
|
||||
#if ( DEBOUNCE > 0 )
|
||||
static uint8_t matrix_debounce [MATRIX_ROWS] = {0};
|
||||
#endif
|
||||
|
||||
@@ -237,7 +237,7 @@ void matrix_init(void) {
|
||||
// initialize matrix state: all keys off
|
||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
||||
matrix[i] = 0;
|
||||
# if (DEBOUNCING_DELAY > 0)
|
||||
# if (DEBOUNCE > 0)
|
||||
matrix_debounce [i] = 0;
|
||||
# endif
|
||||
}
|
||||
@@ -247,7 +247,7 @@ void matrix_init(void) {
|
||||
|
||||
uint8_t matrix_scan(void) {
|
||||
for ( uint8_t current_row = 0; current_row < MATRIX_ROWS; ++current_row ) {
|
||||
# if (DEBOUNCING_DELAY > 0)
|
||||
# if (DEBOUNCE > 0)
|
||||
bool matrix_changed = matrix_read(matrix_debounce, current_row);
|
||||
|
||||
if (matrix_changed) {
|
||||
@@ -260,8 +260,8 @@ uint8_t matrix_scan(void) {
|
||||
# endif
|
||||
}
|
||||
|
||||
# if (DEBOUNCING_DELAY > 0)
|
||||
if (debouncing && (timer_elapsed(debouncing_time) > DEBOUNCING_DELAY)) {
|
||||
# if (DEBOUNCE > 0)
|
||||
if (debouncing && (timer_elapsed(debouncing_time) > DEBOUNCE)) {
|
||||
for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
|
||||
matrix[i] = matrix_debounce[i];
|
||||
}
|
||||
|
@@ -49,7 +49,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
#define DIODE_DIRECTION ROW2COL
|
||||
|
||||
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed (5 is default) */
|
||||
#define DEBOUNCING_DELAY 5
|
||||
#define DEBOUNCE 5
|
||||
|
||||
/*
|
||||
* Magic Key Options
|
||||
@@ -120,4 +120,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
//#define NO_ACTION_TAPPING
|
||||
//#define NO_ACTION_ONESHOT
|
||||
//#define NO_ACTION_MACRO
|
||||
//#define NO_ACTION_FUNCTION
|
||||
//#define NO_ACTION_FUNCTION
|
||||
|
@@ -52,10 +52,10 @@ Header Pins
|
||||
Header / Matrix
|
||||
---------------
|
||||
|
||||
Pin Name Description
|
||||
Pin Name Description
|
||||
--------------------------------------------------------------
|
||||
1,2,5,3,4,6 Y0-Y5 Y-direction key-matrix connections
|
||||
7 NC
|
||||
7 NC
|
||||
9,11,10,8 X4-X7 X-direction key-matrix connections
|
||||
|
||||
|
||||
@@ -98,4 +98,4 @@ http://wiki.apple2.org/index.php?title=Pinouts#Apple_.2F.2Fe_Numeric_Keypad_conn
|
||||
#define UNUSED_PINS
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
#define SOFT_SERIAL_PIN D0
|
||||
#define DEBOUNCING_DELAY 5
|
||||
#define DEBOUNCE 5
|
||||
|
Reference in New Issue
Block a user