From 966cdc94e48ecd1631809bbf6b9cd9b0aca9c54a Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Mon, 22 Feb 2021 14:04:14 -0800 Subject: [PATCH] Bugfix for Jacky Studio keyboards (#11981) PR 10528 was intended to move the source for the Bear 65 and S7 Elephant to the new `jacky_studio` vendor directory. Instead of moving the source files, that PR added the source as if they were newly-supported. The result is that the Bear 65 and both revisions of the S7 Elephant have working, identical firmware in two different directories. This commit removes the source from the old directories. --- keyboards/bear_65/keymaps/via/keymap.c | 47 ---------- keyboards/bear_65/keymaps/via/readme.md | 1 - keyboards/bear_65/keymaps/via/rules.mk | 1 - .../s7_elephant/rev2/keymaps/via/keymap.c | 92 ------------------- .../s7_elephant/rev2/keymaps/via/readme.md | 35 ------- .../s7_elephant/rev2/keymaps/via/rules.mk | 1 - 6 files changed, 177 deletions(-) delete mode 100644 keyboards/bear_65/keymaps/via/keymap.c delete mode 100644 keyboards/bear_65/keymaps/via/readme.md delete mode 100644 keyboards/bear_65/keymaps/via/rules.mk delete mode 100644 keyboards/s7_elephant/rev2/keymaps/via/keymap.c delete mode 100644 keyboards/s7_elephant/rev2/keymaps/via/readme.md delete mode 100644 keyboards/s7_elephant/rev2/keymaps/via/rules.mk diff --git a/keyboards/bear_65/keymaps/via/keymap.c b/keyboards/bear_65/keymaps/via/keymap.c deleted file mode 100644 index 2ddc5b43..00000000 --- a/keyboards/bear_65/keymaps/via/keymap.c +++ /dev/null @@ -1,47 +0,0 @@ -/* Copyright 2020 MudkipMao - * - * 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_full_bs( - KC_ESC, 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_DEL, - KC_PGUP, 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_PGDN, 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_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, - KC_LCTL, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, MO(1), KC_LEFT, KC_DOWN, KC_RGHT - ), - [1] = LAYOUT_full_bs( - RESET, _______, 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_MOD, _______, KC_BRID, KC_BRIU, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, - RGB_TOG, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______,_______ - ), - [2] = LAYOUT_full_bs( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______,_______ - ), - [3] = LAYOUT_full_bs( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______,_______ - ) -}; diff --git a/keyboards/bear_65/keymaps/via/readme.md b/keyboards/bear_65/keymaps/via/readme.md deleted file mode 100644 index 5cb67ab2..00000000 --- a/keyboards/bear_65/keymaps/via/readme.md +++ /dev/null @@ -1 +0,0 @@ -# The via keymap for bear_65 diff --git a/keyboards/bear_65/keymaps/via/rules.mk b/keyboards/bear_65/keymaps/via/rules.mk deleted file mode 100644 index 1e5b9980..00000000 --- a/keyboards/bear_65/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes diff --git a/keyboards/s7_elephant/rev2/keymaps/via/keymap.c b/keyboards/s7_elephant/rev2/keymaps/via/keymap.c deleted file mode 100644 index b81777b1..00000000 --- a/keyboards/s7_elephant/rev2/keymaps/via/keymap.c +++ /dev/null @@ -1,92 +0,0 @@ -#include QMK_KEYBOARD_H - -// For readability -enum layer_names { - _BASE, - _FN1, - _FN2, - _FN3, -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - /* Default layer - * ,------. ,-------------------------------------------------------------------------------------------------. - * | F1 | | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | Bkspc | Ins | - * |------| |-------------------------------------------------------------------------------------------------| - * | F2 | | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | Del | - * |------| |-------------------------------------------------------------------------------------------------| - * | F3 | | Caps | A | S | D | F | G | H | J | K | L | ; | ' | Enter |Home | - * |------| |-------------------------------------------------------------------------------------------------| - * | F4 | | Shift | Z | X | C | V | B | N | M | , | . | / | RShift | U | End | - * |------| |-------------------------------------------------------------------------------------------------| - * | F5 | | Ctrl | Gui | Alt | Space | RAlt | FN | RCtrl | L | D | R | - * `------' `-------------------------------------------------------------------------------------------------' - */ - [_BASE] = LAYOUT_ansi_1u( - KC_F1, 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_INS, - KC_F2, 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_DEL, - KC_F3, 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_HOME, - KC_F4, 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_END, - KC_F5, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), - - /* Fn1 Layer - * ,------. ,-------------------------------------------------------------------------------------------------. - * | F6 | | `~ | | | | | | | | | | | | | | | - * |------| |-------------------------------------------------------------------------------------------------| - * | F7 | | | | | | | | | | | | | | | | | - * |------| |-------------------------------------------------------------------------------------------------| - * | F8 | | |VolD |VolU |Mute | | | | | | | | | |PgUp | - * |------| |-------------------------------------------------------------------------------------------------| - * | F9 | | |Prev |Play |Next | | | | | | | | | |PgDn | - * |------| |-------------------------------------------------------------------------------------------------| - * | F10 | | | | | | | | | | | | - * `------' `-------------------------------------------------------------------------------------------------' - */ - [_FN1] = LAYOUT_ansi_1u( - KC_F6, KC_GRV, 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_F7, 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_F8, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, - KC_F9, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, - KC_F10, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - /* Fn2 Layer - * ,------. ,-------------------------------------------------------------------------------------------------. - * | | | | | | | | | | | | | | | | | | - * |------| |-------------------------------------------------------------------------------------------------| - * | | | | | | | | | | | | | | | | | | - * |------| |-------------------------------------------------------------------------------------------------| - * | | | | | | | | | | | | | | | | | - * |------| |-------------------------------------------------------------------------------------------------| - * | | | | | | | | | | | | | | | | | - * |------| |-------------------------------------------------------------------------------------------------| - * | | | | | | | | | | | | | - * `------' `-------------------------------------------------------------------------------------------------' - */ - [_FN2] = LAYOUT_ansi_1u( - 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, 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), - - /* Fn3 Layer - * ,------. ,-------------------------------------------------------------------------------------------------. - * | | | | | | | | | | | | | | | | | | - * |------| |-------------------------------------------------------------------------------------------------| - * | | | | | | | | | | | | | | | | | | - * |------| |-------------------------------------------------------------------------------------------------| - * | | | | | | | | | | | | | | | | | - * |------| |-------------------------------------------------------------------------------------------------| - * | | | | | | | | | | | | | | | | | - * |------| |-------------------------------------------------------------------------------------------------| - * | | | | | | | | | | | | | - * `------' `-------------------------------------------------------------------------------------------------' - */ - [_FN3] = LAYOUT_ansi_1u( - 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, 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/s7_elephant/rev2/keymaps/via/readme.md b/keyboards/s7_elephant/rev2/keymaps/via/readme.md deleted file mode 100644 index c4fe30ac..00000000 --- a/keyboards/s7_elephant/rev2/keymaps/via/readme.md +++ /dev/null @@ -1,35 +0,0 @@ -# Default keymap for S7 Elephant - -**Features** - -* LEDs are functioning as Caps-Lock indicators - -## QWERTY (Normal) Layer -``` -,------. ,-------------------------------------------------------------------------------------------------. -| F1 | | Esc`~ | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | Bkspc |Home | -|------| |-------------------------------------------------------------------------------------------------| -| F2 | | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | \ | End | -|------| |-------------------------------------------------------------------------------------------------| -| F3 | | Caps | A | S | D | F | G | H | J | K | L | ; | ' | Enter | Ins | -|------| |-------------------------------------------------------------------------------------------------| -| F4 | | Shift | Z | X | C | V | B | N | M | , | . | / | RShift | U | Del | -|------| |-------------------------------------------------------------------------------------------------| -| F5 | | Ctrl | Gui | Alt | Space | FN | RAlt | RCtrl | L | D | R | -`------' `-------------------------------------------------------------------------------------------------' -``` - -## FN Layer -``` -,------. ,-------------------------------------------------------------------------------------------------. -|Reset | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | PScr | ScrLck |Pause| -|------| |-------------------------------------------------------------------------------------------------| -| | | | | | | | | | | | | | | | | | -|------| |-------------------------------------------------------------------------------------------------| -| | | |Prev |Play |Next | | | | |VolD |Mute |VolU | | |PgUp | -|------| |-------------------------------------------------------------------------------------------------| -| | | | | | | | | | | | | | | |PgDn | -|------| |-------------------------------------------------------------------------------------------------| -|EPRM | | | | | | | | | | | | -`------' `-------------------------------------------------------------------------------------------------' -``` diff --git a/keyboards/s7_elephant/rev2/keymaps/via/rules.mk b/keyboards/s7_elephant/rev2/keymaps/via/rules.mk deleted file mode 100644 index 1e5b9980..00000000 --- a/keyboards/s7_elephant/rev2/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes