Replace DEBOUNCING_DELAY (deprecated) with DEBOUNCE (#5997)

author: Drashna Jaelre <drashna@live.com> 2019-06-06 12:09:56 -0700
committer: MechMerlin <30334081+mechmerlin@users.noreply.github.com> 2019-06-06 12:09:56 -0700
commit: faaaa134fd436be400aa2c7841b38907899d49a6 (patch)
tree: 9deaea82d250f349b314ec89d369f068ddd75489 /keyboards/duck
parent: fe6b8edd581c334a92a97c15faced95a12d5e882 (diff)
download: qmk_firmware-faaaa134fd436be400aa2c7841b38907899d49a6.tar.gz
qmk_firmware-faaaa134fd436be400aa2c7841b38907899d49a6.zip
10 files changed, 15 insertions, 18 deletions
diff --git a/keyboards/duck/eagle_viper/v2/config.h b/keyboards/duck/eagle_viper/v2/config.h
index a0ce866cc..e328b1ee2 100644
--- a/keyboards/duck/eagle_viper/v2/config.h
+++ b/keyboards/duck/eagle_viper/v2/config.h
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCING_DELAY 5
+#define DEBOUNCE 5
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 3
@@ -48,4 +48,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BOOTMAGIC_LITE_COLUMN 10
 #define TAPPING_TERM 200
diff --git a/keyboards/duck/eagle_viper/v2/matrix.c b/keyboards/duck/eagle_viper/v2/matrix.c
index b705ae49f..0964493ac 100644
--- a/keyboards/duck/eagle_viper/v2/matrix.c
+++ b/keyboards/duck/eagle_viper/v2/matrix.c
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "print.h"
 #include "debug.h"
-static uint8_t debouncing = DEBOUNCING_DELAY;
+static uint8_t debouncing = DEBOUNCE;
 /* matrix state(1:on, 0:off) */
 static matrix_row_t matrix[MATRIX_ROWS];
@@ -92,7 +92,7 @@ uint8_t matrix_scan(void) {
        if (debouncing) {
            dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
        }
-        debouncing = DEBOUNCING_DELAY;
+        debouncing = DEBOUNCE;
      }
    }
    unselect_cols();
diff --git a/keyboards/duck/jetfire/config.h b/keyboards/duck/jetfire/config.h
index 774e28491..f616bc238 100644
--- a/keyboards/duck/jetfire/config.h
+++ b/keyboards/duck/jetfire/config.h
@@ -46,7 +46,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #endif
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCING_DELAY 5
+#define DEBOUNCE 5
 /* Set to top left most key */
 #define BOOTMAGIC_LITE_ROW 5
diff --git a/keyboards/duck/jetfire/matrix.c b/keyboards/duck/jetfire/matrix.c
index 51202aeb6..2dd94a72a 100644
--- a/keyboards/duck/jetfire/matrix.c
+++ b/keyboards/duck/jetfire/matrix.c
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "matrix.h"
-static uint8_t debouncing = DEBOUNCING_DELAY;
+static uint8_t debouncing = DEBOUNCE;
 /* matrix state(1:on, 0:off) */
 static matrix_row_t matrix[MATRIX_ROWS];
@@ -97,7 +97,7 @@ uint8_t matrix_scan(void)
                if (debouncing) {
                    dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
                }
-                debouncing = DEBOUNCING_DELAY;
+                debouncing = DEBOUNCE;
            }
        }
        unselect_cols();
diff --git a/keyboards/duck/lightsaver/config.h b/keyboards/duck/lightsaver/config.h
index d302fb395..5bb4e6faf 100644
--- a/keyboards/duck/lightsaver/config.h
+++ b/keyboards/duck/lightsaver/config.h
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCING_DELAY 5
+#define DEBOUNCE 5
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 1
@@ -48,4 +48,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BOOTMAGIC_LITE_COLUMN 10
 #define TAPPING_TERM 200
diff --git a/keyboards/duck/lightsaver/matrix.c b/keyboards/duck/lightsaver/matrix.c
index 543205c0b..066452724 100644
--- a/keyboards/duck/lightsaver/matrix.c
+++ b/keyboards/duck/lightsaver/matrix.c
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "print.h"
 #include "debug.h"
-static uint8_t debouncing = DEBOUNCING_DELAY;
+static uint8_t debouncing = DEBOUNCE;
 /* matrix state(1:on, 0:off) */
 static matrix_row_t matrix[MATRIX_ROWS];
@@ -90,7 +90,7 @@ uint8_t matrix_scan(void) {
        if (debouncing) {
            dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
        }        
-        debouncing = DEBOUNCING_DELAY;
+        debouncing = DEBOUNCE;
      }
    }
    unselect_cols();
diff --git a/keyboards/duck/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h
index d818cb622..45e87de4b 100644
--- a/keyboards/duck/octagon/v1/config.h
+++ b/keyboards/duck/octagon/v1/config.h
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCING_DELAY 5
+#define DEBOUNCE 5
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 1
diff --git a/keyboards/duck/octagon/v1/matrix.c b/keyboards/duck/octagon/v1/matrix.c
index 233404ed3..a2bea865b 100644
--- a/keyboards/duck/octagon/v1/matrix.c
+++ b/keyboards/duck/octagon/v1/matrix.c
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "print.h"
 #include "debug.h"
-static uint8_t debouncing = DEBOUNCING_DELAY;
+static uint8_t debouncing = DEBOUNCE;
 /* matrix state(1:on, 0:off) */
 static matrix_row_t matrix[MATRIX_ROWS];
@@ -87,7 +87,7 @@ uint8_t matrix_scan(void) {
        if (debouncing) {
            dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
        }
-        debouncing = DEBOUNCING_DELAY;
+        debouncing = DEBOUNCE;
      }
    }
    unselect_cols();
diff --git a/keyboards/duck/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h
index 4aab587f6..82b0c8a99 100644
--- a/keyboards/duck/octagon/v2/config.h
+++ b/keyboards/duck/octagon/v2/config.h
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DIODE_DIRECTION COL2ROW
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCING_DELAY 5
+#define DEBOUNCE 5
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 1
@@ -48,4 +48,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BOOTMAGIC_LITE_COLUMN 10
 #define TAPPING_TERM 200
diff --git a/keyboards/duck/octagon/v2/matrix.c b/keyboards/duck/octagon/v2/matrix.c
index e6e7046b4..25d1e45b0 100644
--- a/keyboards/duck/octagon/v2/matrix.c
+++ b/keyboards/duck/octagon/v2/matrix.c
@@ -22,7 +22,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "print.h"
 #include "debug.h"
-static uint8_t debouncing = DEBOUNCING_DELAY;
+static uint8_t debouncing = DEBOUNCE;
 /* matrix state(1:on, 0:off) */
 static matrix_row_t matrix[MATRIX_ROWS];
@@ -92,7 +92,7 @@ uint8_t matrix_scan(void) {
        if (debouncing) {
            dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
        }
-        debouncing = DEBOUNCING_DELAY;
+        debouncing = DEBOUNCE;
      }
    }
    unselect_cols();
author	Drashna Jaelre <drashna@live.com>	2019-06-06 12:09:56 -0700
committer	MechMerlin <30334081+mechmerlin@users.noreply.github.com>	2019-06-06 12:09:56 -0700
commit	faaaa134fd436be400aa2c7841b38907899d49a6 (patch)
tree	9deaea82d250f349b314ec89d369f068ddd75489 /keyboards/duck
parent	fe6b8edd581c334a92a97c15faced95a12d5e882 (diff)
download	qmk_firmware-faaaa134fd436be400aa2c7841b38907899d49a6.tar.gz qmk_firmware-faaaa134fd436be400aa2c7841b38907899d49a6.zip

diff --git a/keyboards/duck/eagle_viper/v2/config.h b/keyboards/duck/eagle_viper/v2/config.h index a0ce866cc..e328b1ee2 100644 --- a/keyboards/duck/eagle_viper/v2/config.h +++ b/keyboards/duck/eagle_viper/v2/config.h
@@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
34	#define DIODE_DIRECTION COL2ROW	34	#define DIODE_DIRECTION COL2ROW
35		35
36	/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */	36	/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
37	#define DEBOUNCING_DELAY 5	37	#define DEBOUNCE 5
38		38
39	/* number of backlight levels */	39	/* number of backlight levels */
40	#define BACKLIGHT_LEVELS 3	40	#define BACKLIGHT_LEVELS 3
@@ -48,4 +48,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
48	#define BOOTMAGIC_LITE_COLUMN 10	48	#define BOOTMAGIC_LITE_COLUMN 10
49		49
50	#define TAPPING_TERM 200	50	#define TAPPING_TERM 200
51


diff --git a/keyboards/duck/eagle_viper/v2/matrix.c b/keyboards/duck/eagle_viper/v2/matrix.c index b705ae49f..0964493ac 100644 --- a/keyboards/duck/eagle_viper/v2/matrix.c +++ b/keyboards/duck/eagle_viper/v2/matrix.c
@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
22	#include "print.h"	22	#include "print.h"
23	#include "debug.h"	23	#include "debug.h"
24		24
25	static uint8_t debouncing = DEBOUNCING_DELAY;	25	static uint8_t debouncing = DEBOUNCE;
26		26
27	/* matrix state(1:on, 0:off) */	27	/* matrix state(1:on, 0:off) */
28	static matrix_row_t matrix[MATRIX_ROWS];	28	static matrix_row_t matrix[MATRIX_ROWS];
@@ -92,7 +92,7 @@ uint8_t matrix_scan(void) {
92	if (debouncing) {	92	if (debouncing) {
93	dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();	93	dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
94	}	94	}
95	debouncing = DEBOUNCING_DELAY;	95	debouncing = DEBOUNCE;
96	}	96	}
97	}	97	}
98	unselect_cols();	98	unselect_cols();


diff --git a/keyboards/duck/jetfire/config.h b/keyboards/duck/jetfire/config.h index 774e28491..f616bc238 100644 --- a/keyboards/duck/jetfire/config.h +++ b/keyboards/duck/jetfire/config.h
@@ -46,7 +46,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
46	// #endif	46	// #endif
47		47
48	/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */	48	/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
49	#define DEBOUNCING_DELAY 5	49	#define DEBOUNCE 5
50		50
51	/* Set to top left most key */	51	/* Set to top left most key */
52	#define BOOTMAGIC_LITE_ROW 5	52	#define BOOTMAGIC_LITE_ROW 5


diff --git a/keyboards/duck/jetfire/matrix.c b/keyboards/duck/jetfire/matrix.c index 51202aeb6..2dd94a72a 100644 --- a/keyboards/duck/jetfire/matrix.c +++ b/keyboards/duck/jetfire/matrix.c
@@ -21,7 +21,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
21	#include "util.h"	21	#include "util.h"
22	#include "matrix.h"	22	#include "matrix.h"
23		23
24	static uint8_t debouncing = DEBOUNCING_DELAY;	24	static uint8_t debouncing = DEBOUNCE;
25		25
26	/* matrix state(1:on, 0:off) */	26	/* matrix state(1:on, 0:off) */
27	static matrix_row_t matrix[MATRIX_ROWS];	27	static matrix_row_t matrix[MATRIX_ROWS];
@@ -97,7 +97,7 @@ uint8_t matrix_scan(void)
97	if (debouncing) {	97	if (debouncing) {
98	dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();	98	dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
99	}	99	}
100	debouncing = DEBOUNCING_DELAY;	100	debouncing = DEBOUNCE;
101	}	101	}
102	}	102	}
103	unselect_cols();	103	unselect_cols();


diff --git a/keyboards/duck/lightsaver/config.h b/keyboards/duck/lightsaver/config.h index d302fb395..5bb4e6faf 100644 --- a/keyboards/duck/lightsaver/config.h +++ b/keyboards/duck/lightsaver/config.h
@@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
34	#define DIODE_DIRECTION COL2ROW	34	#define DIODE_DIRECTION COL2ROW
35		35
36	/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */	36	/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
37	#define DEBOUNCING_DELAY 5	37	#define DEBOUNCE 5
38		38
39	/* number of backlight levels */	39	/* number of backlight levels */
40	#define BACKLIGHT_LEVELS 1	40	#define BACKLIGHT_LEVELS 1
@@ -48,4 +48,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
48	#define BOOTMAGIC_LITE_COLUMN 10	48	#define BOOTMAGIC_LITE_COLUMN 10
49		49
50	#define TAPPING_TERM 200	50	#define TAPPING_TERM 200
51


diff --git a/keyboards/duck/lightsaver/matrix.c b/keyboards/duck/lightsaver/matrix.c index 543205c0b..066452724 100644 --- a/keyboards/duck/lightsaver/matrix.c +++ b/keyboards/duck/lightsaver/matrix.c
@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
22	#include "print.h"	22	#include "print.h"
23	#include "debug.h"	23	#include "debug.h"
24		24
25	static uint8_t debouncing = DEBOUNCING_DELAY;	25	static uint8_t debouncing = DEBOUNCE;
26		26
27	/* matrix state(1:on, 0:off) */	27	/* matrix state(1:on, 0:off) */
28	static matrix_row_t matrix[MATRIX_ROWS];	28	static matrix_row_t matrix[MATRIX_ROWS];
@@ -90,7 +90,7 @@ uint8_t matrix_scan(void) {
90	if (debouncing) {	90	if (debouncing) {
91	dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();	91	dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
92	}	92	}
93	debouncing = DEBOUNCING_DELAY;	93	debouncing = DEBOUNCE;
94	}	94	}
95	}	95	}
96	unselect_cols();	96	unselect_cols();


diff --git a/keyboards/duck/octagon/v1/config.h b/keyboards/duck/octagon/v1/config.h index d818cb622..45e87de4b 100644 --- a/keyboards/duck/octagon/v1/config.h +++ b/keyboards/duck/octagon/v1/config.h
@@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
34	#define DIODE_DIRECTION COL2ROW	34	#define DIODE_DIRECTION COL2ROW
35		35
36	/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */	36	/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
37	#define DEBOUNCING_DELAY 5	37	#define DEBOUNCE 5
38		38
39	/* number of backlight levels */	39	/* number of backlight levels */
40	#define BACKLIGHT_LEVELS 1	40	#define BACKLIGHT_LEVELS 1


diff --git a/keyboards/duck/octagon/v1/matrix.c b/keyboards/duck/octagon/v1/matrix.c index 233404ed3..a2bea865b 100644 --- a/keyboards/duck/octagon/v1/matrix.c +++ b/keyboards/duck/octagon/v1/matrix.c
@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
22	#include "print.h"	22	#include "print.h"
23	#include "debug.h"	23	#include "debug.h"
24		24
25	static uint8_t debouncing = DEBOUNCING_DELAY;	25	static uint8_t debouncing = DEBOUNCE;
26		26
27	/* matrix state(1:on, 0:off) */	27	/* matrix state(1:on, 0:off) */
28	static matrix_row_t matrix[MATRIX_ROWS];	28	static matrix_row_t matrix[MATRIX_ROWS];
@@ -87,7 +87,7 @@ uint8_t matrix_scan(void) {
87	if (debouncing) {	87	if (debouncing) {
88	dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();	88	dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
89	}	89	}
90	debouncing = DEBOUNCING_DELAY;	90	debouncing = DEBOUNCE;
91	}	91	}
92	}	92	}
93	unselect_cols();	93	unselect_cols();


diff --git a/keyboards/duck/octagon/v2/config.h b/keyboards/duck/octagon/v2/config.h index 4aab587f6..82b0c8a99 100644 --- a/keyboards/duck/octagon/v2/config.h +++ b/keyboards/duck/octagon/v2/config.h
@@ -34,7 +34,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
34	#define DIODE_DIRECTION COL2ROW	34	#define DIODE_DIRECTION COL2ROW
35		35
36	/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */	36	/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
37	#define DEBOUNCING_DELAY 5	37	#define DEBOUNCE 5
38		38
39	/* number of backlight levels */	39	/* number of backlight levels */
40	#define BACKLIGHT_LEVELS 1	40	#define BACKLIGHT_LEVELS 1
@@ -48,4 +48,3 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
48	#define BOOTMAGIC_LITE_COLUMN 10	48	#define BOOTMAGIC_LITE_COLUMN 10
49		49
50	#define TAPPING_TERM 200	50	#define TAPPING_TERM 200
51


diff --git a/keyboards/duck/octagon/v2/matrix.c b/keyboards/duck/octagon/v2/matrix.c index e6e7046b4..25d1e45b0 100644 --- a/keyboards/duck/octagon/v2/matrix.c +++ b/keyboards/duck/octagon/v2/matrix.c
@@ -22,7 +22,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
22	#include "print.h"	22	#include "print.h"
23	#include "debug.h"	23	#include "debug.h"
24		24
25	static uint8_t debouncing = DEBOUNCING_DELAY;	25	static uint8_t debouncing = DEBOUNCE;
26		26
27	/* matrix state(1:on, 0:off) */	27	/* matrix state(1:on, 0:off) */
28	static matrix_row_t matrix[MATRIX_ROWS];	28	static matrix_row_t matrix[MATRIX_ROWS];
@@ -92,7 +92,7 @@ uint8_t matrix_scan(void) {
92	if (debouncing) {	92	if (debouncing) {
93	dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();	93	dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
94	}	94	}
95	debouncing = DEBOUNCING_DELAY;	95	debouncing = DEBOUNCE;
96	}	96	}
97	}	97	}
98	unselect_cols();	98	unselect_cols();