Allow Combo feature to be enabled/disabled live (#6318)
* Add ability to enable/disable combos * Update documentation for Combo feature * Change keycodes for appeasement * Simplify combo_toggle function * Update names * Update combo docs to use tables
This commit is contained in:
committed by
Florian Didron
parent
90853e60bb
commit
ce1b51be8b
@@ -28,6 +28,7 @@ static uint16_t timer = 0;
|
|||||||
static uint8_t current_combo_index = 0;
|
static uint8_t current_combo_index = 0;
|
||||||
static bool drop_buffer = false;
|
static bool drop_buffer = false;
|
||||||
static bool is_active = false;
|
static bool is_active = false;
|
||||||
|
static bool b_combo_enable = true; // defaults to enabled
|
||||||
|
|
||||||
static uint8_t buffer_size = 0;
|
static uint8_t buffer_size = 0;
|
||||||
#ifdef COMBO_ALLOW_ACTION_KEYS
|
#ifdef COMBO_ALLOW_ACTION_KEYS
|
||||||
@@ -128,6 +129,23 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
|
|||||||
drop_buffer = false;
|
drop_buffer = false;
|
||||||
bool no_combo_keys_pressed = true;
|
bool no_combo_keys_pressed = true;
|
||||||
|
|
||||||
|
if (keycode == CMB_ON && record->event.pressed) {
|
||||||
|
combo_enable();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (keycode == CMB_OFF && record->event.pressed) {
|
||||||
|
combo_disable();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (keycode == CMB_TOG && record->event.pressed) {
|
||||||
|
combo_toggle();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!is_combo_enabled()) { return true; }
|
||||||
|
|
||||||
for (current_combo_index = 0; current_combo_index < COMBO_COUNT;
|
for (current_combo_index = 0; current_combo_index < COMBO_COUNT;
|
||||||
++current_combo_index) {
|
++current_combo_index) {
|
||||||
combo_t *combo = &key_combos[current_combo_index];
|
combo_t *combo = &key_combos[current_combo_index];
|
||||||
@@ -166,7 +184,7 @@ bool process_combo(uint16_t keycode, keyrecord_t *record) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void matrix_scan_combo(void) {
|
void matrix_scan_combo(void) {
|
||||||
if (is_active && timer && timer_elapsed(timer) > COMBO_TERM) {
|
if (b_combo_enable && is_active && timer && timer_elapsed(timer) > COMBO_TERM) {
|
||||||
|
|
||||||
/* This disables the combo, meaning key events for this
|
/* This disables the combo, meaning key events for this
|
||||||
* combo will be handled by the next processors in the chain
|
* combo will be handled by the next processors in the chain
|
||||||
@@ -175,3 +193,26 @@ void matrix_scan_combo(void) {
|
|||||||
dump_key_buffer(true);
|
dump_key_buffer(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void combo_enable(void) {
|
||||||
|
b_combo_enable = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
void combo_disable(void) {
|
||||||
|
b_combo_enable = is_active = false;
|
||||||
|
timer = 0;
|
||||||
|
dump_key_buffer(true);
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void combo_toggle(void) {
|
||||||
|
if (b_combo_enable) {
|
||||||
|
combo_disable();
|
||||||
|
} else {
|
||||||
|
combo_enable();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
bool is_combo_enabled(void) {
|
||||||
|
return b_combo_enable;
|
||||||
|
}
|
||||||
|
|||||||
@@ -58,4 +58,9 @@ bool process_combo(uint16_t keycode, keyrecord_t *record);
|
|||||||
void matrix_scan_combo(void);
|
void matrix_scan_combo(void);
|
||||||
void process_combo_event(uint8_t combo_index, bool pressed);
|
void process_combo_event(uint8_t combo_index, bool pressed);
|
||||||
|
|
||||||
|
void combo_enable(void);
|
||||||
|
void combo_disable(void);
|
||||||
|
void combo_toggle(void);
|
||||||
|
bool is_combo_enabled(void);
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -489,6 +489,9 @@ enum quantum_keycodes {
|
|||||||
// Right control, close paren
|
// Right control, close paren
|
||||||
KC_RAPC,
|
KC_RAPC,
|
||||||
|
|
||||||
|
CMB_ON,
|
||||||
|
CMB_OFF,
|
||||||
|
CMB_TOG,
|
||||||
// always leave at the end
|
// always leave at the end
|
||||||
SAFE_RANGE
|
SAFE_RANGE
|
||||||
};
|
};
|
||||||
|
|||||||
Reference in New Issue
Block a user