diff options
| 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/bpiphany | |
| parent | fe6b8edd581c334a92a97c15faced95a12d5e882 (diff) | |
| download | qmk_firmware-faaaa134fd436be400aa2c7841b38907899d49a6.tar.gz qmk_firmware-faaaa134fd436be400aa2c7841b38907899d49a6.zip | |
Replace DEBOUNCING_DELAY (deprecated) with DEBOUNCE (#5997)
Diffstat (limited to 'keyboards/bpiphany')
| -rw-r--r-- | keyboards/bpiphany/frosty_flake/config.h | 2 | ||||
| -rw-r--r-- | keyboards/bpiphany/frosty_flake/matrix.c | 8 | ||||
| -rw-r--r-- | keyboards/bpiphany/kitten_paw/config.h | 2 | ||||
| -rw-r--r-- | keyboards/bpiphany/kitten_paw/matrix.c | 8 | ||||
| -rw-r--r-- | keyboards/bpiphany/pegasushoof/config.h | 2 | ||||
| -rw-r--r-- | keyboards/bpiphany/pegasushoof/matrix.c | 4 | ||||
| -rw-r--r-- | keyboards/bpiphany/sixshooter/config.h | 2 | ||||
| -rw-r--r-- | keyboards/bpiphany/tiger_lily/config.h | 2 | ||||
| -rw-r--r-- | keyboards/bpiphany/tiger_lily/matrix.c | 8 | ||||
| -rw-r--r-- | keyboards/bpiphany/unloved_bastard/config.h | 2 | ||||
| -rw-r--r-- | keyboards/bpiphany/unloved_bastard/matrix.c | 8 |
11 files changed, 24 insertions, 24 deletions
diff --git a/keyboards/bpiphany/frosty_flake/config.h b/keyboards/bpiphany/frosty_flake/config.h index a797fef42..250a1b775 100644 --- a/keyboards/bpiphany/frosty_flake/config.h +++ b/keyboards/bpiphany/frosty_flake/config.h | |||
| @@ -45,7 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 45 | #define UNUSED_PINS { B0, C4, D3 } | 45 | #define UNUSED_PINS { B0, C4, D3 } |
| 46 | 46 | ||
| 47 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | 47 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ |
| 48 | #define DEBOUNCING_DELAY 5 | 48 | #define DEBOUNCE 5 |
| 49 | 49 | ||
| 50 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | 50 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ |
| 51 | #define LOCKING_SUPPORT_ENABLE | 51 | #define LOCKING_SUPPORT_ENABLE |
diff --git a/keyboards/bpiphany/frosty_flake/matrix.c b/keyboards/bpiphany/frosty_flake/matrix.c index 480e3455b..3c49e9c00 100644 --- a/keyboards/bpiphany/frosty_flake/matrix.c +++ b/keyboards/bpiphany/frosty_flake/matrix.c | |||
| @@ -24,10 +24,10 @@ | |||
| 24 | #include "util.h" | 24 | #include "util.h" |
| 25 | #include "matrix.h" | 25 | #include "matrix.h" |
| 26 | 26 | ||
| 27 | #ifndef DEBOUNCING_DELAY | 27 | #ifndef DEBOUNCE |
| 28 | # define DEBOUNCING_DELAY 5 | 28 | # define DEBOUNCE 5 |
| 29 | #endif | 29 | #endif |
| 30 | static uint8_t debouncing = DEBOUNCING_DELAY; | 30 | static uint8_t debouncing = DEBOUNCE; |
| 31 | 31 | ||
| 32 | static matrix_row_t matrix[MATRIX_ROWS]; | 32 | static matrix_row_t matrix[MATRIX_ROWS]; |
| 33 | static matrix_row_t matrix_debouncing[MATRIX_ROWS]; | 33 | static matrix_row_t matrix_debouncing[MATRIX_ROWS]; |
| @@ -111,7 +111,7 @@ uint8_t matrix_scan(void) { | |||
| 111 | bool curr_bit = col_scan & (1<<row); | 111 | bool curr_bit = col_scan & (1<<row); |
| 112 | if (prev_bit != curr_bit) { | 112 | if (prev_bit != curr_bit) { |
| 113 | matrix_debouncing[row] ^= ((matrix_row_t)1<<col); | 113 | matrix_debouncing[row] ^= ((matrix_row_t)1<<col); |
| 114 | debouncing = DEBOUNCING_DELAY; | 114 | debouncing = DEBOUNCE; |
| 115 | } | 115 | } |
| 116 | } | 116 | } |
| 117 | } | 117 | } |
diff --git a/keyboards/bpiphany/kitten_paw/config.h b/keyboards/bpiphany/kitten_paw/config.h index 5ecf6d8dd..89f104cfe 100644 --- a/keyboards/bpiphany/kitten_paw/config.h +++ b/keyboards/bpiphany/kitten_paw/config.h | |||
| @@ -53,7 +53,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 53 | // #define BACKLIGHT_LEVELS 3 | 53 | // #define BACKLIGHT_LEVELS 3 |
| 54 | 54 | ||
| 55 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | 55 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ |
| 56 | #define DEBOUNCING_DELAY 5 | 56 | #define DEBOUNCE 5 |
| 57 | 57 | ||
| 58 | /* define if matrix has ghost (lacks anti-ghosting diodes) */ | 58 | /* define if matrix has ghost (lacks anti-ghosting diodes) */ |
| 59 | //#define MATRIX_HAS_GHOST | 59 | //#define MATRIX_HAS_GHOST |
diff --git a/keyboards/bpiphany/kitten_paw/matrix.c b/keyboards/bpiphany/kitten_paw/matrix.c index 6fdbfffd6..b59089cdf 100644 --- a/keyboards/bpiphany/kitten_paw/matrix.c +++ b/keyboards/bpiphany/kitten_paw/matrix.c | |||
| @@ -24,10 +24,10 @@ | |||
| 24 | #include "util.h" | 24 | #include "util.h" |
| 25 | #include "matrix.h" | 25 | #include "matrix.h" |
| 26 | 26 | ||
| 27 | #ifndef DEBOUNCING_DELAY | 27 | #ifndef DEBOUNCE |
| 28 | # define DEBOUNCING_DELAY 5 | 28 | # define DEBOUNCE 5 |
| 29 | #endif | 29 | #endif |
| 30 | static uint8_t debouncing = DEBOUNCING_DELAY; | 30 | static uint8_t debouncing = DEBOUNCE; |
| 31 | 31 | ||
| 32 | static matrix_row_t matrix[MATRIX_ROWS]; | 32 | static matrix_row_t matrix[MATRIX_ROWS]; |
| 33 | static matrix_row_t matrix_debouncing[MATRIX_ROWS]; | 33 | static matrix_row_t matrix_debouncing[MATRIX_ROWS]; |
| @@ -98,7 +98,7 @@ uint8_t matrix_scan(void) { | |||
| 98 | bool curr_bit = rows & (1<<row); | 98 | bool curr_bit = rows & (1<<row); |
| 99 | if (prev_bit != curr_bit) { | 99 | if (prev_bit != curr_bit) { |
| 100 | matrix_debouncing[row] ^= ((matrix_row_t)1<<col); | 100 | matrix_debouncing[row] ^= ((matrix_row_t)1<<col); |
| 101 | debouncing = DEBOUNCING_DELAY; | 101 | debouncing = DEBOUNCE; |
| 102 | } | 102 | } |
| 103 | } | 103 | } |
| 104 | } | 104 | } |
diff --git a/keyboards/bpiphany/pegasushoof/config.h b/keyboards/bpiphany/pegasushoof/config.h index 885afaa90..cd89b7582 100644 --- a/keyboards/bpiphany/pegasushoof/config.h +++ b/keyboards/bpiphany/pegasushoof/config.h | |||
| @@ -36,6 +36,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 36 | #define DIODE_DIRECTION COL2ROW | 36 | #define DIODE_DIRECTION COL2ROW |
| 37 | 37 | ||
| 38 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | 38 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ |
| 39 | #define DEBOUNCING_DELAY 5 | 39 | #define DEBOUNCE 5 |
| 40 | 40 | ||
| 41 | #endif | 41 | #endif |
diff --git a/keyboards/bpiphany/pegasushoof/matrix.c b/keyboards/bpiphany/pegasushoof/matrix.c index 127433875..a670d5382 100644 --- a/keyboards/bpiphany/pegasushoof/matrix.c +++ b/keyboards/bpiphany/pegasushoof/matrix.c | |||
| @@ -26,7 +26,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 26 | #include "util.h" | 26 | #include "util.h" |
| 27 | #include "matrix.h" | 27 | #include "matrix.h" |
| 28 | 28 | ||
| 29 | static uint8_t debouncing = DEBOUNCING_DELAY; | 29 | static uint8_t debouncing = DEBOUNCE; |
| 30 | static matrix_row_t matrix[MATRIX_ROWS]; | 30 | static matrix_row_t matrix[MATRIX_ROWS]; |
| 31 | static matrix_row_t matrix_debouncing[MATRIX_ROWS]; | 31 | static matrix_row_t matrix_debouncing[MATRIX_ROWS]; |
| 32 | 32 | ||
| @@ -90,7 +90,7 @@ uint8_t matrix_scan(void) | |||
| 90 | bool curr_bit = rows & (1<<row); | 90 | bool curr_bit = rows & (1<<row); |
| 91 | if (prev_bit != curr_bit) { | 91 | if (prev_bit != curr_bit) { |
| 92 | matrix_debouncing[row] ^= (matrix_row_t) 1 << col; | 92 | matrix_debouncing[row] ^= (matrix_row_t) 1 << col; |
| 93 | debouncing = DEBOUNCING_DELAY; | 93 | debouncing = DEBOUNCE; |
| 94 | } | 94 | } |
| 95 | } | 95 | } |
| 96 | } | 96 | } |
diff --git a/keyboards/bpiphany/sixshooter/config.h b/keyboards/bpiphany/sixshooter/config.h index ed890d3c9..ade95cc19 100644 --- a/keyboards/bpiphany/sixshooter/config.h +++ b/keyboards/bpiphany/sixshooter/config.h | |||
| @@ -32,7 +32,7 @@ | |||
| 32 | #define DIODE_DIRECTION COL2ROW | 32 | #define DIODE_DIRECTION COL2ROW |
| 33 | 33 | ||
| 34 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | 34 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ |
| 35 | #define DEBOUNCING_DELAY 5 | 35 | #define DEBOUNCE 5 |
| 36 | 36 | ||
| 37 | /* | 37 | /* |
| 38 | * Force NKRO | 38 | * Force NKRO |
diff --git a/keyboards/bpiphany/tiger_lily/config.h b/keyboards/bpiphany/tiger_lily/config.h index de1d90127..1ab352ccb 100644 --- a/keyboards/bpiphany/tiger_lily/config.h +++ b/keyboards/bpiphany/tiger_lily/config.h | |||
| @@ -45,7 +45,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 45 | #define UNUSED_PINS { B0, C4, D3 } | 45 | #define UNUSED_PINS { B0, C4, D3 } |
| 46 | 46 | ||
| 47 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | 47 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ |
| 48 | #define DEBOUNCING_DELAY 5 | 48 | #define DEBOUNCE 5 |
| 49 | 49 | ||
| 50 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ | 50 | /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ |
| 51 | #define LOCKING_SUPPORT_ENABLE | 51 | #define LOCKING_SUPPORT_ENABLE |
diff --git a/keyboards/bpiphany/tiger_lily/matrix.c b/keyboards/bpiphany/tiger_lily/matrix.c index 3b48f6b36..47a92268c 100644 --- a/keyboards/bpiphany/tiger_lily/matrix.c +++ b/keyboards/bpiphany/tiger_lily/matrix.c | |||
| @@ -24,10 +24,10 @@ | |||
| 24 | #include "util.h" | 24 | #include "util.h" |
| 25 | #include "matrix.h" | 25 | #include "matrix.h" |
| 26 | 26 | ||
| 27 | #ifndef DEBOUNCING_DELAY | 27 | #ifndef DEBOUNCE |
| 28 | # define DEBOUNCING_DELAY 5 | 28 | # define DEBOUNCE 5 |
| 29 | #endif | 29 | #endif |
| 30 | static uint8_t debouncing = DEBOUNCING_DELAY; | 30 | static uint8_t debouncing = DEBOUNCE; |
| 31 | 31 | ||
| 32 | static matrix_row_t matrix[MATRIX_ROWS]; | 32 | static matrix_row_t matrix[MATRIX_ROWS]; |
| 33 | static matrix_row_t matrix_debouncing[MATRIX_ROWS]; | 33 | static matrix_row_t matrix_debouncing[MATRIX_ROWS]; |
| @@ -111,7 +111,7 @@ uint8_t matrix_scan(void) { | |||
| 111 | bool curr_bit = col_scan & (1<<row); | 111 | bool curr_bit = col_scan & (1<<row); |
| 112 | if (prev_bit != curr_bit) { | 112 | if (prev_bit != curr_bit) { |
| 113 | matrix_debouncing[row] ^= ((matrix_row_t)1<<col); | 113 | matrix_debouncing[row] ^= ((matrix_row_t)1<<col); |
| 114 | debouncing = DEBOUNCING_DELAY; | 114 | debouncing = DEBOUNCE; |
| 115 | } | 115 | } |
| 116 | } | 116 | } |
| 117 | } | 117 | } |
diff --git a/keyboards/bpiphany/unloved_bastard/config.h b/keyboards/bpiphany/unloved_bastard/config.h index fc5090e64..029cdb59e 100644 --- a/keyboards/bpiphany/unloved_bastard/config.h +++ b/keyboards/bpiphany/unloved_bastard/config.h | |||
| @@ -33,7 +33,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
| 33 | #define MATRIX_COLS 18 | 33 | #define MATRIX_COLS 18 |
| 34 | 34 | ||
| 35 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ | 35 | /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ |
| 36 | #define DEBOUNCING_DELAY 5 | 36 | #define DEBOUNCE 5 |
| 37 | 37 | ||
| 38 | /* define if matrix has ghost (lacks anti-ghosting diodes) */ | 38 | /* define if matrix has ghost (lacks anti-ghosting diodes) */ |
| 39 | //#define MATRIX_HAS_GHOST | 39 | //#define MATRIX_HAS_GHOST |
diff --git a/keyboards/bpiphany/unloved_bastard/matrix.c b/keyboards/bpiphany/unloved_bastard/matrix.c index bb6de8613..328d9015c 100644 --- a/keyboards/bpiphany/unloved_bastard/matrix.c +++ b/keyboards/bpiphany/unloved_bastard/matrix.c | |||
| @@ -43,10 +43,10 @@ __attribute__ ((weak)) | |||
| 43 | void matrix_scan_user(void) { | 43 | void matrix_scan_user(void) { |
| 44 | } | 44 | } |
| 45 | 45 | ||
| 46 | #ifndef DEBOUNCING_DELAY | 46 | #ifndef DEBOUNCE |
| 47 | # define DEBOUNCING_DELAY 5 | 47 | # define DEBOUNCE 5 |
| 48 | #endif | 48 | #endif |
| 49 | static uint8_t debouncing = DEBOUNCING_DELAY; | 49 | static uint8_t debouncing = DEBOUNCE; |
| 50 | 50 | ||
| 51 | static matrix_row_t matrix[MATRIX_ROWS]; | 51 | static matrix_row_t matrix[MATRIX_ROWS]; |
| 52 | static matrix_row_t matrix_debouncing[MATRIX_ROWS]; | 52 | static matrix_row_t matrix_debouncing[MATRIX_ROWS]; |
| @@ -112,7 +112,7 @@ uint8_t matrix_scan(void) { | |||
| 112 | bool curr_bit = col_scan & (1<<row); | 112 | bool curr_bit = col_scan & (1<<row); |
| 113 | if (prev_bit != curr_bit) { | 113 | if (prev_bit != curr_bit) { |
| 114 | matrix_debouncing[row] ^= ((matrix_row_t)1<<col); | 114 | matrix_debouncing[row] ^= ((matrix_row_t)1<<col); |
| 115 | debouncing = DEBOUNCING_DELAY; | 115 | debouncing = DEBOUNCE; |
| 116 | } | 116 | } |
| 117 | } | 117 | } |
| 118 | } | 118 | } |
