Merge remote-tracking branch 'qmk/master' into merge-2025-06-21
This commit is contained in:
commit
7b247bc800
3559 changed files with 29294 additions and 11618 deletions
|
|
@ -38,7 +38,7 @@ bool autocorrect_is_enabled(void) {
|
|||
*/
|
||||
void autocorrect_enable(void) {
|
||||
keymap_config.autocorrect_enable = true;
|
||||
eeconfig_update_keymap(keymap_config.raw);
|
||||
eeconfig_update_keymap(&keymap_config);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -48,7 +48,7 @@ void autocorrect_enable(void) {
|
|||
void autocorrect_disable(void) {
|
||||
keymap_config.autocorrect_enable = false;
|
||||
typo_buffer_size = 0;
|
||||
eeconfig_update_keymap(keymap_config.raw);
|
||||
eeconfig_update_keymap(&keymap_config);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -58,7 +58,7 @@ void autocorrect_disable(void) {
|
|||
void autocorrect_toggle(void) {
|
||||
keymap_config.autocorrect_enable = !keymap_config.autocorrect_enable;
|
||||
typo_buffer_size = 0;
|
||||
eeconfig_update_keymap(keymap_config.raw);
|
||||
eeconfig_update_keymap(&keymap_config);
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -160,8 +160,13 @@ bool process_caps_word(uint16_t keycode, keyrecord_t* record) {
|
|||
case QK_TOGGLE_LAYER ... QK_TOGGLE_LAYER_MAX:
|
||||
case QK_LAYER_TAP_TOGGLE ... QK_LAYER_TAP_TOGGLE_MAX:
|
||||
case QK_ONE_SHOT_LAYER ... QK_ONE_SHOT_LAYER_MAX:
|
||||
#ifdef TRI_LAYER_ENABLE // Ignore Tri Layer keys.
|
||||
case QK_TRI_LAYER_LOWER ... QK_TRI_LAYER_UPPER:
|
||||
// Ignore AltGr.
|
||||
#endif // TRI_LAYER_ENABLE
|
||||
#ifdef LAYER_LOCK_ENABLE // Ignore Layer Lock key.
|
||||
case QK_LAYER_LOCK:
|
||||
#endif // LAYER_LOCK_ENABLE
|
||||
// Ignore AltGr.
|
||||
case KC_RALT:
|
||||
case OSM(MOD_RALT):
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -66,17 +66,17 @@ void clicky_freq_reset(void) {
|
|||
|
||||
void clicky_toggle(void) {
|
||||
audio_config.clicky_enable ^= 1;
|
||||
eeconfig_update_audio(audio_config.raw);
|
||||
eeconfig_update_audio(&audio_config);
|
||||
}
|
||||
|
||||
void clicky_on(void) {
|
||||
audio_config.clicky_enable = 1;
|
||||
eeconfig_update_audio(audio_config.raw);
|
||||
eeconfig_update_audio(&audio_config);
|
||||
}
|
||||
|
||||
void clicky_off(void) {
|
||||
audio_config.clicky_enable = 0;
|
||||
eeconfig_update_audio(audio_config.raw);
|
||||
eeconfig_update_audio(&audio_config);
|
||||
}
|
||||
|
||||
bool is_clicky_on(void) {
|
||||
|
|
|
|||
|
|
@ -1,24 +1,34 @@
|
|||
// Copyright 2024 Nick Brassel (@tzarc)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
#include "outputselect.h"
|
||||
#include "connection.h"
|
||||
#include "process_connection.h"
|
||||
|
||||
bool process_connection(uint16_t keycode, keyrecord_t *record) {
|
||||
if (record->event.pressed) {
|
||||
switch (keycode) {
|
||||
case QK_OUTPUT_NEXT:
|
||||
set_output(OUTPUT_AUTO); // This should cycle through the outputs going forward. Ensure `docs/keycodes.md`, `docs/features/bluetooth.md` are updated when it does.
|
||||
connection_next_host();
|
||||
return false;
|
||||
case QK_OUTPUT_USB:
|
||||
set_output(OUTPUT_USB);
|
||||
return false;
|
||||
case QK_OUTPUT_BLUETOOTH:
|
||||
set_output(OUTPUT_BLUETOOTH);
|
||||
case QK_OUTPUT_PREV:
|
||||
connection_prev_host();
|
||||
return false;
|
||||
|
||||
case QK_OUTPUT_PREV:
|
||||
case QK_OUTPUT_AUTO:
|
||||
connection_set_host(CONNECTION_HOST_AUTO);
|
||||
return false;
|
||||
case QK_OUTPUT_NONE:
|
||||
connection_set_host(CONNECTION_HOST_NONE);
|
||||
return false;
|
||||
case QK_OUTPUT_USB:
|
||||
connection_set_host(CONNECTION_HOST_USB);
|
||||
return false;
|
||||
case QK_OUTPUT_BLUETOOTH:
|
||||
connection_set_host(CONNECTION_HOST_BLUETOOTH);
|
||||
return false;
|
||||
case QK_OUTPUT_2P4GHZ:
|
||||
connection_set_host(CONNECTION_HOST_2P4GHZ);
|
||||
return false;
|
||||
|
||||
case QK_BLUETOOTH_PROFILE_NEXT:
|
||||
case QK_BLUETOOTH_PROFILE_PREV:
|
||||
case QK_BLUETOOTH_UNPAIR:
|
||||
|
|
|
|||
|
|
@ -22,11 +22,7 @@ bool process_leader(uint16_t keycode, keyrecord_t *record) {
|
|||
if (record->event.pressed) {
|
||||
if (leader_sequence_active() && !leader_sequence_timed_out()) {
|
||||
#ifndef LEADER_KEY_STRICT_KEY_PROCESSING
|
||||
if (IS_QK_MOD_TAP(keycode)) {
|
||||
keycode = QK_MOD_TAP_GET_TAP_KEYCODE(keycode);
|
||||
} else if (IS_QK_LAYER_TAP(keycode)) {
|
||||
keycode = QK_LAYER_TAP_GET_TAP_KEYCODE(keycode);
|
||||
}
|
||||
keycode = get_tap_keycode(keycode);
|
||||
#endif
|
||||
|
||||
if (!leader_sequence_add(keycode)) {
|
||||
|
|
|
|||
|
|
@ -47,7 +47,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
|
|||
if (record->event.pressed) {
|
||||
if (IS_MAGIC_KEYCODE(keycode)) {
|
||||
/* keymap config */
|
||||
keymap_config.raw = eeconfig_read_keymap();
|
||||
eeconfig_read_keymap(&keymap_config);
|
||||
switch (keycode) {
|
||||
case QK_MAGIC_SWAP_CONTROL_CAPS_LOCK:
|
||||
keymap_config.swap_control_capslock = true;
|
||||
|
|
@ -187,7 +187,7 @@ bool process_magic(uint16_t keycode, keyrecord_t *record) {
|
|||
break;
|
||||
}
|
||||
|
||||
eeconfig_update_keymap(keymap_config.raw);
|
||||
eeconfig_update_keymap(&keymap_config);
|
||||
clear_keyboard(); // clear to prevent stuck keys
|
||||
|
||||
return false;
|
||||
|
|
|
|||
|
|
@ -41,7 +41,10 @@ static bool remember_last_key(uint16_t keycode, keyrecord_t* record, uint8_t* re
|
|||
#ifdef TRI_LAYER_ENABLE // Ignore Tri Layer keys.
|
||||
case QK_TRI_LAYER_LOWER:
|
||||
case QK_TRI_LAYER_UPPER:
|
||||
#endif // TRI_LAYER_ENABLE
|
||||
#endif // TRI_LAYER_ENABLE
|
||||
#ifdef LAYER_LOCK_ENABLE // Ignore Layer Lock key.
|
||||
case QK_LAYER_LOCK:
|
||||
#endif // LAYER_LOCK_ENABLE
|
||||
return false;
|
||||
|
||||
// Ignore hold events on tap-hold keys.
|
||||
|
|
|
|||
|
|
@ -20,9 +20,6 @@
|
|||
#ifdef VIRTSER_ENABLE
|
||||
# include "virtser.h"
|
||||
#endif
|
||||
#ifdef STENO_ENABLE_ALL
|
||||
# include "eeprom.h"
|
||||
#endif
|
||||
|
||||
// All steno keys that have been pressed to form this chord,
|
||||
// stored in MAX_STROKE_SIZE groups of 8-bit arrays.
|
||||
|
|
@ -128,13 +125,13 @@ static const uint16_t combinedmap_second[] PROGMEM = {STN_S2, STN_KL, STN_WL, ST
|
|||
|
||||
#ifdef STENO_ENABLE_ALL
|
||||
void steno_init(void) {
|
||||
mode = eeprom_read_byte(EECONFIG_STENOMODE);
|
||||
mode = eeconfig_read_steno_mode();
|
||||
}
|
||||
|
||||
void steno_set_mode(steno_mode_t new_mode) {
|
||||
steno_clear_chord();
|
||||
mode = new_mode;
|
||||
eeprom_update_byte(EECONFIG_STENOMODE, mode);
|
||||
eeconfig_update_steno_mode(mode);
|
||||
}
|
||||
#endif // STENO_ENABLE_ALL
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue