From e7c5a283561ad1a2f44ddc60b03b83892f82a99f Mon Sep 17 00:00:00 2001
From: jcshumpert <38388154+jcshumpert@users.noreply.github.com>
Date: Mon, 30 Jan 2023 20:25:37 -0500
Subject: [PATCH] Owlab Jelly epoch hotswap and soldered (#350)
* porting vial to Jelly Epoch hotswap and soldered
* correcting keymap file for soldered PCB
---
.../jelly_epoch/hotswap/keymaps/vial/config.h | 9 +
.../jelly_epoch/hotswap/keymaps/vial/keymap.c | 37 +++
.../jelly_epoch/hotswap/keymaps/vial/rules.mk | 2 +
.../hotswap/keymaps/vial/vial.json | 197 +++++++++++++
.../soldered/keymaps/vial/config.h | 9 +
.../soldered/keymaps/vial/keymap.c | 37 +++
.../soldered/keymaps/vial/rules.mk | 2 +
.../soldered/keymaps/vial/vial.json | 269 ++++++++++++++++++
8 files changed, 562 insertions(+)
create mode 100644 keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/config.h
create mode 100644 keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/keymap.c
create mode 100644 keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/rules.mk
create mode 100644 keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/vial.json
create mode 100644 keyboards/owlab/jelly_epoch/soldered/keymaps/vial/config.h
create mode 100644 keyboards/owlab/jelly_epoch/soldered/keymaps/vial/keymap.c
create mode 100644 keyboards/owlab/jelly_epoch/soldered/keymaps/vial/rules.mk
create mode 100644 keyboards/owlab/jelly_epoch/soldered/keymaps/vial/vial.json
diff --git a/keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/config.h b/keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/config.h
new file mode 100644
index 0000000000..dd49343533
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/config.h
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x86, 0x13, 0x29, 0xD7, 0x76, 0x44, 0x19, 0xA7}
+
+// Esc + Enter
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 12 }
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/keymap.c b/keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/keymap.c
new file mode 100644
index 0000000000..f61039a33a
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2021 owlab
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT(
+ 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT(
+ 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,
+ 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,
+ 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
diff --git a/keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/rules.mk b/keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/rules.mk
new file mode 100644
index 0000000000..6bc7063adc
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/vial.json b/keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/vial.json
new file mode 100644
index 0000000000..f12bdfa979
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/hotswap/keymaps/vial/vial.json
@@ -0,0 +1,197 @@
+{
+ "name": "Jelly Epoch Hotswap",
+ "vendorId": "0x4F53",
+ "productId": "0x4A4C",
+ "lighting": "qmk_rgblight",
+ "matrix": {
+ "rows": 6,
+ "cols": 14
+ },
+ "layouts": {
+ "keymap": [
+ [
+ {
+ "c": "#777777"
+ },
+ "0,0",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "0,2",
+ "0,3",
+ "0,4",
+ "0,5",
+ {
+ "x": 0.25,
+ "c": "#aaaaaa"
+ },
+ "0,6",
+ "0,7",
+ "0,8",
+ "0,9",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "0,10",
+ "0,11",
+ "0,12",
+ "0,13",
+ {
+ "x": 0.25,
+ "c": "#aaaaaa"
+ },
+ "4,12",
+ "3,13"
+ ],
+ [
+ {
+ "y": 0.25,
+ "c": "#cccccc"
+ },
+ "1,0",
+ "1,1",
+ "1,2",
+ "1,3",
+ "1,4",
+ "1,5",
+ "1,6",
+ "1,7",
+ "1,8",
+ "1,9",
+ "1,10",
+ "1,11",
+ "1,12",
+ {
+ "c": "#aaaaaa",
+ "w": 2
+ },
+ "1,13",
+ "5,12"
+ ],
+ [
+ {
+ "w": 1.5
+ },
+ "2,0",
+ {
+ "c": "#cccccc"
+ },
+ "2,1",
+ "2,2",
+ "2,3",
+ "2,4",
+ "2,5",
+ "2,6",
+ "2,7",
+ "2,8",
+ "2,9",
+ "2,10",
+ "2,11",
+ "2,12",
+ {
+ "w": 1.5
+ },
+ "2,13",
+ {
+ "c": "#aaaaaa"
+ },
+ "5,11"
+ ],
+ [
+ {
+ "w": 1.75
+ },
+ "3,0",
+ {
+ "c": "#cccccc"
+ },
+ "3,1",
+ "3,2",
+ "3,3",
+ "3,4",
+ "3,5",
+ "3,6",
+ "3,7",
+ "3,8",
+ "3,9",
+ "3,10",
+ "3,11",
+ {
+ "c": "#777777",
+ "w": 2.25
+ },
+ "3,12",
+ {
+ "c": "#aaaaaa"
+ },
+ "5,10"
+ ],
+ [
+ {
+ "w": 2.25
+ },
+ "4,0",
+ {
+ "c": "#cccccc"
+ },
+ "4,1",
+ "4,2",
+ "4,3",
+ "4,4",
+ "4,5",
+ "4,6",
+ "4,7",
+ "4,8",
+ "4,9",
+ "4,10",
+ {
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "4,11",
+ {
+ "c": "#cccccc"
+ },
+ "4,13"
+ ],
+ [
+ {
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "5,0",
+ {
+ "w": 1.25
+ },
+ "5,1",
+ {
+ "w": 1.25
+ },
+ "5,2",
+ {
+ "c": "#cccccc",
+ "w": 6.25
+ },
+ "5,4",
+ {
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "5,6",
+ {
+ "w": 1.25
+ },
+ "5,7",
+ {
+ "x": 0.5,
+ "c": "#cccccc"
+ },
+ "5,8",
+ "5,9",
+ "5,13"
+ ]
+ ]
+ }
+}
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_epoch/soldered/keymaps/vial/config.h b/keyboards/owlab/jelly_epoch/soldered/keymaps/vial/config.h
new file mode 100644
index 0000000000..3d74e9e192
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/soldered/keymaps/vial/config.h
@@ -0,0 +1,9 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define VIAL_KEYBOARD_UID {0x78, 0x8B, 0xC5, 0x1F, 0x4B, 0x6C, 0xE6, 0xF4}
+
+// Esc + Enter
+#define VIAL_UNLOCK_COMBO_ROWS { 0, 3 }
+#define VIAL_UNLOCK_COMBO_COLS { 0, 12 }
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_epoch/soldered/keymaps/vial/keymap.c b/keyboards/owlab/jelly_epoch/soldered/keymaps/vial/keymap.c
new file mode 100644
index 0000000000..c82f8bc67a
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/soldered/keymaps/vial/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2021 owlab
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see .
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_75_ansi(
+ 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,
+ 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,
+ 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,
+ 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,
+ 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,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [1] = LAYOUT_75_ansi(
+ 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,
+ 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,
+ 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+ )
+};
diff --git a/keyboards/owlab/jelly_epoch/soldered/keymaps/vial/rules.mk b/keyboards/owlab/jelly_epoch/soldered/keymaps/vial/rules.mk
new file mode 100644
index 0000000000..6bc7063adc
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/soldered/keymaps/vial/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+VIAL_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/owlab/jelly_epoch/soldered/keymaps/vial/vial.json b/keyboards/owlab/jelly_epoch/soldered/keymaps/vial/vial.json
new file mode 100644
index 0000000000..2a1a677cfb
--- /dev/null
+++ b/keyboards/owlab/jelly_epoch/soldered/keymaps/vial/vial.json
@@ -0,0 +1,269 @@
+{
+ "name": "Jelly Epoch",
+ "vendorId": "0x4F53",
+ "productId": "0x4A53",
+ "lighting": "qmk_rgblight",
+ "matrix": {
+ "rows": 6,
+ "cols": 14
+ },
+ "layouts": {
+ "labels": [
+ "Split backspace",
+ "ISO enter",
+ "Split left shift",
+ [
+ "Bottom Row",
+ "6.25u",
+ "7u"
+ ]
+ ],
+ "keymap": [
+ [
+ {
+ "x": 2.5,
+ "c": "#777777"
+ },
+ "0,0",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "0,2",
+ "0,3",
+ "0,4",
+ "0,5",
+ {
+ "x": 0.25,
+ "c": "#aaaaaa"
+ },
+ "0,6",
+ "0,7",
+ "0,8",
+ "0,9",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "0,10",
+ "0,11",
+ "0,12",
+ "0,13",
+ {
+ "x": 0.25,
+ "c": "#aaaaaa"
+ },
+ "4,12",
+ "4,13"
+ ],
+ [
+ {
+ "y": 0.25,
+ "x": 2.5,
+ "c": "#cccccc"
+ },
+ "1,0",
+ "1,1",
+ "1,2",
+ "1,3",
+ "1,4",
+ "1,5",
+ "1,6",
+ "1,7",
+ "1,8",
+ "1,9",
+ "1,10",
+ "1,11",
+ "1,12",
+ {
+ "c": "#aaaaaa",
+ "w": 2
+ },
+ "1,13\n\n\n0,0",
+ "5,11",
+ {
+ "x": 0.5,
+ "c": "#cccccc"
+ },
+ "2,13\n\n\n0,1",
+ "1,13\n\n\n0,1"
+ ],
+ [
+ {
+ "x": 2.5,
+ "c": "#aaaaaa",
+ "w": 1.5
+ },
+ "2,0",
+ {
+ "c": "#cccccc"
+ },
+ "2,1",
+ "2,2",
+ "2,3",
+ "2,4",
+ "2,5",
+ "2,6",
+ "2,7",
+ "2,8",
+ "2,9",
+ "2,10",
+ "2,11",
+ "2,12",
+ {
+ "w": 1.5
+ },
+ "3,13\n\n\n1,0",
+ {
+ "c": "#aaaaaa"
+ },
+ "5,10",
+ {
+ "x": 1.25,
+ "c": "#777777",
+ "w": 1.25,
+ "h": 2,
+ "w2": 1.5,
+ "h2": 1,
+ "x2": -0.25
+ },
+ "3,12\n\n\n1,1"
+ ],
+ [
+ {
+ "x": 2.5,
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "3,0",
+ {
+ "c": "#cccccc"
+ },
+ "3,1",
+ "3,2",
+ "3,3",
+ "3,4",
+ "3,5",
+ "3,6",
+ "3,7",
+ "3,8",
+ "3,9",
+ "3,10",
+ "3,11",
+ {
+ "c": "#777777",
+ "w": 2.25
+ },
+ "3,12\n\n\n1,0",
+ {
+ "c": "#aaaaaa"
+ },
+ "5,9",
+ {
+ "x": 0.25,
+ "c": "#cccccc"
+ },
+ "3,13\n\n\n1,1"
+ ],
+ [
+ {
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "4,0\n\n\n2,1",
+ {
+ "c": "#cccccc"
+ },
+ "5,3\n\n\n2,1",
+ {
+ "x": 0.25,
+ "c": "#aaaaaa",
+ "w": 2.25
+ },
+ "4,0\n\n\n2,0",
+ {
+ "c": "#cccccc"
+ },
+ "4,1",
+ "4,2",
+ "4,3",
+ "4,4",
+ "4,5",
+ "4,6",
+ "4,7",
+ "4,8",
+ "4,9",
+ "4,10",
+ {
+ "c": "#aaaaaa",
+ "w": 1.75
+ },
+ "4,11",
+ {
+ "c": "#cccccc"
+ },
+ "5,13"
+ ],
+ [
+ {
+ "x": 2.5,
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "5,0\n\n\n3,0",
+ {
+ "w": 1.25
+ },
+ "5,1\n\n\n3,0",
+ {
+ "w": 1.25
+ },
+ "5,2\n\n\n3,0",
+ {
+ "c": "#cccccc",
+ "w": 6.25
+ },
+ "5,4\n\n\n3,0",
+ {
+ "c": "#aaaaaa",
+ "w": 1.25
+ },
+ "5,5\n\n\n3,0",
+ {
+ "w": 1.25
+ },
+ "5,6\n\n\n3,0",
+ {
+ "x": 0.5,
+ "c": "#cccccc"
+ },
+ "5,7",
+ "5,8",
+ "5,12"
+ ],
+ [
+ {
+ "x": 2.5,
+ "c": "#aaaaaa",
+ "w": 1.5
+ },
+ "5,0\n\n\n3,1",
+ "5,1\n\n\n3,1",
+ {
+ "w": 1.5
+ },
+ "5,2\n\n\n3,1",
+ {
+ "c": "#cccccc",
+ "w": 7
+ },
+ "5,4\n\n\n3,1",
+ {
+ "c": "#aaaaaa",
+ "w": 1.5
+ },
+ "5,6\n\n\n3,1"
+ ]
+ ]
+ }
+}
\ No newline at end of file