Merge remote-tracking branch 'origin/master' into develop

changelog
QMK Bot 4 years ago
commit c8320726bd
  1. 2
      keyboards/zinc/keymaps/via/readme_en.md
  2. 8
      tmk_core/common/action_tapping.h

@ -1,4 +1,4 @@
# The VIA Zinc Layout
# The VIA Zinc Layout
## layout
### Qwerty

@ -34,8 +34,8 @@ uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache);
void action_tapping_process(keyrecord_t record);
uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record);
bool get_permissive_hold(uint16_t keycode, keyrecord_t *record);
bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record);
bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record);
bool get_retro_tapping(uint16_t keycode, keyrecord_t *record);
bool get_permissive_hold(uint16_t keycode, keyrecord_t *record);
bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record);
bool get_tapping_force_hold(uint16_t keycode, keyrecord_t *record);
bool get_retro_tapping(uint16_t keycode, keyrecord_t *record);
#endif

Loading…
Cancel
Save