aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-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.json60
-rw-r--r--keyboards/relic/keymaps/waffle/keymap.c26
-rw-r--r--keyboards/relic/readme.md3
-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.c12
-rw-r--r--keyboards/vault35/keyboard.json72
-rw-r--r--keyboards/vault35/keymaps/waffle/keymap.c26
-rw-r--r--keyboards/vault35/readme.md3
-rw-r--r--keyboards/xyz60/keymaps/jack/keymap.c (renamed from keyboards/xyz60/keymaps/waffle/keymap.c)8
12 files changed, 23 insertions, 213 deletions
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/relic/keymaps/waffle/keymap.c b/keyboards/relic/keymaps/waffle/keymap.c
deleted file mode 100644
index addfce3..0000000
--- a/keyboards/relic/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___, PNP,
- ___BASE2___,
- ___BASE3___,
- KC_VOLD, KC_ESC, LWRSPC, RSEBSP, C(S(KC_V)), KC_VOLU
- ),
- [_LOWER] = LAYOUT_waffle(
- ___LOWER1___, _______,
- ___LOWER2___,
- ___LOWER3___,
- _______, TABLE1, _______, _______, TABLE2, _______
- ),
- [_RAISE] = LAYOUT_waffle(
- ___RAISE1___, _______,
- ___RAISE2___,
- ___RAISE3___,
- _______, _______, _______, _______, _______, _______
- )
-};
-// clang-format on
diff --git a/keyboards/relic/readme.md b/keyboards/relic/readme.md
deleted file mode 100644
index a8e6d47..0000000
--- a/keyboards/relic/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### relic
-![front](https://i.imgur.com/FMkKVs0h.jpeg)
-![back](https://i.imgur.com/s1HrBumh.jpeg)
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/vault35/readme.md b/keyboards/vault35/readme.md
deleted file mode 100644
index 15d1db4..0000000
--- a/keyboards/vault35/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-### vault35
-![w/o keycaps](https://i.imgur.com/AHwhQdDh.jpeg)
-![w/ keycaps](https://i.imgur.com/lXP50ITh.jpeg)
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___, _______, _______,