aboutsummaryrefslogtreecommitdiff
path: root/quantum/quantum.c
diff options
context:
space:
mode:
Diffstat (limited to 'quantum/quantum.c')
-rw-r--r--quantum/quantum.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/quantum/quantum.c b/quantum/quantum.c
index e60378afe..0ae12b583 100644
--- a/quantum/quantum.c
+++ b/quantum/quantum.c
@@ -145,12 +145,13 @@ void reset_keyboard(void) {
145/* Convert record into usable keycode via the contained event. */ 145/* Convert record into usable keycode via the contained event. */
146uint16_t get_record_keycode(keyrecord_t *record, bool update_layer_cache) { 146uint16_t get_record_keycode(keyrecord_t *record, bool update_layer_cache) {
147#ifdef COMBO_ENABLE 147#ifdef COMBO_ENABLE
148 if (record->keycode) { return record->keycode; } 148 if (record->keycode) {
149 return record->keycode;
150 }
149#endif 151#endif
150 return get_event_keycode(record->event, update_layer_cache); 152 return get_event_keycode(record->event, update_layer_cache);
151} 153}
152 154
153
154/* Convert event into usable keycode. Checks the layer cache to ensure that it 155/* Convert event into usable keycode. Checks the layer cache to ensure that it
155 * retains the correct keycode after a layer change, if the key is still pressed. 156 * retains the correct keycode after a layer change, if the key is still pressed.
156 * "update_layer_cache" is to ensure that it only updates the layer cache when 157 * "update_layer_cache" is to ensure that it only updates the layer cache when
@@ -179,12 +180,12 @@ uint16_t get_event_keycode(keyevent_t event, bool update_layer_cache) {
179bool pre_process_record_quantum(keyrecord_t *record) { 180bool pre_process_record_quantum(keyrecord_t *record) {
180 if (!( 181 if (!(
181#ifdef COMBO_ENABLE 182#ifdef COMBO_ENABLE
182 process_combo(get_record_keycode(record, true), record) && 183 process_combo(get_record_keycode(record, true), record) &&
183#endif 184#endif
184 true)) { 185 true)) {
185 return false; 186 return false;
186 } 187 }
187 return true; // continue processing 188 return true; // continue processing
188} 189}
189 190
190/* Get keycode, and then call keyboard function */ 191/* Get keycode, and then call keyboard function */