diff options
author | jack <[email protected]> | 2023-01-16 15:06:35 -0700 |
---|---|---|
committer | jack <[email protected]> | 2023-01-16 15:06:35 -0700 |
commit | 5501305c71e43d7a089655c71fde9778fa7f3a1e (patch) | |
tree | eacba9118334c261785b30c05553c0fee258a9e7 | |
parent | 1227a32f52e993b024e0887cf39732297fb99e55 (diff) | |
download | qmk_me-5501305c71e43d7a089655c71fde9778fa7f3a1e.tar.gz qmk_me-5501305c71e43d7a089655c71fde9778fa7f3a1e.zip |
`KC_TRNS` -> `_______`
readme fixes
misc
-rw-r--r-- | keyboards/bully/keymaps/waffle/keymap.c | 16 | ||||
-rw-r--r-- | keyboards/leftover30/keymaps/waffle/keymap.c | 2 | ||||
-rw-r--r-- | keyboards/relic/keymaps/waffle/keymap.c | 6 | ||||
-rw-r--r-- | keyboards/tornish/keymaps/default/keymap.c | 2 | ||||
-rw-r--r-- | keymaps/kyria/keymap.c | 32 | ||||
-rw-r--r-- | readme.md | 10 | ||||
-rw-r--r-- | waffle/waffle.c | 3 | ||||
-rw-r--r-- | waffle/waffle.h | 4 |
8 files changed, 38 insertions, 37 deletions
diff --git a/keyboards/bully/keymaps/waffle/keymap.c b/keyboards/bully/keymaps/waffle/keymap.c index dfcf189..a58d407 100644 --- a/keyboards/bully/keymaps/waffle/keymap.c +++ b/keyboards/bully/keymaps/waffle/keymap.c @@ -9,15 +9,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_VOLD, UPDIR, KC_ESC, LWRSPC, C(S(KC_V)), MO(_RAISE), KC_VOLU ), [_LOWER] = LAYOUT_waffle( - KC_TRNS, ___LOWER1___, KC_TRNS, - KC_TRNS, ___LOWER2___, KC_TRNS, - KC_TRNS, ___LOWER3___, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + _______, ___LOWER1___, _______, + _______, ___LOWER2___, _______, + _______, ___LOWER3___, _______, + _______, _______, _______, _______, _______, _______, _______ ), [_RAISE] = LAYOUT_waffle( - KC_TRNS, ___RAISE1___, KC_TRNS, - KC_TRNS, ___RAISE2___, KC_TRNS, - KC_TRNS, ___RAISE3___, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + _______, ___RAISE1___, _______, + _______, ___RAISE2___, _______, + _______, ___RAISE3___, _______, + _______, _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/leftover30/keymaps/waffle/keymap.c b/keyboards/leftover30/keymaps/waffle/keymap.c index b7cf496..8a8ee21 100644 --- a/keyboards/leftover30/keymaps/waffle/keymap.c +++ b/keyboards/leftover30/keymaps/waffle/keymap.c @@ -12,6 +12,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___LOWER1___, KC_DEL, ___LOWER2___, ___LOWER3___, - KC_MUTE, KC_TRNS, KC_TRNS, RGB_MOD, RGB_TOG + KC_MUTE, _______, _______, RGB_MOD, RGB_TOG ) }; diff --git a/keyboards/relic/keymaps/waffle/keymap.c b/keyboards/relic/keymaps/waffle/keymap.c index 7f9b289..a1aff3c 100644 --- a/keyboards/relic/keymaps/waffle/keymap.c +++ b/keyboards/relic/keymaps/waffle/keymap.c @@ -12,12 +12,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ___LOWER1___, QK_MAKE, ___LOWER2___, ___LOWER3___, - KC_TRNS, TABLE1, KC_TRNS, KC_TRNS, TABLE2, KC_TRNS + _______, TABLE1, _______, _______, TABLE2, _______ ), [_RAISE] = LAYOUT_waffle( - ___RAISE1___, KC_TRNS, + ___RAISE1___, _______, ___RAISE2___, ___RAISE3___, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + _______, _______, _______, _______, _______, _______ ) }; diff --git a/keyboards/tornish/keymaps/default/keymap.c b/keyboards/tornish/keymaps/default/keymap.c index 9a4e1c5..cec8c52 100644 --- a/keyboards/tornish/keymaps/default/keymap.c +++ b/keyboards/tornish/keymaps/default/keymap.c @@ -18,7 +18,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_NO, KC_1, KC_2, KC_3, KC_4, KC_5, 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_TRNS, KC_NO, KC_NO + KC_NO, _______, KC_NO, KC_NO ) }; diff --git a/keymaps/kyria/keymap.c b/keymaps/kyria/keymap.c index 7c18d95..bb5b9d4 100644 --- a/keymaps/kyria/keymap.c +++ b/keymaps/kyria/keymap.c @@ -16,27 +16,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_LOWER] = LAYOUT_stack_of_waffles( - KC_TRNS, KC_1, KC_2 , KC_3, KC_4, KC_5, - KC_TRNS, HRML(KC_EXLM, KC_AT, KC_HASH, KC_DLR), KC_PERC, - KC_TRNS, KC_TRNS, KC_TAB, KC_CAPS, KC_TILD, KC_GRV, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, H_S, KC_TRNS, + _______, KC_1, KC_2 , KC_3, KC_4, KC_5, + _______, HRML(KC_EXLM, KC_AT, KC_HASH, KC_DLR), KC_PERC, + _______, _______, KC_TAB, KC_CAPS, KC_TILD, KC_GRV, _______, _______, + _______, _______, _______, H_S, _______, - KC_6, KC_7, KC_8, KC_9, DEG0, KC_TRNS, - KC_CIRC, HRMR(KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN), KC_TRNS, - KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TRNS, KC_TRNS, - KC_TRNS, STAR, KC_TRNS, KC_TRNS, KC_TRNS + KC_6, KC_7, KC_8, KC_9, DEG0, _______, + KC_CIRC, HRMR(KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN), _______, + _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, _______, _______, + _______, STAR, _______, _______, _______ ), [_RAISE] = LAYOUT_stack_of_waffles( - KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, - KC_TRNS, KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, - KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, RWORD, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, + _______, _______, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, + _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, RWORD, _______, + _______, _______, _______, _______, _______, - KC_NOMODE, KC_SCRIPT, KC_BLOCKS, KC_REGIONAL, QK_MAKE, KC_TRNS, - KC_WIDE, KC_AUSSIE, KC_ZALGO, KC_SUPER, QK_BOOT, KC_TRNS, - KC_TRNS, KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + KC_NOMODE, KC_SCRIPT, KC_BLOCKS, KC_REGIONAL, QK_MAKE, _______, + KC_WIDE, KC_AUSSIE, KC_ZALGO, KC_SUPER, QK_BOOT, _______, + _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, + _______, _______, _______, _______, _______ ) }; @@ -15,11 +15,13 @@ qmk compile -kb relic -km waffle ``` ### layout -a simple 34-key layout that makes use of 2 (primary) layers, home-row mods, & combos for many symbols. +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. + ![layout](img/layout.svg) ### combos -(illustrated in colored circles above) +(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(<name>, <output>, <trigger keycodes>) @@ -117,7 +119,7 @@ which can be called from `process_record_user` as `INTERCEPT_MOD_TAP(LALT_T, KC_ | keycode | action (single/double/triple tap) | | :------: | :-------------------------------------------: | | `DEG_0` | 0 / ° | -| `PNP` | play/pause / skip/next / back/prev | +| `PNP` | play/pause / skip / prev | | `CLIPST` | paste (term) / search (term) / layer 2 (hold) | | `UPDIR` | ../ | | `RWORD` | outputs a random word ([dict.h](https://raw.githubusercontent.com/qmk/qmk_firmware/master/users/ridingqwerty/dict.h)) | @@ -125,7 +127,7 @@ which can be called from `process_record_user` as `INTERCEPT_MOD_TAP(LALT_T, KC_ ### 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 diff --git a/waffle/waffle.c b/waffle/waffle.c index 63754ce..938f092 100644 --- a/waffle/waffle.c +++ b/waffle/waffle.c @@ -127,9 +127,8 @@ layer_state_t layer_state_set_user(layer_state_t state) { pointing_device_set_cpi(1024); #endif } - break; } - return state; + return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST); } report_mouse_t pointing_device_task_user(report_mouse_t mouse_report) { diff --git a/waffle/waffle.h b/waffle/waffle.h index dbaa015..a22b55b 100644 --- a/waffle/waffle.h +++ b/waffle/waffle.h @@ -89,12 +89,12 @@ enum unicode_mode { #define ___LOWER1___ KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, DEG0 #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 ___LOWER4___ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS +#define ___LOWER4___ _______, _______, _______, _______, _______, _______ #define ___RAISE1___ RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NOMODE, KC_SCRIPT, KC_BLOCKS, KC_REGIONAL, QK_MAKE #define ___RAISE2___ CK_TOGG, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_WIDE, KC_AUSSIE, KC_ZALGO, KC_SUPER, QK_BOOT #define ___RAISE3___ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10 -#define ___RAISE4___ KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS +#define ___RAISE4___ _______, _______, _______, _______, _______, _______ #define LAYOUT_waffle_60_ts(...) LAYOUT_60_ansi_tsangan(__VA_ARGS__) #define LAYOUT_stack_of_waffles(...) LAYOUT_stack(__VA_ARGS__) |