Big cleanup and tune
- increased combo timer to 35 - I removed all the unnecessary defines and associated methods for per keycode customizations like quick tap term, combo press in order, etc
This commit is contained in:
		
							parent
							
								
									92efb790af
								
							
						
					
					
						commit
						1fa52ae34c
					
				
					 4 changed files with 6 additions and 66 deletions
				
			
		| 
						 | 
				
			
			@ -11,13 +11,8 @@
 | 
			
		|||
#undef EXTRA_SHORT_COMBOS
 | 
			
		||||
 | 
			
		||||
#undef COMBO_TERM
 | 
			
		||||
#undef COMBO_TERM_PER_COMBO
 | 
			
		||||
 | 
			
		||||
#undef COMBO_HOLD_TERM
 | 
			
		||||
#undef COMBO_MUST_HOLD_PER_COMBO
 | 
			
		||||
 | 
			
		||||
#undef COMBO_MUST_TAP_PER_COMBO
 | 
			
		||||
#undef COMBO_MUST_PRESS_IN_ORDER_PER_COMBO
 | 
			
		||||
#undef COMBO_SHOULD_TRIGGER
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -25,12 +20,7 @@
 | 
			
		|||
#define COMBO_ONLY_FROM_LAYER 0 //this will always setup combos based off of QWERTY layout
 | 
			
		||||
#define EXTRA_SHORT_COMBOS
 | 
			
		||||
 | 
			
		||||
#define COMBO_TERM 25
 | 
			
		||||
#define COMBO_TERM_PER_COMBO
 | 
			
		||||
 | 
			
		||||
#define COMBO_HOLD_TERM TAPPING_TERM
 | 
			
		||||
#define COMBO_MUST_HOLD_PER_COMBO
 | 
			
		||||
#define COMBO_TERM 35
 | 
			
		||||
 | 
			
		||||
#define COMBO_MUST_TAP_PER_COMBO
 | 
			
		||||
#define COMBO_MUST_PRESS_IN_ORDER_PER_COMBO
 | 
			
		||||
#define COMBO_SHOULD_TRIGGER
 | 
			
		||||
| 
						 | 
				
			
			@ -12,11 +12,12 @@
 | 
			
		|||
#undef TAP_CODE_DELAY
 | 
			
		||||
#undef TAP_HOLD_CAPS_DELAY
 | 
			
		||||
 | 
			
		||||
#undef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
 | 
			
		||||
#undef HOLD_ON_OTHER_KEY_PRESS
 | 
			
		||||
 | 
			
		||||
#undef TAPPING_TERM
 | 
			
		||||
#undef TAPPING_TERM_PER_KEY
 | 
			
		||||
 | 
			
		||||
#undef QUICK_TAP_TERM
 | 
			
		||||
#undef QUICK_TAP_TERM_PER_KEY
 | 
			
		||||
 | 
			
		||||
#undef ONESHOT_TAP_TOGGLE
 | 
			
		||||
#undef ONESHOT_TIMEOUT
 | 
			
		||||
| 
						 | 
				
			
			@ -27,13 +28,12 @@
 | 
			
		|||
#define TAP_HOLD_CAPS_DELAY TAP_CODE_DELAY  //turning down delay for caps lock so ploopy can do DPI switching
 | 
			
		||||
#define WAIT_DELAY 5                        //custom variable to configure time between taps
 | 
			
		||||
 | 
			
		||||
#define HOLD_ON_OTHER_KEY_PRESS_PER_KEY
 | 
			
		||||
#define HOLD_ON_OTHER_KEY_PRESS
 | 
			
		||||
 | 
			
		||||
#define TAPPING_TERM 200
 | 
			
		||||
#define TAPPING_TERM_PER_KEY
 | 
			
		||||
 | 
			
		||||
#define QUICK_TAP_TERM 135
 | 
			
		||||
#define QUICK_TAP_TERM_PER_KEY
 | 
			
		||||
 | 
			
		||||
#define ONESHOT_TAP_TOGGLE 3
 | 
			
		||||
#define ONESHOT_TIMEOUT 2000
 | 
			
		||||
| 
						 | 
				
			
			@ -1,15 +1,5 @@
 | 
			
		|||
#include "combo.h"
 | 
			
		||||
 | 
			
		||||
uint16_t get_combo_term(uint16_t index, combo_t *combo) {
 | 
			
		||||
  // or with combo index, i.e. its name from enum.
 | 
			
		||||
  switch (index) {
 | 
			
		||||
 | 
			
		||||
    default:
 | 
			
		||||
      return COMBO_TERM;
 | 
			
		||||
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool get_combo_must_tap(uint16_t index, combo_t *combo) {
 | 
			
		||||
 | 
			
		||||
  switch (index) {
 | 
			
		||||
| 
						 | 
				
			
			@ -19,7 +9,7 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) {
 | 
			
		|||
    case MOUSE_BUTTON4:
 | 
			
		||||
    case MOUSE_BUTTON5:
 | 
			
		||||
    case MOUSE_DRGTOG:
 | 
			
		||||
#endif //MOUSEKEY_ENABLE
 | 
			
		||||
#endif //MOUSEKEY_ENABLEdf
 | 
			
		||||
 | 
			
		||||
    case KEY_ESC:
 | 
			
		||||
    case KEY_ENT:
 | 
			
		||||
| 
						 | 
				
			
			@ -31,28 +21,6 @@ bool get_combo_must_tap(uint16_t index, combo_t *combo) {
 | 
			
		|||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool get_combo_must_hold(uint16_t index, combo_t *combo) {
 | 
			
		||||
  switch (index) {
 | 
			
		||||
 | 
			
		||||
    default:
 | 
			
		||||
      return false;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool get_combo_must_press_in_order(uint16_t combo_index, combo_t *combo) {
 | 
			
		||||
  switch (combo_index) {
 | 
			
		||||
    /* List combos here that you want to only activate if their keys
 | 
			
		||||
    * are pressed in the same order as they are defined in the combo's key
 | 
			
		||||
    * array. 
 | 
			
		||||
    * 
 | 
			
		||||
    * return false means they do not have to be pressed in order
 | 
			
		||||
    * */
 | 
			
		||||
 | 
			
		||||
    default:
 | 
			
		||||
      return false;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode, keyrecord_t *record) {
 | 
			
		||||
 | 
			
		||||
  // disable all combos on config layer
 | 
			
		||||
| 
						 | 
				
			
			@ -89,6 +57,5 @@ bool combo_should_trigger(uint16_t combo_index, combo_t *combo, uint16_t keycode
 | 
			
		|||
 | 
			
		||||
  }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
  return true;
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -1,22 +1,5 @@
 | 
			
		|||
#include "tapping.h"
 | 
			
		||||
 | 
			
		||||
bool get_hold_on_other_key_press(uint16_t keycode, keyrecord_t *record) {
 | 
			
		||||
  //This is effective for all dual role keys (e.g. Mod-Taps, Layer-Taps, etc)
 | 
			
		||||
  switch(keycode) {
 | 
			
		||||
    default:
 | 
			
		||||
      //Disable HOLD_ON_OTHER_KEY_PRESS aka enable IGNORE_MOD_TAP_INTERRUPT 
 | 
			
		||||
      return false;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
uint16_t get_quick_tap_term(uint16_t keycode, keyrecord_t *record) {
 | 
			
		||||
  switch (keycode) {
 | 
			
		||||
 | 
			
		||||
    default:
 | 
			
		||||
      return QUICK_TAP_TERM;
 | 
			
		||||
  }
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
 | 
			
		||||
  switch (keycode) {
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue