summaryrefslogtreecommitdiff
path: root/users/danielo515
diff options
context:
space:
mode:
Diffstat (limited to 'users/danielo515')
-rw-r--r--users/danielo515/danielo515.c4
-rw-r--r--users/danielo515/tap_dance.c22
-rw-r--r--users/danielo515/tap_dance.h22
3 files changed, 24 insertions, 24 deletions
diff --git a/users/danielo515/danielo515.c b/users/danielo515/danielo515.c
index 9b09aed9d7..ea91ec55bf 100644
--- a/users/danielo515/danielo515.c
+++ b/users/danielo515/danielo515.c
@@ -7,9 +7,9 @@ bool onMac = true;
LEADER_EXTERNS();
# ifdef RGBLIGHT_ENABLE
-void leader_start() { rgblight_setrgb_range(5, 100, 199, 10, 15); };
+void leader_start_user() { rgblight_setrgb_range(5, 100, 199, 10, 15); };
-void leader_end() { rgblight_setrgb_range(200, 200, 255, 10, 15); };
+void leader_end_user() { rgblight_setrgb_range(200, 200, 255, 10, 15); };
# endif
void matrix_scan_user(void) {
diff --git a/users/danielo515/tap_dance.c b/users/danielo515/tap_dance.c
index a07b4c792f..b69ee715d4 100644
--- a/users/danielo515/tap_dance.c
+++ b/users/danielo515/tap_dance.c
@@ -1,7 +1,7 @@
#include "tap_dance.h"
//**************** Definitions needed for quad function to work *********************//
#ifdef QUAD_DANCE
-int cur_dance(qk_tap_dance_state_t *state)
+int cur_dance(tap_dance_state_t *state)
{
if (state->count == 1)
{
@@ -30,8 +30,8 @@ int cur_dance(qk_tap_dance_state_t *state)
# endif
// Slightly better tap dance double: interruption sends double single and any number over double sends the single that number of times
-void qk_tap_dance_pair_finished_safe(qk_tap_dance_state_t *state, void *user_data) {
- qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data;
+void tap_dance_pair_finished_safe(tap_dance_state_t *state, void *user_data) {
+ tap_dance_pair_t *pair = (tap_dance_pair_t *)user_data;
int count = state->count;
if (state->count == 2) {
if (state->interrupted){
@@ -47,8 +47,8 @@ void qk_tap_dance_pair_finished_safe(qk_tap_dance_state_t *state, void *user_dat
}
}
-void qk_tap_dance_pair_reset_safe(qk_tap_dance_state_t *state, void *user_data) {
- qk_tap_dance_pair_t *pair = (qk_tap_dance_pair_t *)user_data;
+void tap_dance_pair_reset_safe(tap_dance_state_t *state, void *user_data) {
+ tap_dance_pair_t *pair = (tap_dance_pair_t *)user_data;
if (state->count == 2) {
unregister_code16 (pair->kc2);
return;
@@ -58,7 +58,7 @@ void qk_tap_dance_pair_reset_safe(qk_tap_dance_state_t *state, void *user_data)
//**************** Tap dance functions *********************//
-qk_tap_dance_action_t tap_dance_actions[] = {
+tap_dance_action_t tap_dance_actions[] = {
[COPY_CUT] = ACTION_TAP_DANCE_FN(td_copy_cut),
[PASTE_DANCE] = ACTION_TAP_DANCE_FN(td_paste),
[_TD_F1] = ACTION_TAP_DANCE_DOUBLE(KC_1, KC_F1),
@@ -86,7 +86,7 @@ qk_tap_dance_action_t tap_dance_actions[] = {
[_TD_PASTE] = ACTION_TAP_DANCE_FN(dance_paste)
};
-void td_copy_cut(qk_tap_dance_state_t *state, void *user_data)
+void td_copy_cut(tap_dance_state_t *state, void *user_data)
{
if (state->count == 2)
{
@@ -99,7 +99,7 @@ void td_copy_cut(qk_tap_dance_state_t *state, void *user_data)
reset_tap_dance(state);
};
-void td_paste(qk_tap_dance_state_t *state, void *user_data)
+void td_paste(tap_dance_state_t *state, void *user_data)
{
if (state->count == 2)
{
@@ -113,7 +113,7 @@ void td_paste(qk_tap_dance_state_t *state, void *user_data)
};
//===== The awesome tap dance for CUT, COPY and PASTE letters
-void dance_copy (qk_tap_dance_state_t *state, void *user_data) {
+void dance_copy (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) { tap_code16(KC_C); }
else
if (state->interrupted) { tap_code16(KC_C);tap_code16(KC_C);}
@@ -122,13 +122,13 @@ void dance_copy (qk_tap_dance_state_t *state, void *user_data) {
reset_tap_dance (state);
}
-void dance_cut (qk_tap_dance_state_t *state, void *user_data) {
+void dance_cut (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) { tap_code16(KC_X); }
else { CMD(KC_X); }
reset_tap_dance (state);
}
-void dance_paste (qk_tap_dance_state_t *state, void *user_data) {
+void dance_paste (tap_dance_state_t *state, void *user_data) {
if (state->count == 1) {
tap_code16(KC_V);
}
diff --git a/users/danielo515/tap_dance.h b/users/danielo515/tap_dance.h
index 880ad525ee..aaf3864841 100644
--- a/users/danielo515/tap_dance.h
+++ b/users/danielo515/tap_dance.h
@@ -4,8 +4,8 @@ extern bool onMac;
#define ACTION_TAP_DANCE_DOUBLE_SAFE(kc1, kc2) { \
- .fn = { NULL, qk_tap_dance_pair_finished_safe, qk_tap_dance_pair_reset_safe }, \
- .user_data = (void *)&((qk_tap_dance_pair_t) { kc1, kc2 }), \
+ .fn = { NULL, tap_dance_pair_finished_safe, tap_dance_pair_reset_safe }, \
+ .user_data = (void *)&((tap_dance_pair_t) { kc1, kc2 }), \
}
#ifdef QUAD_DANCE
@@ -18,7 +18,7 @@ enum {
DOUBLE_SINGLE_TAP = 5 //send SINGLE_TAP twice - NOT DOUBLE_TAP
// Add more enums here if you want for triple, quadruple, etc.
};
-int cur_dance (qk_tap_dance_state_t *state);
+int cur_dance (tap_dance_state_t *state);
# endif
enum tap_dance {
@@ -48,14 +48,14 @@ enum tap_dance {
_TD_CUT,
_TD_PASTE,
};
-void qk_tap_dance_pair_finished_safe(qk_tap_dance_state_t *state, void *user_data);
-void qk_tap_dance_pair_reset_safe(qk_tap_dance_state_t *state, void *user_data);
-void td_copy_cut (qk_tap_dance_state_t *state, void *user_data);
-void td_paste(qk_tap_dance_state_t *state, void *user_data);
-int cur_dance (qk_tap_dance_state_t *state);
-void dance_cut (qk_tap_dance_state_t *state, void *user_data);
-void dance_copy (qk_tap_dance_state_t *state, void *user_data);
-void dance_paste (qk_tap_dance_state_t *state, void *user_data);
+void tap_dance_pair_finished_safe(tap_dance_state_t *state, void *user_data);
+void tap_dance_pair_reset_safe(tap_dance_state_t *state, void *user_data);
+void td_copy_cut (tap_dance_state_t *state, void *user_data);
+void td_paste(tap_dance_state_t *state, void *user_data);
+int cur_dance (tap_dance_state_t *state);
+void dance_cut (tap_dance_state_t *state, void *user_data);
+void dance_copy (tap_dance_state_t *state, void *user_data);
+void dance_paste (tap_dance_state_t *state, void *user_data);
// Ready to use Tap dance definitions, just put them on your layout
#define TD_COPY TD(_TD_COPY)