Replace DEBOUNCING_DELAY (deprecated) with DEBOUNCE (#5997)
This commit is contained in:
		
							parent
							
								
									fe6b8edd58
								
							
						
					
					
						commit
						faaaa134fd
					
				
					 448 changed files with 594 additions and 627 deletions
				
			
		| 
						 | 
				
			
			@ -56,7 +56,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
// #define BACKLIGHT_LEVELS 3
 | 
			
		||||
 | 
			
		||||
/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 | 
			
		||||
#define DEBOUNCING_DELAY 5
 | 
			
		||||
#define DEBOUNCE 5
 | 
			
		||||
 | 
			
		||||
/* define if matrix has ghost (lacks anti-ghosting diodes) */
 | 
			
		||||
//#define MATRIX_HAS_GHOST
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -42,11 +42,11 @@ static uint8_t error_count_arrow = 0;
 | 
			
		|||
 | 
			
		||||
/* Set 0 if debouncing isn't needed */
 | 
			
		||||
 | 
			
		||||
#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
 | 
			
		||||
| 
						 | 
				
			
			@ -169,7 +169,7 @@ uint8_t matrix_scan(void)
 | 
			
		|||
 | 
			
		||||
    // Set row, read cols
 | 
			
		||||
    for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
 | 
			
		||||
#       if (DEBOUNCING_DELAY > 0)
 | 
			
		||||
#       if (DEBOUNCE > 0)
 | 
			
		||||
            bool matrix_changed = read_cols_on_row(matrix_debouncing, current_row);
 | 
			
		||||
 | 
			
		||||
            if (matrix_changed) {
 | 
			
		||||
| 
						 | 
				
			
			@ -187,7 +187,7 @@ uint8_t matrix_scan(void)
 | 
			
		|||
 | 
			
		||||
    // Set col, read rows
 | 
			
		||||
    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
 | 
			
		||||
#       if (DEBOUNCING_DELAY > 0)
 | 
			
		||||
#       if (DEBOUNCE > 0)
 | 
			
		||||
            bool matrix_changed = read_rows_on_col(matrix_debouncing, current_col);
 | 
			
		||||
            if (matrix_changed) {
 | 
			
		||||
                debouncing = true;
 | 
			
		||||
| 
						 | 
				
			
			@ -201,8 +201,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_debouncing[i];
 | 
			
		||||
            }
 | 
			
		||||
| 
						 | 
				
			
			@ -249,7 +249,7 @@ uint8_t matrix_scan(void)
 | 
			
		|||
 | 
			
		||||
bool matrix_is_modified(void)
 | 
			
		||||
{
 | 
			
		||||
#if (DEBOUNCING_DELAY > 0)
 | 
			
		||||
#if (DEBOUNCE > 0)
 | 
			
		||||
    if (debouncing) return false;
 | 
			
		||||
#endif
 | 
			
		||||
    return true;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue