[Keymap] Smarter KC_MAKE code and removed duplicate MOD_MASK entries (#5331)
* Change to predefined MOD_MASK codes * Remove duplicate predefined codes * Better reset keybaord logic * Cleaned up code as requested
This commit is contained in:
parent
81fae5c306
commit
4a597e031f
|
@ -9,30 +9,28 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
|
|||
switch (keycode) {
|
||||
case KC_MAKE:
|
||||
if (!record->event.pressed) {
|
||||
uint8_t temp_mod = get_mods();
|
||||
uint8_t temp_osm = get_oneshot_mods();
|
||||
uint8_t mods = get_mods();
|
||||
clear_mods();
|
||||
clear_oneshot_mods();
|
||||
send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), 10);
|
||||
if (temp_mod & MODS_SHIFT_MASK || temp_osm & MODS_SHIFT_MASK ) {
|
||||
if (mods & MOD_MASK_SHIFT) {
|
||||
//RESET board for flashing if SHIFT held or tapped with KC_MAKE
|
||||
#if defined(__arm__)
|
||||
send_string_with_delay_P(PSTR(":dfu-util"), 10);
|
||||
wait_ms(100);
|
||||
reset_keyboard();
|
||||
#elif defined(BOOTLOADER_DFU)
|
||||
send_string_with_delay_P(PSTR(":dfu"), 10);
|
||||
#elif defined(BOOTLOADER_HALFKAY)
|
||||
send_string_with_delay_P(PSTR(":teensy"), 10);
|
||||
#elif defined(BOOTLOADER_CATERINA)
|
||||
send_string_with_delay_P(PSTR(":avrdude"), 10);
|
||||
#else
|
||||
reset_keyboard();
|
||||
#endif // bootloader options
|
||||
}
|
||||
if (temp_mod & MODS_CTRL_MASK || temp_osm & MODS_CTRL_MASK) { send_string_with_delay_P(PSTR(" -j8 --output-sync"), 10); }
|
||||
send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), 10);
|
||||
set_mods(temp_mod);
|
||||
reset_keyboard();
|
||||
}
|
||||
if (mods & MOD_MASK_CTRL) {
|
||||
send_string_with_delay_P(PSTR(" -j8 --output-sync"), 10);
|
||||
}
|
||||
send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), 10);
|
||||
set_mods(mods);
|
||||
}
|
||||
return false;
|
||||
break;
|
||||
|
|
|
@ -13,9 +13,6 @@ enum custom_keycodes {
|
|||
NEW_SAFE_RANGE //use "NEW_SAFE_RANGE" for keymap specific codes
|
||||
};
|
||||
|
||||
#define MODS_SHIFT_MASK (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
|
||||
#define MODS_CTRL_MASK (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL))
|
||||
|
||||
//Aliases for longer keycodes
|
||||
#define KC_CAD LALT(LCTL(KC_DEL))
|
||||
#define KC_LOCK LGUI(KC_L)
|
||||
|
|
Loading…
Reference in New Issue