megamanmalte/qmk_firmware
0
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

process_keycode: remove direct quantum.h includes (#21486)

Browse source
This commit is contained in:
Ryan 2023-07-11 17:07:24 +10:00 committed by GitHub
parent 39a97d2ee4
commit eee0384167
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
46 changed files with 257 additions and 155 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
quantum/action_layer.h
View file

@ -20,6 +20,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <stdint.h> #include <stdint.h>
#include "keyboard.h" #include "keyboard.h"
#include "action.h" #include "action.h"
#include "bitwise.h"
#ifdef DYNAMIC_KEYMAP_ENABLE #ifdef DYNAMIC_KEYMAP_ENABLE
# ifndef DYNAMIC_KEYMAP_LAYER_COUNT # ifndef DYNAMIC_KEYMAP_LAYER_COUNT

4
quantum/midi/qmk_midi.c
View file

@ -5,6 +5,10 @@
#include "usb_descriptor.h" #include "usb_descriptor.h"
#include "process_midi.h" #include "process_midi.h"
#ifdef AUDIO_ENABLE
# include "audio.h"
#endif
/******************************************************************************* /*******************************************************************************
* MIDI * MIDI
******************************************************************************/ ******************************************************************************/

4
quantum/process_keycode/process_audio.h
View file

@ -1,5 +1,9 @@
#pragma once #pragma once
#include <stdint.h>
#include <stdbool.h>
#include "action.h"
float compute_freq_for_midi_note(uint8_t note); float compute_freq_for_midi_note(uint8_t note);
bool process_audio(uint16_t keycode, keyrecord_t *record); bool process_audio(uint16_t keycode, keyrecord_t *record);

115
quantum/process_keycode/process_auto_shift.c
View file

@ -14,27 +14,28 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifdef AUTO_SHIFT_ENABLE #include "process_auto_shift.h"
#include "quantum.h"
#include "action_util.h"
#include "timer.h"
#include "keycodes.h"
# include <stdbool.h> #ifndef AUTO_SHIFT_DISABLED_AT_STARTUP
# include "process_auto_shift.h"
# ifndef AUTO_SHIFT_DISABLED_AT_STARTUP
# define AUTO_SHIFT_STARTUP_STATE true /* enabled */ # define AUTO_SHIFT_STARTUP_STATE true /* enabled */
# else #else
# define AUTO_SHIFT_STARTUP_STATE false /* disabled */ # define AUTO_SHIFT_STARTUP_STATE false /* disabled */
# endif #endif
// Stores the last Auto Shift key's up or down time, for evaluation or keyrepeat. // Stores the last Auto Shift key's up or down time, for evaluation or keyrepeat.
static uint16_t autoshift_time = 0; static uint16_t autoshift_time = 0;
# if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING) #if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
// Stores the last key's up or down time, to replace autoshift_time so that Tap Hold times are accurate. // Stores the last key's up or down time, to replace autoshift_time so that Tap Hold times are accurate.
static uint16_t retroshift_time = 0; static uint16_t retroshift_time = 0;
// Stores a possibly Retro Shift key's up or down time, as retroshift_time needs // Stores a possibly Retro Shift key's up or down time, as retroshift_time needs
// to be set before the Retro Shift key is evaluated if it is interrupted by an // to be set before the Retro Shift key is evaluated if it is interrupted by an
// Auto Shifted key. // Auto Shifted key.
static uint16_t last_retroshift_time; static uint16_t last_retroshift_time;
# endif #endif
static uint16_t autoshift_timeout = AUTO_SHIFT_TIMEOUT; static uint16_t autoshift_timeout = AUTO_SHIFT_TIMEOUT;
static uint16_t autoshift_lastkey = KC_NO; static uint16_t autoshift_lastkey = KC_NO;
static keyrecord_t autoshift_lastrecord; static keyrecord_t autoshift_lastrecord;
@ -68,23 +69,23 @@ __attribute__((weak)) bool get_custom_auto_shifted_key(uint16_t keycode, keyreco
/** \brief Called on physical press, returns whether is Auto Shift key */ /** \brief Called on physical press, returns whether is Auto Shift key */
__attribute__((weak)) bool get_auto_shifted_key(uint16_t keycode, keyrecord_t *record) { __attribute__((weak)) bool get_auto_shifted_key(uint16_t keycode, keyrecord_t *record) {
switch (keycode) { switch (keycode) {
# ifndef NO_AUTO_SHIFT_ALPHA #ifndef NO_AUTO_SHIFT_ALPHA
case AUTO_SHIFT_ALPHA: case AUTO_SHIFT_ALPHA:
# endif #endif
# ifndef NO_AUTO_SHIFT_NUMERIC #ifndef NO_AUTO_SHIFT_NUMERIC
case AUTO_SHIFT_NUMERIC: case AUTO_SHIFT_NUMERIC:
# endif #endif
# ifndef NO_AUTO_SHIFT_SPECIAL #ifndef NO_AUTO_SHIFT_SPECIAL
# ifndef NO_AUTO_SHIFT_TAB # ifndef NO_AUTO_SHIFT_TAB
case KC_TAB: case KC_TAB:
# endif # endif
# ifndef NO_AUTO_SHIFT_SYMBOLS # ifndef NO_AUTO_SHIFT_SYMBOLS
case AUTO_SHIFT_SYMBOLS: case AUTO_SHIFT_SYMBOLS:
# endif # endif
# endif #endif
# ifdef AUTO_SHIFT_ENTER #ifdef AUTO_SHIFT_ENTER
case KC_ENT: case KC_ENT:
# endif #endif
return true; return true;
} }
return get_custom_auto_shifted_key(keycode, record); return get_custom_auto_shifted_key(keycode, record);
@ -130,9 +131,9 @@ bool get_autoshift_shift_state(uint16_t keycode) {
/** \brief Restores the shift key if it was cancelled by Auto Shift */ /** \brief Restores the shift key if it was cancelled by Auto Shift */
static void autoshift_flush_shift(void) { static void autoshift_flush_shift(void) {
autoshift_flags.holding_shift = false; autoshift_flags.holding_shift = false;
# ifdef CAPS_WORD_ENABLE #ifdef CAPS_WORD_ENABLE
if (!is_caps_word_on()) if (!is_caps_word_on())
# endif // CAPS_WORD_ENABLE #endif // CAPS_WORD_ENABLE
{ {
del_weak_mods(MOD_BIT(KC_LSFT)); del_weak_mods(MOD_BIT(KC_LSFT));
} }
@ -154,15 +155,15 @@ static void autoshift_flush_shift(void) {
static bool autoshift_press(uint16_t keycode, uint16_t now, keyrecord_t *record) { static bool autoshift_press(uint16_t keycode, uint16_t now, keyrecord_t *record) {
// clang-format off // clang-format off
if ((get_mods() if ((get_mods()
# if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING) #if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
| get_oneshot_mods() | get_oneshot_mods()
# endif #endif
) & (~MOD_BIT(KC_LSFT)) ) & (~MOD_BIT(KC_LSFT))
) { ) {
// clang-format on // clang-format on
// Prevents keyrepeating unshifted value of key after using it in a key combo. // Prevents keyrepeating unshifted value of key after using it in a key combo.
autoshift_lastkey = KC_NO; autoshift_lastkey = KC_NO;
# ifndef AUTO_SHIFT_MODIFIERS #ifndef AUTO_SHIFT_MODIFIERS
// We can't return true here anymore because custom unshifted values are // We can't return true here anymore because custom unshifted values are
// possible and there's no good way to tell whether the press returned // possible and there's no good way to tell whether the press returned
// true upon release. // true upon release.
@ -173,7 +174,7 @@ static bool autoshift_press(uint16_t keycode, uint16_t now, keyrecord_t *record)
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
# endif # endif
return false; return false;
# endif #endif
} }
// Store record to be sent to user functions if there's no release record then. // Store record to be sent to user functions if there's no release record then.
@ -181,7 +182,7 @@ static bool autoshift_press(uint16_t keycode, uint16_t now, keyrecord_t *record)
autoshift_lastrecord.event.pressed = false; autoshift_lastrecord.event.pressed = false;
autoshift_lastrecord.event.time = 0; autoshift_lastrecord.event.time = 0;
// clang-format off // clang-format off
# if defined(AUTO_SHIFT_REPEAT) || defined(AUTO_SHIFT_REPEAT_PER_KEY) #if defined(AUTO_SHIFT_REPEAT) || defined(AUTO_SHIFT_REPEAT_PER_KEY)
if (keycode == autoshift_lastkey && if (keycode == autoshift_lastkey &&
# ifdef AUTO_SHIFT_REPEAT_PER_KEY # ifdef AUTO_SHIFT_REPEAT_PER_KEY
get_auto_shift_repeat(autoshift_lastkey, record) && get_auto_shift_repeat(autoshift_lastkey, record) &&
@ -210,23 +211,23 @@ static bool autoshift_press(uint16_t keycode, uint16_t now, keyrecord_t *record)
autoshift_press_user(autoshift_lastkey, autoshift_flags.lastshifted, record); autoshift_press_user(autoshift_lastkey, autoshift_flags.lastshifted, record);
return false; return false;
} }
# endif #endif
// Use physical shift state of press event to be more like normal typing. // Use physical shift state of press event to be more like normal typing.
# if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING) #if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
autoshift_flags.lastshifted = (get_mods() | get_oneshot_mods()) & MOD_BIT(KC_LSFT); autoshift_flags.lastshifted = (get_mods() | get_oneshot_mods()) & MOD_BIT(KC_LSFT);
set_oneshot_mods(get_oneshot_mods() & (~MOD_BIT(KC_LSFT))); set_oneshot_mods(get_oneshot_mods() & (~MOD_BIT(KC_LSFT)));
# else #else
autoshift_flags.lastshifted = get_mods() & MOD_BIT(KC_LSFT); autoshift_flags.lastshifted = get_mods() & MOD_BIT(KC_LSFT);
# endif #endif
// Record the keycode so we can simulate it later. // Record the keycode so we can simulate it later.
autoshift_lastkey = keycode; autoshift_lastkey = keycode;
autoshift_time = now; autoshift_time = now;
autoshift_flags.in_progress = true; autoshift_flags.in_progress = true;
# if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING) #if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED); clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
# endif #endif
return false; return false;
} }
@ -247,11 +248,11 @@ static void autoshift_end(uint16_t keycode, uint16_t now, bool matrix_trigger, k
autoshift_flags.lastshifted = autoshift_flags.lastshifted =
autoshift_flags.lastshifted autoshift_flags.lastshifted
|| TIMER_DIFF_16(now, autoshift_time) >= || TIMER_DIFF_16(now, autoshift_time) >=
# ifdef AUTO_SHIFT_TIMEOUT_PER_KEY #ifdef AUTO_SHIFT_TIMEOUT_PER_KEY
get_autoshift_timeout(autoshift_lastkey, record) get_autoshift_timeout(autoshift_lastkey, record)
# else #else
autoshift_timeout autoshift_timeout
# endif #endif
; ;
// clang-format on // clang-format on
set_autoshift_shift_state(autoshift_lastkey, autoshift_flags.lastshifted); set_autoshift_shift_state(autoshift_lastkey, autoshift_flags.lastshifted);
@ -266,7 +267,7 @@ static void autoshift_end(uint16_t keycode, uint16_t now, bool matrix_trigger, k
autoshift_press_user(autoshift_lastkey, autoshift_flags.lastshifted, record); autoshift_press_user(autoshift_lastkey, autoshift_flags.lastshifted, record);
// clang-format off // clang-format off
# if (defined(AUTO_SHIFT_REPEAT) || defined(AUTO_SHIFT_REPEAT_PER_KEY)) && (!defined(AUTO_SHIFT_NO_AUTO_REPEAT) || defined(AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY)) #if (defined(AUTO_SHIFT_REPEAT) || defined(AUTO_SHIFT_REPEAT_PER_KEY)) && (!defined(AUTO_SHIFT_NO_AUTO_REPEAT) || defined(AUTO_SHIFT_NO_AUTO_REPEAT_PER_KEY))
if (matrix_trigger if (matrix_trigger
# ifdef AUTO_SHIFT_REPEAT_PER_KEY # ifdef AUTO_SHIFT_REPEAT_PER_KEY
&& get_auto_shift_repeat(autoshift_lastkey, record) && get_auto_shift_repeat(autoshift_lastkey, record)
@ -278,11 +279,11 @@ static void autoshift_end(uint16_t keycode, uint16_t now, bool matrix_trigger, k
// Prevents release. // Prevents release.
return; return;
} }
# endif #endif
// clang-format on // clang-format on
# if TAP_CODE_DELAY > 0 #if TAP_CODE_DELAY > 0
wait_ms(TAP_CODE_DELAY); wait_ms(TAP_CODE_DELAY);
# endif #endif
autoshift_release_user(autoshift_lastkey, autoshift_flags.lastshifted, record); autoshift_release_user(autoshift_lastkey, autoshift_flags.lastshifted, record);
autoshift_flush_shift(); autoshift_flush_shift();
@ -310,11 +311,11 @@ void autoshift_matrix_scan(void) {
if (autoshift_flags.in_progress) { if (autoshift_flags.in_progress) {
const uint16_t now = timer_read(); const uint16_t now = timer_read();
if (TIMER_DIFF_16(now, autoshift_time) >= if (TIMER_DIFF_16(now, autoshift_time) >=
# ifdef AUTO_SHIFT_TIMEOUT_PER_KEY #ifdef AUTO_SHIFT_TIMEOUT_PER_KEY
get_autoshift_timeout(autoshift_lastkey, &autoshift_lastrecord) get_autoshift_timeout(autoshift_lastkey, &autoshift_lastrecord)
# else #else
autoshift_timeout autoshift_timeout
# endif #endif
) { ) {
autoshift_end(autoshift_lastkey, now, true, &autoshift_lastrecord); autoshift_end(autoshift_lastkey, now, true, &autoshift_lastrecord);
} }
@ -335,7 +336,7 @@ void autoshift_disable(void) {
autoshift_flush_shift(); autoshift_flush_shift();
} }
# ifndef AUTO_SHIFT_NO_SETUP #ifndef AUTO_SHIFT_NO_SETUP
void autoshift_timer_report(void) { void autoshift_timer_report(void) {
# ifdef SEND_STRING_ENABLE # ifdef SEND_STRING_ENABLE
const char *autoshift_timeout_str = get_u16_str(autoshift_timeout, ' '); const char *autoshift_timeout_str = get_u16_str(autoshift_timeout, ' ');
@ -346,7 +347,7 @@ void autoshift_timer_report(void) {
send_string(autoshift_timeout_str); send_string(autoshift_timeout_str);
# endif # endif
} }
# endif #endif
bool get_autoshift_state(void) { bool get_autoshift_state(void) {
return autoshift_flags.enabled; return autoshift_flags.enabled;
@ -368,11 +369,11 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
// https://github.com/qmk/qmk_firmware/pull/9826#issuecomment-733559550 // https://github.com/qmk/qmk_firmware/pull/9826#issuecomment-733559550
// clang-format off // clang-format off
const uint16_t now = const uint16_t now =
# if !defined(RETRO_SHIFT) || defined(NO_ACTION_TAPPING) #if !defined(RETRO_SHIFT) || defined(NO_ACTION_TAPPING)
timer_read() timer_read()
# else #else
(record->event.pressed) ? retroshift_time : timer_read() (record->event.pressed) ? retroshift_time : timer_read()
# endif #endif
; ;
// clang-format on // clang-format on
@ -393,7 +394,7 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
autoshift_disable(); autoshift_disable();
break; break;
# ifndef AUTO_SHIFT_NO_SETUP #ifndef AUTO_SHIFT_NO_SETUP
case AS_UP: case AS_UP:
autoshift_timeout += 5; autoshift_timeout += 5;
break; break;
@ -403,19 +404,19 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
case AS_RPT: case AS_RPT:
autoshift_timer_report(); autoshift_timer_report();
break; break;
# endif #endif
} }
// If Retro Shift is disabled, possible custom actions shouldn't happen. // If Retro Shift is disabled, possible custom actions shouldn't happen.
// clang-format off // clang-format off
# if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING) #if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY # ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
const bool is_hold_on_interrupt = get_hold_on_other_key_press(keycode, record); const bool is_hold_on_interrupt = get_hold_on_other_key_press(keycode, record);
# else # else
const bool is_hold_on_interrupt = false; const bool is_hold_on_interrupt = false;
# endif # endif
# endif #endif
if (IS_RETRO(keycode) if (IS_RETRO(keycode)
# if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING) #if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
// Not tapped or #defines mean that rolls should use hold action. // Not tapped or #defines mean that rolls should use hold action.
&& ( && (
record->tap.count == 0 record->tap.count == 0
@ -423,7 +424,7 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
|| !get_retro_tapping(keycode, record) || !get_retro_tapping(keycode, record)
# endif # endif
|| (record->tap.interrupted && is_hold_on_interrupt)) || (record->tap.interrupted && is_hold_on_interrupt))
# endif #endif
) { ) {
// clang-format on // clang-format on
autoshift_lastkey = KC_NO; autoshift_lastkey = KC_NO;
@ -439,21 +440,21 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
// tap.count gets set to 0 in process_action // tap.count gets set to 0 in process_action
// clang-format off // clang-format off
else if (IS_RETRO(keycode) else if (IS_RETRO(keycode)
# if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING) #if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
&& ( && (
record->tap.count == 0 record->tap.count == 0
# ifdef RETRO_TAPPING_PER_KEY # ifdef RETRO_TAPPING_PER_KEY
|| !get_retro_tapping(keycode, record) || !get_retro_tapping(keycode, record)
# endif # endif
) )
# endif #endif
) { ) {
// Fixes modifiers not being applied to rolls with AUTO_SHIFT_MODIFIERS set. // Fixes modifiers not being applied to rolls with AUTO_SHIFT_MODIFIERS set.
# ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY #ifdef HOLD_ON_OTHER_KEY_PRESS_PER_KEY
if (autoshift_flags.in_progress && get_hold_on_other_key_press(keycode, record)) { if (autoshift_flags.in_progress && get_hold_on_other_key_press(keycode, record)) {
autoshift_end(KC_NO, now, false, &autoshift_lastrecord); autoshift_end(KC_NO, now, false, &autoshift_lastrecord);
} }
# endif #endif
// clang-format on // clang-format on
return true; return true;
} }
@ -479,7 +480,7 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
return true; return true;
} }
# if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING) #if defined(RETRO_SHIFT) && !defined(NO_ACTION_TAPPING)
// Called to record time before possible delays by action_tapping_process. // Called to record time before possible delays by action_tapping_process.
void retroshift_poll_time(keyevent_t *event) { void retroshift_poll_time(keyevent_t *event) {
last_retroshift_time = retroshift_time; last_retroshift_time = retroshift_time;
@ -493,6 +494,4 @@ void retroshift_swap_times(void) {
last_retroshift_time = temp; last_retroshift_time = temp;
} }
} }
# endif
#endif #endif

6
quantum/process_keycode/process_auto_shift.h
View file

@ -16,7 +16,11 @@
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
#include "keyboard.h"
#include "keycodes.h"
#ifndef AUTO_SHIFT_TIMEOUT #ifndef AUTO_SHIFT_TIMEOUT
# define AUTO_SHIFT_TIMEOUT 175 # define AUTO_SHIFT_TIMEOUT 175

4
quantum/process_keycode/process_autocorrect.c
View file

@ -6,7 +6,11 @@
#include "process_autocorrect.h" #include "process_autocorrect.h"
#include <string.h> #include <string.h>
#include "keycodes.h"
#include "quantum_keycodes.h"
#include "keycode_config.h" #include "keycode_config.h"
#include "send_string.h"
#include "action_util.h"
#if __has_include("autocorrect_data.h") #if __has_include("autocorrect_data.h")
# include "autocorrect_data.h" # include "autocorrect_data.h"

4
quantum/process_keycode/process_autocorrect.h
View file

@ -6,7 +6,9 @@
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
bool process_autocorrect(uint16_t keycode, keyrecord_t *record); bool process_autocorrect(uint16_t keycode, keyrecord_t *record);
bool process_autocorrect_user(uint16_t *keycode, keyrecord_t *record, uint8_t *typo_buffer_size, uint8_t *mods); bool process_autocorrect_user(uint16_t *keycode, keyrecord_t *record, uint8_t *typo_buffer_size, uint8_t *mods);

4
quantum/process_keycode/process_backlight.h
View file

@ -16,6 +16,8 @@
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
bool process_backlight(uint16_t keycode, keyrecord_t *record); bool process_backlight(uint16_t keycode, keyrecord_t *record);

8
quantum/process_keycode/process_caps_word.c
View file

@ -13,6 +13,14 @@
// limitations under the License. // limitations under the License.
#include "process_caps_word.h" #include "process_caps_word.h"
#include "process_auto_shift.h"
#include "caps_word.h"
#include "keycodes.h"
#include "quantum_keycodes.h"
#include "modifiers.h"
#include "timer.h"
#include "action_tapping.h"
#include "action_util.h"
#ifdef CAPS_WORD_INVERT_ON_SHIFT #ifdef CAPS_WORD_INVERT_ON_SHIFT
static uint8_t held_mods = 0; static uint8_t held_mods = 0;

5
quantum/process_keycode/process_caps_word.h
View file

@ -14,8 +14,9 @@
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include "caps_word.h" #include <stdbool.h>
#include "action.h"
/** /**
* @brief Process handler for Caps Word feature. * @brief Process handler for Caps Word feature.

4
quantum/process_keycode/process_clicky.h
View file

@ -1,5 +1,9 @@
#pragma once #pragma once
#include <stdint.h>
#include <stdbool.h>
#include "action.h"
void clicky_play(void); void clicky_play(void);
bool process_clicky(uint16_t keycode, keyrecord_t *record); bool process_clicky(uint16_t keycode, keyrecord_t *record);

11
quantum/process_keycode/process_combo.c
View file

@ -14,11 +14,16 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "keymap_common.h"
#include "print.h"
#include "process_combo.h" #include "process_combo.h"
#include <stddef.h>
#include "process_auto_shift.h"
#include "caps_word.h"
#include "timer.h"
#include "keyboard.h"
#include "keymap_common.h"
#include "action_layer.h"
#include "action_tapping.h" #include "action_tapping.h"
#include "action.h" #include "action_util.h"
#include "keymap_introspection.h" #include "keymap_introspection.h"
__attribute__((weak)) void process_combo_event(uint16_t combo_index, bool pressed) {} __attribute__((weak)) void process_combo_event(uint16_t combo_index, bool pressed) {}

6
quantum/process_keycode/process_combo.h
View file

@ -16,9 +16,11 @@
#pragma once #pragma once
#include "progmem.h"
#include "quantum.h"
#include <stdint.h> #include <stdint.h>
#include <stdbool.h>
#include "action.h"
#include "keycodes.h"
#include "quantum_keycodes.h"
#ifdef EXTRA_SHORT_COMBOS #ifdef EXTRA_SHORT_COMBOS
# define MAX_COMBO_LENGTH 6 # define MAX_COMBO_LENGTH 6

9
quantum/process_keycode/process_dynamic_macro.c
View file

@ -17,6 +17,15 @@
/* Author: Wojciech Siewierski < wojciech dot siewierski at onet dot pl > */ /* Author: Wojciech Siewierski < wojciech dot siewierski at onet dot pl > */
#include "process_dynamic_macro.h" #include "process_dynamic_macro.h"
#include <stddef.h>
#include "action_layer.h"
#include "keycodes.h"
#include "debug.h"
#include "wait.h"
#ifdef BACKLIGHT_ENABLE
# include "backlight.h"
#endif
// default feedback method // default feedback method
void dynamic_macro_led_blink(void) { void dynamic_macro_led_blink(void) {

4
quantum/process_keycode/process_dynamic_macro.h
View file

@ -18,7 +18,9 @@
/* Author: Wojciech Siewierski < wojciech dot siewierski at onet dot pl > */ /* Author: Wojciech Siewierski < wojciech dot siewierski at onet dot pl > */
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
/* May be overridden with a custom value. Be aware that the effective /* May be overridden with a custom value. Be aware that the effective
* macro length is half of this value: each keypress is recorded twice * macro length is half of this value: each keypress is recorded twice

4
quantum/process_keycode/process_dynamic_tapping_term.c
View file

@ -14,8 +14,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "quantum.h"
#include "process_dynamic_tapping_term.h" #include "process_dynamic_tapping_term.h"
#include "quantum.h"
#include "keycodes.h"
#include "send_string.h"
#ifndef DYNAMIC_TAPPING_TERM_INCREMENT #ifndef DYNAMIC_TAPPING_TERM_INCREMENT
# define DYNAMIC_TAPPING_TERM_INCREMENT 5 # define DYNAMIC_TAPPING_TERM_INCREMENT 5

1
quantum/process_keycode/process_dynamic_tapping_term.h
View file

@ -16,6 +16,7 @@
#pragma once #pragma once
#include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "action.h" #include "action.h"

3
quantum/process_keycode/process_grave_esc.c
View file

@ -14,6 +14,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "process_grave_esc.h" #include "process_grave_esc.h"
#include "keycodes.h"
#include "modifiers.h"
#include "action_util.h"
/* true if the last press of QK_GRAVE_ESCAPE was shifted (i.e. GUI or SHIFT were pressed), false otherwise. /* true if the last press of QK_GRAVE_ESCAPE was shifted (i.e. GUI or SHIFT were pressed), false otherwise.
* Used to ensure that the correct keycode is released if the key is released. * Used to ensure that the correct keycode is released if the key is released.

4
quantum/process_keycode/process_grave_esc.h
View file

@ -15,6 +15,8 @@
*/ */
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
bool process_grave_esc(uint16_t keycode, keyrecord_t *record); bool process_grave_esc(uint16_t keycode, keyrecord_t *record);

1
quantum/process_keycode/process_haptic.h
View file

@ -15,6 +15,7 @@
*/ */
#pragma once #pragma once
#include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "action.h" #include "action.h"

3
quantum/process_keycode/process_joystick.h
View file

@ -17,6 +17,7 @@
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include "quantum.h" #include <stdbool.h>
#include "action.h"
bool process_joystick(uint16_t keycode, keyrecord_t *record); bool process_joystick(uint16_t keycode, keyrecord_t *record);

4
quantum/process_keycode/process_key_lock.h
View file

@ -16,7 +16,9 @@
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
void cancel_key_lock(void); void cancel_key_lock(void);
bool process_key_lock(uint16_t *keycode, keyrecord_t *record); bool process_key_lock(uint16_t *keycode, keyrecord_t *record);

6
quantum/process_keycode/process_key_override.c
View file

@ -15,12 +15,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "quantum.h" #include "process_key_override.h"
#include "report.h" #include "report.h"
#include "timer.h" #include "timer.h"
#include "process_key_override.h" #include "debug.h"
#include <debug.h>
#ifndef KEY_OVERRIDE_REPEAT_DELAY #ifndef KEY_OVERRIDE_REPEAT_DELAY
# define KEY_OVERRIDE_REPEAT_DELAY 500 # define KEY_OVERRIDE_REPEAT_DELAY 500

3
quantum/process_keycode/process_key_override.h
View file

@ -18,9 +18,8 @@
#pragma once #pragma once
#include <stdbool.h> #include <stdbool.h>
#include <stddef.h>
#include <stdint.h> #include <stdint.h>
#include "action.h"
#include "action_layer.h" #include "action_layer.h"
/** /**

1
quantum/process_keycode/process_leader.c
View file

@ -16,6 +16,7 @@
#include "process_leader.h" #include "process_leader.h"
#include "leader.h" #include "leader.h"
#include "quantum_keycodes.h"
bool process_leader(uint16_t keycode, keyrecord_t *record) { bool process_leader(uint16_t keycode, keyrecord_t *record) {
if (record->event.pressed) { if (record->event.pressed) {

4
quantum/process_keycode/process_leader.h
View file

@ -16,6 +16,8 @@
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
bool process_leader(uint16_t keycode, keyrecord_t *record); bool process_leader(uint16_t keycode, keyrecord_t *record);

5
quantum/process_keycode/process_magic.c
View file

@ -14,8 +14,13 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "process_magic.h" #include "process_magic.h"
#include "keycode_config.h"
#include "keycodes.h"
#include "eeconfig.h"
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
# include "audio.h"
# ifndef AG_NORM_SONG # ifndef AG_NORM_SONG
# define AG_NORM_SONG SONG(AG_NORM_SOUND) # define AG_NORM_SONG SONG(AG_NORM_SOUND)
# endif # endif

4
quantum/process_keycode/process_magic.h
View file

@ -15,6 +15,8 @@
*/ */
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
bool process_magic(uint16_t keycode, keyrecord_t *record); bool process_magic(uint16_t keycode, keyrecord_t *record);

26
quantum/process_keycode/process_midi.c
View file

@ -15,12 +15,13 @@
*/ */
#include "process_midi.h" #include "process_midi.h"
#ifdef MIDI_ENABLE #include <LUFA/Drivers/USB/USB.h>
# include <LUFA/Drivers/USB/USB.h> #include "midi.h"
# include "midi.h" #include "qmk_midi.h"
# include "qmk_midi.h" #include "timer.h"
#include "debug.h"
# ifdef MIDI_BASIC #ifdef MIDI_BASIC
void process_midi_basic_noteon(uint8_t note) { void process_midi_basic_noteon(uint8_t note) {
midi_send_noteon(&midi_device, 0, note, 127); midi_send_noteon(&midi_device, 0, note, 127);
@ -34,12 +35,9 @@ void process_midi_all_notes_off(void) {
midi_send_cc(&midi_device, 0, 0x7B, 0); midi_send_cc(&midi_device, 0, 0x7B, 0);
} }
# endif // MIDI_BASIC #endif // MIDI_BASIC
# ifdef MIDI_ADVANCED
# include "timer.h"
#ifdef MIDI_ADVANCED
static uint8_t tone_status[2][MIDI_TONE_COUNT]; static uint8_t tone_status[2][MIDI_TONE_COUNT];
static uint8_t midi_modulation; static uint8_t midi_modulation;
@ -248,11 +246,11 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
return true; return true;
} }
# endif // MIDI_ADVANCED #endif // MIDI_ADVANCED
void midi_task(void) { void midi_task(void) {
midi_device_process(&midi_device); midi_device_process(&midi_device);
# ifdef MIDI_ADVANCED #ifdef MIDI_ADVANCED
if (timer_elapsed(midi_modulation_timer) < midi_config.modulation_interval) return; if (timer_elapsed(midi_modulation_timer) < midi_config.modulation_interval) return;
midi_modulation_timer = timer_read(); midi_modulation_timer = timer_read();
@ -270,7 +268,5 @@ void midi_task(void) {
if (midi_modulation > 127) midi_modulation = 127; if (midi_modulation > 127) midi_modulation = 127;
} }
# endif #endif
} }
#endif // MIDI_ENABLE

5
quantum/process_keycode/process_midi.h
View file

@ -16,7 +16,10 @@
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
#include "quantum_keycodes.h"
#ifdef MIDI_ENABLE #ifdef MIDI_ENABLE

2
quantum/process_keycode/process_music.c
View file

@ -14,8 +14,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "process_music.h" #include "process_music.h"
#include "timer.h"
#ifdef AUDIO_ENABLE #ifdef AUDIO_ENABLE
# include "audio.h"
# include "process_audio.h" # include "process_audio.h"
#endif #endif
#if defined(MIDI_ENABLE) && defined(MIDI_BASIC) #if defined(MIDI_ENABLE) && defined(MIDI_BASIC)

4
quantum/process_keycode/process_music.h
View file

@ -16,7 +16,9 @@
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
#if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC)) #if defined(AUDIO_ENABLE) || (defined(MIDI_ENABLE) && defined(MIDI_BASIC))

3
quantum/process_keycode/process_programmable_button.h
View file

@ -18,6 +18,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#pragma once #pragma once
#include <stdint.h> #include <stdint.h>
#include "quantum.h" #include <stdbool.h>
#include "action.h"
bool process_programmable_button(uint16_t keycode, keyrecord_t *record); bool process_programmable_button(uint16_t keycode, keyrecord_t *record);

4
quantum/process_keycode/process_repeat_key.c
View file

@ -13,6 +13,10 @@
// limitations under the License. // limitations under the License.
#include "process_repeat_key.h" #include "process_repeat_key.h"
#include "repeat_key.h"
#include "keycodes.h"
#include "quantum_keycodes.h"
#include "action_util.h"
// Default implementation of remember_last_key_user(). // Default implementation of remember_last_key_user().
__attribute__((weak)) bool remember_last_key_user(uint16_t keycode, keyrecord_t* record, uint8_t* remembered_mods) { __attribute__((weak)) bool remember_last_key_user(uint16_t keycode, keyrecord_t* record, uint8_t* remembered_mods) {

4
quantum/process_keycode/process_repeat_key.h
View file

@ -14,7 +14,9 @@
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
/** /**
* @brief Process handler for remembering the last key. * @brief Process handler for remembering the last key.

8
quantum/process_keycode/process_rgb.c
View file

@ -14,6 +14,14 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "process_rgb.h" #include "process_rgb.h"
#include "action_util.h"
#ifdef RGB_MATRIX_ENABLE
# include "rgb_matrix.h"
#endif
#ifdef RGBLIGHT_ENABLE
# include "rgblight.h"
#endif
typedef void (*rgb_func_pointer)(void); typedef void (*rgb_func_pointer)(void);

4
quantum/process_keycode/process_rgb.h
View file

@ -15,6 +15,8 @@
*/ */
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
bool process_rgb(const uint16_t keycode, const keyrecord_t *record); bool process_rgb(const uint16_t keycode, const keyrecord_t *record);

1
quantum/process_keycode/process_secure.h
View file

@ -3,6 +3,7 @@
#pragma once #pragma once
#include <stdint.h>
#include <stdbool.h> #include <stdbool.h>
#include "action.h" #include "action.h"

4
quantum/process_keycode/process_sequencer.h
View file

@ -16,6 +16,8 @@
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
bool process_sequencer(uint16_t keycode, keyrecord_t *record); bool process_sequencer(uint16_t keycode, keyrecord_t *record);

2
quantum/process_keycode/process_space_cadet.c
View file

@ -14,6 +14,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "process_space_cadet.h" #include "process_space_cadet.h"
#include "keycodes.h"
#include "timer.h"
#include "action_tapping.h" #include "action_tapping.h"
// ********** OBSOLETE DEFINES, STOP USING! (pls?) ********** // ********** OBSOLETE DEFINES, STOP USING! (pls?) **********

4
quantum/process_keycode/process_space_cadet.h
View file

@ -15,7 +15,9 @@
*/ */
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
void perform_space_cadet(keyrecord_t *record, uint16_t sc_keycode, uint8_t holdMod, uint8_t tapMod, uint8_t keycode); void perform_space_cadet(keyrecord_t *record, uint16_t sc_keycode, uint8_t holdMod, uint8_t tapMod, uint8_t keycode);
bool process_space_cadet(uint16_t keycode, keyrecord_t *record); bool process_space_cadet(uint16_t keycode, keyrecord_t *record);

1
quantum/process_keycode/process_steno.c
View file

@ -15,6 +15,7 @@
*/ */
#include "process_steno.h" #include "process_steno.h"
#include "quantum_keycodes.h" #include "quantum_keycodes.h"
#include "eeconfig.h"
#include "keymap_steno.h" #include "keymap_steno.h"
#include <string.h> #include <string.h>
#ifdef VIRTSER_ENABLE #ifdef VIRTSER_ENABLE

4
quantum/process_keycode/process_steno.h
View file

@ -16,7 +16,9 @@
#pragma once #pragma once
#include "quantum.h" #include <stdint.h>
#include <stdbool.h>
#include "action.h"
#define BOLT_STROKE_SIZE 4 #define BOLT_STROKE_SIZE 4
#define GEMINI_STROKE_SIZE 6 #define GEMINI_STROKE_SIZE 6

7
quantum/process_keycode/process_tap_dance.c
View file

@ -13,7 +13,14 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "process_tap_dance.h"
#include "quantum.h" #include "quantum.h"
#include "action_layer.h"
#include "action_tapping.h"
#include "action_util.h"
#include "timer.h"
#include "wait.h"
static uint16_t active_td; static uint16_t active_td;
static uint16_t last_tap_time; static uint16_t last_tap_time;

33
quantum/process_keycode/process_tap_dance.h
View file

@ -16,18 +16,17 @@
#pragma once #pragma once
#ifdef TAP_DANCE_ENABLE #include <stdint.h>
#include <stdbool.h>
# include <stdbool.h> #include "action.h"
# include <inttypes.h>
typedef struct { typedef struct {
uint16_t interrupting_keycode; uint16_t interrupting_keycode;
uint8_t count; uint8_t count;
uint8_t weak_mods; uint8_t weak_mods;
# ifndef NO_ACTION_ONESHOT #ifndef NO_ACTION_ONESHOT
uint8_t oneshot_mods; uint8_t oneshot_mods;
# endif #endif
bool pressed : 1; bool pressed : 1;
bool finished : 1; bool finished : 1;
bool interrupted : 1; bool interrupted : 1;
@ -56,24 +55,24 @@ typedef struct {
void (*layer_function)(uint8_t); void (*layer_function)(uint8_t);
} tap_dance_dual_role_t; } tap_dance_dual_role_t;
# define ACTION_TAP_DANCE_DOUBLE(kc1, kc2) \ #define ACTION_TAP_DANCE_DOUBLE(kc1, kc2) \
{ .fn = {tap_dance_pair_on_each_tap, tap_dance_pair_finished, tap_dance_pair_reset}, .user_data = (void *)&((tap_dance_pair_t){kc1, kc2}), } { .fn = {tap_dance_pair_on_each_tap, tap_dance_pair_finished, tap_dance_pair_reset}, .user_data = (void *)&((tap_dance_pair_t){kc1, kc2}), }
# define ACTION_TAP_DANCE_LAYER_MOVE(kc, layer) \ #define ACTION_TAP_DANCE_LAYER_MOVE(kc, layer) \
{ .fn = {tap_dance_dual_role_on_each_tap, tap_dance_dual_role_finished, tap_dance_dual_role_reset}, .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_move}), } { .fn = {tap_dance_dual_role_on_each_tap, tap_dance_dual_role_finished, tap_dance_dual_role_reset}, .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_move}), }
# define ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer) \ #define ACTION_TAP_DANCE_LAYER_TOGGLE(kc, layer) \
{ .fn = {NULL, tap_dance_dual_role_finished, tap_dance_dual_role_reset}, .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_invert}), } { .fn = {NULL, tap_dance_dual_role_finished, tap_dance_dual_role_reset}, .user_data = (void *)&((tap_dance_dual_role_t){kc, layer, layer_invert}), }
# define ACTION_TAP_DANCE_FN(user_fn) \ #define ACTION_TAP_DANCE_FN(user_fn) \
{ .fn = {NULL, user_fn, NULL}, .user_data = NULL, } { .fn = {NULL, user_fn, NULL}, .user_data = NULL, }
# define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset) \ #define ACTION_TAP_DANCE_FN_ADVANCED(user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset) \
{ .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset}, .user_data = NULL, } { .fn = {user_fn_on_each_tap, user_fn_on_dance_finished, user_fn_on_dance_reset}, .user_data = NULL, }
# define TD(n) (QK_TAP_DANCE | TD_INDEX(n)) #define TD(n) (QK_TAP_DANCE | TD_INDEX(n))
# define TD_INDEX(code) ((code)&0xFF) #define TD_INDEX(code) ((code)&0xFF)
# define TAP_DANCE_KEYCODE(state) TD(((tap_dance_action_t *)state) - tap_dance_actions) #define TAP_DANCE_KEYCODE(state) TD(((tap_dance_action_t *)state) - tap_dance_actions)
extern tap_dance_action_t tap_dance_actions[]; extern tap_dance_action_t tap_dance_actions[];
@ -92,9 +91,3 @@ void tap_dance_pair_reset(tap_dance_state_t *state, void *user_data);
void tap_dance_dual_role_on_each_tap(tap_dance_state_t *state, void *user_data); void tap_dance_dual_role_on_each_tap(tap_dance_state_t *state, void *user_data);
void tap_dance_dual_role_finished(tap_dance_state_t *state, void *user_data); void tap_dance_dual_role_finished(tap_dance_state_t *state, void *user_data);
void tap_dance_dual_role_reset(tap_dance_state_t *state, void *user_data); void tap_dance_dual_role_reset(tap_dance_state_t *state, void *user_data);
#else
# define TD(n) KC_NO
#endif

2
quantum/process_keycode/process_tri_layer.h
View file

@ -3,6 +3,8 @@
#pragma once #pragma once
#include <stdint.h>
#include <stdbool.h>
#include "action.h" #include "action.h"
/** /**