From e21bfc585a1076bd67a297b6f86e13297bbc25bd Mon Sep 17 00:00:00 2001
From: adophoxia <100170946+adophoxia@users.noreply.github.com>
Date: Fri, 9 Feb 2024 00:32:01 -0800
Subject: [PATCH] Move vial folders back to correct keyboards (#666)
---
.../{rev_0130 => base}/keymaps/vial/config.h | 0
.../{rev_0130 => base}/keymaps/vial/keymap.c | 0
.../{rev_0130 => base}/keymaps/vial/rules.mk | 0
.../{rev_0130 => base}/keymaps/vial/vial.json | 0
.../{rev_0131 => plus}/keymaps/vial/config.h | 0
.../{rev_0131 => plus}/keymaps/vial/keymap.c | 0
.../{rev_0131 => plus}/keymaps/vial/rules.mk | 0
.../{rev_0131 => plus}/keymaps/vial/vial.json | 0
.../ansi}/keymaps/vial/config.h | 0
.../ansi}/keymaps/vial/keymap.c | 0
.../ansi}/keymaps/vial/rules.mk | 0
.../ansi}/keymaps/vial/vial.json | 0
.../{ansi_v1 => ansi}/keymaps/vial/config.h | 0
.../{ansi_v1 => ansi}/keymaps/vial/keymap.c | 0
.../{ansi_v1 => ansi}/keymaps/vial/rules.mk | 0
.../{ansi_v1 => ansi}/keymaps/vial/vial.json | 0
.../keychron/q4/ansi_v2/keymaps/vial/config.h | 27 ---
.../keychron/q4/ansi_v2/keymaps/vial/keymap.c | 75 --------
.../keychron/q4/ansi_v2/keymaps/vial/rules.mk | 6 -
.../q4/ansi_v2/keymaps/vial/vial.json | 161 ------------------
20 files changed, 269 deletions(-)
rename keyboards/keychron/q0/{rev_0130 => base}/keymaps/vial/config.h (100%)
rename keyboards/keychron/q0/{rev_0130 => base}/keymaps/vial/keymap.c (100%)
rename keyboards/keychron/q0/{rev_0130 => base}/keymaps/vial/rules.mk (100%)
rename keyboards/keychron/q0/{rev_0130 => base}/keymaps/vial/vial.json (100%)
rename keyboards/keychron/q0/{rev_0131 => plus}/keymaps/vial/config.h (100%)
rename keyboards/keychron/q0/{rev_0131 => plus}/keymaps/vial/keymap.c (100%)
rename keyboards/keychron/q0/{rev_0131 => plus}/keymaps/vial/rules.mk (100%)
rename keyboards/keychron/q0/{rev_0131 => plus}/keymaps/vial/vial.json (100%)
rename keyboards/keychron/{q1/rev_0100 => q1v1/ansi}/keymaps/vial/config.h (100%)
rename keyboards/keychron/{q1/rev_0100 => q1v1/ansi}/keymaps/vial/keymap.c (100%)
rename keyboards/keychron/{q1/rev_0100 => q1v1/ansi}/keymaps/vial/rules.mk (100%)
rename keyboards/keychron/{q1/rev_0100 => q1v1/ansi}/keymaps/vial/vial.json (100%)
rename keyboards/keychron/q4/{ansi_v1 => ansi}/keymaps/vial/config.h (100%)
rename keyboards/keychron/q4/{ansi_v1 => ansi}/keymaps/vial/keymap.c (100%)
rename keyboards/keychron/q4/{ansi_v1 => ansi}/keymaps/vial/rules.mk (100%)
rename keyboards/keychron/q4/{ansi_v1 => ansi}/keymaps/vial/vial.json (100%)
delete mode 100644 keyboards/keychron/q4/ansi_v2/keymaps/vial/config.h
delete mode 100644 keyboards/keychron/q4/ansi_v2/keymaps/vial/keymap.c
delete mode 100644 keyboards/keychron/q4/ansi_v2/keymaps/vial/rules.mk
delete mode 100644 keyboards/keychron/q4/ansi_v2/keymaps/vial/vial.json
diff --git a/keyboards/keychron/q0/rev_0130/keymaps/vial/config.h b/keyboards/keychron/q0/base/keymaps/vial/config.h
similarity index 100%
rename from keyboards/keychron/q0/rev_0130/keymaps/vial/config.h
rename to keyboards/keychron/q0/base/keymaps/vial/config.h
diff --git a/keyboards/keychron/q0/rev_0130/keymaps/vial/keymap.c b/keyboards/keychron/q0/base/keymaps/vial/keymap.c
similarity index 100%
rename from keyboards/keychron/q0/rev_0130/keymaps/vial/keymap.c
rename to keyboards/keychron/q0/base/keymaps/vial/keymap.c
diff --git a/keyboards/keychron/q0/rev_0130/keymaps/vial/rules.mk b/keyboards/keychron/q0/base/keymaps/vial/rules.mk
similarity index 100%
rename from keyboards/keychron/q0/rev_0130/keymaps/vial/rules.mk
rename to keyboards/keychron/q0/base/keymaps/vial/rules.mk
diff --git a/keyboards/keychron/q0/rev_0130/keymaps/vial/vial.json b/keyboards/keychron/q0/base/keymaps/vial/vial.json
similarity index 100%
rename from keyboards/keychron/q0/rev_0130/keymaps/vial/vial.json
rename to keyboards/keychron/q0/base/keymaps/vial/vial.json
diff --git a/keyboards/keychron/q0/rev_0131/keymaps/vial/config.h b/keyboards/keychron/q0/plus/keymaps/vial/config.h
similarity index 100%
rename from keyboards/keychron/q0/rev_0131/keymaps/vial/config.h
rename to keyboards/keychron/q0/plus/keymaps/vial/config.h
diff --git a/keyboards/keychron/q0/rev_0131/keymaps/vial/keymap.c b/keyboards/keychron/q0/plus/keymaps/vial/keymap.c
similarity index 100%
rename from keyboards/keychron/q0/rev_0131/keymaps/vial/keymap.c
rename to keyboards/keychron/q0/plus/keymaps/vial/keymap.c
diff --git a/keyboards/keychron/q0/rev_0131/keymaps/vial/rules.mk b/keyboards/keychron/q0/plus/keymaps/vial/rules.mk
similarity index 100%
rename from keyboards/keychron/q0/rev_0131/keymaps/vial/rules.mk
rename to keyboards/keychron/q0/plus/keymaps/vial/rules.mk
diff --git a/keyboards/keychron/q0/rev_0131/keymaps/vial/vial.json b/keyboards/keychron/q0/plus/keymaps/vial/vial.json
similarity index 100%
rename from keyboards/keychron/q0/rev_0131/keymaps/vial/vial.json
rename to keyboards/keychron/q0/plus/keymaps/vial/vial.json
diff --git a/keyboards/keychron/q1/rev_0100/keymaps/vial/config.h b/keyboards/keychron/q1v1/ansi/keymaps/vial/config.h
similarity index 100%
rename from keyboards/keychron/q1/rev_0100/keymaps/vial/config.h
rename to keyboards/keychron/q1v1/ansi/keymaps/vial/config.h
diff --git a/keyboards/keychron/q1/rev_0100/keymaps/vial/keymap.c b/keyboards/keychron/q1v1/ansi/keymaps/vial/keymap.c
similarity index 100%
rename from keyboards/keychron/q1/rev_0100/keymaps/vial/keymap.c
rename to keyboards/keychron/q1v1/ansi/keymaps/vial/keymap.c
diff --git a/keyboards/keychron/q1/rev_0100/keymaps/vial/rules.mk b/keyboards/keychron/q1v1/ansi/keymaps/vial/rules.mk
similarity index 100%
rename from keyboards/keychron/q1/rev_0100/keymaps/vial/rules.mk
rename to keyboards/keychron/q1v1/ansi/keymaps/vial/rules.mk
diff --git a/keyboards/keychron/q1/rev_0100/keymaps/vial/vial.json b/keyboards/keychron/q1v1/ansi/keymaps/vial/vial.json
similarity index 100%
rename from keyboards/keychron/q1/rev_0100/keymaps/vial/vial.json
rename to keyboards/keychron/q1v1/ansi/keymaps/vial/vial.json
diff --git a/keyboards/keychron/q4/ansi_v1/keymaps/vial/config.h b/keyboards/keychron/q4/ansi/keymaps/vial/config.h
similarity index 100%
rename from keyboards/keychron/q4/ansi_v1/keymaps/vial/config.h
rename to keyboards/keychron/q4/ansi/keymaps/vial/config.h
diff --git a/keyboards/keychron/q4/ansi_v1/keymaps/vial/keymap.c b/keyboards/keychron/q4/ansi/keymaps/vial/keymap.c
similarity index 100%
rename from keyboards/keychron/q4/ansi_v1/keymaps/vial/keymap.c
rename to keyboards/keychron/q4/ansi/keymaps/vial/keymap.c
diff --git a/keyboards/keychron/q4/ansi_v1/keymaps/vial/rules.mk b/keyboards/keychron/q4/ansi/keymaps/vial/rules.mk
similarity index 100%
rename from keyboards/keychron/q4/ansi_v1/keymaps/vial/rules.mk
rename to keyboards/keychron/q4/ansi/keymaps/vial/rules.mk
diff --git a/keyboards/keychron/q4/ansi_v1/keymaps/vial/vial.json b/keyboards/keychron/q4/ansi/keymaps/vial/vial.json
similarity index 100%
rename from keyboards/keychron/q4/ansi_v1/keymaps/vial/vial.json
rename to keyboards/keychron/q4/ansi/keymaps/vial/vial.json
diff --git a/keyboards/keychron/q4/ansi_v2/keymaps/vial/config.h b/keyboards/keychron/q4/ansi_v2/keymaps/vial/config.h
deleted file mode 100644
index a06d82c57f..0000000000
--- a/keyboards/keychron/q4/ansi_v2/keymaps/vial/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * 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 .
- */
-
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-
-#pragma once
-
-#define VIAL_KEYBOARD_UID {0x33, 0x31, 0x2F, 0xBC, 0xB4, 0x4F, 0x45, 0x16}
-
-#define VIAL_UNLOCK_COMBO_ROWS {0, 2}
-#define VIAL_UNLOCK_COMBO_COLS {0, 13}
-
-/* Set dynamic keymap layer counts to 5 */
-#define DYNAMIC_KEYMAP_LAYER_COUNT 5
diff --git a/keyboards/keychron/q4/ansi_v2/keymaps/vial/keymap.c b/keyboards/keychron/q4/ansi_v2/keymaps/vial/keymap.c
deleted file mode 100644
index d58af0f244..0000000000
--- a/keyboards/keychron/q4/ansi_v2/keymaps/vial/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2022 @ Keychron (https://www.keychron.com)
- *
- * 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
-#include "keychron_common.h"
-
-// clang-format off
-
-enum layers {
- MAC_BASE,
- WIN_BASE,
- _FN1,
- _FN2,
- _FN3
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [MAC_BASE] = LAYOUT_ansi_61(
- KC_ESC, 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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_LCTL, KC_LOPT, KC_LCMD, KC_SPC, KC_RCMD, MO(_FN1), MO(_FN3), KC_RCTL),
-
- [WIN_BASE] = LAYOUT_ansi_61(
- KC_ESC, 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_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_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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FN2), MO(_FN3), KC_RCTL),
-
- [_FN1] = LAYOUT_ansi_61(
- KC_GRV, KC_BRID, KC_BRIU, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD,
- RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, KC_INS, KC_PGUP, KC_HOME, _______,
- _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, KC_UP, KC_NO, KC_PGDN, KC_END, _______,
- _______, _______, _______, _______, _______, _______, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______,
- _______, _______, _______, _______, _______, _______, _______, _______),
-
- [_FN2] = LAYOUT_ansi_61(
- KC_GRV, KC_BRID, KC_BRIU, KC_NO, KC_NO, RGB_VAD, RGB_VAI, KC_MPRV, KC_MPLY, KC_MNXT, KC_MUTE, KC_VOLD, KC_VOLU, RGB_MOD,
- RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, KC_APP, KC_SCRL, KC_INS, KC_PGUP, KC_HOME, _______,
- _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, KC_UP, KC_PSCR, KC_PGDN, KC_END, _______,
- _______, _______, _______, _______, _______, _______, NK_TOGG, KC_LEFT, KC_DOWN, KC_RIGHT, KC_DEL, _______,
- _______, _______, _______, _______, _______, _______, _______, _______),
-
- [_FN3] = LAYOUT_ansi_61(
- KC_TILD, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, _______,
- RGB_TOG, RGB_MOD, RGB_VAI, RGB_HUI, RGB_SAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, RGB_RMOD, RGB_VAD, RGB_HUD, RGB_SAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
- _______, _______, _______, _______, _______, _______, _______, _______)
-};
-
-// clang-format on
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
- if (!process_record_keychron(keycode, record)) {
- return false;
- }
-
- return true;
-}
\ No newline at end of file
diff --git a/keyboards/keychron/q4/ansi_v2/keymaps/vial/rules.mk b/keyboards/keychron/q4/ansi_v2/keymaps/vial/rules.mk
deleted file mode 100644
index 1d2d2c11d2..0000000000
--- a/keyboards/keychron/q4/ansi_v2/keymaps/vial/rules.mk
+++ /dev/null
@@ -1,6 +0,0 @@
-VIA_ENABLE = yes
-VIAL_ENABLE = yes
-VIALRGB_ENABLE = yes
-
-VPATH += keyboards/keychron/common
-SRC += keychron_common.c
\ No newline at end of file
diff --git a/keyboards/keychron/q4/ansi_v2/keymaps/vial/vial.json b/keyboards/keychron/q4/ansi_v2/keymaps/vial/vial.json
deleted file mode 100644
index f3c9f7b766..0000000000
--- a/keyboards/keychron/q4/ansi_v2/keymaps/vial/vial.json
+++ /dev/null
@@ -1,161 +0,0 @@
-{
- "name": "Keychron Q4",
- "vendorId": "0x3434",
- "productId": "0x0140",
- "lighting": "vialrgb",
- "matrix": {"rows": 5, "cols": 14},
- "customKeycodes": [
- {"name": "Mission Control", "title": "Mission Control in macOS", "shortName": "Mission Control"},
- {"name": "Launch Pad", "title": "Launch Pad in macOS", "shortName": "Launch Pad"},
- {"name": "Left Option", "title": "Left Option in macOS", "shortName": "Left Option"},
- {"name": "Right Option", "title": "Right Option in macOS", "shortName": "Right Option"},
- {"name": "Left Cmd", "title": "Left Command in macOS", "shortName": "Left Command"},
- {"name": "Right Cmd", "title": "Right Command in macOS", "shortName": "Right Command"},
- {"name": "Task View", "title": "Task View in windows", "shortName": "Task View"},
- {"name": "File Explorer", "title": "File Explorer in windows", "shortName": "File Explorer"},
- {"name": "Screen Shot", "title": "Screenshot in macOS", "shortName": "Screen Shot"}
- ],
- "layouts": {
- "keymap":[
- [
- {
- "c": "#777777",
- "y": 0.25
- },
- "0,0\nESC",
- {
- "c": "#cccccc"
- },
- "0,1",
- "0,2",
- "0,3",
- "0,4",
- "0,5",
- "0,6",
- "0,7",
- "0,8",
- "0,9",
- "0,10",
- "0,11",
- "0,12",
- {
- "c": "#aaaaaa",
- "w": 2
- },
- "0,13"
- ],
- [
- {
- "w": 1.5
- },
- "1,0",
- {
- "c": "#cccccc"
- },
- "1,1",
- "1,2",
- "1,3",
- "1,4",
- "1,5",
- "1,6",
- "1,7",
- "1,8",
- "1,9",
- "1,10",
- "1,11",
- "1,12",
- {
- "w": 1.5
- },
- "1,13"
- ],
- [
- {
- "w": 1.75
- },
- "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",
- {
- "c": "#777777",
- "w": 2.25
- },
- "2,13"
- ],
- [
- {
- "c": "#cccccc",
- "w": 2.25
- },
- "3,0",
- {
- "c": "#cccccc"
- },
- "3,2",
- "3,3",
- "3,4",
- "3,5",
- "3,6",
- "3,7",
- "3,8",
- "3,9",
- "3,10",
- "3,11",
- {
- "c": "#aaaaaa",
- "w": 2.75
- },
- "3,13"
- ],
- [
- {
- "c": "#aaaaaa",
- "w": 1.25
- },
- "4,0",
- {
- "w": 1.25
- },
- "4,1",
- {
- "w": 1.25
- },
- "4,2",
- {
- "c": "#cccccc",
- "w": 6.25
- },
- "4,6",
- {
- "c": "#aaaaaa",
- "w": 1.25
- },
- "4,10",
- {
- "w": 1.25
- },
- "4,11",
- {
- "w": 1.25
- },
- "4,12",
- {
- "w": 1.25
- },
- "4,13"
- ]
- ]
- }
-}