From 72c11222823f11e1e9ec7fefd1c1324083f54d27 Mon Sep 17 00:00:00 2001 From: Jack Sangdahl Date: Mon, 8 Jul 2024 00:20:24 -0600 Subject: update layout image, tidy readme, remove unused codes, redo combos --- .gitignore | 1 + img/layout.svg | 2986 ++++++++----------------------- keyboards/bully/keymaps/waffle/keymap.c | 8 +- keyboards/xyz60/keymaps/waffle/keymap.c | 2 +- keymaps/crkbd/keymap.c | 2 +- keymaps/f60/keymap.c | 4 +- keymaps/ferris/keymap.c | 2 +- keymaps/kyria/keymap.c | 6 +- readme.md | 154 +- util/keymap.yaml | 68 + waffle/combos.def | 22 +- waffle/tapping.c | 27 +- waffle/waffle.h | 13 +- 13 files changed, 813 insertions(+), 2482 deletions(-) create mode 100644 util/keymap.yaml diff --git a/.gitignore b/.gitignore index 01e5ee4..7f0d883 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ .cache *.o compile_commands.json +.venv diff --git a/img/layout.svg b/img/layout.svg index a1689d6..59f8f84 100644 --- a/img/layout.svg +++ b/img/layout.svg @@ -1,2280 +1,710 @@ - - + +/* start glyphs */ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +/* end glyphs */ + + +BASE: + + + +Q + + + +W + + + +E + + + +R + + + +T + + + +Y + + + +U + + + +I + + + +O + + + +P + + + +A + + + + +S + + + + +D + + + + +F + + + + +G + + + +H + + + +J + + + + +K + + + + +L + + + + +; + + + + +Z + + + +X + + + +C + + + +V + + + +B + + + +N + + + +M + + + +, +< + + + +. +> + + + +/ +? + + + +../ + + + +Esc +LWR + + + + + + + + + + + + +RSE + + + + + + + +{} + + + +| + + + +[] + + + +: + + + +Ent + + + +\ + + + ++ + + + + + + +CapWrd + + + + +' + + + +" + + + += + + + +_ + + + +- + + + + +LOWER: + + + +1 + + + +2 + + + +3 + + + +4 + + + +5 + + + +6 + + + +7 + + + +8 + + + +9 + + + +0 + + + +! + + + +@ + + + +# + + + +$ + + + +% + + + +^ + + + +& + + + +* + + + +( + + + +) + + + + + + + + + + + + + + + + +DelWrd + + + + +` +~ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +RAISE: + + + + +RGBTogg + + + + + +Mode+ + + + + + +Hue+ + + + + + +Sat+ + + + + + +Val+ + + + + + +NoMode + + + + +Fancy + + + +Block + + + + +RegIndic + + + + +Make + + + + +AudioTogg + + + + + +Mode- + + + + + +Hue- + + + + + +Sat- + + + + + +Val- + + + + +Wide + + + + +UpsideDown + + + + +Zalgo + + + +Tiny + + + +Reset + + + +F1 + + + +F2 + + + +F3 + + + +F4 + + + +F5 + + + +F6 + + + +F7 + + + +F8 + + + +F9 + + + +F10 + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/keyboards/bully/keymaps/waffle/keymap.c b/keyboards/bully/keymaps/waffle/keymap.c index ac9a0c7..c927b21 100644 --- a/keyboards/bully/keymaps/waffle/keymap.c +++ b/keyboards/bully/keymaps/waffle/keymap.c @@ -5,10 +5,10 @@ // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_waffle( - REMOVE, ___BASE1___, KC_BSPC, KC_BSPC, - NUKE, ___BASE2___, PNP, - KC_NO, ___BASE3___, KC_NO, - KC_VOLD, UPDIR, KC_ESC, LT(_LOWER, KC_SPC), RSEPST, KC_NO, KC_VOLU + KC_NO, ___BASE1___, KC_BSPC, KC_BSPC, + NUKE, ___BASE2___, PNP, + KC_NO, ___BASE3___, KC_NO, + KC_VOLD, UPDIR, KC_ESC, LT(_LOWER, KC_SPC), PSTRSE, KC_NO, KC_VOLU ), [_LOWER] = LAYOUT_waffle( _______, ___LOWER1___, _______, _______, diff --git a/keyboards/xyz60/keymaps/waffle/keymap.c b/keyboards/xyz60/keymaps/waffle/keymap.c index 8c9dc23..dbb3fe4 100644 --- a/keyboards/xyz60/keymaps/waffle/keymap.c +++ b/keyboards/xyz60/keymaps/waffle/keymap.c @@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { _______, ___BASE1___, KC_BSPC, _______, PNP, _______, ___BASE2___, _______, _______, _______, ___BASE3___, _______, - _______, _______, KC_ESC, LWRSPC, RSEPST, _______, _______ + _______, _______, KC_ESC, LWRSPC, PSTRSE, _______, _______ ), [_LOWER] = LAYOUT_waffle_60_ts( _______, ___NONE___, diff --git a/keymaps/crkbd/keymap.c b/keymaps/crkbd/keymap.c index d148d25..098ade4 100644 --- a/keymaps/crkbd/keymap.c +++ b/keymaps/crkbd/keymap.c @@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_waffle_3x6( KC_NO, ___BASE1___, KC_NO, - LINKS, ___BASE2___, RWORD, + KC_NO, ___BASE2___, RWORD, KC_NO, ___BASE3___, KC_NO, ___BASE4___ ), diff --git a/keymaps/f60/keymap.c b/keymaps/f60/keymap.c index 7094bde..2ced32d 100644 --- a/keymaps/f60/keymap.c +++ b/keymaps/f60/keymap.c @@ -11,9 +11,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_waffle_60_ts( _______, ___NONE___, _______, ___BASE1___, KC_BSPC, _______, PNP, - LINKS, ___BASE2___, _______, _______, + _______, ___BASE2___, _______, _______, _______, ___BASE3___, _______, - _______, _______, KC_ESC, LWRSPC, RSEPST, _______, _______ + _______, _______, KC_ESC, LWRSPC, PSTRSE, _______, _______ ), [_LOWER] = LAYOUT_waffle_60_ts( _______, ___NONE___, diff --git a/keymaps/ferris/keymap.c b/keymaps/ferris/keymap.c index 6352c5b..ebb0cdf 100644 --- a/keymaps/ferris/keymap.c +++ b/keymaps/ferris/keymap.c @@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___BASE1___, ___BASE2___, ___BASE3___, - ESCLWR, KC_SPC, KC_BSPC, RSEPST + ESCLWR, KC_SPC, KC_BSPC, PSTRSE ), [_LOWER] = LAYOUT_waffle( ___LOWER1___, diff --git a/keymaps/kyria/keymap.c b/keymaps/kyria/keymap.c index 4dac028..496fd78 100644 --- a/keymaps/kyria/keymap.c +++ b/keymaps/kyria/keymap.c @@ -7,8 +7,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_waffle( KC_NO, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_NO, KC_NO, HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN), KC_NO, - KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, REMOVE, KC_NO, KC_NO, NUKE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, - KC_NO, UPDIR, ESCLWR, KC_SPC, KC_NO, KC_NO, KC_BSPC, RSEPST, PNP, KC_NO + KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, RWORD, KC_NO, KC_NO, NUKE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_NO, + KC_NO, UPDIR, ESCLWR, KC_SPC, KC_NO, KC_NO, KC_BSPC, PSTRSE, PNP, KC_NO ), [_LOWER] = LAYOUT_waffle( @@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_RAISE] = LAYOUT_waffle( _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NOMODE, KC_SCRIPT, KC_BLOCKS, KC_REGIONAL, QK_MAKE, _______, _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_WIDE, KC_AUSSIE, KC_ZALGO, KC_SUPER, QK_BOOT, _______, - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, RWORD, _______, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, _______, _______, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/readme.md b/readme.md index 18757c4..87cb61b 100644 --- a/readme.md +++ b/readme.md @@ -1,163 +1,23 @@ ### qmk.me this is a self-contained repository for my personal [qmk](https://github.com/qmk/qmk_firmware) userspace & keyboard code. -![keyboard](https://i.imgur.com/s0dN0JDh.jpeg) +![keyboard](https://i.imgur.com/s0dN0JD.jpeg) ### building -symlinks are used to compile this code in a proper `qmk_firmware` repository.\ +symlinks are used to compile this code in a proper `qmk_firmware` repository. + eg. ```shell ln -s ~/qmk.me/waffle ~/qmk_firmware/users/waffle ln -s ~/qmk.me/keyboards/relic ~/qmk_firmware/keyboards/relic echo "users/waffle\nkeyboards/relic" >> ~/qmk_firmware/.git/info/exclude qmk compile -kb relic -km waffle - ``` +the official [userspace feature](https://docs.qmk.fm/newbs_external_userspace) +is used as this repository contains personal keyboards, which are not supported. ### layout -a simple 34-key layout that makes use of 2 (primary) layers, home-row mods, & combos for many symbols.\ -primarily used in sway/i3, vim (c/c++), & other generic computing activities. +a simple 34-key layout that makes use of 2 (primary) layers, home-row mods, & combos for many symbols. +mostly used in sway, vim (c, python), & other generic computing tasks. ![layout](img/layout.svg) - -### combos -(illustrated in colored circles above)\ -[combos.h](waffle/combos.h) contains macros that allow for combos be simply defined in a `combos.def` file as -``` -CMB(, , ) -``` - -### oled -[font file](waffle/oledfont.h) can be viewed and modified at [qmk logo editor](https://joric.github.io/qle)\ -all the boring animation code is stored in [oled.h](waffle/oled.h) - -**animations:**\ -[bongo cat](https://github.com/waffle87/qmk.me/blob/master/waffle/oled.c#L151-#L168)\ -[felix the dog](https://github.com/waffle87/qmk.me/blob/master/waffle/oled.c#L128-#L149)\ -![sit](img/sit.png) ![walk](img/walk.png) ![run](img/run.png) ![bark](img/bark.png) ![sneak](img/sneak.png)\ -[layer animation](https://github.com/waffle87/qmk.me/blob/master/waffle/oled.c#L203-#L226)\ -![num](img/num.png)\ -![sym](img/sym.png)\ -![sys](img/sys.png)\ -[wpm graph](https://github.com/waffle87/qmk.me/blob/master/waffle/oled.c#L170-#L201)\ -![gif](img/wpm_graph.gif) - -the below snippet is used to render the big byte arrays used by animations. -where `size` is the array size and `action` is the animation frame name. -```c -void anim_frame(uint16_t size, char const action[][size]) { - static uint8_t current_frame = 0; - current_frame = (current_frame + 1) & 1; - oled_write_raw_P(action[current_frame], size); -} -``` -**custom timeout:**\ -some animations don't respect `OLED_TIMEOUT`, so a custom timeout from [drashna](https://github.com/qmk/qmk_firmware/blob/master/users/drashna/oled/oled_stuff.c) can be used. -(this depends on `OLED_DISABLE_TIMEOUT` & `SPLIT_OLED_ENABLE` being defined) -```c -uint32_t oled_timer = 0; - -bool oled_task_user(void) { - if (is_keyboard_master()) { - if (timer_elapsed32(oled_timer) > 180000) { //turn off after 3min - oled_off(); - return false; - } else - oled_on(); - } - if (!oled_task_keymap()) - return false; - return false; -} - -void oled_timer_reset(void) { - oled_timer = timer_read32(); -} -``` -`oled_timer_reset()` just needs to be called from `process_record_user()`: -```c -if (record->event.pressed) - oled_timer_reset(); -``` -the above snippet is also neat because global oled behavior can be placed in `oled_task_user`, -while keyboard specific oled code, like rendering certain things, can go in `oled_task_keymap`. - -### raw hid -data is stored in a [typedef](https://github.com/waffle87/qmk.me/blob/master/waffle/waffle.h#L11-#L16) and [assigned](https://github.com/waffle87/qmk.me/blob/master/waffle/waffle.c#L7-#L11) when info is sent by the host.\ -[raw.py](waffle/raw.py) is a basic implementation modified from [rawhid in python](https://gist.github.com/fauxpark/03a3efcc7dbdfbfe57791ea267b13c55). -renders current time on oled display: -```c -void host_info(uint8_t data) { - char buffer[3]; - oled_write_P((char*)itoa(data, buffer, 10), false); -} - -void render_time(void) { - if (user_state.hour < 10) - oled_write_P(PSTR("0"), false); - host_info(user_state.hour); - oled_write_P(PSTR(":"), false); - if (user_state.min < 10) - oled_write_P(PSTR("0"), false); - host_info(user_state.min); -} -``` -### tap dances & custom keycodes -macro to help circumvent mod-tap/16-bit keycode limitation: -```c -#define INTERCEPT_MOD_TAP(mod, keycode) \ -case mod(keycode): \ - if (record->tap.count && record->event.pressed) { \ - tap_code16(keycode); \ - return false; \ - } \ - break; \ - -``` -which can be called from `process_record_user` as `INTERCEPT_MOD_TAP(LALT_T, KC_EXLM)` for example. - -| keycode | action (single/double/triple tap) | -| :------------: | :-------------------------------------------------: | -| `DEG_0` | 0 / ° | -| `PNP` | play/pause / skip / prev | -| `SRCH_PST_RSE` | paste (term) / search (term) / layer 2 (hold) | -| `QSPC` | 1 space / 4 spaces (useful for code outside editor) | -| `UPDIR` | ../ | -| `RWORD` | outputs a random word ([dict.h](https://raw.githubusercontent.com/qmk/qmk_firmware/master/users/ridingqwerty/dict.h)) | - -### misc -#### gentoo -mostly ensure following packages are built with `multilib` & `nano` USE flags. -```sh -# /etc/portage/package.use/cross-arm-none-eabi -cross-arm-none-eabi/binutils multilib -cross-arm-none-eabi/gcc -openmp -fortran -hardened -sanitize -vtv -selinux -boundschecking -d -gcj -gtk -libffi -mudflap -objc -objc++ -objc-gc -fortran -go -jit -cxx -mpx -openmp -sanitize -vtv multilib -cross-arm-none-eabi/newlib -selinux -libraries multilib nano -``` -additionally, if any sort of optimization is enabled (eg. O3), `_FORTIFY_SOURCE` is enabled for unknown reason. (see [`gentoo/01_all_default-fortify-source.patch`](https://gitweb.gentoo.org/proj/gcc-patches.git/tree/11.3.0/gentoo/01_all_default-fortify-source.patch))\ -which subsequently defines `__SSP_FORTIFY_LEVEL` and clashes with [qmk's printf](https://github.com/qmk/printf/tree/master) library: -```c -#if __SSP_FORTIFY_LEVEL > 0 -#include -#endif -``` -so following workaround can be used: -```make -ifneq ($(findstring Gentoo, $(shell arm-none-eabi-gcc --version)),) - EXTRAFLAGS += -U_FORTIFY_SOURCE -endif -``` - -### some keyboards -[crkbd](keymaps/crkbd)\ -[kyria](keymaps/kyria)\ -[ferris](keymaps/ferris)\ -[microdox](keymaps/microdox)\ -[relic](keyboards/relic)\ -[vault35](keyboards/vault35)\ -[bully](keyboards/bully)\ -[torn-ish](keyboards/tornish)\ -[xyz60](keyboards/xyz60)\ -[f60](kemaps/f60)\ -[minidox](keyboards/minidox)\ -[leftover30](keyboards/leftover30) diff --git a/util/keymap.yaml b/util/keymap.yaml new file mode 100644 index 0000000..c9d489d --- /dev/null +++ b/util/keymap.yaml @@ -0,0 +1,68 @@ +layout: + qmk_keyboard: corne_rotated + qmk_layout: LAYOUT_split_3x5_3 +layers: + BASE: + - [Q, W, E, R, T, Y, U, I, O, P] + - [ + {h: $$mdi:apple-keyboard-option$$, t: A}, + {h: $$mdi:apple-keyboard-command$$, t: S}, + {h: $$mdi:apple-keyboard-control$$, t: D}, + {h: $$mdi:apple-keyboard-shift$$, t: F}, + G, H, + {h: $$mdi:apple-keyboard-shift$$, t: J}, + {h: $$mdi:apple-keyboard-control$$, t: K}, + {h: $$mdi:apple-keyboard-command$$, t: L}, + {h: $$mdi:apple-keyboard-option$$, t: ;} + ] + - [Z, X, C, V, B, N, M, {t: ",", s: "<"}, {t: ., s: ">"}, {t: /, s: "?"}] + - {t: "../", type: ghost} + - {h: LWR, t: Esc, type: held} + - {t: $$mdi:keyboard-space$$ } + - {t: $$mdi:backspace-outline$$} + - {h: RSE, t: $$mdi:content-paste$$, type: held} + - {t: $$mdi:play-pause$$, type: ghost} + LOWER: + - [1,2,3,4,5,6,7,8,9,0] + - ["!", "@", "#", "$", "%", "^", "&", "*", "(", ")"] + - [ + $$mdi:volume-minus$$, + $$mdi:keyboard-tab$$, + $$mdi:apple-keyboard-caps$$, + "Del Wrd", {t: "`", s: "~"}, + $$mdi:arrow-left$$, + $$mdi:arrow-down$$, + $$mdi:arrow-up$$, + $$mdi:arrow-right$$, + $$mdi:volume-plus$$ + ] + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + RAISE: + - ["RGB Togg", "Mode +", "Hue +", "Sat +", "Val +", "No Mode", "Fancy", "Block", "Reg Indic", "Make"] + - ["Audio Togg", "Mode -", "Hue -", "Sat -", "Val -", "Wide", "Upside Down", "Zalgo", "Tiny", "Reset"] + - [F1, F2, F3, F4, F5, F6, F7, F8, F9, F10] + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} + - {t: ▽, type: trans} +combos: + - {p: [2, 3], 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: "Ent", 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: [16, 17], k: "_", l: ["BASE"]} + - {p: [17, 18], k: "-", l: ["BASE"]} diff --git a/waffle/combos.def b/waffle/combos.def index b20c3a8..a1417a2 100644 --- a/waffle/combos.def +++ b/waffle/combos.def @@ -2,13 +2,15 @@ // SPDX-License-Identifier: GPL-2.0-or-later // name output keys -CMB(ru_ent, KC_ENT, KC_R, KC_U) -CMB(dk_eql, KC_EQL, LCTL_T(KC_D), RCTL_T(KC_K)) -CMB(gh_quot, TD(QUOT_DQUO), KC_G, KC_H) -CMB(ty_coln, KC_COLN, KC_T, KC_Y) -CMB(bn_unds, KC_UNDS, KC_B, KC_N) -CMB(er_cbkt, TD(CURLY_BRACKET), KC_E, KC_R) -CMB(ui_brkt, TD(SQR_BRACKET), KC_U, KC_I) -CMB(ccom_plus, KC_PLUS, KC_C, KC_COMM) -CMB(ei_bsls, TD(BSLS_PIPE), KC_E, KC_I) -CMB(vm_mins, TD(EM_DASH_MINS), KC_V, KC_M) +CMB(fg_coln, KC_COLN, 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_ent, KC_ENT, KC_I, KC_O) +CMB(sd_eql, KC_EQL, LGUI_T(KC_S), LCTL_T(KC_D)) +CMB(df_plus, KC_PLUS, 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_unds, KC_UNDS, RSFT_T(KC_J), RCTL_T(KC_K)) +CMB(kl_mins, TD(EM_DASH_MINS), RCTL_T(KC_K), RGUI_T(KC_L)) diff --git a/waffle/tapping.c b/waffle/tapping.c index 50fea91..0a01637 100644 --- a/waffle/tapping.c +++ b/waffle/tapping.c @@ -21,13 +21,10 @@ uint16_t get_tapping_term(uint16_t keycode, keyrecord_t *record) { case ESCLWR: case RSEBSP: return TAPPING_TERM - SPC_OFFSET; - case TD(QMK_LINKS): case TD(EM_DASH_MINS): case TD(PLY_NXT_PRV): case TD(CURLY_BRACKET): case TD(SQR_BRACKET): - case TD(BSLS_PIPE): - case TD(QUOT_DQUO): return TAPPING_TERM + 60; default: return TAPPING_TERM; @@ -39,28 +36,13 @@ void td_reset(tap_dance_state_t *state, void *user_data) { layer_clear(); } -void qmk_links(tap_dance_state_t *state, void *user_data) { - if (state->count == 1) { - tap_code16(C(KC_T)); - send_string(qmkstr); - tap_code(KC_ENT); - } else { - tap_code16(C(KC_T)); - send_string(confstr); - tap_code(KC_ENT); - } -} - void em_dash_mins(tap_dance_state_t *state, void *user_data) { switch (state->count) { - case 3: + case 2: #ifdef UNICODE_COMMON_ENABLE register_unicode(0x2014); // — #endif break; - case 2: - tap_code(KC_MINS), tap_code(KC_MINS); - break; default: tap_code(KC_MINS); } @@ -88,14 +70,11 @@ void raise_paste(tap_dance_state_t *state, void *user_data) { } tap_dance_action_t tap_dance_actions[] = { - [QMK_LINKS] = ACTION_TAP_DANCE_FN(qmk_links), [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), - [BSLS_PIPE] = ACTION_TAP_DANCE_DOUBLE(KC_BSLS, KC_PIPE), - [QUOT_DQUO] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_DQUO), }; bool process_record_user(uint16_t keycode, keyrecord_t *record) { @@ -120,10 +99,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { SEND_STRING("\b```suggestion\n```"); } break; - case REMOVE: - if (record->event.pressed) - SEND_STRING("This file should be removed."); - break; INTERCEPT_MOD_TAP(LALT_T, KC_EXLM) INTERCEPT_MOD_TAP(LGUI_T, KC_AT) INTERCEPT_MOD_TAP(LCTL_T, KC_HASH) diff --git a/waffle/waffle.h b/waffle/waffle.h index 5694ca3..3f5b9ba 100644 --- a/waffle/waffle.h +++ b/waffle/waffle.h @@ -18,20 +18,16 @@ typedef struct user_config { enum layers { _BASE, _LOWER, _RAISE, _ADJUST }; enum tapdances { - QMK_LINKS, EM_DASH_MINS, PLY_NXT_PRV, RAISE_PASTE, CURLY_BRACKET, - SQR_BRACKET, - BSLS_PIPE, - QUOT_DQUO + SQR_BRACKET }; enum custom_keycodes { UPDIR = QK_USER, NUKE, - REMOVE, TABLE1, TABLE2, KC_NOMODE, @@ -60,9 +56,8 @@ enum unicode_mode { }; #endif -#define LINKS TD(QMK_LINKS) #define PNP TD(PLY_NXT_PRV) -#define RSEPST TD(RAISE_PASTE) +#define PSTRSE TD(RAISE_PASTE) #define ESCLWR LT(_LOWER, KC_ESC) #define LWRSPC LT(_LOWER, KC_SPC) #define RSEBSP LT(_RAISE, KC_BSPC) @@ -73,11 +68,11 @@ enum unicode_mode { #define ___BASE1___ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P #define ___BASE2___ HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN) #define ___BASE3___ KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH -#define ___BASE4___ UPDIR, ESCLWR, KC_SPC, KC_BSPC, RSEPST, PNP +#define ___BASE4___ UPDIR, ESCLWR, KC_SPC, KC_BSPC, PSTRSE, PNP #define ___LOWER1___ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0 #define ___LOWER2___ HRML(KC_EXLM, KC_AT, KC_HASH, KC_DLR), KC_PERC, KC_CIRC, HRMR(KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN) -#define ___LOWER3___ KC_VOLD, KC_TAB, KC_CAPS, KC_TILD, KC_GRV, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU +#define ___LOWER3___ KC_VOLD, KC_TAB, KC_CAPS, C(KC_BSPC), KC_GRV, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU #define ___LOWER4___ _______, _______, _______, _______, _______, _______ #define ___RAISE1___ RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NOMODE, KC_SCRIPT, KC_BLOCKS, KC_REGIONAL, QK_MAKE -- cgit v1.2.3