Nulo/qmk_firmware
1
0
Fork 0
Code Releases Activity

Add blank lines, prefer explicit initialization

Browse source
This commit is contained in:
Konstantin Đorđević 2019-02-18 06:08:52 +01:00
parent 14908f86fb
commit 6a088f7ff6
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keyboards/melody96/keymaps/konstantin/keymap.c
View file

@ -3,7 +3,7 @@
static const hsv_t *colors[] = { &GODSPEED_BLUE, &GODSPEED_YELLOW }; static const hsv_t *colors[] = { &GODSPEED_BLUE, &GODSPEED_YELLOW };
static size_t cnum = sizeof colors / sizeof *colors; static size_t cnum = sizeof colors / sizeof *colors;
static size_t cidx; static size_t cidx = 0;
void eeconfig_init_keymap(void) { void eeconfig_init_keymap(void) {
rgblight_sethsv(colors[cidx]->h, colors[cidx]->s, colors[cidx]->v); rgblight_sethsv(colors[cidx]->h, colors[cidx]->s, colors[cidx]->v);

9
users/konstantin/tap_dance.c
View file

@ -8,6 +8,7 @@
void td_double_mods_each(qk_tap_dance_state_t *state, void *user_data) { void td_double_mods_each(qk_tap_dance_state_t *state, void *user_data) {
qk_tap_dance_pair_t *data = (qk_tap_dance_pair_t *)user_data; qk_tap_dance_pair_t *data = (qk_tap_dance_pair_t *)user_data;
// Single tap → mod1, double tap → mod2, triple tap etc. → mod1+mod2 // Single tap → mod1, double tap → mod2, triple tap etc. → mod1+mod2
if (state->count == 1 || state->count == 3) { if (state->count == 1 || state->count == 3) {
register_code(data->kc1); register_code(data->kc1);
@ -21,6 +22,7 @@ void td_double_mods_each(qk_tap_dance_state_t *state, void *user_data) {
void td_double_mods_reset(qk_tap_dance_state_t *state, void *user_data) { void td_double_mods_reset(qk_tap_dance_state_t *state, void *user_data) {
qk_tap_dance_pair_t *data = (qk_tap_dance_pair_t *)user_data; qk_tap_dance_pair_t *data = (qk_tap_dance_pair_t *)user_data;
if (state->count == 1 || state->count >= 3) { if (state->count == 1 || state->count >= 3) {
unregister_code(data->kc1); unregister_code(data->kc1);
} }
@ -36,6 +38,7 @@ void td_double_mods_reset(qk_tap_dance_state_t *state, void *user_data) {
void td_mod_layer_each(qk_tap_dance_state_t *state, void *user_data) { void td_mod_layer_each(qk_tap_dance_state_t *state, void *user_data) {
qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data; qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data;
// Single tap → mod, double tap → layer, triple tap etc. → mod+layer // Single tap → mod, double tap → layer, triple tap etc. → mod+layer
if (state->count == 1 || state->count == 3) { if (state->count == 1 || state->count == 3) {
register_code(data->kc); register_code(data->kc);
@ -49,6 +52,7 @@ void td_mod_layer_each(qk_tap_dance_state_t *state, void *user_data) {
void td_mod_layer_reset(qk_tap_dance_state_t *state, void *user_data) { void td_mod_layer_reset(qk_tap_dance_state_t *state, void *user_data) {
qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data; qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data;
if (state->count == 1 || state->count >= 3) { if (state->count == 1 || state->count >= 3) {
unregister_code(data->kc); unregister_code(data->kc);
} }
@ -59,7 +63,7 @@ void td_mod_layer_reset(qk_tap_dance_state_t *state, void *user_data) {
#define ACTION_TAP_DANCE_LAYER_MOD(layer, mod) { \ #define ACTION_TAP_DANCE_LAYER_MOD(layer, mod) { \
.fn = { td_layer_mod_each, NULL, td_layer_mod_reset }, \ .fn = { td_layer_mod_each, NULL, td_layer_mod_reset }, \
.user_data = &(qk_tap_dance_layer_mod_t){ layer, mod }, \ .user_data = &(qk_tap_dance_layer_mod_t){ layer, mod, 0, 0 }, \
} }
typedef struct { typedef struct {
@ -75,6 +79,7 @@ void td_layer_mod_each(qk_tap_dance_state_t *state, void *user_data) {
data->layer_on = IS_LAYER_ON(data->layer); data->layer_on = IS_LAYER_ON(data->layer);
data->started = true; data->started = true;
} }
// Single tap → layer, double tap → mod, triple tap etc. → layer+mod // Single tap → layer, double tap → mod, triple tap etc. → layer+mod
if (state->count == 1 || state->count == 3) { if (state->count == 1 || state->count == 3) {
layer_on(data->layer); layer_on(data->layer);
@ -88,12 +93,14 @@ void td_layer_mod_each(qk_tap_dance_state_t *state, void *user_data) {
void td_layer_mod_reset(qk_tap_dance_state_t *state, void *user_data) { void td_layer_mod_reset(qk_tap_dance_state_t *state, void *user_data) {
qk_tap_dance_layer_mod_t *data = (qk_tap_dance_layer_mod_t *)user_data; qk_tap_dance_layer_mod_t *data = (qk_tap_dance_layer_mod_t *)user_data;
if ((state->count == 1 || state->count >= 3) && !data->layer_on) { if ((state->count == 1 || state->count >= 3) && !data->layer_on) {
layer_off(data->layer); layer_off(data->layer);
} }
if (state->count >= 2) { if (state->count >= 2) {
unregister_code(data->kc); unregister_code(data->kc);
} }
data->started = false; data->started = false;
} }