qmk/qmk_firmware
1
0
Fork 0
mirror of https://github.com/qmk/qmk_firmware.git synced 2026-10-21 00:20:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into xap

Browse Source
This commit is contained in:
QMK Bot
2022-12-14 02:46:51 +00:00
parent 6de01b4a76 e2117564c5
commit 63d7f4c040
14 changed files with 46 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
keyboards/dz60/keymaps/jdelkins/keymap.c
+1 -1
View File
@@ -38,7 +38,7 @@ int ctl_state = 0;
void ctl_finished(qk_tap_dance_state_t *state, void *user_data) {
ctl_state = cur_dance(state);
switch (ctl_state) {
case SINGLE_TAP: qk_leader_start(); break;
case SINGLE_TAP: leader_start(); break;
case SINGLE_HOLD: register_code(KC_LCTL); break;
case DOUBLE_TAP: tap_code(KC_RCTL); break;
case DOUBLE_HOLD: register_code(KC_RCTL); break;
keyboards/dztech/dz65rgb/keymaps/drootz/keymap.c
+2 -2
View File
@@ -708,11 +708,11 @@ void matrix_scan_user(void)
}
}
void leader_start(void) {
void leader_start_user(void) {
isLeader = true;
}
void leader_end(void) {
void leader_end_user(void) {
isLeader = false;
}
keyboards/ergodox_ez/keymaps/hacker_dvorak/tap_dance/mod_tap_layer_dances/none_lead.c
+1 -1
View File
@@ -17,7 +17,7 @@ void none_lead_finished(qk_tap_dance_state_t *state, void *user_data) {
break;
case DOUBLE_TAP:
qk_leader_start();
leader_start();
break;
}
}
keyboards/massdrop/alt/keymaps/jdelkins/keymap.c
+1 -1
View File
@@ -45,7 +45,7 @@ int ctl_state = 0;
void ctl_finished(qk_tap_dance_state_t *state, void *user_data) {
ctl_state = cur_dance(state);
switch(ctl_state) {
case SINGLE_TAP: qk_leader_start(); break;
case SINGLE_TAP: leader_start(); break;
case SINGLE_HOLD: register_code(KC_LCTL); break;
case DOUBLE_TAP: tap_code(KC_RCTL); break;
case DOUBLE_HOLD: register_code(KC_RCTL); break;
keyboards/planck/keymaps/jdelkins/keymap.c
+1 -1
View File
@@ -43,7 +43,7 @@ int ctl_state = 0;
void ctl_finished(qk_tap_dance_state_t *state, void *user_data) {
ctl_state = cur_dance(state);
switch (ctl_state) {
case SINGLE_TAP: qk_leader_start(); break;
case SINGLE_TAP: leader_start(); break;
case SINGLE_HOLD: register_code(KC_LCTL); break;
case DOUBLE_TAP: tap_code(KC_RCTL); break;
case DOUBLE_HOLD: register_code(KC_RCTL); break;
keyboards/planck/keymaps/rootiest/keymap.c
+2 -2
View File
@@ -1397,13 +1397,13 @@ bool get_permissive_hold(uint16_t keycode, keyrecord_t* record) {
* by playing sound at different stages of the leader chord
*/
// Called when you tap the Leader key
void leader_start(void) {
void leader_start_user(void) {
#ifdef AUDIO_ENABLE
PLAY_SONG(leader_started);
#endif
}
// Called when either the leader sequence is completed, or the leader timeout is hit
void leader_end(void) {
void leader_end_user(void) {
if (did_leader_succeed) {
#ifdef AUDIO_ENABLE
PLAY_SONG(leader_succeed);
keyboards/planck/keymaps/yhaliaw/keymap.c
+1 -1
View File
@@ -187,7 +187,7 @@ void matrix_scan_user(void) {
}
}
void leader_end(void) {
void leader_end_user(void) {
// Plays sound on if leader sequence found.
if (leader_found) {
#ifdef AUDIO_ENABLE
keyboards/preonic/keymaps/pcurt854/keymap.c
+2 -2
View File
@@ -469,13 +469,13 @@ void matrix_scan_user(void) {
}
}
void leader_start(void) {
void leader_start_user(void) {
#ifdef AUDIO_ENABLE
PLAY_SONG(leader_start_song);
#endif
}
void leader_end(void) {
void leader_end_user(void) {
if (did_leader_succeed) {
#ifdef AUDIO_ENABLE
PLAY_SONG(leader_succeed_song);
keyboards/preonic/keymaps/yhaliaw/keymap.c
+1 -1
View File
@@ -197,7 +197,7 @@ void matrix_scan_user(void) {
}
}
void leader_end(void) {
void leader_end_user(void) {
// Plays sound on if leader sequence found.
if (leader_found) {
#ifdef AUDIO_ENABLE