diff options
author | Jack Sangdahl <[email protected]> | 2024-12-20 12:37:07 -0700 |
---|---|---|
committer | Jack Sangdahl <[email protected]> | 2024-12-20 12:37:07 -0700 |
commit | 42fc0e65c572ff1cb258ec750a45d34ee5ba0049 (patch) | |
tree | 0304734cef75ee49181d2ff5c0e3edb182940972 | |
parent | 2ef7a462a119dd9365a72092fc5d7a4b5fb04de2 (diff) | |
download | qmk_me-42fc0e65c572ff1cb258ec750a45d34ee5ba0049.tar.gz qmk_me-42fc0e65c572ff1cb258ec750a45d34ee5ba0049.zip |
Renaming and moving keymaps around
-rw-r--r-- | jack/autocorrect_data.h (renamed from waffle/autocorrect_data.h) | 0 | ||||
-rw-r--r-- | jack/autocorrect_dict.txt (renamed from waffle/autocorrect_dict.txt) | 0 | ||||
-rw-r--r-- | jack/color.c (renamed from waffle/color.c) | 0 | ||||
-rw-r--r-- | jack/combos.def (renamed from waffle/combos.def) | 0 | ||||
-rw-r--r-- | jack/combos.h (renamed from waffle/combos.h) | 0 | ||||
-rw-r--r-- | jack/config.h (renamed from waffle/config.h) | 2 | ||||
-rw-r--r-- | jack/dict.h (renamed from waffle/dict.h) | 0 | ||||
-rw-r--r-- | jack/jack.c (renamed from waffle/waffle.c) | 2 | ||||
-rw-r--r-- | jack/jack.h (renamed from waffle/waffle.h) | 17 | ||||
-rw-r--r-- | jack/oled.c (renamed from waffle/oled.c) | 2 | ||||
-rw-r--r-- | jack/oled.h (renamed from waffle/oled.h) | 0 | ||||
-rw-r--r-- | jack/oledfont.h (renamed from waffle/oledfont.h) | 0 | ||||
-rw-r--r-- | jack/raw.py (renamed from waffle/raw.py) | 0 | ||||
-rw-r--r-- | jack/rules.mk (renamed from waffle/rules.mk) | 2 | ||||
-rw-r--r-- | jack/tapping.c (renamed from waffle/tapping.c) | 2 | ||||
-rw-r--r-- | jack/unicode.c (renamed from waffle/unicode.c) | 2 | ||||
-rw-r--r-- | keyboards/grumpy/keymaps/jack/keymap.c (renamed from keyboards/grumpy/keymaps/waffle/keymap.c) | 2 | ||||
-rw-r--r-- | keyboards/leftover30/keymaps/jack/keymap.c (renamed from keyboards/leftover30/keymaps/waffle/keymap.c) | 8 | ||||
-rw-r--r-- | keyboards/locus/keymaps/jack/keymap.c (renamed from keyboards/locus/keymaps/waffle/keymap.c) | 8 | ||||
-rw-r--r-- | keyboards/relic/keyboard.json | 60 | ||||
-rw-r--r-- | keyboards/sweep/keymaps/jack/keymap.c (renamed from keyboards/sweep/keymaps/waffle/keymap.c) | 8 | ||||
-rw-r--r-- | keyboards/tornish/keymaps/default/keymap.c | 12 | ||||
-rw-r--r-- | keyboards/vault35/keyboard.json | 72 | ||||
-rw-r--r-- | keyboards/vault35/keymaps/waffle/keymap.c | 26 | ||||
-rw-r--r-- | keyboards/xyz60/keymaps/jack/keymap.c (renamed from keyboards/xyz60/keymaps/waffle/keymap.c) | 8 | ||||
-rw-r--r-- | keymaps/bully/keymap.c | 14 | ||||
-rw-r--r-- | keymaps/crkbd/config.h | 1 | ||||
-rw-r--r-- | keymaps/crkbd/keymap.c | 26 | ||||
-rw-r--r-- | keymaps/f60/keymap.c | 8 | ||||
-rw-r--r-- | keymaps/ferris/keymap.c | 12 | ||||
-rw-r--r-- | keymaps/kyria/keymap.c | 18 | ||||
-rw-r--r-- | keymaps/relic/keymap.c (renamed from keyboards/relic/keymaps/waffle/keymap.c) | 14 | ||||
-rw-r--r-- | keymaps/relic/readme.md (renamed from keyboards/relic/readme.md) | 0 | ||||
-rw-r--r-- | keymaps/the_q/config.h | 7 | ||||
-rw-r--r-- | keymaps/the_q/keymap.c | 43 | ||||
-rw-r--r-- | keymaps/the_q/rules.mk | 1 | ||||
-rw-r--r-- | keymaps/vault35/config.h | 16 | ||||
-rw-r--r-- | keymaps/vault35/keymap.c | 26 | ||||
-rw-r--r-- | keymaps/vault35/readme.md (renamed from keyboards/vault35/readme.md) | 0 | ||||
-rw-r--r-- | keymaps/vault35/rules.mk | 2 | ||||
-rw-r--r-- | readme.md | 6 | ||||
-rwxr-xr-x | util/link.sh | 12 |
42 files changed, 142 insertions, 297 deletions
diff --git a/waffle/autocorrect_data.h b/jack/autocorrect_data.h index f9d6352..f9d6352 100644 --- a/waffle/autocorrect_data.h +++ b/jack/autocorrect_data.h diff --git a/waffle/autocorrect_dict.txt b/jack/autocorrect_dict.txt index 135bb64..135bb64 100644 --- a/waffle/autocorrect_dict.txt +++ b/jack/autocorrect_dict.txt diff --git a/waffle/color.c b/jack/color.c index 4d833f3..4d833f3 100644 --- a/waffle/color.c +++ b/jack/color.c diff --git a/waffle/combos.def b/jack/combos.def index 53934f1..53934f1 100644 --- a/waffle/combos.def +++ b/jack/combos.def diff --git a/waffle/combos.h b/jack/combos.h index 27e7a7c..27e7a7c 100644 --- a/waffle/combos.h +++ b/jack/combos.h diff --git a/waffle/config.h b/jack/config.h index a9178ac..2b47028 100644 --- a/waffle/config.h +++ b/jack/config.h @@ -14,7 +14,7 @@ #define MANUFACTURER "jacks" #ifdef OLED_ENABLE -#define OLED_FONT_H "users/waffle/oledfont.h" +#define OLED_FONT_H "users/jack/oledfont.h" #define OLED_UPDATE_INTERVAL 50 #define OLED_DISABLE_TIMEOUT #endif diff --git a/waffle/dict.h b/jack/dict.h index c7a27f4..c7a27f4 100644 --- a/waffle/dict.h +++ b/jack/dict.h diff --git a/waffle/waffle.c b/jack/jack.c index b48eec6..b876fb1 100644 --- a/waffle/waffle.c +++ b/jack/jack.c @@ -1,6 +1,6 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later -#include "waffle.h" +#include "jack.h" #include "combos.h" tap_dance_action_t tap_dance_actions[] = { diff --git a/waffle/waffle.h b/jack/jack.h index d0416f2..742b6d1 100644 --- a/waffle/waffle.h +++ b/jack/jack.h @@ -78,6 +78,16 @@ void raise_paste(tap_dance_state_t *state, void *user_data); #define XRGB_SAD UG_SATD #define XRGB_VAI UG_VALU #define XRGB_VAD UG_VALD +#else +#define XRGB_TOG _______ +#define XRGB_NXT _______ +#define XRGB_PRV _______ +#define XRGB_HUI _______ +#define XRGB_HUD _______ +#define XRGB_SAI _______ +#define XRGB_SAD _______ +#define XRGB_VAI _______ +#define XRGB_VAD _______ #endif // clang-format off @@ -97,6 +107,7 @@ void raise_paste(tap_dance_state_t *state, void *user_data); #define ___RAISE4___ _______, RWORD, _______, _______, _______, _______ // clang-format on -#define LAYOUT_waffle_60_ts(...) LAYOUT_60_ansi_tsangan(__VA_ARGS__) -#define LAYOUT_waffle_3x6(...) LAYOUT_split_3x6_3(__VA_ARGS__) -#define LAYOUT_waffle(...) LAYOUT(__VA_ARGS__) +#define LAYOUT_jack_60_ts(...) LAYOUT_60_ansi_tsangan(__VA_ARGS__) +#define LAYOUT_jack_3x6(...) LAYOUT_split_3x6_3(__VA_ARGS__) +#define LAYOUT_jack_all(...) LAYOUT_all(__VA_ARGS__) +#define LAYOUT_jack(...) LAYOUT(__VA_ARGS__) diff --git a/waffle/oled.c b/jack/oled.c index d8a618c..7b975e0 100644 --- a/waffle/oled.c +++ b/jack/oled.c @@ -1,7 +1,7 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later #include "oled.h" -#include "waffle.h" +#include "jack.h" uint32_t oled_timer = 0; char keylog_str[KEYLOG_LEN + 1] = {0}; diff --git a/waffle/oled.h b/jack/oled.h index 6e33143..6e33143 100644 --- a/waffle/oled.h +++ b/jack/oled.h diff --git a/waffle/oledfont.h b/jack/oledfont.h index 209f143..209f143 100644 --- a/waffle/oledfont.h +++ b/jack/oledfont.h diff --git a/waffle/raw.py b/jack/raw.py index 994a92c..994a92c 100644 --- a/waffle/raw.py +++ b/jack/raw.py diff --git a/waffle/rules.mk b/jack/rules.mk index 3f7e9e6..f75ba4d 100644 --- a/waffle/rules.mk +++ b/jack/rules.mk @@ -12,7 +12,7 @@ AUTOCORRECT_ENABLE = yes MOUSE_JIGGLE_ENABLE = yes DEBOUNCE_TYPE = asym_eager_defer_pk AVR_CFLAGS += -mrelax -INTROSPECTION_KEYMAP_C = waffle.c +INTROSPECTION_KEYMAP_C = jack.c SRC += tapping.c diff --git a/waffle/tapping.c b/jack/tapping.c index c4351ec..91690d5 100644 --- a/waffle/tapping.c +++ b/jack/tapping.c @@ -1,6 +1,6 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later -#include "waffle.h" +#include "jack.h" #ifdef RANDWORD #include "dict.h" uint16_t word = 0; diff --git a/waffle/unicode.c b/jack/unicode.c index 36dd53d..74c0ccc 100644 --- a/waffle/unicode.c +++ b/jack/unicode.c @@ -1,6 +1,6 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later -#include "waffle.h" +#include "jack.h" uint8_t typing_mode = NOMODE; typedef uint32_t (*translator_function_t)(bool is_shifted, uint32_t keycode); diff --git a/keyboards/grumpy/keymaps/waffle/keymap.c b/keyboards/grumpy/keymaps/jack/keymap.c index 3829c57..1f6d0ad 100644 --- a/keyboards/grumpy/keymaps/waffle/keymap.c +++ b/keyboards/grumpy/keymaps/jack/keymap.c @@ -1,6 +1,6 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later -#include "waffle.h" +#include "jack.h" // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { diff --git a/keyboards/leftover30/keymaps/waffle/keymap.c b/keyboards/leftover30/keymaps/jack/keymap.c index d50aa83..066d6d3 100644 --- a/keyboards/leftover30/keymaps/waffle/keymap.c +++ b/keyboards/leftover30/keymaps/jack/keymap.c @@ -1,16 +1,16 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later -#include "waffle.h" +#include "jack.h" // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_waffle( + [_BASE] = LAYOUT_jack( ___BASE1___, KC_BSPC, ___BASE2___, ___BASE3___, - KC_MPLY, KC_NO, LWRSPC, C(S(KC_V)), RWORD + KC_MPLY, XXXXXXX, LWRSPC, C(S(KC_V)), RWORD ), - [_LOWER] = LAYOUT_waffle( + [_LOWER] = LAYOUT_jack( ___LOWER1___, KC_DEL, ___LOWER2___, ___LOWER3___, diff --git a/keyboards/locus/keymaps/waffle/keymap.c b/keyboards/locus/keymaps/jack/keymap.c index e3ec74b..0779bc5 100644 --- a/keyboards/locus/keymaps/waffle/keymap.c +++ b/keyboards/locus/keymaps/jack/keymap.c @@ -1,22 +1,22 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later -#include "waffle.h" +#include "jack.h" // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_waffle( + [_BASE] = LAYOUT_jack( _______, ___BASE1___, _______, _______, ___BASE2___, _______, ___BASE3___, UPDIR, KC_ESC, LWRSPC, RSEBSP, C(S(KC_V)), PNP ), - [_LOWER] = LAYOUT_waffle( + [_LOWER] = LAYOUT_jack( _______, ___LOWER1___, _______, _______, ___LOWER2___, _______, ___LOWER3___, _______, _______, _______, _______, _______, _______ ), - [_RAISE] = LAYOUT_waffle( + [_RAISE] = LAYOUT_jack( _______, ___RAISE1___, _______, _______, ___RAISE2___, _______, ___RAISE3___, diff --git a/keyboards/relic/keyboard.json b/keyboards/relic/keyboard.json deleted file mode 100644 index 00fd1ee..0000000 --- a/keyboards/relic/keyboard.json +++ /dev/null @@ -1,60 +0,0 @@ -{ - "keyboard_name": "relic", - "manufacturer": "jacks", - "maintainer": "pngu.org", - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "diode_direction": "COL2ROW", - "matrix_pins": { - "cols": ["D3", "D5", "B0", "F0", "F1", "F4", "F5", "F6", "C7", "C6", "B4"], - "rows": ["D7", "B2", "B6", "B5"] - }, - "usb": { - "vid": "0x6A73", - "pid": "0x7263", - "device_version": "1.0.0" - }, - "layouts": { - "LAYOUT": { - "layout": [ - {"label": "q", "matrix": [0, 0], "x": 0, "y": 0}, - {"label": "w", "matrix": [0, 1], "x": 1, "y": 0}, - {"label": "e", "matrix": [0, 2], "x": 2, "y": 0}, - {"label": "r", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "t", "matrix": [0, 4], "x": 4, "y": 0}, - {"label": "y", "matrix": [0, 5], "x": 6, "y": 0}, - {"label": "u", "matrix": [0, 6], "x": 7, "y": 0}, - {"label": "i", "matrix": [0, 7], "x": 8, "y": 0}, - {"label": "o", "matrix": [0, 8], "x": 9, "y": 0}, - {"label": "p", "matrix": [0, 9], "x": 10, "y": 0}, - {"label": "", "matrix": [0, 10], "x": 11, "y": 0}, - {"label": "a", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, - {"label": "s", "matrix": [1, 1], "x": 1.25, "y": 1}, - {"label": "d", "matrix": [1, 2], "x": 2.25, "y": 1}, - {"label": "f", "matrix": [1, 3], "x": 3.25, "y": 1}, - {"label": "g", "matrix": [1, 4], "x": 4.25, "y": 1}, - {"label": "h", "matrix": [1, 5], "x": 6.25, "y": 1}, - {"label": "j", "matrix": [1, 6], "x": 7.25, "y": 1}, - {"label": "k", "matrix": [1, 7], "x": 8.25, "y": 1}, - {"label": "l", "matrix": [1, 8], "x": 9.25, "y": 1}, - {"label": ";", "matrix": [1, 9], "x": 10.25, "y": 1, "w": 1.75}, - {"label": "z", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"label": "x", "matrix": [2, 1], "x": 1.75, "y": 2}, - {"label": "c", "matrix": [2, 2], "x": 2.75, "y": 2}, - {"label": "v", "matrix": [2, 3], "x": 3.75, "y": 2}, - {"label": "b", "matrix": [2, 4], "x": 4.75, "y": 2}, - {"label": "n", "matrix": [2, 5], "x": 6.75, "y": 2}, - {"label": "m", "matrix": [2, 6], "x": 7.75, "y": 2}, - {"label": ",", "matrix": [2, 7], "x": 8.75, "y": 2}, - {"label": ".", "matrix": [2, 8], "x": 9.75, "y": 2}, - {"label": "/", "matrix": [2, 9], "x": 10.75, "y": 2, "w": 1.25}, - {"label": "", "matrix": [3, 0], "x": 0.25, "y": 3, "w": 1.25}, - {"label": "esc", "matrix": [3, 1], "x": 1.5, "y": 3, "w": 1.25}, - {"label": "spc", "matrix": [3, 4], "x": 2.75, "y": 3, "w": 3}, - {"label": "bspc", "matrix": [3, 6], "x": 5.75, "y": 3, "w": 3}, - {"label": "", "matrix": [3, 8], "x": 8.75, "y": 3, "w": 1.25}, - {"label": "", "matrix": [3, 9], "x": 10, "y": 3, "w": 1.25} - ] - } - } -} diff --git a/keyboards/sweep/keymaps/waffle/keymap.c b/keyboards/sweep/keymaps/jack/keymap.c index f9bab6b..d505967 100644 --- a/keyboards/sweep/keymaps/waffle/keymap.c +++ b/keyboards/sweep/keymaps/jack/keymap.c @@ -1,22 +1,22 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later -#include "waffle.h" +#include "jack.h" // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_waffle( + [_BASE] = LAYOUT_jack( ___BASE1___, ___BASE2___, ___BASE3___, ESCLWR, KC_SPC, KC_BSPC, PSTRSE ), - [_LOWER] = LAYOUT_waffle( + [_LOWER] = LAYOUT_jack( ___LOWER1___, ___LOWER2___, ___LOWER3___, KC_TRNS, KC_TRNS, KC_TRNS, PNP ), - [_RAISE] = LAYOUT_waffle( + [_RAISE] = LAYOUT_jack( ___RAISE1___, ___RAISE2___, ___RAISE3___, diff --git a/keyboards/tornish/keymaps/default/keymap.c b/keyboards/tornish/keymaps/default/keymap.c index b3e22f8..aeb2df2 100644 --- a/keyboards/tornish/keymaps/default/keymap.c +++ b/keyboards/tornish/keymaps/default/keymap.c @@ -9,14 +9,14 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( DAY, KC_Q, KC_W, KC_E, KC_R, KC_T, CLEAR, KC_A, KC_S, KC_D, KC_F, KC_G, - KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, - KC_ESC, MO(1), KC_SPC, KC_NO + XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, + KC_ESC, MO(1), KC_SPC, XXXXXXX ), [1] = LAYOUT( - 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_NO, KC_NO + XXXXXXX, KC_1, KC_2, KC_3, KC_4, KC_5, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, + XXXXXXX, _______, XXXXXXX, XXXXXXX ) }; // clang-format on diff --git a/keyboards/vault35/keyboard.json b/keyboards/vault35/keyboard.json deleted file mode 100644 index 39d75c4..0000000 --- a/keyboards/vault35/keyboard.json +++ /dev/null @@ -1,72 +0,0 @@ -{ - "keyboard_name": "vault35", - "manufacturer": "jacks", - "maintainer": "pngu.org", - "processor": "atmega32u4", - "bootloader": "atmel-dfu", - "diode_direction": "COL2ROW", - "matrix_pins": { - "cols": ["B1", "D3", "F0", "F1", "F4", "F5", "F6", "F7", "C6", "B6", "B5"], - "rows": ["B4", "D4", "B0", "C7"] - }, - "usb": { - "vid": "0x6A73", - "pid": "0x3335", - "device_version": "1.0.0" - }, - "features": { "rgblight": true }, - "ws2812": { "pin": "D5" }, - "rgblight": { - "led_count": 12, - "sleep": true, - "default": { - "hue": 104, - "sat": 255, - "val": 255 - } - }, - "debounce": 8, - "layouts": { - "LAYOUT": { - "layout": [ - {"label": "q", "matrix": [0, 0], "x": 0, "y": 0}, - {"label": "w", "matrix": [0, 1], "x": 1, "y": 0}, - {"label": "e", "matrix": [0, 2], "x": 2, "y": 0}, - {"label": "r", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "t", "matrix": [0, 4], "x": 4, "y": 0}, - {"label": "y", "matrix": [0, 5], "x": 5, "y": 0}, - {"label": "u", "matrix": [0, 6], "x": 6, "y": 0}, - {"label": "i", "matrix": [0, 7], "x": 7, "y": 0}, - {"label": "o", "matrix": [0, 8], "x": 8, "y": 0}, - {"label": "p", "matrix": [0, 9], "x": 9, "y": 0}, - {"label": "", "matrix": [0, 10], "x": 10, "y": 0}, - {"label": "a", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.25}, - {"label": "s", "matrix": [1, 1], "x": 1.25, "y": 1}, - {"label": "d", "matrix": [1, 2], "x": 2.25, "y": 1}, - {"label": "f", "matrix": [1, 3], "x": 3.25, "y": 1}, - {"label": "g", "matrix": [1, 4], "x": 4.25, "y": 1}, - {"label": "h", "matrix": [1, 5], "x": 5.25, "y": 1}, - {"label": "j", "matrix": [1, 6], "x": 6.25, "y": 1}, - {"label": "k", "matrix": [1, 7], "x": 7.25, "y": 1}, - {"label": "l", "matrix": [1, 8], "x": 8.25, "y": 1}, - {"label": ";", "matrix": [1, 9], "x": 9.25, "y": 1, "w": 1.75}, - {"label": "z", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"label": "x", "matrix": [2, 1], "x": 1.75, "y": 2}, - {"label": "c", "matrix": [2, 2], "x": 2.75, "y": 2}, - {"label": "v", "matrix": [2, 3], "x": 3.75, "y": 2}, - {"label": "b", "matrix": [2, 4], "x": 4.75, "y": 2}, - {"label": "n", "matrix": [2, 5], "x": 5.75, "y": 2}, - {"label": "m", "matrix": [2, 6], "x": 6.75, "y": 2}, - {"label": ",", "matrix": [2, 7], "x": 7.75, "y": 2}, - {"label": ".", "matrix": [2, 8], "x": 8.75, "y": 2}, - {"label": "/", "matrix": [2, 9], "x": 9.75, "y": 2, "w": 1.25}, - {"label": "../", "matrix": [3, 1], "x": 1.5, "y": 3}, - {"label": "", "matrix": [3, 2], "x": 2.5, "y": 3, "w": 1.25}, - {"label": "spc", "matrix": [3, 3], "x": 3.75, "y": 3, "w": 1.75}, - {"label": "bspc", "matrix": [3, 5], "x": 5.5, "y": 3, "w": 1.75}, - {"label": "", "matrix": [3, 6], "x": 7.25, "y": 3, "w": 1.25}, - {"label": "", "matrix": [3, 7], "x": 8.5, "y": 3} - ] - } - } -} diff --git a/keyboards/vault35/keymaps/waffle/keymap.c b/keyboards/vault35/keymaps/waffle/keymap.c deleted file mode 100644 index bdd8946..0000000 --- a/keyboards/vault35/keymaps/waffle/keymap.c +++ /dev/null @@ -1,26 +0,0 @@ -// Copyright 2024 [email protected] -// SPDX-License-Identifier: GPL-3.0-or-later -#include "waffle.h" - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_waffle( - ___BASE1___, KC_NO, - ___BASE2___, - ___BASE3___, - UPDIR, KC_ESC, LWRSPC, RSEBSP, C(S(KC_V)), PNP - ), - [_LOWER] = LAYOUT_waffle( - ___LOWER1___, KC_NO, - ___LOWER2___, - ___LOWER3___, - ___LOWER4___ - ), - [_RAISE] = LAYOUT_waffle( - ___RAISE1___, KC_NO, - ___RAISE2___, - ___RAISE3___, - ___RAISE4___ - ) -}; -// clang-format on diff --git a/keyboards/xyz60/keymaps/waffle/keymap.c b/keyboards/xyz60/keymaps/jack/keymap.c index dbb3fe4..024d732 100644 --- a/keyboards/xyz60/keymaps/waffle/keymap.c +++ b/keyboards/xyz60/keymaps/jack/keymap.c @@ -1,27 +1,27 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later -#include "waffle.h" +#include "jack.h" #define ___NONE___ \ _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______ // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_waffle_60_ts( + [_BASE] = LAYOUT_jack_60_ts( _______, ___NONE___, _______, ___BASE1___, KC_BSPC, _______, PNP, _______, ___BASE2___, _______, _______, _______, ___BASE3___, _______, _______, _______, KC_ESC, LWRSPC, PSTRSE, _______, _______ ), - [_LOWER] = LAYOUT_waffle_60_ts( + [_LOWER] = LAYOUT_jack_60_ts( _______, ___NONE___, _______, ___LOWER1___, _______, _______, _______, _______, ___LOWER2___, _______, _______, _______, ___LOWER3___, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_RAISE] = LAYOUT_waffle_60_ts( + [_RAISE] = LAYOUT_jack_60_ts( _______, ___NONE___, _______, ___RAISE1___, _______, _______, _______, _______, ___RAISE2___, _______, _______, diff --git a/keymaps/bully/keymap.c b/keymaps/bully/keymap.c index a459da5..927d588 100644 --- a/keymaps/bully/keymap.c +++ b/keymaps/bully/keymap.c @@ -1,22 +1,22 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later -#include "waffle.h" +#include "jack.h" // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_waffle( - KC_NO, ___BASE1___, KC_BSPC, KC_BSPC, + [_BASE] = LAYOUT_jack( + XXXXXXX, ___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 + XXXXXXX, ___BASE3___, XXXXXXX, + KC_VOLD, UPDIR, KC_ESC, _______, LT(_LOWER, KC_SPC), _______, PSTRSE, XXXXXXX, KC_VOLU ), - [_LOWER] = LAYOUT_waffle( + [_LOWER] = LAYOUT_jack( _______, ___LOWER1___, _______, _______, _______, ___LOWER2___, _______, _______, ___LOWER3___, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_RAISE] = LAYOUT_waffle( + [_RAISE] = LAYOUT_jack( _______, ___RAISE1___, _______, _______, _______, ___RAISE2___, _______, _______, ___RAISE3___, _______, diff --git a/keymaps/crkbd/config.h b/keymaps/crkbd/config.h index db15b46..1516e0b 100644 --- a/keymaps/crkbd/config.h +++ b/keymaps/crkbd/config.h @@ -11,7 +11,6 @@ #ifdef RGB_MATRIX_ENABLE #undef WS2812_DI_PIN #define WS2812_DI_PIN B5 -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 #define WS2812_PWM_DRIVER PWMD3 #define WS2812_PWM_CHANNEL 3 #define WS2812_DMA_STREAM STM32_DMA1_STREAM3 diff --git a/keymaps/crkbd/keymap.c b/keymaps/crkbd/keymap.c index 1e8dc2f..54fd197 100644 --- a/keymaps/crkbd/keymap.c +++ b/keymaps/crkbd/keymap.c @@ -1,25 +1,25 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later -#include "waffle.h" +#include "jack.h" // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_waffle_3x6( - KC_NO, ___BASE1___, KC_NO, - KC_NO, ___BASE2___, RWORD, - KC_NO, ___BASE3___, KC_NO, + [_BASE] = LAYOUT_jack_3x6( + XXXXXXX, ___BASE1___, XXXXXXX, + XXXXXXX, ___BASE2___, RWORD, + XXXXXXX, ___BASE3___, XXXXXXX, ___BASE4___ ), - [_LOWER] = LAYOUT_waffle_3x6( - KC_NO, ___LOWER1___, KC_NO, - KC_NO, ___LOWER2___, KC_NO, - KC_NO, ___LOWER3___, KC_NO, + [_LOWER] = LAYOUT_jack_3x6( + XXXXXXX, ___LOWER1___, XXXXXXX, + XXXXXXX, ___LOWER2___, XXXXXXX, + XXXXXXX, ___LOWER3___, XXXXXXX, ___LOWER4___ ), - [_RAISE] = LAYOUT_waffle_3x6( - KC_NO, ___RAISE1___, KC_NO, - KC_NO, ___RAISE2___, KC_NO, - KC_NO, ___RAISE3___, KC_NO, + [_RAISE] = LAYOUT_jack_3x6( + XXXXXXX, ___RAISE1___, XXXXXXX, + XXXXXXX, ___RAISE2___, XXXXXXX, + XXXXXXX, ___RAISE3___, XXXXXXX, ___RAISE4___ ) }; diff --git a/keymaps/f60/keymap.c b/keymaps/f60/keymap.c index 6bca255..c730bd5 100644 --- a/keymaps/f60/keymap.c +++ b/keymaps/f60/keymap.c @@ -1,27 +1,27 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later -#include "waffle.h" +#include "jack.h" #define ___NONE___ \ _______, _______, _______, _______, _______, _______, _______, _______, \ _______, _______, _______, _______, _______ // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_waffle_60_ts( + [_BASE] = LAYOUT_jack_60_ts( _______, ___NONE___, _______, ___BASE1___, KC_BSPC, _______, PNP, _______, ___BASE2___, _______, _______, _______, ___BASE3___, _______, _______, _______, KC_ESC, LWRSPC, PSTRSE, _______, _______ ), - [_LOWER] = LAYOUT_waffle_60_ts( + [_LOWER] = LAYOUT_jack_60_ts( _______, ___NONE___, _______, ___LOWER1___, _______, _______, _______, _______, ___LOWER2___, _______, _______, _______, ___LOWER3___, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_RAISE] = LAYOUT_waffle_60_ts( + [_RAISE] = LAYOUT_jack_60_ts( _______, ___NONE___, _______, ___RAISE1___, _______, _______, _______, _______, ___RAISE2___, _______, _______, diff --git a/keymaps/ferris/keymap.c b/keymaps/ferris/keymap.c index ebb0cdf..71f2e14 100644 --- a/keymaps/ferris/keymap.c +++ b/keymaps/ferris/keymap.c @@ -1,27 +1,27 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later -#include "waffle.h" +#include "jack.h" #define XX NO_LED // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_waffle( + [_BASE] = LAYOUT_jack( ___BASE1___, ___BASE2___, ___BASE3___, ESCLWR, KC_SPC, KC_BSPC, PSTRSE ), - [_LOWER] = LAYOUT_waffle( + [_LOWER] = LAYOUT_jack( ___LOWER1___, ___LOWER2___, ___LOWER3___, - KC_NO, KC_NO, KC_NO, PNP + XXXXXXX, XXXXXXX, XXXXXXX, PNP ), - [_RAISE] = LAYOUT_waffle( + [_RAISE] = LAYOUT_jack( ___RAISE1___, ___RAISE2___, ___RAISE3___, - UPDIR, KC_NO, KC_NO, KC_NO + UPDIR, XXXXXXX, XXXXXXX, XXXXXXX ) }; diff --git a/keymaps/kyria/keymap.c b/keymaps/kyria/keymap.c index 496fd78..99b9da3 100644 --- a/keymaps/kyria/keymap.c +++ b/keymaps/kyria/keymap.c @@ -1,25 +1,25 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-2.0-or-later -#include "waffle.h" +#include "jack.h" // clang-format off 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, 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 + [_BASE] = LAYOUT_jack( + XXXXXXX, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, XXXXXXX, + XXXXXXX, HRML(KC_A, KC_S, KC_D, KC_F), KC_G, KC_H, HRMR(KC_J, KC_K, KC_L, KC_SCLN), XXXXXXX, + XXXXXXX, KC_Z, KC_X, KC_C, KC_V, KC_B, RWORD, XXXXXXX, XXXXXXX, NUKE, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, XXXXXXX, + XXXXXXX, UPDIR, ESCLWR, KC_SPC, XXXXXXX, XXXXXXX, KC_BSPC, PSTRSE, PNP, XXXXXXX ), - [_LOWER] = LAYOUT_waffle( + [_LOWER] = LAYOUT_jack( _______, KC_1, KC_2 , KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, _______, _______, HRML(KC_EXLM, KC_AT, KC_HASH, KC_DLR), KC_PERC, KC_CIRC, HRMR(KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN), _______, _______, KC_VOLD, KC_TAB, KC_CAPS, KC_TILD, KC_GRV, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), - [_RAISE] = LAYOUT_waffle( - _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, KC_NOMODE, KC_SCRIPT, KC_BLOCKS, KC_REGIONAL, QK_MAKE, _______, + [_RAISE] = LAYOUT_jack( + _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXXMODE, 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, _______, _______, _______, _______, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/relic/keymaps/waffle/keymap.c b/keymaps/relic/keymap.c index addfce3..7f22e6f 100644 --- a/keyboards/relic/keymaps/waffle/keymap.c +++ b/keymaps/relic/keymap.c @@ -1,26 +1,26 @@ // Copyright 2024 [email protected] // SPDX-License-Identifier: GPL-3.0-or-later -#include "waffle.h" +#include "jack.h" // clang-format off const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_waffle( + [_BASE] = LAYOUT_jack_all( ___BASE1___, PNP, ___BASE2___, ___BASE3___, - KC_VOLD, KC_ESC, LWRSPC, RSEBSP, C(S(KC_V)), KC_VOLU + KC_VOLD, KC_ESC, _______, LWRSPC, _______, RSEBSP, _______, C(S(KC_V)), KC_VOLU ), - [_LOWER] = LAYOUT_waffle( + [_LOWER] = LAYOUT_jack_all( ___LOWER1___, _______, ___LOWER2___, ___LOWER3___, - _______, TABLE1, _______, _______, TABLE2, _______ + _______, TABLE1, _______, _______, _______, _______, _______, TABLE2, _______ ), - [_RAISE] = LAYOUT_waffle( + [_RAISE] = LAYOUT_jack_all( ___RAISE1___, _______, ___RAISE2___, ___RAISE3___, - _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______ ) }; // clang-format on diff --git a/keyboards/relic/readme.md b/keymaps/relic/readme.md index a8e6d47..a8e6d47 100644 --- a/keyboards/relic/readme.md +++ b/keymaps/relic/readme.md diff --git a/keymaps/the_q/config.h b/keymaps/the_q/config.h deleted file mode 100644 index 178a1ba..0000000 --- a/keymaps/the_q/config.h +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright 2024 [email protected] -// SPDX-License-Identifier: GPL-2.0-or-later -#pragma once - -#undef RGB_MATRIX_MAXIMUM_BRIGHTNESS -#define BOOTMAGIC_LITE_ROW 0 -#define BOOTMAGIC_LITE_COLUMN 1 diff --git a/keymaps/the_q/keymap.c b/keymaps/the_q/keymap.c deleted file mode 100644 index da7dfb4..0000000 --- a/keymaps/the_q/keymap.c +++ /dev/null @@ -1,43 +0,0 @@ -// Copyright 2024 [email protected] -// SPDX-License-Identifier: GPL-2.0-or-later -#include "waffle.h" - -// clang-format off -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT_waffle_3x6( - KC_NO, ___BASE1___, KC_NO, - KC_NO, ___BASE2___, KC_NO, - KC_NO, ___BASE3___, KC_NO, - ___BASE4___ - ), - [_LOWER] = LAYOUT_waffle_3x6( - KC_NO, ___LOWER1___, KC_NO, - KC_NO, ___LOWER2___, KC_NO, - KC_NO, ___LOWER3___, KC_NO, - ___LOWER4___ - ), - [_RAISE] = LAYOUT_waffle_3x6( - KC_NO, ___RAISE1___, KC_NO, - KC_NO, ___RAISE2___, KC_NO, - KC_NO, ___RAISE3___, KC_NO, - ___RAISE4___ - ) -}; -// clang-format on - -#ifdef OLED_ENABLE -oled_rotation_t oled_init_user(oled_rotation_t rotation) { - return OLED_ROTATION_270; -} - -bool oled_task_keymap(void) { - layer_status(); - oled_set_cursor(0, 3); - felix_dog(); - oled_set_cursor(0, 7); - render_wpm(); - render_keylog(); - render_mod_status(); - return false; -} -#endif // OLED_ENABLE diff --git a/keymaps/the_q/rules.mk b/keymaps/the_q/rules.mk deleted file mode 100644 index 6724291..0000000 --- a/keymaps/the_q/rules.mk +++ /dev/null @@ -1 +0,0 @@ -CONVERT_TO = blok diff --git a/keymaps/vault35/config.h b/keymaps/vault35/config.h new file mode 100644 index 0000000..392a9d4 --- /dev/null +++ b/keymaps/vault35/config.h @@ -0,0 +1,16 @@ +// Copyright 2024 [email protected] +// SPDX-License-Identifier: GPL-3.0-or-later +#pragma once + +#define RGBLIGHT_DEFAULT_HUE 104 + +#undef RGBLIGHT_MODE_ALTERNATING +#undef RGBLIGHT_MODE_BREATHING +#undef RGBLIGHT_MODE_CHRISTMAS +#undef RGBLIGHT_MODE_KNIGHT +#undef RGBLIGHT_MODE_RAINBOW_MOOD +#undef RGBLIGHT_MODE_RAINBOW_SWIRL +#undef RGBLIGHT_MODE_RGB_TEST +#undef RGBLIGHT_MODE_SNAKE +#undef RGBLIGHT_MODE_STATIC_GRADIENT +#undef RGBLIGHT_MODE_TWINKLE diff --git a/keymaps/vault35/keymap.c b/keymaps/vault35/keymap.c new file mode 100644 index 0000000..e78c59d --- /dev/null +++ b/keymaps/vault35/keymap.c @@ -0,0 +1,26 @@ +// Copyright 2024 [email protected] +// SPDX-License-Identifier: GPL-3.0-or-later +#include "jack.h" + +// clang-format off +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_BASE] = LAYOUT_jack_all( + ___BASE1___, XXXXXXX, + ___BASE2___, + ___BASE3___, + UPDIR, KC_ESC, LWRSPC, _______, RSEBSP, C(S(KC_V)), PNP + ), + [_LOWER] = LAYOUT_jack_all( + ___LOWER1___, XXXXXXX, + ___LOWER2___, + ___LOWER3___, + _______, _______, _______, _______, _______, _______, _______ + ), + [_RAISE] = LAYOUT_jack_all( + ___RAISE1___, XXXXXXX, + ___RAISE2___, + ___RAISE3___, + _______, _______, _______, _______, _______, _______, _______ + ) +}; +// clang-format on diff --git a/keyboards/vault35/readme.md b/keymaps/vault35/readme.md index 15d1db4..15d1db4 100644 --- a/keyboards/vault35/readme.md +++ b/keymaps/vault35/readme.md diff --git a/keymaps/vault35/rules.mk b/keymaps/vault35/rules.mk new file mode 100644 index 0000000..ebd77d6 --- /dev/null +++ b/keymaps/vault35/rules.mk @@ -0,0 +1,2 @@ +ENCODER_ENABLE = no +MOUSEKEY_ENABLE = no @@ -8,10 +8,10 @@ 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/jack ~/qmk_firmware/users/jack 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 +echo "users/jack\nkeyboards/relic" >> ~/qmk_firmware/.git/info/exclude +qmk compile -kb relic -km jack ``` the official [userspace feature](https://docs.qmk.fm/newbs_external_userspace) is not used as this repository contains personal keyboards, which are not supported. diff --git a/util/link.sh b/util/link.sh index 2d7a394..a451438 100755 --- a/util/link.sh +++ b/util/link.sh @@ -5,8 +5,8 @@ QMKFIRMWARE="$HOME/git/qmk_firmware" find $QMKFIRMWARE -type l -not -path "$QMKFIRMWARE/.venv/*" -delete rm $QMKFIRMWARE/.git/info/exclude -ln -sv $QMKME/waffle $QMKFIRMWARE/users/waffle -echo "users/waffle" >> $QMKFIRMWARE/.git/info/exclude +ln -sv $QMKME/jack $QMKFIRMWARE/users/jack +echo "users/jack" >> $QMKFIRMWARE/.git/info/exclude for dir in "keyboards"/*; do src="$QMKME/$dir" @@ -17,9 +17,9 @@ done link() { src="$QMKME/keymaps/$1" - dst="$QMKFIRMWARE/keyboards/$2/keymaps/waffle" + dst="$QMKFIRMWARE/keyboards/$2/keymaps/jack" ln -sv $src $dst - echo "keyboards/$2/keymaps/waffle" >> $QMKFIRMWARE/.git/info/exclude + echo "keyboards/$2/keymaps/jack" >> $QMKFIRMWARE/.git/info/exclude } link crkbd crkbd @@ -27,5 +27,5 @@ link bully mkh_studio/bully link f60 bioi/f60 link ferris ferris link kyria splitkb/kyria -link microdox boardsource/microdox -link the_q boardsource/the_q +link relic projectcain/relic +link vault35 projectcain/vault35 |