aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJack Sangdahl <[email protected]>2024-07-08 10:25:11 -0600
committerJack Sangdahl <[email protected]>2024-07-08 10:25:11 -0600
commit0eab3e161d9be4d22980a8d06250997045e21e6b (patch)
treed63a8c0a0ca9b0df88147f0012e71f7dd8ec25c2
parent13fcd8a9af9e7bd15577075bd8ae1b37999344d9 (diff)
downloadqmk_me-0eab3e161d9be4d22980a8d06250997045e21e6b.tar.gz
qmk_me-0eab3e161d9be4d22980a8d06250997045e21e6b.zip
update combos and tidy some things
-rw-r--r--img/layout.svg16
-rw-r--r--util/keymap.yaml16
-rw-r--r--waffle/combos.def26
-rw-r--r--waffle/tapping.c10
-rw-r--r--waffle/waffle.h11
5 files changed, 36 insertions, 43 deletions
diff --git a/img/layout.svg b/img/layout.svg
index 5639d99..edf12fc 100644
--- a/img/layout.svg
+++ b/img/layout.svg
@@ -328,7 +328,7 @@ path.combo {
</g>
<g class="combo combopos-1">
<rect rx="6" ry="6" x="210" y="26" width="28" height="26" class="combo"/>
-<text x="224" y="38" class="combo tap">|</text>
+<text x="224" y="38" class="combo tap">\</text>
</g>
<g class="combo combopos-2">
<rect rx="6" ry="6" x="546" y="18" width="28" height="26" class="combo"/>
@@ -336,15 +336,15 @@ path.combo {
</g>
<g class="combo combopos-3">
<rect rx="6" ry="6" x="98" y="18" width="28" height="26" class="combo"/>
-<text x="112" y="32" class="combo tap">+</text>
+<text x="112" y="32" class="combo tap">=</text>
</g>
<g class="combo combopos-4">
<rect rx="6" ry="6" x="602" y="18" width="28" height="26" class="combo"/>
-<text x="616" y="32" class="combo tap">_</text>
+<text x="616" y="32" class="combo tap">-</text>
</g>
<g class="combo combopos-5">
<rect rx="6" ry="6" x="210" y="82" width="28" height="26" class="combo"/>
-<text x="224" y="94" class="combo tap">\</text>
+<text x="224" y="94" class="combo tap">|</text>
</g>
<g class="combo combopos-6">
<rect rx="6" ry="6" x="154" y="74" width="28" height="26" class="combo"/>
@@ -360,15 +360,15 @@ path.combo {
</g>
<g class="combo combopos-8">
<rect rx="6" ry="6" x="490" y="82" width="28" height="26" class="combo"/>
-<text x="504" y="94" class="combo tap">&#x27;</text>
+<text x="504" y="94" class="combo tap">&quot;</text>
</g>
<g class="combo combopos-9">
<rect rx="6" ry="6" x="490" y="26" width="28" height="26" class="combo"/>
-<text x="504" y="38" class="combo tap">&quot;</text>
+<text x="504" y="38" class="combo tap">&#x27;</text>
</g>
<g class="combo combopos-10">
<rect rx="6" ry="6" x="98" y="74" width="28" height="26" class="combo"/>
-<text x="112" y="88" class="combo tap">=</text>
+<text x="112" y="88" class="combo tap">+</text>
</g>
<g class="combo combopos-11">
<rect rx="6" ry="6" x="546" y="74" width="28" height="26" class="combo"/>
@@ -376,7 +376,7 @@ path.combo {
</g>
<g class="combo combopos-12">
<rect rx="6" ry="6" x="602" y="74" width="28" height="26" class="combo"/>
-<text x="616" y="88" class="combo tap">-</text>
+<text x="616" y="88" class="combo tap">_</text>
</g>
</g>
</g>
diff --git a/util/keymap.yaml b/util/keymap.yaml
index 2faaf84..d22d976 100644
--- a/util/keymap.yaml
+++ b/util/keymap.yaml
@@ -54,15 +54,15 @@ layers:
- {t: ▽, type: trans}
combos:
- {p: [2, 3], k: "{}", l: ["BASE"]}
- - {p: [3, 4], k: "|", l: ["BASE"]}
+ - {p: [3, 4], k: "\\", l: ["BASE"]}
- {p: [6, 7], k: "[]", l: ["BASE"]}
- - {p: [1, 2], k: "+", l: ["BASE"]}
- - {p: [7, 8], k: "_", l: ["BASE"]}
- - {p: [13, 14], k: "\\", l: ["BASE"]}
+ - {p: [1, 2], k: "=", l: ["BASE"]}
+ - {p: [7, 8], k: "-", l: ["BASE"]}
+ - {p: [13, 14], k: "|", l: ["BASE"]}
- {p: [12, 13], k: ":", l: ["BASE"]}
- {p: [13, 16], k: "Cap Wrd", l: ["BASE"], align: top, offset: 0.1}
- - {p: [15, 16], k: "'", l: ["BASE"]}
- - {p: [5, 6], k: "\"", l: ["BASE"]}
- - {p: [11, 12], k: "=", l: ["BASE"]}
+ - {p: [15, 16], k: "\"", l: ["BASE"]}
+ - {p: [5, 6], k: "'", l: ["BASE"]}
+ - {p: [11, 12], k: "+", l: ["BASE"]}
- {p: [16, 17], k: "Ent", l: ["BASE"]}
- - {p: [17, 18], k: "-", l: ["BASE"]}
+ - {p: [17, 18], k: "_", l: ["BASE"]}
diff --git a/waffle/combos.def b/waffle/combos.def
index 13d098b..53934f1 100644
--- a/waffle/combos.def
+++ b/waffle/combos.def
@@ -1,16 +1,16 @@
// Copyright 2024 [email protected]
// SPDX-License-Identifier: GPL-2.0-or-later
-// name output keys
-CMB(fg_plus, KC_PLUS, KC_W, KC_E)
-CMB(er_cbkt, TD(CURLY_BRACKET), KC_E, KC_R)
-CMB(rt_pipe, KC_PIPE, KC_R, KC_T)
-CMB(yu_dqou, KC_DQUO, KC_Y, KC_U)
-CMB(ui_brkt, TD(SQR_BRACKET), KC_U, KC_I)
-CMB(io_unds, KC_UNDS, KC_I, KC_O)
-CMB(sd_eqal, KC_EQL, LGUI_T(KC_S), LCTL_T(KC_D))
-CMB(df_coln, KC_COLN, LCTL_T(KC_D), LSFT_T(KC_F))
-CMB(fg_bsls, KC_BSLS, LSFT_T(KC_F), KC_G)
-CMB(hj_quot, KC_QUOT, KC_H, RSFT_T(KC_J))
-CMB(jk_entr, KC_ENT, RSFT_T(KC_J), RCTL_T(KC_K))
-CMB(kl_mins, TD(EM_DASH_MINS), RCTL_T(KC_K), RGUI_T(KC_L))
+// name output keys
+CMB(fg_eqal, KC_EQL, KC_W, KC_E)
+CMB(er_cbkt, TD(CBRACKET), KC_E, KC_R)
+CMB(rt_bsls, KC_BSLS, KC_R, KC_T)
+CMB(yu_quot, KC_QUOT, KC_Y, KC_U)
+CMB(ui_brkt, TD(SBRACKET), KC_U, KC_I)
+CMB(io_mins, TD(EM_DASH_MINS), KC_I, KC_O)
+CMB(sd_plus, KC_PLUS, LGUI_T(KC_S), LCTL_T(KC_D))
+CMB(df_coln, KC_COLN, LCTL_T(KC_D), LSFT_T(KC_F))
+CMB(fg_pipe, KC_PIPE, LSFT_T(KC_F), KC_G)
+CMB(hj_dquo, KC_DQUO, KC_H, RSFT_T(KC_J))
+CMB(jk_entr, KC_ENT, RSFT_T(KC_J), RCTL_T(KC_K))
+CMB(kl_unds, KC_UNDS, RCTL_T(KC_K), RGUI_T(KC_L))
diff --git a/waffle/tapping.c b/waffle/tapping.c
index 0a01637..52adccc 100644
--- a/waffle/tapping.c
+++ b/waffle/tapping.c
@@ -23,8 +23,8 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) {
return TAPPING_TERM - SPC_OFFSET;
case TD(EM_DASH_MINS):
case TD(PLY_NXT_PRV):
- case TD(CURLY_BRACKET):
- case TD(SQR_BRACKET):
+ case TD(CBRACKET):
+ case TD(SBRACKET):
return TAPPING_TERM + 60;
default:
return TAPPING_TERM;
@@ -72,9 +72,9 @@ void raise_paste(tap_dance_state_t *state, void *user_data) {
tap_dance_action_t tap_dance_actions[] = {
[EM_DASH_MINS] = ACTION_TAP_DANCE_FN(em_dash_mins),
[PLY_NXT_PRV] = ACTION_TAP_DANCE_FN(ply_nxt_prv),
- [RAISE_PASTE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, raise_paste, td_reset),
- [CURLY_BRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR),
- [SQR_BRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
+ [PASTE_RAISE] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, raise_paste, td_reset),
+ [CBRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LCBR, KC_RCBR),
+ [SBRACKET] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
};
bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/waffle/waffle.h b/waffle/waffle.h
index 3f5b9ba..d746bbe 100644
--- a/waffle/waffle.h
+++ b/waffle/waffle.h
@@ -17,13 +17,7 @@ typedef struct user_config {
enum layers { _BASE, _LOWER, _RAISE, _ADJUST };
-enum tapdances {
- EM_DASH_MINS,
- PLY_NXT_PRV,
- RAISE_PASTE,
- CURLY_BRACKET,
- SQR_BRACKET
-};
+enum tapdances { EM_DASH_MINS, PLY_NXT_PRV, PASTE_RAISE, CBRACKET, SBRACKET };
enum custom_keycodes {
UPDIR = QK_USER,
@@ -57,7 +51,7 @@ enum unicode_mode {
#endif
#define PNP TD(PLY_NXT_PRV)
-#define PSTRSE TD(RAISE_PASTE)
+#define PSTRSE TD(PASTE_RAISE)
#define ESCLWR LT(_LOWER, KC_ESC)
#define LWRSPC LT(_LOWER, KC_SPC)
#define RSEBSP LT(_RAISE, KC_BSPC)
@@ -82,7 +76,6 @@ enum unicode_mode {
// clang-format on
#define LAYOUT_waffle_60_ts(...) LAYOUT_60_ansi_tsangan(__VA_ARGS__)
-#define LAYOUT_stack_of_waffles(...) LAYOUT_stack(__VA_ARGS__)
#define LAYOUT_waffle_3x6(...) LAYOUT_split_3x6_3(__VA_ARGS__)
#define LAYOUT_waffle_3x5(...) LAYOUT_split_3x5_3(__VA_ARGS__)
#define LAYOUT_waffle(...) LAYOUT(__VA_ARGS__)