From 1978007faefc0fb3af809ddf0d2ff1274e540570 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 15 Dec 2022 07:40:25 +1100 Subject: Tap Dance: remove `qk_` prefix (#19313) --- users/ericgebhart/extensions/keycodes.h | 6 +++--- users/ericgebhart/extensions/tap_dances.c | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'users/ericgebhart') diff --git a/users/ericgebhart/extensions/keycodes.h b/users/ericgebhart/extensions/keycodes.h index a3c5d72a09..eafdfbad43 100755 --- a/users/ericgebhart/extensions/keycodes.h +++ b/users/ericgebhart/extensions/keycodes.h @@ -515,9 +515,9 @@ enum { int on_qwerty(void); #ifdef TAP_DANCES_ENABLE -int cur_dance (qk_tap_dance_state_t *state); +int cur_dance (tap_dance_state_t *state); //for the x tap dance. Put it here so it can be used in any keymap -void x_finished (qk_tap_dance_state_t *state, void *user_data); -void x_reset (qk_tap_dance_state_t *state, void *user_data); +void x_finished (tap_dance_state_t *state, void *user_data); +void x_reset (tap_dance_state_t *state, void *user_data); #endif diff --git a/users/ericgebhart/extensions/tap_dances.c b/users/ericgebhart/extensions/tap_dances.c index b292dab678..8b1fea15e8 100755 --- a/users/ericgebhart/extensions/tap_dances.c +++ b/users/ericgebhart/extensions/tap_dances.c @@ -22,7 +22,7 @@ #include "action_layer.h" #include "process_keycode/process_tap_dance.h" -void tap_dance_mouse_btns (qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_mouse_btns (tap_dance_state_t *state, void *user_data) { switch(state->count){ case 1: register_code(KC_BTN1); @@ -72,7 +72,7 @@ static void switch_default_layer(uint8_t layer) { } */ -void tap_dance_df_bepo_layers_switch (qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_df_bepo_layers_switch (tap_dance_state_t *state, void *user_data) { switch(state->count){ case 1: switch_default_layer(_DVORAK_BP); @@ -89,7 +89,7 @@ void tap_dance_df_bepo_layers_switch (qk_tap_dance_state_t *state, void *user_da reset_tap_dance(state); } -void tap_dance_layer_switch (qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_layer_switch (tap_dance_state_t *state, void *user_data) { switch(state->count){ case 1: if(on_qwerty()) @@ -115,7 +115,7 @@ void tap_dance_layer_switch (qk_tap_dance_state_t *state, void *user_data) { reset_tap_dance(state); } -void tap_dance_default_layer_switch (qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_default_layer_switch (tap_dance_state_t *state, void *user_data) { switch(state->count){ case 1: switch_default_layer(_DVORAK); @@ -178,7 +178,7 @@ void switch_default_layer_on_bepo(int count) { // a qwerty software keyboard and a bepo software keyboard. // if shifted, choose layers based on the other software keyboard, otherwise choose only // layers that work on the current software keyboard. -void tap_dance_default_os_layer_switch (qk_tap_dance_state_t *state, void *user_data) { +void tap_dance_default_os_layer_switch (tap_dance_state_t *state, void *user_data) { //uint8_t shifted = (get_mods() & MOD_BIT(KC_LSFT|KC_RSFT)); bool shifted = ( keyboard_report->mods & (MOD_BIT(KC_LSFT)|MOD_BIT(KC_RSFT)) ); int qwerty = on_qwerty(); @@ -230,7 +230,7 @@ void tap_dance_default_os_layer_switch (qk_tap_dance_state_t *state, void *user_ * For the third point, there does exist the 'DOUBLE_SINGLE_TAP', however this is not fully tested * */ -int cur_dance (qk_tap_dance_state_t *state) { +int cur_dance (tap_dance_state_t *state) { if (state->count == 1) { if (state->interrupted || !state->pressed) return SINGLE_TAP; //key has not been interrupted, but they key is still held. Means you want to send a 'HOLD'. @@ -257,7 +257,7 @@ int cur_dance (qk_tap_dance_state_t *state) { } //Tap Dance Definitions -qk_tap_dance_action_t tap_dance_actions[] = { +tap_dance_action_t tap_dance_actions[] = { //Tap once for Esc, twice for Caps Lock [TD_ESC_CAPS] = ACTION_TAP_DANCE_DOUBLE(KC_ESC, KC_CAPS), [TD_TAB_BKTAB] = ACTION_TAP_DANCE_DOUBLE(KC_TAB, LSFT(KC_TAB)), -- cgit v1.2.3 From b61654fb956947939eb6922735130eb2f65b5f53 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 11 Jan 2023 22:31:54 +0000 Subject: Tidy up use of CTPC (#19570) --- users/ericgebhart/rules.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/ericgebhart') diff --git a/users/ericgebhart/rules.mk b/users/ericgebhart/rules.mk index a6eddc2d87..8ec481c17a 100755 --- a/users/ericgebhart/rules.mk +++ b/users/ericgebhart/rules.mk @@ -45,7 +45,7 @@ VPATH += $(USER_PATH)/oled # SERIAL_DRIVER = usart # AUDIO_ENABLE = no # LTO_ENABLE = no -# CONVERT_TO_PROTON_C = yes +# CONVERT_TO=proton_c # so the keyboard's code doesn't add stuff we don't need. # when we use our own oled renders. -- cgit v1.2.3 From cf935d97ae479e7a1e1f2f2f248b93e52e4cc69e Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 21 Jan 2023 03:21:17 +1100 Subject: Fix functions with empty params (#19647) * Fix functions with empty params * Found a bunch more --- users/ericgebhart/extensions/oneshot.c | 4 ++-- users/ericgebhart/oled/oled_stuff.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'users/ericgebhart') diff --git a/users/ericgebhart/extensions/oneshot.c b/users/ericgebhart/extensions/oneshot.c index 55c2fa1ae3..8d4dc2f29c 100644 --- a/users/ericgebhart/extensions/oneshot.c +++ b/users/ericgebhart/extensions/oneshot.c @@ -50,7 +50,7 @@ static int8_t set_modifier_state_all(oneshot_state new_state); static void set_modifier_state_all_from_to(oneshot_state oneshot_state_from, oneshot_state oneshot_state_to); static bool all_modifiers_are_off(void); -int8_t turnoff_oneshot_modifiers() { +int8_t turnoff_oneshot_modifiers(void) { return set_modifier_state_all(ONESHOT_STATE_OFF); } @@ -163,7 +163,7 @@ void set_modifier_state_all_from_to(oneshot_state oneshot_state_from, oneshot_st } } -bool all_modifiers_are_off() { +bool all_modifiers_are_off(void) { for (int8_t i = 0; i < ONESHOT_MOD_COUNT; i++) { if (modifiers_with_state[i] != ONESHOT_STATE_OFF) { return false; diff --git a/users/ericgebhart/oled/oled_stuff.c b/users/ericgebhart/oled/oled_stuff.c index a73b5b174d..f2c4f0f394 100755 --- a/users/ericgebhart/oled/oled_stuff.c +++ b/users/ericgebhart/oled/oled_stuff.c @@ -47,7 +47,7 @@ void oled_render_mod_status(uint8_t modifiers) { oled_write_P(PSTR("G"), (modifiers & MOD_MASK_GUI)); } -void oled_render_mod_lock_status(){ +void oled_render_mod_lock_status(void){ oled_render_mod_status(get_mods() | get_oneshot_mods()); oled_render_keylock_status(host_keyboard_leds()); } -- cgit v1.2.3 From 043d8e1140e09327b72ed3bd55f369e1faf1a334 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 30 Jan 2023 03:44:16 +1100 Subject: Remove deprecated Quantum keycodes (#19712) --- users/ericgebhart/layers/utility.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'users/ericgebhart') diff --git a/users/ericgebhart/layers/utility.h b/users/ericgebhart/layers/utility.h index dab0bb4f41..a3008cc442 100644 --- a/users/ericgebhart/layers/utility.h +++ b/users/ericgebhart/layers/utility.h @@ -70,7 +70,7 @@ /********************************************************************************/ // For an Adjust layer. Like RBB with audio, flash, etc. #define ___ADJUST_L1___ ___RGB_HUE_SAT_INT_UP___, RGB_TOG -#define ___ADJUST_L2___ MU_TOG, CK_TOGG, AU_ON, AU_OFF, CG_NORM +#define ___ADJUST_L2___ MU_TOGG, CK_TOGG, AU_ON, AU_OFF, CG_NORM #define ___ADJUST_L3___ ___RGB_HUE_SAT_INT_DN___, KC_RGB_T #define ___ADJUST_R1___ ___, KC_MAKE, VRSN, MG_NKRO, KC_RESET -- cgit v1.2.3