Minor changes
parent
08f3cee0a7
commit
2845481490
|
@ -97,6 +97,12 @@ void matrix_scan_user(void) {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
const uint16_t PROGMEM test_combo2[] = {KC_D, KC_F, COMBO_END};
|
||||||
|
combo_t key_combos[] = {
|
||||||
|
COMBO(test_combo2, KC_TAB),
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Include all other parts of configuration
|
// Include all other parts of configuration
|
||||||
#include "layers/layers.c"
|
#include "layers/layers.c"
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
# rules.mk overrides
|
# rules.mk overrides
|
||||||
|
|
||||||
TAP_DANCE_ENABLE = yes
|
TAP_DANCE_ENABLE = yes
|
||||||
|
COMBO_ENABLE = yes
|
|
@ -1,47 +0,0 @@
|
||||||
// See symbols.h for docs
|
|
||||||
|
|
||||||
#define BETA_LAYER_MAGIC_MACRO BETA_LAYER(HORIZON)
|
|
||||||
|
|
||||||
#ifdef BETA_LAYER_LAYOUTS
|
|
||||||
#define BETA_LAYER_CONTEXT_DATA LAYOUT_EN
|
|
||||||
BETA_LAYER_MAGIC_MACRO
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef BETA_LAYER_KEYS
|
|
||||||
#define BETA_LAYER_CONTEXT_DATA LAYOUT_voyager(\
|
|
||||||
TD(TD_ESCAPE), KC_1, KC_2, KC_3, KC_4, KC_5, \
|
|
||||||
KC_H, KC_Q, KC_Q, KC_W, KC_E, KC_R, \
|
|
||||||
KC_TAB, KC_LSFT, KC_A, KC_S, KC_D, KC_F, \
|
|
||||||
KC_NO, KC_Z, KC_X, KC_NO, KC_C, KC_V, \
|
|
||||||
KC_SPACE, KC_ENTER, \
|
|
||||||
\
|
|
||||||
\
|
|
||||||
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
|
|
||||||
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
|
|
||||||
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
|
|
||||||
KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
|
|
||||||
KC_NO, KC_NO \
|
|
||||||
)
|
|
||||||
|
|
||||||
BETA_LAYER_MAGIC_MACRO
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef BETA_LAYER_LEDS
|
|
||||||
#define BETA_LAYER_CONTEXT_DATA {\
|
|
||||||
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
|
|
||||||
LC_OFF, LC_OFF, LC_OFF, LC_BLU, LC_OFF, LC_OFF, \
|
|
||||||
LC_OFF, LC_OFF, LC_BLU, LC_BLU, LC_BLU, LC_OFF, \
|
|
||||||
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
|
|
||||||
LC_OFF, LC_OFF, \
|
|
||||||
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
|
|
||||||
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
|
|
||||||
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
|
|
||||||
LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, LC_OFF, \
|
|
||||||
LC_OFF, LC_OFF \
|
|
||||||
}
|
|
||||||
|
|
||||||
BETA_LAYER_MAGIC_MACRO
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#undef BETA_LAYER_CONTEXT_DATA
|
|
||||||
#undef BETA_LAYER_MAGIC_MACRO
|
|
|
@ -19,7 +19,6 @@
|
||||||
|
|
||||||
// The order of the layers below doesn't matter,
|
// The order of the layers below doesn't matter,
|
||||||
// since they avoid transparent keys.
|
// since they avoid transparent keys.
|
||||||
#include "horizon.h"
|
|
||||||
#include "symbols.h"
|
#include "symbols.h"
|
||||||
#include "arrows.h"
|
#include "arrows.h"
|
||||||
#include "macros.h"
|
#include "macros.h"
|
||||||
|
|
|
@ -33,10 +33,5 @@ bool beta_leader_check(void) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
BETA_SEQ_2_SHORT(KC_H, KC_O) {
|
|
||||||
layer_move(LAYER_HORIZON);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
|
@ -20,19 +20,7 @@ void td_wmlayout(tap_dance_state_t *state, void *user_data) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void td_escape(tap_dance_state_t *state, void *user_data) {
|
|
||||||
if (state->count == 1) {
|
|
||||||
tap_code16(KC_ESCAPE);
|
|
||||||
} else if (state->count == 2) {
|
|
||||||
layer_move(LAYER_MAIN);
|
|
||||||
} else {
|
|
||||||
reset_tap_dance(state);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
tap_dance_action_t tap_dance_actions[] = {
|
tap_dance_action_t tap_dance_actions[] = {
|
||||||
[TD_WMLAYOUT] = ACTION_TAP_DANCE_FN(td_wmlayout),
|
[TD_WMLAYOUT] = ACTION_TAP_DANCE_FN(td_wmlayout),
|
||||||
[TD_SCREENSHOT] = ACTION_TAP_DANCE_FN(td_screenshot),
|
[TD_SCREENSHOT] = ACTION_TAP_DANCE_FN(td_screenshot),
|
||||||
[TD_ESCAPE] = ACTION_TAP_DANCE_FN(td_escape),
|
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in New Issue