aboutsummaryrefslogtreecommitdiff
path: root/keyboards/owlab
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/owlab')
-rw-r--r--keyboards/owlab/jelly_epoch/hotswap/config.h65
-rw-r--r--keyboards/owlab/jelly_epoch/hotswap/hotswap.c18
-rw-r--r--keyboards/owlab/jelly_epoch/hotswap/hotswap.h38
-rw-r--r--keyboards/owlab/jelly_epoch/hotswap/info.json94
-rw-r--r--keyboards/owlab/jelly_epoch/hotswap/keymaps/default/keymap.c37
-rw-r--r--keyboards/owlab/jelly_epoch/hotswap/keymaps/via/keymap.c53
-rw-r--r--keyboards/owlab/jelly_epoch/hotswap/keymaps/via/rules.mk2
-rw-r--r--keyboards/owlab/jelly_epoch/hotswap/readme.md21
-rw-r--r--keyboards/owlab/jelly_epoch/hotswap/rules.mk22
-rw-r--r--keyboards/owlab/jelly_epoch/soldered/config.h65
-rw-r--r--keyboards/owlab/jelly_epoch/soldered/info.json267
-rw-r--r--keyboards/owlab/jelly_epoch/soldered/keymaps/default/keymap.c37
-rw-r--r--keyboards/owlab/jelly_epoch/soldered/keymaps/via/keymap.c53
-rw-r--r--keyboards/owlab/jelly_epoch/soldered/keymaps/via/rules.mk2
-rw-r--r--keyboards/owlab/jelly_epoch/soldered/readme.md21
-rw-r--r--keyboards/owlab/jelly_epoch/soldered/rules.mk22
-rw-r--r--keyboards/owlab/jelly_epoch/soldered/soldered.c18
-rw-r--r--keyboards/owlab/jelly_epoch/soldered/soldered.h70
-rw-r--r--keyboards/owlab/voice65/hotswap/config.h2
-rw-r--r--keyboards/owlab/voice65/soldered/config.h2
20 files changed, 907 insertions, 2 deletions
diff --git a/keyboards/owlab/jelly_epoch/hotswap/config.h b/keyboards/owlab/jelly_epoch/hotswap/config.h
new file mode 100644
index 000000000..eb2998de7
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/hotswap/config.h
@@ -0,0 +1,65 @@
1/*
2Copyright 2021 owlab
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "config_common.h"
21
22/* USB Device descriptor parameter*/
23#define VENDOR_ID 0x4F53 //0x4F53 OS for owl studio
24#define PRODUCT_ID 0x4A4C //0x4A4C JL for jelly, 0x4A53 JS for jelly solder
25#define DEVICE_VER 0x0001
26#define MANUFACTURER OwLab
27#define PRODUCT Jelly Epoch
28
29/* key matrix size */
30#define MATRIX_ROWS 6
31#define MATRIX_COLS 14
32
33/* Keyboard Matrix Assignments */
34#define MATRIX_ROW_PINS { B0, B1, B2, B3, A15, B10 }
35#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, B11, B8, B9, C13 }
36
37/* COL2ROW, ROW2COL */
38#define DIODE_DIRECTION COL2ROW
39
40/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
41#define DEBOUNCE 5
42
43/* NKRO */
44#ifdef NKRO_ENABLE
45# define FORCE_NKRO
46#endif
47
48/* RGB Strip*/
49#define RGB_DI_PIN B15
50#ifdef RGB_DI_PIN
51# define RGBLIGHT_EFFECT_ALTERNATING
52# define RGBLIGHT_EFFECT_BREATHING
53# define RGBLIGHT_EFFECT_CHRISTMAS
54# define RGBLIGHT_EFFECT_KNIGHT
55# define RGBLIGHT_EFFECT_RAINBOW_MOOD
56# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
57# define RGBLIGHT_EFFECT_SNAKE
58# define RGBLIGHT_EFFECT_STATIC_GRADIENT
59# define RGBLIGHT_EFFECT_TWINKLE
60# define RGBLED_NUM 24
61# define RGBLIGHT_HUE_STEP 8
62# define RGBLIGHT_SAT_STEP 8
63# define RGBLIGHT_VAL_STEP 10
64# define RGBLIGHT_LIMIT_VAL 255
65#endif
diff --git a/keyboards/owlab/jelly_epoch/hotswap/hotswap.c b/keyboards/owlab/jelly_epoch/hotswap/hotswap.c
new file mode 100644
index 000000000..55fbd3ea2
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/hotswap/hotswap.c
@@ -0,0 +1,18 @@
1/*
2Copyright 2021 owlab
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include "hotswap.h"
diff --git a/keyboards/owlab/jelly_epoch/hotswap/hotswap.h b/keyboards/owlab/jelly_epoch/hotswap/hotswap.h
new file mode 100644
index 000000000..c9ab3643a
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/hotswap/hotswap.h
@@ -0,0 +1,38 @@
1/*
2Copyright 2021 owlab
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "quantum.h"
21
22#define ____ KC_NO
23
24#define LAYOUT( \
25 K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K412, K313, \
26 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K512, \
27 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K511, \
28 K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K510, \
29 K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K413, \
30 K500, K501, K502, K504, K506, K507, K508, K509, K513 \
31) { \
32 { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
33 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
34 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
35 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
36 { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413 }, \
37 { K500, K501, K502, ____, K504, ____, K506, K507, K508, K509, K510, K511, K512, K513 } \
38}
diff --git a/keyboards/owlab/jelly_epoch/hotswap/info.json b/keyboards/owlab/jelly_epoch/hotswap/info.json
new file mode 100644
index 000000000..b8f3f305d
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/hotswap/info.json
@@ -0,0 +1,94 @@
1{
2 "keyboard_name": "jelly epoch",
3 "url": "https://www.popkeyboard.com/products/jrrgvdsyu47wer",
4 "maintainer": "Owlab",
5 "width": 16,
6 "height": 6.25,
7 "layouts": {
8 "LAYOUT": {
9 "layout": [
10 {"x":0, "y":0},
11 {"x":1.25, "y":0},
12 {"x":2.25, "y":0},
13 {"x":3.25, "y":0},
14 {"x":4.25, "y":0},
15 {"x":5.5, "y":0},
16 {"x":6.5, "y":0},
17 {"x":7.5, "y":0},
18 {"x":8.5, "y":0},
19 {"x":9.75, "y":0},
20 {"x":10.75, "y":0},
21 {"x":11.75, "y":0},
22 {"x":12.75, "y":0},
23 {"x":14, "y":0},
24 {"x":15, "y":0},
25 {"x":0, "y":1.25},
26 {"x":1, "y":1.25},
27 {"x":2, "y":1.25},
28 {"x":3, "y":1.25},
29 {"x":4, "y":1.25},
30 {"x":5, "y":1.25},
31 {"x":6, "y":1.25},
32 {"x":7, "y":1.25},
33 {"x":8, "y":1.25},
34 {"x":9, "y":1.25},
35 {"x":10, "y":1.25},
36 {"x":11, "y":1.25},
37 {"x":12, "y":1.25},
38 {"x":13, "y":1.25, "w":2},
39 {"x":15, "y":1.25},
40 {"x":0, "y":2.25, "w":1.5},
41 {"x":1.5, "y":2.25},
42 {"x":2.5, "y":2.25},
43 {"x":3.5, "y":2.25},
44 {"x":4.5, "y":2.25},
45 {"x":5.5, "y":2.25},
46 {"x":6.5, "y":2.25},
47 {"x":7.5, "y":2.25},
48 {"x":8.5, "y":2.25},
49 {"x":9.5, "y":2.25},
50 {"x":10.5, "y":2.25},
51 {"x":11.5, "y":2.25},
52 {"x":12.5, "y":2.25},
53 {"x":13.5, "y":2.25, "w":1.5},
54 {"x":15, "y":2.25},
55 {"x":0, "y":3.25, "w":1.75},
56 {"x":1.75, "y":3.25},
57 {"x":2.75, "y":3.25},
58 {"x":3.75, "y":3.25},
59 {"x":4.75, "y":3.25},
60 {"x":5.75, "y":3.25},
61 {"x":6.75, "y":3.25},
62 {"x":7.75, "y":3.25},
63 {"x":8.75, "y":3.25},
64 {"x":9.75, "y":3.25},
65 {"x":10.75, "y":3.25},
66 {"x":11.75, "y":3.25},
67 {"x":12.75, "y":3.25, "w":2.25},
68 {"x":15, "y":3.25},
69 {"x":0, "y":4.25, "w":2.25},
70 {"x":2.25, "y":4.25},
71 {"x":3.25, "y":4.25},
72 {"x":4.25, "y":4.25},
73 {"x":5.25, "y":4.25},
74 {"x":6.25, "y":4.25},
75 {"x":7.25, "y":4.25},
76 {"x":8.25, "y":4.25},
77 {"x":9.25, "y":4.25},
78 {"x":10.25, "y":4.25},
79 {"x":11.25, "y":4.25},
80 {"x":12.25, "y":4.25, "w":1.75},
81 {"x":14, "y":4.25},
82 {"x":0, "y":5.25, "w":1.25},
83 {"x":1.25, "y":5.25, "w":1.25},
84 {"x":2.5, "y":5.25, "w":1.25},
85 {"x":3.75, "y":5.25, "w":6.25},
86 {"x":10, "y":5.25, "w":1.25},
87 {"x":11.25, "y":5.25, "w":1.25},
88 {"x":13, "y":5.25},
89 {"x":14, "y":5.25},
90 {"x":15, "y":5.25}
91 ]
92 }
93 }
94} \ No newline at end of file
diff --git a/keyboards/owlab/jelly_epoch/hotswap/keymaps/default/keymap.c b/keyboards/owlab/jelly_epoch/hotswap/keymaps/default/keymap.c
new file mode 100644
index 000000000..93d9ec204
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/hotswap/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
1/*
2Copyright 2021 owlab
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include QMK_KEYBOARD_H
19
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 [0] = LAYOUT(
22 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME,
23 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_END,
24 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
25 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
26 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
28 ),
29 [1] = LAYOUT(
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,
32 KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
35 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
36 )
37};
diff --git a/keyboards/owlab/jelly_epoch/hotswap/keymaps/via/keymap.c b/keyboards/owlab/jelly_epoch/hotswap/keymaps/via/keymap.c
new file mode 100644
index 000000000..a78ca0a4c
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/hotswap/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
1/*
2Copyright 2021 owlab
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include QMK_KEYBOARD_H
19
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 [0] = LAYOUT(
22 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME,
23 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_END,
24 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
25 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
26 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
28 ),
29 [1] = LAYOUT(
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,
32 KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
35 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
36 ),
37 [2] = LAYOUT(
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
42 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
44 ),
45 [3] = LAYOUT(
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
52 )
53};
diff --git a/keyboards/owlab/jelly_epoch/hotswap/keymaps/via/rules.mk b/keyboards/owlab/jelly_epoch/hotswap/keymaps/via/rules.mk
new file mode 100644
index 000000000..36b7ba9cb
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/hotswap/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
1VIA_ENABLE = yes
2LTO_ENABLE = yes
diff --git a/keyboards/owlab/jelly_epoch/hotswap/readme.md b/keyboards/owlab/jelly_epoch/hotswap/readme.md
new file mode 100644
index 000000000..93aa42060
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/hotswap/readme.md
@@ -0,0 +1,21 @@
1# Jelly Epoch - hotswap PCB
2
3![jelly](https://i.imgur.com/Hs7tFCgl.jpg)
4
5A 75% made by Owlab.
6
7* Keyboard Maintainer: [owlab](https://github.com/owlab-git), [kb-elmo](https://github.com/kb-elmo)
8* Hardware Supported: Jelly Epoch hotswap PCB
9* Hardware Availability: Ended groupbuy: https://www.popkeyboard.com/products/jrrgvdsyu47wer
10
11Make example for this keyboard (after setting up your build environment):
12
13 make owlab/jelly_epoch/hotswap:default
14
15Flashing example for this keyboard:
16
17 make owlab/jelly_epoch/hotswap:default:flash
18
19**Bootloader:** Press the physical reset button on the bottom side of the PCB (labeled SW1) or hold down ESC while plugging in the board.
20
21See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/owlab/jelly_epoch/hotswap/rules.mk b/keyboards/owlab/jelly_epoch/hotswap/rules.mk
new file mode 100644
index 000000000..ada20ce94
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/hotswap/rules.mk
@@ -0,0 +1,22 @@
1# MCU name
2MCU = STM32F303
3
4# Bootloader selection
5BOOTLOADER = stm32-dfu
6
7# Build Options
8# change yes to no to disable
9#
10BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
11MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug
14COMMAND_ENABLE = no # Commands for debug and configuration
15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = no # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/owlab/jelly_epoch/soldered/config.h b/keyboards/owlab/jelly_epoch/soldered/config.h
new file mode 100644
index 000000000..cd27b71dd
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/soldered/config.h
@@ -0,0 +1,65 @@
1/*
2Copyright 2021 owlab
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "config_common.h"
21
22/* USB Device descriptor parameter*/
23#define VENDOR_ID 0x4F53 //0x4F53 OS for owl studio
24#define PRODUCT_ID 0x4A53 //0x4A4C JL for jelly, 0x4A53 JS for jelly solder
25#define DEVICE_VER 0x0001
26#define MANUFACTURER OwLab
27#define PRODUCT Jelly Epoch
28
29/* key matrix size */
30#define MATRIX_ROWS 6
31#define MATRIX_COLS 14
32
33/* Keyboard Matrix Assignments */
34#define MATRIX_ROW_PINS { B0, B1, B2, B3, A15, B10 }
35#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, A8, A9, A10, B11, B8, B9, C13 }
36
37/* COL2ROW, ROW2COL */
38#define DIODE_DIRECTION COL2ROW
39
40/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
41#define DEBOUNCE 5
42
43/* NKRO */
44#ifdef NKRO_ENABLE
45# define FORCE_NKRO
46#endif
47
48/* RGB Strip*/
49#define RGB_DI_PIN B15
50#ifdef RGB_DI_PIN
51# define RGBLIGHT_EFFECT_ALTERNATING
52# define RGBLIGHT_EFFECT_BREATHING
53# define RGBLIGHT_EFFECT_CHRISTMAS
54# define RGBLIGHT_EFFECT_KNIGHT
55# define RGBLIGHT_EFFECT_RAINBOW_MOOD
56# define RGBLIGHT_EFFECT_RAINBOW_SWIRL
57# define RGBLIGHT_EFFECT_SNAKE
58# define RGBLIGHT_EFFECT_STATIC_GRADIENT
59# define RGBLIGHT_EFFECT_TWINKLE
60# define RGBLED_NUM 24
61# define RGBLIGHT_HUE_STEP 8
62# define RGBLIGHT_SAT_STEP 8
63# define RGBLIGHT_VAL_STEP 10
64# define RGBLIGHT_LIMIT_VAL 255
65#endif
diff --git a/keyboards/owlab/jelly_epoch/soldered/info.json b/keyboards/owlab/jelly_epoch/soldered/info.json
new file mode 100644
index 000000000..2c7ff4e35
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/soldered/info.json
@@ -0,0 +1,267 @@
1{
2 "keyboard_name": "jelly",
3 "url": "https://www.popkeyboard.com/products/jrrgvdsyu47wer",
4 "maintainer": "Owlab",
5 "width": 16,
6 "height": 6.25,
7 "layouts": {
8 "LAYOUT_all": {
9 "layout": [
10 {"x":0, "y":0},
11 {"x":1.25, "y":0},
12 {"x":2.25, "y":0},
13 {"x":3.25, "y":0},
14 {"x":4.25, "y":0},
15 {"x":5.5, "y":0},
16 {"x":6.5, "y":0},
17 {"x":7.5, "y":0},
18 {"x":8.5, "y":0},
19 {"x":9.75, "y":0},
20 {"x":10.75, "y":0},
21 {"x":11.75, "y":0},
22 {"x":12.75, "y":0},
23 {"x":14, "y":0},
24 {"x":15, "y":0},
25 {"x":0, "y":1.25},
26 {"x":1, "y":1.25},
27 {"x":2, "y":1.25},
28 {"x":3, "y":1.25},
29 {"x":4, "y":1.25},
30 {"x":5, "y":1.25},
31 {"x":6, "y":1.25},
32 {"x":7, "y":1.25},
33 {"x":8, "y":1.25},
34 {"x":9, "y":1.25},
35 {"x":10, "y":1.25},
36 {"x":11, "y":1.25},
37 {"x":12, "y":1.25},
38 {"x":13, "y":1.25},
39 {"x":14, "y":1.25},
40 {"x":15, "y":1.25},
41 {"x":0, "y":2.25, "w":1.5},
42 {"x":1.5, "y":2.25},
43 {"x":2.5, "y":2.25},
44 {"x":3.5, "y":2.25},
45 {"x":4.5, "y":2.25},
46 {"x":5.5, "y":2.25},
47 {"x":6.5, "y":2.25},
48 {"x":7.5, "y":2.25},
49 {"x":8.5, "y":2.25},
50 {"x":9.5, "y":2.25},
51 {"x":10.5, "y":2.25},
52 {"x":11.5, "y":2.25},
53 {"x":12.5, "y":2.25},
54 {"x":13.5, "y":2.25, "w":1.5},
55 {"x":15, "y":2.25},
56 {"x":0, "y":3.25, "w":1.75},
57 {"x":1.75, "y":3.25},
58 {"x":2.75, "y":3.25},
59 {"x":3.75, "y":3.25},
60 {"x":4.75, "y":3.25},
61 {"x":5.75, "y":3.25},
62 {"x":6.75, "y":3.25},
63 {"x":7.75, "y":3.25},
64 {"x":8.75, "y":3.25},
65 {"x":9.75, "y":3.25},
66 {"x":10.75, "y":3.25},
67 {"x":11.75, "y":3.25},
68 {"x":12.75, "y":3.25, "w":2.25},
69 {"x":15, "y":3.25},
70 {"x":0, "y":4.25, "w":1.25},
71 {"x":1.25, "y":4.25},
72 {"x":2.25, "y":4.25},
73 {"x":3.25, "y":4.25},
74 {"x":4.25, "y":4.25},
75 {"x":5.25, "y":4.25},
76 {"x":6.25, "y":4.25},
77 {"x":7.25, "y":4.25},
78 {"x":8.25, "y":4.25},
79 {"x":9.25, "y":4.25},
80 {"x":10.25, "y":4.25},
81 {"x":11.25, "y":4.25},
82 {"x":12.25, "y":4.25, "w":1.75},
83 {"x":14, "y":4.25},
84 {"x":0, "y":5.25, "w":1.25},
85 {"x":1.25, "y":5.25, "w":1.25},
86 {"x":2.5, "y":5.25, "w":1.25},
87 {"x":3.75, "y":5.25, "w":6.25},
88 {"x":10, "y":5.25, "w":1.25},
89 {"x":11.25, "y":5.25, "w":1.25},
90 {"x":13, "y":5.25},
91 {"x":14, "y":5.25},
92 {"x":15, "y":5.25}
93 ]
94 },
95 "LAYOUT_75_ansi": {
96 "layout": [
97 {"x":0, "y":0},
98 {"x":1.25, "y":0},
99 {"x":2.25, "y":0},
100 {"x":3.25, "y":0},
101 {"x":4.25, "y":0},
102 {"x":5.5, "y":0},
103 {"x":6.5, "y":0},
104 {"x":7.5, "y":0},
105 {"x":8.5, "y":0},
106 {"x":9.75, "y":0},
107 {"x":10.75, "y":0},
108 {"x":11.75, "y":0},
109 {"x":12.75, "y":0},
110 {"x":14, "y":0},
111 {"x":15, "y":0},
112 {"x":0, "y":1.25},
113 {"x":1, "y":1.25},
114 {"x":2, "y":1.25},
115 {"x":3, "y":1.25},
116 {"x":4, "y":1.25},
117 {"x":5, "y":1.25},
118 {"x":6, "y":1.25},
119 {"x":7, "y":1.25},
120 {"x":8, "y":1.25},
121 {"x":9, "y":1.25},
122 {"x":10, "y":1.25},
123 {"x":11, "y":1.25},
124 {"x":12, "y":1.25},
125 {"x":13, "y":1.25, "w":2},
126 {"x":15, "y":1.25},
127 {"x":0, "y":2.25, "w":1.5},
128 {"x":1.5, "y":2.25},
129 {"x":2.5, "y":2.25},
130 {"x":3.5, "y":2.25},
131 {"x":4.5, "y":2.25},
132 {"x":5.5, "y":2.25},
133 {"x":6.5, "y":2.25},
134 {"x":7.5, "y":2.25},
135 {"x":8.5, "y":2.25},
136 {"x":9.5, "y":2.25},
137 {"x":10.5, "y":2.25},
138 {"x":11.5, "y":2.25},
139 {"x":12.5, "y":2.25},
140 {"x":13.5, "y":2.25, "w":1.5},
141 {"x":15, "y":2.25},
142 {"x":0, "y":3.25, "w":1.75},
143 {"x":1.75, "y":3.25},
144 {"x":2.75, "y":3.25},
145 {"x":3.75, "y":3.25},
146 {"x":4.75, "y":3.25},
147 {"x":5.75, "y":3.25},
148 {"x":6.75, "y":3.25},
149 {"x":7.75, "y":3.25},
150 {"x":8.75, "y":3.25},
151 {"x":9.75, "y":3.25},
152 {"x":10.75, "y":3.25},
153 {"x":11.75, "y":3.25},
154 {"x":12.75, "y":3.25, "w":2.25},
155 {"x":15, "y":3.25},
156 {"x":0, "y":4.25, "w":2.25},
157 {"x":2.25, "y":4.25},
158 {"x":3.25, "y":4.25},
159 {"x":4.25, "y":4.25},
160 {"x":5.25, "y":4.25},
161 {"x":6.25, "y":4.25},
162 {"x":7.25, "y":4.25},
163 {"x":8.25, "y":4.25},
164 {"x":9.25, "y":4.25},
165 {"x":10.25, "y":4.25},
166 {"x":11.25, "y":4.25},
167 {"x":12.25, "y":4.25, "w":1.75},
168 {"x":14, "y":4.25},
169 {"x":0, "y":5.25, "w":1.25},
170 {"x":1.25, "y":5.25, "w":1.25},
171 {"x":2.5, "y":5.25, "w":1.25},
172 {"x":3.75, "y":5.25, "w":6.25},
173 {"x":10, "y":5.25, "w":1.25},
174 {"x":11.25, "y":5.25, "w":1.25},
175 {"x":13, "y":5.25},
176 {"x":14, "y":5.25},
177 {"x":15, "y":5.25}
178 ]
179 },
180 "LAYOUT_75_iso": {
181 "layout": [
182 {"x":0, "y":0},
183 {"x":1.25, "y":0},
184 {"x":2.25, "y":0},
185 {"x":3.25, "y":0},
186 {"x":4.25, "y":0},
187 {"x":5.5, "y":0},
188 {"x":6.5, "y":0},
189 {"x":7.5, "y":0},
190 {"x":8.5, "y":0},
191 {"x":9.75, "y":0},
192 {"x":10.75, "y":0},
193 {"x":11.75, "y":0},
194 {"x":12.75, "y":0},
195 {"x":14, "y":0},
196 {"x":15, "y":0},
197 {"x":0, "y":1.25},
198 {"x":1, "y":1.25},
199 {"x":2, "y":1.25},
200 {"x":3, "y":1.25},
201 {"x":4, "y":1.25},
202 {"x":5, "y":1.25},
203 {"x":6, "y":1.25},
204 {"x":7, "y":1.25},
205 {"x":8, "y":1.25},
206 {"x":9, "y":1.25},
207 {"x":10, "y":1.25},
208 {"x":11, "y":1.25},
209 {"x":12, "y":1.25},
210 {"x":13, "y":1.25, "w":2},
211 {"x":15, "y":1.25},
212 {"x":0, "y":2.25, "w":1.5},
213 {"x":1.5, "y":2.25},
214 {"x":2.5, "y":2.25},
215 {"x":3.5, "y":2.25},
216 {"x":4.5, "y":2.25},
217 {"x":5.5, "y":2.25},
218 {"x":6.5, "y":2.25},
219 {"x":7.5, "y":2.25},
220 {"x":8.5, "y":2.25},
221 {"x":9.5, "y":2.25},
222 {"x":10.5, "y":2.25},
223 {"x":11.5, "y":2.25},
224 {"x":12.5, "y":2.25},
225 {"x":15, "y":2.25},
226 {"x":0, "y":3.25, "w":1.75},
227 {"x":1.75, "y":3.25},
228 {"x":2.75, "y":3.25},
229 {"x":3.75, "y":3.25},
230 {"x":4.75, "y":3.25},
231 {"x":5.75, "y":3.25},
232 {"x":6.75, "y":3.25},
233 {"x":7.75, "y":3.25},
234 {"x":8.75, "y":3.25},
235 {"x":9.75, "y":3.25},
236 {"x":10.75, "y":3.25},
237 {"x":11.75, "y":3.25},
238 {"x":12.75, "y":3.25},
239 {"x":13.75, "y":2.25, "w":1.25, "h":2},
240 {"x":15, "y":3.25},
241 {"x":0, "y":4.25, "w":1.25},
242 {"x":1.25, "y":4.25},
243 {"x":2.25, "y":4.25},
244 {"x":3.25, "y":4.25},
245 {"x":4.25, "y":4.25},
246 {"x":5.25, "y":4.25},
247 {"x":6.25, "y":4.25},
248 {"x":7.25, "y":4.25},
249 {"x":8.25, "y":4.25},
250 {"x":9.25, "y":4.25},
251 {"x":10.25, "y":4.25},
252 {"x":11.25, "y":4.25},
253 {"x":12.25, "y":4.25, "w":1.75},
254 {"x":14, "y":4.25},
255 {"x":0, "y":5.25, "w":1.25},
256 {"x":1.25, "y":5.25, "w":1.25},
257 {"x":2.5, "y":5.25, "w":1.25},
258 {"x":3.75, "y":5.25, "w":6.25},
259 {"x":10, "y":5.25, "w":1.25},
260 {"x":11.25, "y":5.25, "w":1.25},
261 {"x":13, "y":5.25},
262 {"x":14, "y":5.25},
263 {"x":15, "y":5.25}
264 ]
265 }
266 }
267} \ No newline at end of file
diff --git a/keyboards/owlab/jelly_epoch/soldered/keymaps/default/keymap.c b/keyboards/owlab/jelly_epoch/soldered/keymaps/default/keymap.c
new file mode 100644
index 000000000..fa024790d
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/soldered/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
1/*
2Copyright 2021 owlab
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include QMK_KEYBOARD_H
19
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 [0] = LAYOUT_75_ansi(
22 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME,
23 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_END,
24 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
25 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
26 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
28 ),
29 [1] = LAYOUT_75_ansi(
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,
32 KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
35 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
36 )
37};
diff --git a/keyboards/owlab/jelly_epoch/soldered/keymaps/via/keymap.c b/keyboards/owlab/jelly_epoch/soldered/keymaps/via/keymap.c
new file mode 100644
index 000000000..29bd0a08e
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/soldered/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
1/*
2Copyright 2021 owlab
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include QMK_KEYBOARD_H
19
20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
21 [0] = LAYOUT_all(
22 KC_ESC, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_DEL, KC_HOME,
23 KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_BSPC, KC_END,
24 KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
25 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, KC_PGDN,
26 KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
27 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
28 ),
29 [1] = LAYOUT_all(
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS,
32 KC_TRNS, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
33 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
35 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
36 ),
37 [2] = LAYOUT_all(
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
39 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
40 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
42 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
43 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
44 ),
45 [3] = LAYOUT_all(
46 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
47 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
48 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
49 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
51 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
52 )
53};
diff --git a/keyboards/owlab/jelly_epoch/soldered/keymaps/via/rules.mk b/keyboards/owlab/jelly_epoch/soldered/keymaps/via/rules.mk
new file mode 100644
index 000000000..36b7ba9cb
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/soldered/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
1VIA_ENABLE = yes
2LTO_ENABLE = yes
diff --git a/keyboards/owlab/jelly_epoch/soldered/readme.md b/keyboards/owlab/jelly_epoch/soldered/readme.md
new file mode 100644
index 000000000..1b718f890
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/soldered/readme.md
@@ -0,0 +1,21 @@
1# Jelly Epoch - soldered PCB
2
3![jelly](https://i.imgur.com/Hs7tFCgl.jpg)
4
5A 75% made by Owlab.
6
7* Keyboard Maintainer: [owlab](https://github.com/owlab-git), [kb-elmo](https://github.com/kb-elmo)
8* Hardware Supported: Jelly Epoch soldered PCB
9* Hardware Availability: Ended groupbuy: https://www.popkeyboard.com/products/jrrgvdsyu47wer
10
11Make example for this keyboard (after setting up your build environment):
12
13 make owlab/jelly_epoch/soldered:default
14
15Flashing example for this keyboard:
16
17 make owlab/jelly_epoch/soldered:default:flash
18
19**Bootloader:** Press the physical reset button on the bottom side of the PCB (labeled SW1) or hold down ESC while plugging in the board.
20
21See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/owlab/jelly_epoch/soldered/rules.mk b/keyboards/owlab/jelly_epoch/soldered/rules.mk
new file mode 100644
index 000000000..ada20ce94
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/soldered/rules.mk
@@ -0,0 +1,22 @@
1# MCU name
2MCU = STM32F303
3
4# Bootloader selection
5BOOTLOADER = stm32-dfu
6
7# Build Options
8# change yes to no to disable
9#
10BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
11MOUSEKEY_ENABLE = yes # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug
14COMMAND_ENABLE = no # Commands for debug and configuration
15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = no # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output
diff --git a/keyboards/owlab/jelly_epoch/soldered/soldered.c b/keyboards/owlab/jelly_epoch/soldered/soldered.c
new file mode 100644
index 000000000..a1af466d2
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/soldered/soldered.c
@@ -0,0 +1,18 @@
1/*
2Copyright 2021 owlab
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#include "soldered.h"
diff --git a/keyboards/owlab/jelly_epoch/soldered/soldered.h b/keyboards/owlab/jelly_epoch/soldered/soldered.h
new file mode 100644
index 000000000..e69e25802
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/soldered/soldered.h
@@ -0,0 +1,70 @@
1/*
2Copyright 2021 owlab
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "quantum.h"
21
22#define ____ KC_NO
23
24#define LAYOUT_all( \
25 K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K412, K413, \
26 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K213, K113, K511, \
27 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K313, K510, \
28 K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K509, \
29 K400, K503, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K513, \
30 K500, K501, K502, K504, K505, K506, K507, K508, K512 \
31) { \
32 { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013}, \
33 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113}, \
34 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213}, \
35 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313}, \
36 { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413}, \
37 { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513} \
38}
39
40#define LAYOUT_75_ansi( \
41 K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K412, K413, \
42 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K511, \
43 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K313, K510, \
44 K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K509, \
45 K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K513, \
46 K500, K501, K502, K504, K505, K506, K507, K508, K512 \
47) { \
48 { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013}, \
49 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113}, \
50 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____}, \
51 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313}, \
52 { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413}, \
53 { K500, K501, K502, ____, K504, ____, K506, K507, K508, K509, K510, K511, K512, K513} \
54}
55
56#define LAYOUT_75_iso( \
57 K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K412, K413, \
58 K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K511, \
59 K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K510, \
60 K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K312, K509, \
61 K400, K503, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K513, \
62 K500, K501, K502, K504, K505, K506, K507, K508, K512 \
63) { \
64 { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013}, \
65 { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113}, \
66 { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____}, \
67 { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313}, \
68 { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413}, \
69 { K500, K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513} \
70}
diff --git a/keyboards/owlab/voice65/hotswap/config.h b/keyboards/owlab/voice65/hotswap/config.h
index 18187249f..fc894bd3c 100644
--- a/keyboards/owlab/voice65/hotswap/config.h
+++ b/keyboards/owlab/voice65/hotswap/config.h
@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
23#define VENDOR_ID 0x4F53 23#define VENDOR_ID 0x4F53
24#define PRODUCT_ID 0x564F 24#define PRODUCT_ID 0x564F
25#define DEVICE_VER 0x0001 25#define DEVICE_VER 0x0001
26#define MANUFACTURER Owl Studio 26#define MANUFACTURER OwLab
27#define PRODUCT Voice65 Hotswap 27#define PRODUCT Voice65 Hotswap
28 28
29/* key matrix size */ 29/* key matrix size */
diff --git a/keyboards/owlab/voice65/soldered/config.h b/keyboards/owlab/voice65/soldered/config.h
index 78cbb4d42..e0e53a5d5 100644
--- a/keyboards/owlab/voice65/soldered/config.h
+++ b/keyboards/owlab/voice65/soldered/config.h
@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
23#define VENDOR_ID 0x4F53 23#define VENDOR_ID 0x4F53
24#define PRODUCT_ID 0x5657 24#define PRODUCT_ID 0x5657
25#define DEVICE_VER 0x0001 25#define DEVICE_VER 0x0001
26#define MANUFACTURER Owl Studio 26#define MANUFACTURER OwLab
27#define PRODUCT Voice65 27#define PRODUCT Voice65
28 28
29/* key matrix size */ 29/* key matrix size */