diff options
author | just-another-jxliu <just-another-jxliu@users.noreply.github.com> | 2019-08-15 00:51:54 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-08-15 00:51:54 -0700 |
commit | 99d89b124f51f79d272e4b8b89bc56f7700480b5 (patch) | |
tree | d21fe853a74f8c4d870ba855db7a607da5a2c34a | |
parent | 8b5e4959a01441c9c2cf718b725b18ecbf4d046f (diff) |
Drop FW Fixes for massdrop alt, ctrl, rocketeer & shift keyboards (#8)drop-1.0.0
- In config.h of each, added '#define BOOTKEY_HOLD_MS 2000' to define hold time required to active Boot key (was 500ms hardcode)
- Updated all active keymap.c files to use this define
- Added line in quantum.c in MAGIC_TOGGLE_NKRO case to clear_keyboard() before toggling nkro state to fix stuck key issues when switching NKRO.
-rw-r--r-- | keyboards/massdrop/alt/config.h | 3 | ||||
-rw-r--r-- | keyboards/massdrop/alt/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/massdrop/alt/keymaps/default_md/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/massdrop/alt/keymaps/mac/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/massdrop/alt/keymaps/mac_md/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/massdrop/ctrl/config.h | 3 | ||||
-rw-r--r-- | keyboards/massdrop/ctrl/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/massdrop/ctrl/keymaps/default_md/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/massdrop/ctrl/keymaps/mac/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/massdrop/rocketeer/config.h | 3 | ||||
-rw-r--r-- | keyboards/massdrop/rocketeer/keymaps/default_md/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/massdrop/rocketeer/keymaps/mac_md/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/massdrop/shift/config.h | 3 | ||||
-rw-r--r-- | keyboards/massdrop/shift/keymaps/default_md/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/massdrop/shift/keymaps/mac_md/keymap.c | 2 | ||||
-rw-r--r-- | quantum/quantum.c | 1 |
17 files changed, 25 insertions, 12 deletions
diff --git a/keyboards/massdrop/alt/config.h b/keyboards/massdrop/alt/config.h index 05199b2da6..6ed4208166 100644 --- a/keyboards/massdrop/alt/config.h +++ b/keyboards/massdrop/alt/config.h @@ -94,6 +94,9 @@ 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 DEBOUNCE 5 +// Required BOOT key hold time (in ms) for restarting to bootloader -PS081419 +#define BOOTKEY_HOLD_MS 2000 + /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ //#define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/massdrop/alt/keymaps/default/keymap.c b/keyboards/massdrop/alt/keymaps/default/keymap.c index 83cbe622cd..39cd97eb08 100644 --- a/keyboards/massdrop/alt/keymaps/default/keymap.c +++ b/keyboards/massdrop/alt/keymaps/default/keymap.c @@ -84,7 +84,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { key_timer = timer_read32(); } else { - if (timer_elapsed32(key_timer) >= 500) { + if (timer_elapsed32(key_timer) >= BOOTKEY_HOLD_MS) { reset_keyboard(); } } diff --git a/keyboards/massdrop/alt/keymaps/default_md/keymap.c b/keyboards/massdrop/alt/keymaps/default_md/keymap.c index 443ad03d1c..122e8be641 100644 --- a/keyboards/massdrop/alt/keymaps/default_md/keymap.c +++ b/keyboards/massdrop/alt/keymaps/default_md/keymap.c @@ -231,7 +231,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { key_timer = timer_read32(); } else { - if (timer_elapsed32(key_timer) >= 500) { + if (timer_elapsed32(key_timer) >= BOOTKEY_HOLD_MS) { reset_keyboard(); } } diff --git a/keyboards/massdrop/alt/keymaps/mac/keymap.c b/keyboards/massdrop/alt/keymaps/mac/keymap.c index 900504e4d4..9ea817e260 100644 --- a/keyboards/massdrop/alt/keymaps/mac/keymap.c +++ b/keyboards/massdrop/alt/keymaps/mac/keymap.c @@ -84,7 +84,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { key_timer = timer_read32(); } else { - if (timer_elapsed32(key_timer) >= 500) { + if (timer_elapsed32(key_timer) >= BOOTKEY_HOLD_MS) { reset_keyboard(); } } diff --git a/keyboards/massdrop/alt/keymaps/mac_md/keymap.c b/keyboards/massdrop/alt/keymaps/mac_md/keymap.c index facfd10a15..e505ef9a83 100644 --- a/keyboards/massdrop/alt/keymaps/mac_md/keymap.c +++ b/keyboards/massdrop/alt/keymaps/mac_md/keymap.c @@ -231,7 +231,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { key_timer = timer_read32(); } else { - if (timer_elapsed32(key_timer) >= 500) { + if (timer_elapsed32(key_timer) >= BOOTKEY_HOLD_MS) { reset_keyboard(); } } diff --git a/keyboards/massdrop/ctrl/config.h b/keyboards/massdrop/ctrl/config.h index b67f3b7117..035f954218 100644 --- a/keyboards/massdrop/ctrl/config.h +++ b/keyboards/massdrop/ctrl/config.h @@ -94,6 +94,9 @@ 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 DEBOUNCE 5 +// Required BOOT key hold time (in ms) for restarting to bootloader -PS081419 +#define BOOTKEY_HOLD_MS 2000 + /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ //#define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/massdrop/ctrl/keymaps/default/keymap.c b/keyboards/massdrop/ctrl/keymaps/default/keymap.c index 75c9fd35fa..0637055d92 100644 --- a/keyboards/massdrop/ctrl/keymaps/default/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/default/keymap.c @@ -87,7 +87,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { key_timer = timer_read32(); } else { - if (timer_elapsed32(key_timer) >= 500) { + if (timer_elapsed32(key_timer) >= BOOTKEY_HOLD_MS) { reset_keyboard(); } } diff --git a/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c b/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c index ddd90a8fa8..73891473a0 100644 --- a/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c @@ -234,7 +234,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { key_timer = timer_read32(); } else { - if (timer_elapsed32(key_timer) >= 500) { + if (timer_elapsed32(key_timer) >= BOOTKEY_HOLD_MS) { reset_keyboard(); } } diff --git a/keyboards/massdrop/ctrl/keymaps/mac/keymap.c b/keyboards/massdrop/ctrl/keymaps/mac/keymap.c index cceaa10780..20cd74b5d8 100644 --- a/keyboards/massdrop/ctrl/keymaps/mac/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/mac/keymap.c @@ -87,7 +87,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { key_timer = timer_read32(); } else { - if (timer_elapsed32(key_timer) >= 500) { + if (timer_elapsed32(key_timer) >= BOOTKEY_HOLD_MS) { reset_keyboard(); } } diff --git a/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c b/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c index fcf1057d75..f2b0728338 100644 --- a/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c +++ b/keyboards/massdrop/ctrl/keymaps/mac_md/keymap.c @@ -234,7 +234,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { key_timer = timer_read32(); } else { - if (timer_elapsed32(key_timer) >= 500) { + if (timer_elapsed32(key_timer) >= BOOTKEY_HOLD_MS) { reset_keyboard(); } } diff --git a/keyboards/massdrop/rocketeer/config.h b/keyboards/massdrop/rocketeer/config.h index 3caa0fdf7a..d9bab749b2 100644 --- a/keyboards/massdrop/rocketeer/config.h +++ b/keyboards/massdrop/rocketeer/config.h @@ -95,6 +95,9 @@ 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 DEBOUNCE 5 +// Required BOOT key hold time (in ms) for restarting to bootloader -PS081419 +#define BOOTKEY_HOLD_MS 2000 + /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ //#define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/massdrop/rocketeer/keymaps/default_md/keymap.c b/keyboards/massdrop/rocketeer/keymaps/default_md/keymap.c index 633c8a8c79..c184d750a6 100644 --- a/keyboards/massdrop/rocketeer/keymaps/default_md/keymap.c +++ b/keyboards/massdrop/rocketeer/keymaps/default_md/keymap.c @@ -231,7 +231,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { key_timer = timer_read32(); } else { - if (timer_elapsed32(key_timer) >= 500) { + if (timer_elapsed32(key_timer) >= BOOTKEY_HOLD_MS) { reset_keyboard(); } } diff --git a/keyboards/massdrop/rocketeer/keymaps/mac_md/keymap.c b/keyboards/massdrop/rocketeer/keymaps/mac_md/keymap.c index f227978d58..77aaa01fc2 100644 --- a/keyboards/massdrop/rocketeer/keymaps/mac_md/keymap.c +++ b/keyboards/massdrop/rocketeer/keymaps/mac_md/keymap.c @@ -231,7 +231,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { key_timer = timer_read32(); } else { - if (timer_elapsed32(key_timer) >= 500) { + if (timer_elapsed32(key_timer) >= BOOTKEY_HOLD_MS) { reset_keyboard(); } } diff --git a/keyboards/massdrop/shift/config.h b/keyboards/massdrop/shift/config.h index d5a9bb6406..f89c7703e8 100644 --- a/keyboards/massdrop/shift/config.h +++ b/keyboards/massdrop/shift/config.h @@ -125,6 +125,9 @@ 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 DEBOUNCE 5 +// Required BOOT key hold time (in ms) for restarting to bootloader -PS081419 +#define BOOTKEY_HOLD_MS 2000 + /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ //#define LOCKING_SUPPORT_ENABLE /* Locking resynchronize hack */ diff --git a/keyboards/massdrop/shift/keymaps/default_md/keymap.c b/keyboards/massdrop/shift/keymaps/default_md/keymap.c index 5a9933a992..9386c291da 100644 --- a/keyboards/massdrop/shift/keymaps/default_md/keymap.c +++ b/keyboards/massdrop/shift/keymaps/default_md/keymap.c @@ -243,7 +243,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { key_timer = timer_read32(); } else { - if (timer_elapsed32(key_timer) >= 500) { + if (timer_elapsed32(key_timer) >= BOOTKEY_HOLD_MS) { reset_keyboard(); } } diff --git a/keyboards/massdrop/shift/keymaps/mac_md/keymap.c b/keyboards/massdrop/shift/keymaps/mac_md/keymap.c index c4b7a5975b..d5977c5c14 100644 --- a/keyboards/massdrop/shift/keymaps/mac_md/keymap.c +++ b/keyboards/massdrop/shift/keymaps/mac_md/keymap.c @@ -243,7 +243,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { if (record->event.pressed) { key_timer = timer_read32(); } else { - if (timer_elapsed32(key_timer) >= 500) { + if (timer_elapsed32(key_timer) >= BOOTKEY_HOLD_MS) { reset_keyboard(); } } diff --git a/quantum/quantum.c b/quantum/quantum.c index 6530738b71..e01e98ff00 100644 --- a/quantum/quantum.c +++ b/quantum/quantum.c @@ -647,6 +647,7 @@ bool process_record_quantum(keyrecord_t *record) { #endif break; case MAGIC_TOGGLE_NKRO: + clear_keyboard(); // clear first buffer to prevent stuck keys -PS080919 keymap_config.nkro = !keymap_config.nkro; break; default: |