From 45fd373661b597a059d3711586bad9c618e72486 Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Mon, 20 Mar 2023 12:33:07 -0400 Subject: [PATCH] March merge additions (#417) * fixup: update Vial keymaps per upstream reqs more keycodes renamed `rgb_matrix_indicators_user` return type switched to bool keymaps/encoder maps that exceeded DYNAMIC_KEYMAP_LAYER_COUNT had excess layers removed EOL spaces and backslashes removed from keymaps * fixup: DRIVER_LED_TOTAL --> RGB_MATRIX_LED_COUNT * fixup: Vial-exclusive keyboard configs * fixup: 42keebs rules * fixup: relocated Vial keymaps * fixup: cleanup post-keymap move Remove wavtype/p01_ultra keymaps that went into QMK under different names Fix handwired/misterdeck and 4pplet/waffling60/rev_c keymaps * fixup: Vial-exclusive default keymaps * fixup: remove broken via-only keymaps compiling VIA keymaps is not supported anyway * fixup: non-compiling Vial keymaps * refactor: changes from QMK PR, fix Vial keymap --- keyboards/42keebs/basketweave_s/config.h | 4 +- .../basketweave_s/keymaps/default/keymap.c | 2 +- .../basketweave_s/keymaps/vial/keymap.c | 2 +- keyboards/42keebs/basketweave_s/rules.mk | 2 +- .../42keebs/discipline/keymaps/via/keymap.c | 70 ------ .../42keebs/discipline/keymaps/via/rules.mk | 2 - keyboards/42keebs/mysterium/config.h | 4 +- .../mysterium/keymaps/default/keymap.c | 4 +- .../42keebs/mysterium/keymaps/via/keymap.c | 59 ----- .../42keebs/mysterium/keymaps/via/rules.mk | 2 - .../42keebs/mysterium/keymaps/vial/keymap.c | 15 +- keyboards/42keebs/mysterium/rules.mk | 1 + keyboards/42keebs/mysterium/v15c/rules.mk | 2 +- keyboards/42keebs/mysterium/v15d/rules.mk | 2 +- .../{ => rev_c}/keymaps/vial/config.h | 0 .../{ => rev_c}/keymaps/vial/keymap.c | 32 +-- .../{ => rev_c}/keymaps/vial/rules.mk | 0 .../{ => rev_c}/keymaps/vial/vial.json | 0 keyboards/adalyn/adalyn.c | 1 - keyboards/adalyn/adalyn.h | 18 -- keyboards/adalyn/info.json | 12 - keyboards/adalyn/keymaps/default/config.h | 6 - keyboards/adalyn/keymaps/default/keymap.c | 57 ----- keyboards/adalyn/keymaps/default/readme.md | 1 - keyboards/adalyn/keymaps/default/rules.mk | 1 - keyboards/adalyn/readme.md | 3 - keyboards/adalyn/rules.mk | 23 -- keyboards/ai03/vega/keymaps/vial/keymap.c | 40 ++-- .../cannonkeys/db60/keymaps/vial/keymap.c | 2 +- .../cannonkeys/savage65/keymaps/vial/keymap.c | 2 +- .../mini36/keymaps/vial/config.h | 2 +- .../mini42/keymaps/vial/config.h | 4 +- keyboards/doio/kb04/config.h | 2 +- .../duckboard_r2/keymaps/vial/config.h | 2 +- .../duckboard_r2/keymaps/vial/keymap.c | 10 +- keyboards/durgod/k3x0/keymaps/vial/keymap.c | 4 +- keyboards/ekow/akira/keymaps/vial/keymap.c | 6 - .../aletheia/keymaps/via/keymap.c | 48 ---- .../aletheia/keymaps/via/rules.mk | 2 - keyboards/feker/ik75/keymaps/vial/config.h | 22 ++ keyboards/feker/ik75/keymaps/vial/keymap.c | 3 +- keyboards/getawayvan/config.h | 6 +- keyboards/getawayvan/keymaps/default/keymap.c | 4 +- keyboards/getawayvan/keymaps/vial/keymap.c | 4 +- .../gmmk/pro/rev1/ansi/keymaps/vial/config.h | 2 +- .../gmmk/pro/rev1/ansi/keymaps/vial/keymap.c | 8 +- .../gmmk/pro/rev1/iso/keymaps/vial/config.h | 2 +- .../gmmk/pro/rev1/iso/keymaps/vial/keymap.c | 4 +- .../grezeh/larva/larva2/keymaps/via/keymap.c | 44 ---- .../grezeh/larva/larva2/keymaps/via/rules.mk | 3 - .../grezeh/larva/larva2/keymaps/via/via.json | 102 --------- .../handwired/3dpcb/keymaps/vial/keymap.c | 2 +- .../misterdeck/keymaps/vial/config.h | 7 + .../misterdeck/keymaps/vial/keymap.c | 2 + .../misterdeck/keymaps/vial/rules.mk | 0 .../misterdeck/keymaps/vial/vial.json | 0 .../keebio/bdn9/rev2/keymaps/vial/keymap.c | 2 +- .../q0/rev_0130/keymaps/vial/keymap.c | 2 +- .../kingly_keys/romac/keymaps/vial/keymap.c | 32 +-- .../kprepublic/bm16a/keymaps/vial/keymap.c | 4 +- .../dimple/staggered/keymaps/vial/keymap.c | 2 +- .../lets_split_eh/keymaps/vial/config.h | 5 + .../mechlovin/kay65/keymaps/vial/keymap.c | 10 +- keyboards/misterdeck/info.json | 47 ---- keyboards/misterdeck/keymaps/default/keymap.c | 70 ------ keyboards/misterdeck/misterdeck.c | 1 - keyboards/misterdeck/misterdeck.h | 10 - keyboards/misterdeck/readme.md | 27 --- keyboards/misterdeck/rules.mk | 31 --- keyboards/mt/split75/keymaps/vial/config.h | 2 +- keyboards/neodox/keymaps/vial/keymap.c | 10 +- .../novelkeys/nk87/keymaps/vial/keymap.c | 2 +- keyboards/pancake/rev1/config.h | 30 --- keyboards/pancake/rev1/feather/config.h | 28 --- keyboards/pancake/rev1/feather/rules.mk | 37 ---- keyboards/pancake/rev1/info.json | 112 ---------- .../pancake/rev1/keymaps/default/keymap.c | 90 -------- .../pancake/rev1/keymaps/default/readme.md | 3 - keyboards/pancake/rev1/keymaps/via/keymap.c | 105 --------- keyboards/pancake/rev1/keymaps/via/rules.mk | 2 - keyboards/pancake/rev1/promicro/config.h | 22 -- keyboards/pancake/rev1/promicro/rules.mk | 33 --- keyboards/pancake/rev1/readme.md | 13 -- keyboards/pancake/rev1/rev1.c | 16 -- keyboards/pancake/rev1/rev1.h | 44 ---- keyboards/pancake/rev2/info.json | 62 ------ .../pancake/rev2/keymaps/default/readme.md | 3 - keyboards/pancake/rev2/keymaps/via/keymap.c | 84 ------- .../pancake/rev2/keymaps/via/pancakev2.json | 18 -- keyboards/pancake/rev2/keymaps/via/readme.md | 3 - keyboards/pancake/rev2/keymaps/via/rules.mk | 2 - keyboards/pancake/rev2/keymaps/vial/keymap.c | 84 ------- keyboards/pancake/rev2/readme.md | 12 - keyboards/pancake/rev2/rev2.c | 54 ----- keyboards/pancake/rev2/rev2.h | 31 --- keyboards/pancake/rev2/rules.mk | 25 --- keyboards/preonic/rev1/keymaps/vial/keymap.c | 16 +- .../preonic/rev1/keymaps/vial/post_rules.mk | 3 + keyboards/preonic/rev1/keymaps/vial/rules.mk | 5 +- .../primekb/meridian/keymaps/vial/keymap.c | 2 +- keyboards/rainkeebs/plop/keymaps/via/keymap.c | 32 --- keyboards/rainkeebs/plop/keymaps/via/rules.mk | 1 - .../smithrune/iron165r2/keymaps/vial/keymap.c | 12 +- .../pancake/rev2/keymaps/vial/config.h | 0 .../pancake/rev2/keymaps/vial}/keymap.c | 0 .../pancake/rev2/keymaps/vial/rules.mk | 0 .../pancake/rev2/keymaps/vial/vial.json | 0 .../adalyn/keymaps/vial/config.h | 0 .../adalyn/keymaps/vial/keymap.c | 0 .../adalyn/keymaps/vial/rules.mk | 0 .../adalyn/keymaps/vial/vial.json | 0 keyboards/velocifire/sun20pro/config.h | 6 +- .../sun20pro/keymaps/default/keymap.c | 2 +- .../p01_ultra/keymaps/ansi_7u/keymap.c | 34 --- .../wavtype/p01_ultra/keymaps/iso/keymap.c | 34 --- keyboards/xelus/ninjin/keymaps/vial/keymap.c | 2 +- .../xelus/valor/rev2/keymaps/vial/keymap.c | 3 +- keyboards/ymdk/id75/board.h | 7 +- keyboards/ymdk/id75/chconf.h | 41 ---- keyboards/ymdk/id75/config.h | 162 +++++--------- keyboards/ymdk/id75/halconf.h | 8 - keyboards/ymdk/id75/id75.c | 58 +---- keyboards/ymdk/id75/id75.h | 42 ---- keyboards/ymdk/id75/info.json | 208 +++++++++++++++++- keyboards/ymdk/id75/keymaps/default/keymap.c | 52 ----- .../ymdk/id75/keymaps/default/keymap.json | 24 ++ keyboards/ymdk/id75/keymaps/vial/config.h | 3 - keyboards/ymdk/id75/keymaps/vial/keymap.c | 25 +-- keyboards/ymdk/id75/ld/STM32F103xB_uf2.ld | 88 -------- keyboards/ymdk/id75/ld/board.h | 25 --- keyboards/ymdk/id75/mcuconf.h | 7 +- keyboards/ymdk/id75/readme.md | 81 +++---- keyboards/ymdk/id75/rules.mk | 28 +-- 133 files changed, 509 insertions(+), 2336 deletions(-) delete mode 100644 keyboards/42keebs/discipline/keymaps/via/keymap.c delete mode 100644 keyboards/42keebs/discipline/keymaps/via/rules.mk delete mode 100644 keyboards/42keebs/mysterium/keymaps/via/keymap.c delete mode 100644 keyboards/42keebs/mysterium/keymaps/via/rules.mk create mode 100644 keyboards/42keebs/mysterium/rules.mk rename keyboards/4pplet/waffling60/{ => rev_c}/keymaps/vial/config.h (100%) rename keyboards/4pplet/waffling60/{ => rev_c}/keymaps/vial/keymap.c (85%) rename keyboards/4pplet/waffling60/{ => rev_c}/keymaps/vial/rules.mk (100%) rename keyboards/4pplet/waffling60/{ => rev_c}/keymaps/vial/vial.json (100%) delete mode 100644 keyboards/adalyn/adalyn.c delete mode 100644 keyboards/adalyn/adalyn.h delete mode 100644 keyboards/adalyn/info.json delete mode 100644 keyboards/adalyn/keymaps/default/config.h delete mode 100644 keyboards/adalyn/keymaps/default/keymap.c delete mode 100644 keyboards/adalyn/keymaps/default/readme.md delete mode 100644 keyboards/adalyn/keymaps/default/rules.mk delete mode 100644 keyboards/adalyn/readme.md delete mode 100644 keyboards/adalyn/rules.mk delete mode 100644 keyboards/fancy_customs/aletheia/keymaps/via/keymap.c delete mode 100644 keyboards/fancy_customs/aletheia/keymaps/via/rules.mk delete mode 100644 keyboards/grezeh/larva/larva2/keymaps/via/keymap.c delete mode 100644 keyboards/grezeh/larva/larva2/keymaps/via/rules.mk delete mode 100644 keyboards/grezeh/larva/larva2/keymaps/via/via.json create mode 100644 keyboards/handwired/misterdeck/keymaps/vial/config.h rename keyboards/{ => handwired}/misterdeck/keymaps/vial/keymap.c (98%) rename keyboards/{ => handwired}/misterdeck/keymaps/vial/rules.mk (100%) rename keyboards/{ => handwired}/misterdeck/keymaps/vial/vial.json (100%) delete mode 100644 keyboards/misterdeck/info.json delete mode 100644 keyboards/misterdeck/keymaps/default/keymap.c delete mode 100644 keyboards/misterdeck/misterdeck.c delete mode 100644 keyboards/misterdeck/misterdeck.h delete mode 100644 keyboards/misterdeck/readme.md delete mode 100644 keyboards/misterdeck/rules.mk delete mode 100644 keyboards/pancake/rev1/config.h delete mode 100644 keyboards/pancake/rev1/feather/config.h delete mode 100644 keyboards/pancake/rev1/feather/rules.mk delete mode 100644 keyboards/pancake/rev1/info.json delete mode 100644 keyboards/pancake/rev1/keymaps/default/keymap.c delete mode 100644 keyboards/pancake/rev1/keymaps/default/readme.md delete mode 100644 keyboards/pancake/rev1/keymaps/via/keymap.c delete mode 100644 keyboards/pancake/rev1/keymaps/via/rules.mk delete mode 100644 keyboards/pancake/rev1/promicro/config.h delete mode 100644 keyboards/pancake/rev1/promicro/rules.mk delete mode 100644 keyboards/pancake/rev1/readme.md delete mode 100644 keyboards/pancake/rev1/rev1.c delete mode 100644 keyboards/pancake/rev1/rev1.h delete mode 100644 keyboards/pancake/rev2/info.json delete mode 100644 keyboards/pancake/rev2/keymaps/default/readme.md delete mode 100644 keyboards/pancake/rev2/keymaps/via/keymap.c delete mode 100644 keyboards/pancake/rev2/keymaps/via/pancakev2.json delete mode 100644 keyboards/pancake/rev2/keymaps/via/readme.md delete mode 100644 keyboards/pancake/rev2/keymaps/via/rules.mk delete mode 100644 keyboards/pancake/rev2/keymaps/vial/keymap.c delete mode 100644 keyboards/pancake/rev2/readme.md delete mode 100644 keyboards/pancake/rev2/rev2.c delete mode 100644 keyboards/pancake/rev2/rev2.h delete mode 100644 keyboards/pancake/rev2/rules.mk create mode 100644 keyboards/preonic/rev1/keymaps/vial/post_rules.mk delete mode 100644 keyboards/rainkeebs/plop/keymaps/via/keymap.c delete mode 100644 keyboards/rainkeebs/plop/keymaps/via/rules.mk rename keyboards/{ => spaceman}/pancake/rev2/keymaps/vial/config.h (100%) rename keyboards/{pancake/rev2/keymaps/default => spaceman/pancake/rev2/keymaps/vial}/keymap.c (100%) rename keyboards/{ => spaceman}/pancake/rev2/keymaps/vial/rules.mk (100%) rename keyboards/{ => spaceman}/pancake/rev2/keymaps/vial/vial.json (100%) rename keyboards/{ => tominabox1}/adalyn/keymaps/vial/config.h (100%) rename keyboards/{ => tominabox1}/adalyn/keymaps/vial/keymap.c (100%) rename keyboards/{ => tominabox1}/adalyn/keymaps/vial/rules.mk (100%) rename keyboards/{ => tominabox1}/adalyn/keymaps/vial/vial.json (100%) delete mode 100644 keyboards/wavtype/p01_ultra/keymaps/ansi_7u/keymap.c delete mode 100644 keyboards/wavtype/p01_ultra/keymaps/iso/keymap.c delete mode 100644 keyboards/ymdk/id75/chconf.h delete mode 100644 keyboards/ymdk/id75/id75.h delete mode 100644 keyboards/ymdk/id75/keymaps/default/keymap.c create mode 100644 keyboards/ymdk/id75/keymaps/default/keymap.json delete mode 100644 keyboards/ymdk/id75/ld/STM32F103xB_uf2.ld delete mode 100644 keyboards/ymdk/id75/ld/board.h diff --git a/keyboards/42keebs/basketweave_s/config.h b/keyboards/42keebs/basketweave_s/config.h index 403a9fd3a0..c1c4e05802 100644 --- a/keyboards/42keebs/basketweave_s/config.h +++ b/keyboards/42keebs/basketweave_s/config.h @@ -21,8 +21,8 @@ #define VENDOR_ID 0x6B62 #define PRODUCT_ID 0x6869 #define DEVICE_VER 0x0001 -#define MANUFACTURER 42. Keebs -#define PRODUCT Basketweave-S +#define MANUFACTURER "42. Keebs" +#define PRODUCT "Basketweave-S" /* key matrix size */ #define MATRIX_ROWS 5 diff --git a/keyboards/42keebs/basketweave_s/keymaps/default/keymap.c b/keyboards/42keebs/basketweave_s/keymaps/default/keymap.c index ed0cf7601d..f984ed9fc7 100644 --- a/keyboards/42keebs/basketweave_s/keymaps/default/keymap.c +++ b/keyboards/42keebs/basketweave_s/keymaps/default/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* esc ` 1 2 3 4 5 6 7 8 9 0 - = bspc */ KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS, /* ins tab Q W E R T Y U I O P [ ] \ */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, /* rotary caps A S D F G H J K L ; ' enter */ KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, /* shift Z X C V B B N M , . / shift up */ diff --git a/keyboards/42keebs/basketweave_s/keymaps/vial/keymap.c b/keyboards/42keebs/basketweave_s/keymaps/vial/keymap.c index d8c97c6db9..7de4e72d38 100644 --- a/keyboards/42keebs/basketweave_s/keymaps/vial/keymap.c +++ b/keyboards/42keebs/basketweave_s/keymaps/vial/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* esc ` 1 2 3 4 5 6 7 8 9 0 - = bspc */ KC_TRNS, KC_TRNS, 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_TRNS, KC_TRNS, /* ins tab Q W E R T Y U I O P [ ] \ */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, /* rotary caps A S D F G H J K L ; ' enter */ KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_TRNS, /* shift Z X C V B B N M , . / shift up */ diff --git a/keyboards/42keebs/basketweave_s/rules.mk b/keyboards/42keebs/basketweave_s/rules.mk index f3ae898749..38778a5405 100644 --- a/keyboards/42keebs/basketweave_s/rules.mk +++ b/keyboards/42keebs/basketweave_s/rules.mk @@ -5,7 +5,7 @@ MCU = atmega32a F_CPU = 16000000 # Bootloader selection -BOOTLOADER = USBasp +BOOTLOADER = usbasploader # Build Options # change yes to no to disable diff --git a/keyboards/42keebs/discipline/keymaps/via/keymap.c b/keyboards/42keebs/discipline/keymaps/via/keymap.c deleted file mode 100644 index 539ade504d..0000000000 --- a/keyboards/42keebs/discipline/keymaps/via/keymap.c +++ /dev/null @@ -1,70 +0,0 @@ -/* Copyright 2019 COSEYFANNITUTTI - * - * 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_65_iso( - KC_GESC, 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_GRV, - 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_DEL, KC_DEL, - 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_NUHS, KC_ENT, KC_PGUP, - 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, KC_PGDN, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), - - [1] = LAYOUT_65_iso( - /* esc 1 2 3 4 5 6 7 8 9 0 - = bkspc `~ */ - KC_GRV, 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_PSCR, - /* tab Q W E R T Y U I O P [ ] spltbs delete*/ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS,KC_TRNS,KC_TRNS,KC_INS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS, - /* caps A S D F G H J K L ; ' # enter pg up*/ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_HOME, - /* shift \ Z X C V B N M , . / shift up pg dn*/ - KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_MUTE,KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT, KC_VOLU, KC_END, - /* ctrl win alt space alt fn ctrl left down right*/ - KC_LCTL, KC_LGUI, KC_LALT, KC_TRNS, KC_RALT, KC_TRNS, KC_RCTL, KC_TRNS, KC_VOLD, KC_TRNS), - - [2] = LAYOUT_65_iso( - /* esc 1 2 3 4 5 6 7 8 9 0 - = bkspc `~ */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - /* tab Q W E R T Y U I O P [ ] spltbs delete*/ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - /* caps A S D F G H J K L ; ' # enter pg up*/ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - /* shift \ Z X C V B N M , . / shift up pg dn*/ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - /* ctrl win alt space alt fn ctrl left down right*/ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - [3] = LAYOUT_65_iso( - /* esc 1 2 3 4 5 6 7 8 9 0 - = bkspc `~ */ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - /* tab Q W E R T Y U I O P [ ] spltbs delete*/ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - /* caps A S D F G H J K L ; ' # enter pg up*/ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - /* shift \ Z X C V B N M , . / shift up pg dn*/ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - /* ctrl win alt space alt fn ctrl left down right*/ - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return true; -} diff --git a/keyboards/42keebs/discipline/keymaps/via/rules.mk b/keyboards/42keebs/discipline/keymaps/via/rules.mk deleted file mode 100644 index 36b7ba9cbc..0000000000 --- a/keyboards/42keebs/discipline/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/42keebs/mysterium/config.h b/keyboards/42keebs/mysterium/config.h index 40b52a2ddc..b5aad178b8 100644 --- a/keyboards/42keebs/mysterium/config.h +++ b/keyboards/42keebs/mysterium/config.h @@ -21,8 +21,8 @@ along with this program. If not, see . #define VENDOR_ID 0x6B62 #define PRODUCT_ID 0x8769 #define DEVICE_VER 0x0001 -#define MANUFACTURER coseyfannitutti -#define PRODUCT MYSTERIUM +#define MANUFACTURER "coseyfannitutti" +#define PRODUCT "MYSTERIUM" /* key matrix size */ #define MATRIX_ROWS 6 diff --git a/keyboards/42keebs/mysterium/keymaps/default/keymap.c b/keyboards/42keebs/mysterium/keymaps/default/keymap.c index 19deb9604f..e8555b5450 100644 --- a/keyboards/42keebs/mysterium/keymaps/default/keymap.c +++ b/keyboards/42keebs/mysterium/keymaps/default/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_tkl_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_PSCR, KC_SLCK, KC_MUTE, + 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_PSCR, KC_SCRL, KC_MUTE, 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_INS, KC_HOME, 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_DEL, KC_END, 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, @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_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, 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,KC_TRNS,KC_TRNS,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,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS) diff --git a/keyboards/42keebs/mysterium/keymaps/via/keymap.c b/keyboards/42keebs/mysterium/keymaps/via/keymap.c deleted file mode 100644 index d1c7b21ac1..0000000000 --- a/keyboards/42keebs/mysterium/keymaps/via/keymap.c +++ /dev/null @@ -1,59 +0,0 @@ -/* Copyright 2019 COSEYFANNITUTTI - * - * 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_tkl_iso( - 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_PSCR, KC_SLCK, KC_PAUS, - 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_INS, KC_HOME, 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_DEL, KC_END, 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_NUHS, KC_ENT, - 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, MO(1), KC_UP, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), - - [1] = LAYOUT_tkl_iso( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, 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,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS), - - [2] = LAYOUT_tkl_iso( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - [3] = LAYOUT_tkl_iso( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) -}; - -bool encoder_update_user(uint8_t index, bool clockwise) { - if (clockwise) { - tap_code(KC_VOLU); - } else { - tap_code(KC_VOLD); - } - return true; -} diff --git a/keyboards/42keebs/mysterium/keymaps/via/rules.mk b/keyboards/42keebs/mysterium/keymaps/via/rules.mk deleted file mode 100644 index 36b7ba9cbc..0000000000 --- a/keyboards/42keebs/mysterium/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/42keebs/mysterium/keymaps/vial/keymap.c b/keyboards/42keebs/mysterium/keymaps/vial/keymap.c index 5ac8e642e1..a186336353 100644 --- a/keyboards/42keebs/mysterium/keymaps/vial/keymap.c +++ b/keyboards/42keebs/mysterium/keymaps/vial/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_tkl_iso( - 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_PSCR, KC_SLCK, KC_PAUS, + 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_PSCR, KC_SCRL, KC_PAUS, 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_INS, KC_HOME, 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_DEL, KC_END, 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_NUHS, KC_ENT, @@ -27,20 +27,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_tkl_iso( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, 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,KC_TRNS,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,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS), [2] = LAYOUT_tkl_iso( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - [3] = LAYOUT_tkl_iso( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -52,6 +44,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { [0] = { ENCODER_CCW_CW(KC_VOLD, KC_VOLU) }, [1] = { ENCODER_CCW_CW(KC_MPRV, KC_MNXT) }, - [2] = { ENCODER_CCW_CW(KC_NO, KC_NO) }, - [3] = { ENCODER_CCW_CW(KC_NO, KC_NO) }, + [2] = { ENCODER_CCW_CW(KC_NO, KC_NO) } }; diff --git a/keyboards/42keebs/mysterium/rules.mk b/keyboards/42keebs/mysterium/rules.mk new file mode 100644 index 0000000000..c418c115b9 --- /dev/null +++ b/keyboards/42keebs/mysterium/rules.mk @@ -0,0 +1 @@ +DEFAULT_FOLDER=42keebs/mysterium/v15c diff --git a/keyboards/42keebs/mysterium/v15c/rules.mk b/keyboards/42keebs/mysterium/v15c/rules.mk index 1cec9dfd3c..0170924500 100644 --- a/keyboards/42keebs/mysterium/v15c/rules.mk +++ b/keyboards/42keebs/mysterium/v15c/rules.mk @@ -12,7 +12,7 @@ F_CPU = 16000000 # QMK DFU qmk-dfu # ATmega32A bootloadHID # ATmega328P USBasp -BOOTLOADER = USBasp +BOOTLOADER = usbasploader # Build Options # change yes to no to disable diff --git a/keyboards/42keebs/mysterium/v15d/rules.mk b/keyboards/42keebs/mysterium/v15d/rules.mk index 6bb14941b9..015ff02c7f 100644 --- a/keyboards/42keebs/mysterium/v15d/rules.mk +++ b/keyboards/42keebs/mysterium/v15d/rules.mk @@ -12,7 +12,7 @@ F_CPU = 16000000 # QMK DFU qmk-dfu # ATmega32A bootloadHID # ATmega328P USBasp -BOOTLOADER = USBasp +BOOTLOADER = usbasploader # Build Options # change yes to no to disable diff --git a/keyboards/4pplet/waffling60/keymaps/vial/config.h b/keyboards/4pplet/waffling60/rev_c/keymaps/vial/config.h similarity index 100% rename from keyboards/4pplet/waffling60/keymaps/vial/config.h rename to keyboards/4pplet/waffling60/rev_c/keymaps/vial/config.h diff --git a/keyboards/4pplet/waffling60/keymaps/vial/keymap.c b/keyboards/4pplet/waffling60/rev_c/keymaps/vial/keymap.c similarity index 85% rename from keyboards/4pplet/waffling60/keymaps/vial/keymap.c rename to keyboards/4pplet/waffling60/rev_c/keymaps/vial/keymap.c index d20c6bf06c..954a0bc259 100644 --- a/keyboards/4pplet/waffling60/keymaps/vial/keymap.c +++ b/keyboards/4pplet/waffling60/rev_c/keymaps/vial/keymap.c @@ -18,31 +18,31 @@ along with this program. If not, see . const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // main layer -[0] = LAYOUT_all( +[0] = LAYOUT( 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_NO, 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_LCTRL, 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_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_LCTL, 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_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_NO, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_APP, MO(1)), // basic function layer -[1] = LAYOUT_all( - 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, KC_TRNS, KC_TRNS, +[1] = LAYOUT( + QK_BOOT, 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), // extra layer for VIA -[2] = LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +[2] = 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, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), // extra layer for VIA -[3] = LAYOUT_all( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, +[3] = 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, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) -}; \ No newline at end of file +}; diff --git a/keyboards/4pplet/waffling60/keymaps/vial/rules.mk b/keyboards/4pplet/waffling60/rev_c/keymaps/vial/rules.mk similarity index 100% rename from keyboards/4pplet/waffling60/keymaps/vial/rules.mk rename to keyboards/4pplet/waffling60/rev_c/keymaps/vial/rules.mk diff --git a/keyboards/4pplet/waffling60/keymaps/vial/vial.json b/keyboards/4pplet/waffling60/rev_c/keymaps/vial/vial.json similarity index 100% rename from keyboards/4pplet/waffling60/keymaps/vial/vial.json rename to keyboards/4pplet/waffling60/rev_c/keymaps/vial/vial.json diff --git a/keyboards/adalyn/adalyn.c b/keyboards/adalyn/adalyn.c deleted file mode 100644 index 2adc078c93..0000000000 --- a/keyboards/adalyn/adalyn.c +++ /dev/null @@ -1 +0,0 @@ -#include "adalyn.h" diff --git a/keyboards/adalyn/adalyn.h b/keyboards/adalyn/adalyn.h deleted file mode 100644 index 5f1fd41ff4..0000000000 --- a/keyboards/adalyn/adalyn.h +++ /dev/null @@ -1,18 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define XXX KC_NO - -#define LAYOUT( \ - K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, \ - K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, \ - K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, \ - K30, K31, K33, K36, K37, K39 \ -) \ -{ \ - { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \ - { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \ - { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \ - { K30, K31, XXX, K33, XXX, XXX, K36, K37, XXX, K39 } \ -} diff --git a/keyboards/adalyn/info.json b/keyboards/adalyn/info.json deleted file mode 100644 index b27c017f79..0000000000 --- a/keyboards/adalyn/info.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "keyboard_name": "adalyn", - "url": "https://github.com/MarvFPV/Adalyn", - "maintainer": "tominabox1", - "width": 10.25, - "height": 4, - "layouts": { - "LAYOUT": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0, "w":1.25}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":6.75, "y":1}, {"x":7.75, "y":1}, {"x":8.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2, "w":1.5}, {"x":0, "y":3}, {"x":2.5, "y":3}, {"x":3.5, "y":3, "w":2.25}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3}, {"x":10.75, "y":3}] - } -} -} diff --git a/keyboards/adalyn/keymaps/default/config.h b/keyboards/adalyn/keymaps/default/config.h deleted file mode 100644 index 12482ff6fe..0000000000 --- a/keyboards/adalyn/keymaps/default/config.h +++ /dev/null @@ -1,6 +0,0 @@ -#pragma once - -#ifdef COMBO_ENABLE -# define COMBO_COUNT 5 -# define COMBO_TERM 200 -#endif diff --git a/keyboards/adalyn/keymaps/default/keymap.c b/keyboards/adalyn/keymaps/default/keymap.c deleted file mode 100644 index 2d78a20b5a..0000000000 --- a/keyboards/adalyn/keymaps/default/keymap.c +++ /dev/null @@ -1,57 +0,0 @@ -#include QMK_KEYBOARD_H - -enum layers{ - _BASE, - _NUM_SYM, - _NAV -}; -enum combo_events { - COMBO_BSPC, - COMBO_NUMBAK, - COMBO_TAB, - COMBO_ESC, - COMBO_DEL, -}; - -#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC) -#define KC_GA LGUI_T(KC_A) -#define KC_AS LALT_T(KC_S) -#define KC_CD LCTL_T(KC_D) -#define KC_SF LSFT_T(KC_F) -#define KC_SJ RSFT_T(KC_J) -#define KC_CK RCTL_T(KC_K) -#define KC_AL RALT_T(KC_L) -#define KC_GSCLN RGUI_T(KC_SCLN) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_BASE] = LAYOUT( - KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, - KC_GA, KC_AS, KC_CD, KC_SF, KC_G, KC_H, KC_SJ, KC_CK, KC_AL, KC_ENT, - KC_Z, KC_X, KC_C, KC_V, KC_B, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, - KC_LCTL, KC_LALT, KC_BSPC, LT(_NUM_SYM,KC_SPACE), KC_RGUI, KC_RCTL - ), - - [_NUM_SYM] = LAYOUT( - KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, - KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS, - KC_LCBR, KC_LBRC, KC_LPRN, KC_UNDS, KC_NO, KC_RPRN, KC_RBRC, KC_RCBR, KC_SCLN, KC_QUOTE, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) -}; - -#ifdef COMBO_ENABLE -const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END}; -const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END}; -const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END}; -const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END}; -const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END}; - -combo_t key_combos[COMBO_COUNT] = { - [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC), - [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC), - [COMBO_TAB] = COMBO(combo_tab,KC_TAB), - [COMBO_ESC] = COMBO(combo_esc,KC_ESC), - [COMBO_DEL] = COMBO(combo_del,KC_DEL), - -}; -#endif diff --git a/keyboards/adalyn/keymaps/default/readme.md b/keyboards/adalyn/keymaps/default/readme.md deleted file mode 100644 index fb85d36e28..0000000000 --- a/keyboards/adalyn/keymaps/default/readme.md +++ /dev/null @@ -1 +0,0 @@ -# Default QAZ Layout diff --git a/keyboards/adalyn/keymaps/default/rules.mk b/keyboards/adalyn/keymaps/default/rules.mk deleted file mode 100644 index ab1e438182..0000000000 --- a/keyboards/adalyn/keymaps/default/rules.mk +++ /dev/null @@ -1 +0,0 @@ -COMBO_ENABLE = yes diff --git a/keyboards/adalyn/readme.md b/keyboards/adalyn/readme.md deleted file mode 100644 index ce00e0fcc1..0000000000 --- a/keyboards/adalyn/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Adalyn - -Todo diff --git a/keyboards/adalyn/rules.mk b/keyboards/adalyn/rules.mk deleted file mode 100644 index 55134dbe24..0000000000 --- a/keyboards/adalyn/rules.mk +++ /dev/null @@ -1,23 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output -COMBO_ENABLE = yes diff --git a/keyboards/ai03/vega/keymaps/vial/keymap.c b/keyboards/ai03/vega/keymaps/vial/keymap.c index 53d10127f3..4232f7db3d 100644 --- a/keyboards/ai03/vega/keymaps/vial/keymap.c +++ b/keyboards/ai03/vega/keymaps/vial/keymap.c @@ -31,35 +31,35 @@ enum layer_names { const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_all( - 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_DEL, KC_HOME, - 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_END, - MO(1), 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_PGUP, - KC_LSFT, KC_BSLS, 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_PGDN, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT + 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_DEL, KC_HOME, + 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_END, + MO(1), 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_PGUP, + KC_LSFT, KC_BSLS, 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_PGDN, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT ), [_FN1] = LAYOUT_all( - 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, _______, _______, _______, - _______, _______, _______, KC_PGUP, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, - _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END + QK_BOOT, 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_PGUP, _______, _______, _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, + _______, _______, KC_HOME, KC_PGDN, KC_END, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, + _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END ), [_FN2] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), [_FN3] = LAYOUT_all( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ), }; diff --git a/keyboards/cannonkeys/db60/keymaps/vial/keymap.c b/keyboards/cannonkeys/db60/keymaps/vial/keymap.c index 93fc97bbaf..dba91a6633 100644 --- a/keyboards/cannonkeys/db60/keymaps/vial/keymap.c +++ b/keyboards/cannonkeys/db60/keymaps/vial/keymap.c @@ -42,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { RGB_TOG, RGB_MOD, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_BRTG, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_UP, BL_DOWN, BL_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, RESET + _______, _______, _______, _______, _______, _______, _______, QK_BOOT ), [_FN2] = LAYOUT_all( diff --git a/keyboards/cannonkeys/savage65/keymaps/vial/keymap.c b/keyboards/cannonkeys/savage65/keymaps/vial/keymap.c index 5451beaee7..56e7522ab8 100644 --- a/keyboards/cannonkeys/savage65/keymaps/vial/keymap.c +++ b/keyboards/cannonkeys/savage65/keymaps/vial/keymap.c @@ -42,6 +42,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, BL_BRTG, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_UP, BL_DOWN, BL_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET, KC_TRNS, KC_TRNS + KC_GRV, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS, KC_TRNS ) }; diff --git a/keyboards/controllerworks/mini36/keymaps/vial/config.h b/keyboards/controllerworks/mini36/keymaps/vial/config.h index 433fb8a6bc..c39e43750a 100644 --- a/keyboards/controllerworks/mini36/keymaps/vial/config.h +++ b/keyboards/controllerworks/mini36/keymaps/vial/config.h @@ -29,7 +29,7 @@ // # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_FRAMEBUFFER_EFFECTS -// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) +// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) // # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. # define RGB_MATRIX_HUE_STEP 8 diff --git a/keyboards/controllerworks/mini42/keymaps/vial/config.h b/keyboards/controllerworks/mini42/keymaps/vial/config.h index 709e2edeca..bc02d40548 100644 --- a/keyboards/controllerworks/mini42/keymaps/vial/config.h +++ b/keyboards/controllerworks/mini42/keymaps/vial/config.h @@ -22,7 +22,7 @@ #ifdef RGB_MATRIX_ENABLE # define RGBLED_NUM 54 // Number of LEDs -# define DRIVER_LED_TOTAL RGBLED_NUM +# define RGB_MATRIX_LED_COUNT RGBLED_NUM # define RGB_MATRIX_SPLIT \ { 27, 27 } //# define SPLIT_TRANSPORT_MIRROR @@ -31,7 +31,7 @@ // # define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects # define RGB_DISABLE_WHEN_USB_SUSPENDED // turn off effects when suspended # define RGB_MATRIX_FRAMEBUFFER_EFFECTS -// # define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) +// # define RGB_MATRIX_LED_PROCESS_LIMIT (RGB_MATRIX_LED_COUNT + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness) // # define RGB_MATRIX_LED_FLUSH_LIMIT 16 // limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness) # define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150 // limits maximum brightness of LEDs to 150 out of 255. Higher may cause the controller to crash. # define RGB_MATRIX_HUE_STEP 8 diff --git a/keyboards/doio/kb04/config.h b/keyboards/doio/kb04/config.h index 8aa5045fca..b9e243defb 100644 --- a/keyboards/doio/kb04/config.h +++ b/keyboards/doio/kb04/config.h @@ -39,7 +39,7 @@ #ifdef RGB_MATRIX_ENABLE /* RGB Matrix config */ #define RGB_DI_PIN A10 - #define DRIVER_LED_TOTAL 8 + #define RGB_MATRIX_LED_COUNT 8 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 #define RGB_MATRIX_STARTUP_SPD 30 #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS diff --git a/keyboards/doodboard/duckboard_r2/keymaps/vial/config.h b/keyboards/doodboard/duckboard_r2/keymaps/vial/config.h index 40939929dc..c4296c1cec 100644 --- a/keyboards/doodboard/duckboard_r2/keymaps/vial/config.h +++ b/keyboards/doodboard/duckboard_r2/keymaps/vial/config.h @@ -14,7 +14,7 @@ #define DYNAMIC_KEYMAP_LAYER_COUNT 6 #ifdef RGB_MATRIX_ENABLE -# define DRIVER_LED_TOTAL 8 +# define RGB_MATRIX_LED_COUNT 8 # define RGB_DISABLE_WHEN_USB_SUSPENDED true // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: diff --git a/keyboards/doodboard/duckboard_r2/keymaps/vial/keymap.c b/keyboards/doodboard/duckboard_r2/keymaps/vial/keymap.c index 7d20e568af..3e458ffd28 100644 --- a/keyboards/doodboard/duckboard_r2/keymaps/vial/keymap.c +++ b/keyboards/doodboard/duckboard_r2/keymaps/vial/keymap.c @@ -35,8 +35,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS, - RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - TG(2), RESET, KC_TRNS, KC_TRNS, KC_TRNS), + QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + TG(2), QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS), [3] = LAYOUT( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, @@ -74,21 +74,21 @@ bool encoder_update_user(uint8_t index, bool clockwise) { #ifdef RGB_MATRIX_ENABLE #define XX NO_LED -led_config_t g_led_config = { +led_config_t g_led_config = { { // Key Matrix to LED Index { XX, 7, XX, 6, XX }, { 0, XX, XX, XX, 5 }, { XX, XX, XX, XX, XX }, { 1, XX, XX, XX, 4 }, - { XX, 2, XX, 3, XX } + { XX, 2, XX, 3, XX } }, { // LED Index to Physical Position { 0, 16 }, { 0, 48 }, { 56, 64 }, { 168, 64 }, { 224, 48 }, { 224, 16 }, { 168, 0 }, { 56, 0 } }, { // LED Index to Flag 2, 2, 2, 2, 2, 2, 2, 2 - } + } }; #endif diff --git a/keyboards/durgod/k3x0/keymaps/vial/keymap.c b/keyboards/durgod/k3x0/keymaps/vial/keymap.c index ee79c28a2d..d1a9e1496a 100644 --- a/keyboards/durgod/k3x0/keymaps/vial/keymap.c +++ b/keyboards/durgod/k3x0/keymaps/vial/keymap.c @@ -46,8 +46,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘ */ [_BASE] = LAYOUT_all( /* Base Layer */ - 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_PSCR, KC_SLCK, KC_PAUS, - 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_INS, KC_HOME, KC_PGUP, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + 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_PSCR, KC_SCRL, KC_PAUS, + 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_INS, KC_HOME, KC_PGUP, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, 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_END, KC_PGDN, KC_P7, KC_P8, KC_P9, KC_PPLS, 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_NUHS, KC_ENT, KC_P4, KC_P5, KC_P6, 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, KC_P1, KC_P2, KC_P3, KC_PENT, diff --git a/keyboards/ekow/akira/keymaps/vial/keymap.c b/keyboards/ekow/akira/keymaps/vial/keymap.c index 0777bba3cb..d9465fc2d0 100644 --- a/keyboards/ekow/akira/keymaps/vial/keymap.c +++ b/keyboards/ekow/akira/keymaps/vial/keymap.c @@ -20,10 +20,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Default layer [0] = LAYOUT_60_hhkb(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_BSLS, KC_DEL, 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_BSPC, KC_LCTL, 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, MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_RCTL, KC_RALT), - // Fn1 Layer - [1] = LAYOUT_60_hhkb(KC_GRV, 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_INS, KC_DEL, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - // Additional Custom Layer - [3] = LAYOUT_60_hhkb(KC_GRV, 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_INS, KC_DEL, KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - }; diff --git a/keyboards/fancy_customs/aletheia/keymaps/via/keymap.c b/keyboards/fancy_customs/aletheia/keymaps/via/keymap.c deleted file mode 100644 index b39a5a4f2c..0000000000 --- a/keyboards/fancy_customs/aletheia/keymaps/via/keymap.c +++ /dev/null @@ -1,48 +0,0 @@ -/* Copyright 2021 Quark - * - * 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_GESC, 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_GRV, KC_BSLS, \ - 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_BSPC, \ - KC_PGDN, KC_LCTL, 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_NUBS, 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_RSFT, \ - KC_LGUI, KC_LALT, KC_SPC, KC_LGUI, KC_SPC, KC_RALT, KC_RCTL \ - ), - [1] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP , _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______ \ - ), - [2] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP , _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______ \ - ), - [3] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP , _______, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, \ - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______, \ - _______, _______, _______, _______, _______, _______, _______ \ - ), -}; diff --git a/keyboards/fancy_customs/aletheia/keymaps/via/rules.mk b/keyboards/fancy_customs/aletheia/keymaps/via/rules.mk deleted file mode 100644 index 43061db1dd..0000000000 --- a/keyboards/fancy_customs/aletheia/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes \ No newline at end of file diff --git a/keyboards/feker/ik75/keymaps/vial/config.h b/keyboards/feker/ik75/keymaps/vial/config.h index c84e1ae701..1073a06805 100644 --- a/keyboards/feker/ik75/keymaps/vial/config.h +++ b/keyboards/feker/ik75/keymaps/vial/config.h @@ -6,3 +6,25 @@ #define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } #define VIAL_UNLOCK_COMBO_COLS { 1, 2 } + +// undefine animations to save space +#undef ENABLE_RGB_MATRIX_ALPHAS_MODS +#undef ENABLE_RGB_MATRIX_BAND_SAT +#undef ENABLE_RGB_MATRIX_BAND_VAL +#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +#undef ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +#undef ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN +#undef ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +#undef ENABLE_RGB_MATRIX_DUAL_BEACON + +#undef ENABLE_RGB_MATRIX_DIGITAL_RAIN + +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +#undef ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +#undef ENABLE_RGB_MATRIX_SOLID_MULTISPLASH diff --git a/keyboards/feker/ik75/keymaps/vial/keymap.c b/keyboards/feker/ik75/keymaps/vial/keymap.c index f6944177cf..707f884fb8 100644 --- a/keyboards/feker/ik75/keymaps/vial/keymap.c +++ b/keyboards/feker/ik75/keymaps/vial/keymap.c @@ -134,7 +134,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { return true; } -void rgb_matrix_indicators_user(void) { +bool rgb_matrix_indicators_user(void) { rgb_matrix_set_color(46, 0, 0, 0); rgb_matrix_set_color(104, 0, 0, 0); @@ -156,6 +156,7 @@ void rgb_matrix_indicators_user(void) { } rgb_matrix_set_color(104, red, green, blue); } + return false; } #ifdef ENCODER_MAP_ENABLE diff --git a/keyboards/getawayvan/config.h b/keyboards/getawayvan/config.h index 16c3a78877..870470f507 100644 --- a/keyboards/getawayvan/config.h +++ b/keyboards/getawayvan/config.h @@ -21,8 +21,8 @@ along with this program. If not, see . #define VENDOR_ID 0xE5CA #define PRODUCT_ID 0x0401 #define DEVICE_VER 0x0001 -#define MANUFACTURER esca -#define PRODUCT GetawayVan +#define MANUFACTURER "esca" +#define PRODUCT "GetawayVan" /* key matrix size */ #define MATRIX_ROWS 4 @@ -33,7 +33,7 @@ along with this program. If not, see . #define DIODE_DIRECTION COL2ROW #define RGB_DI_PIN B15 -#define DRIVER_LED_TOTAL 51 +#define RGB_MATRIX_LED_COUNT 51 #define RGBLED_NUM 51 #define WS2812_SPI SPID2 #define WS2812_SPI_MOSI_PAL_MODE 0 diff --git a/keyboards/getawayvan/keymaps/default/keymap.c b/keyboards/getawayvan/keymaps/default/keymap.c index a24d82bad5..7fd1df2501 100644 --- a/keyboards/getawayvan/keymaps/default/keymap.c +++ b/keyboards/getawayvan/keymaps/default/keymap.c @@ -4,7 +4,7 @@ extern keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* Qwerty */ - KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, LT(3, KC_ENT), KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, LT(2, KC_SPC), LT(1, KC_SPC), MO(2), KC_LEFT, KC_DOWN, KC_RIGHT @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT ), [3] = LAYOUT( /* LAYER 3 */ - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/getawayvan/keymaps/vial/keymap.c b/keyboards/getawayvan/keymaps/vial/keymap.c index 03e3dd2079..713e33c46e 100644 --- a/keyboards/getawayvan/keymaps/vial/keymap.c +++ b/keyboards/getawayvan/keymaps/vial/keymap.c @@ -4,7 +4,7 @@ extern keymap_config_t keymap_config; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( /* Qwerty */ - KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, + QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, CTL_T(KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, LT(3, KC_ENT), KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSFT, KC_LCTL, KC_LGUI, KC_LALT, LT(2, KC_SPC), LT(1, KC_SPC), MO(2), KC_LEFT, KC_DOWN, KC_RIGHT @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT ), [3] = LAYOUT( /* LAYER 3 */ - RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, + QK_BOOT, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_TRNS, KC_TRNS, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_F11, KC_F12, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, KC_TRNS, KC_TRNS diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h index ac8394c30a..8015d795b1 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/config.h @@ -21,7 +21,7 @@ #define DRIVER_1_LED_TOTAL 66 #define DRIVER_2_LED_TOTAL 32 -#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) +#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) //enable RGB Matrix Effects for Vial #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/keymap.c b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/keymap.c index d96431de96..436dea3db4 100644 --- a/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/keymap.c +++ b/keyboards/gmmk/pro/rev1/ansi/keymaps/vial/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Ct_L Win_L Alt_L SPACE Alt_R FN Ct_R Left Down Right - // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without + // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI // if that's your preference. @@ -50,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, + _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, RGB_SPD, RGB_RMOD, RGB_SPI @@ -59,7 +59,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [2] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ @@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [3] = LAYOUT( _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, + _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h index f6add7756d..8f0c1e9686 100644 --- a/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h +++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/config.h @@ -21,7 +21,7 @@ #define DRIVER_1_LED_TOTAL 66 #define DRIVER_2_LED_TOTAL 33 -#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) +#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) //enable RGB Matrix Effects for Vial #define RGB_MATRIX_FRAMEBUFFER_EFFECTS diff --git a/keyboards/gmmk/pro/rev1/iso/keymaps/vial/keymap.c b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/keymap.c index da3578530c..96652ad9cb 100644 --- a/keyboards/gmmk/pro/rev1/iso/keymaps/vial/keymap.c +++ b/keyboards/gmmk/pro/rev1/iso/keymaps/vial/keymap.c @@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { // Ct_L Win_L Alt_L SPACE Alt_R FN Ct_R Left Down Right - // The FN key by default maps to a momentary toggle to layer 1 to provide access to the RESET key (to put the board into bootloader mode). Without + // The FN key by default maps to a momentary toggle to layer 1 to provide access to the QK_BOOT key (to put the board into bootloader mode). Without // this mapping, you have to open the case to hit the button on the bottom of the PCB (near the USB cable attachment) while plugging in the USB // cable to get the board into bootloader mode - definitely not fun when you're working on your QMK builds. Remove this and put it back to KC_RGUI // if that's your preference. @@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( _______, KC_MYCM, KC_WHOM, KC_CALC, KC_MSEL, KC_MPRV, KC_MNXT, KC_MPLY, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______, - _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, _______, + _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, QK_BOOT, _______, _______, _______, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_HUI, _______, _______, _______, NK_TOGG, _______, _______, _______, _______, _______, RGB_MOD, _______, diff --git a/keyboards/grezeh/larva/larva2/keymaps/via/keymap.c b/keyboards/grezeh/larva/larva2/keymaps/via/keymap.c deleted file mode 100644 index 00dccf765a..0000000000 --- a/keyboards/grezeh/larva/larva2/keymaps/via/keymap.c +++ /dev/null @@ -1,44 +0,0 @@ -/* - * 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_C, KC_T, KC_O, KC_H, KC_PSCR, KC_K, KC_W, KC_U, KC_R, - KC_BSPC, KC_S, KC_A, KC_E, KC_I, KC_DEL, KC_P, KC_L, KC_J, KC_F, KC_ENT, - KC_PGUP, KC_LBRC, KC_COMM, KC_X, KC_N, KC_MINS, KC_EQL, KC_M, KC_Q, KC_DOT, KC_RBRC, KC_PGDN, - KC_HOME, KC_LCTL, KC_SPC, KC_LSFT, MO(1), MO(2), KC_LALT, KC_END), - - [1] = LAYOUT( - KC_TAB, KC_SCLN, KC_D, KC_PMNS, KC_PPLS, KC_NLCK, KC_G, KC_SLSH, KC_GRV, KC_QUOT, - KC_TRNS, KC_Z, KC_PEQL, KC_PSLS, KC_PAST, KC_CAPS, KC_B, KC_BSLS, KC_Y, KC_V, KC_TRNS, - KC_TRNS, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - [2] = LAYOUT( - KC_P0, KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_P9, - KC_MUTE, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_CAPS, KC_PDOT, KC_AT, KC_HASH, KC_TILD, KC_TRNS, - 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_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - [3] = LAYOUT( - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______) - -}; \ No newline at end of file diff --git a/keyboards/grezeh/larva/larva2/keymaps/via/rules.mk b/keyboards/grezeh/larva/larva2/keymaps/via/rules.mk deleted file mode 100644 index d5c96b362f..0000000000 --- a/keyboards/grezeh/larva/larva2/keymaps/via/rules.mk +++ /dev/null @@ -1,3 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes -TAP_DANCE_ENABLE = no \ No newline at end of file diff --git a/keyboards/grezeh/larva/larva2/keymaps/via/via.json b/keyboards/grezeh/larva/larva2/keymaps/via/via.json deleted file mode 100644 index 1c835d5c8d..0000000000 --- a/keyboards/grezeh/larva/larva2/keymaps/via/via.json +++ /dev/null @@ -1,102 +0,0 @@ -{ - "name": "larva mk.2", - "vendorId": "0x0444", - "productId": "0x0002", - "lighting": "none", - "matrix": { - "rows": 4, - "cols": 12 - }, - "layouts": { - "keymap":[ - [ - { - "f": 5, - "w": 1.5 - }, - "0,0", - "0,1", - "0,2", - "0,3", - "0,4", - "0,5", - "0,6", - "0,7", - "0,8", - "0,9", - { - "x": 0.25, - "w": 1.25, - "h": 2, - "w2": 1.5, - "h2": 1, - "x2": -0.25 - }, - "1,11" - ], - [ - { - "w": 1.25 - }, - "1,0", - "1,1", - "1,2", - "1,3", - "1,4", - { - "w": 1.5 - }, - "1,5", - "1,6", - "1,7", - "1,8", - "1,9" - ], - [ - "2,0", - "2,1", - "2,2", - "2,3", - "2,4", - "2,5", - "2,6", - "2,7", - "2,8", - "2,9", - "2,10", - "2,11" - ], - [ - { - "x": 1.25 - }, - "3,2", - { - "w": 1.25 - }, - "3,3", - { - "w": 1.25 - }, - "3,4", - { - "w": 1.25 - }, - "3,5", - { - "w": 1.25 - }, - "3,6", - { - "w": 1.25 - }, - "3,7", - { - "w": 1.25 - }, - "3,8", - "3,9" - ] -] - } -} \ No newline at end of file diff --git a/keyboards/handwired/3dpcb/keymaps/vial/keymap.c b/keyboards/handwired/3dpcb/keymaps/vial/keymap.c index eb5bdebe04..02e2142d23 100644 --- a/keyboards/handwired/3dpcb/keymaps/vial/keymap.c +++ b/keyboards/handwired/3dpcb/keymaps/vial/keymap.c @@ -6,7 +6,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LCTL(LALT(KC_M)), LCTL(KC_T), LCTL(LSFT(KC_M)), LCTL(KC_J), LCTL(KC_0), LCTL(LSFT(KC_A)), LCTL(LALT(KC_P)), LCTL(KC_3), LCTL(KC_5), LCTL(KC_7), LCTL(KC_8), LCTL(LSFT(KC_1)), LCTL(KC_F1), KC_LSFT, LCTL(LSFT(KC_3)), LCTL(LSFT(KC_5)), LCTL(LSFT(KC_8)), LCTL(LALT(KC_0)), LCTL(LALT(KC_3)), LCTL(KC_F4), - KC_LCTL, FN_MO13, FN_MO23, LCTL(KC_Z), LCTL(KC_C), LCTL(KC_G), KC_DEL), + KC_LCTL, TL_LOWR, TL_UPPR, LCTL(KC_Z), LCTL(KC_C), LCTL(KC_G), KC_DEL), [1] = LAYOUT( KC_TRNS, LCTL(LSFT(KC_F2)), LCTL(LSFT(KC_F5)), LCTL(LSFT(KC_F6)), LCTL(LSFT(KC_F8)), LCTL(LSFT(KC_F10)), diff --git a/keyboards/handwired/misterdeck/keymaps/vial/config.h b/keyboards/handwired/misterdeck/keymaps/vial/config.h new file mode 100644 index 0000000000..12edb10c20 --- /dev/null +++ b/keyboards/handwired/misterdeck/keymaps/vial/config.h @@ -0,0 +1,7 @@ +/* SPDX-License-Identifier: GPL-2.0-or-later */ + +#pragma once + +#define VIAL_KEYBOARD_UID {0x2B, 0x5F, 0xA7, 0x6F, 0x0B, 0xF9, 0xC8, 0xC0} +#define VIAL_UNLOCK_COMBO_ROWS { 0, 2 } +#define VIAL_UNLOCK_COMBO_COLS { 0, 3 } diff --git a/keyboards/misterdeck/keymaps/vial/keymap.c b/keyboards/handwired/misterdeck/keymaps/vial/keymap.c similarity index 98% rename from keyboards/misterdeck/keymaps/vial/keymap.c rename to keyboards/handwired/misterdeck/keymaps/vial/keymap.c index bd500c6a89..8e68358836 100644 --- a/keyboards/misterdeck/keymaps/vial/keymap.c +++ b/keyboards/handwired/misterdeck/keymaps/vial/keymap.c @@ -36,6 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; +#ifdef RGBLIGHT_ENABLE static const rgblight_segment_t PROGMEM mrd_numpad_layer[] = RGBLIGHT_LAYER_SEGMENTS( {0, 4, HSV_GREEN} ); @@ -68,3 +69,4 @@ layer_state_t layer_state_set_user(layer_state_t state) { rgblight_set_layer_state(3, layer_state_cmp(state, _CTRL)); return state; } +#endif diff --git a/keyboards/misterdeck/keymaps/vial/rules.mk b/keyboards/handwired/misterdeck/keymaps/vial/rules.mk similarity index 100% rename from keyboards/misterdeck/keymaps/vial/rules.mk rename to keyboards/handwired/misterdeck/keymaps/vial/rules.mk diff --git a/keyboards/misterdeck/keymaps/vial/vial.json b/keyboards/handwired/misterdeck/keymaps/vial/vial.json similarity index 100% rename from keyboards/misterdeck/keymaps/vial/vial.json rename to keyboards/handwired/misterdeck/keymaps/vial/vial.json diff --git a/keyboards/keebio/bdn9/rev2/keymaps/vial/keymap.c b/keyboards/keebio/bdn9/rev2/keymaps/vial/keymap.c index 8b67d7ebc1..a91fa28561 100644 --- a/keyboards/keebio/bdn9/rev2/keymaps/vial/keymap.c +++ b/keyboards/keebio/bdn9/rev2/keymaps/vial/keymap.c @@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_ONE] = LAYOUT( - RESET, BL_STEP, KC_STOP, + QK_BOOT, BL_STEP, KC_STOP, _______, KC_HOME, RGB_MOD, KC_MPRV, KC_END , KC_MNXT ), diff --git a/keyboards/keychron/q0/rev_0130/keymaps/vial/keymap.c b/keyboards/keychron/q0/rev_0130/keymaps/vial/keymap.c index c0b73c3235..82e5cf4bbb 100644 --- a/keyboards/keychron/q0/rev_0130/keymaps/vial/keymap.c +++ b/keyboards/keychron/q0/rev_0130/keymaps/vial/keymap.c @@ -21,7 +21,7 @@ enum layers { _BASE, _FN1, _RESERVED1, _RESERVED2 }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [_BASE] = LAYOUT_numpad_6x4( MO(_FN1), KC_ESC, KC_BSPC, KC_TAB, - KC_NUM_LOCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_P7, KC_P8, KC_P9, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P1, KC_P2, KC_P3, diff --git a/keyboards/kingly_keys/romac/keymaps/vial/keymap.c b/keyboards/kingly_keys/romac/keymaps/vial/keymap.c index d2b9ee4e3a..3ebd9b0a34 100644 --- a/keyboards/kingly_keys/romac/keymaps/vial/keymap.c +++ b/keyboards/kingly_keys/romac/keymaps/vial/keymap.c @@ -18,27 +18,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_KP_7, KC_KP_8, KC_KP_9, \ - KC_KP_4, KC_KP_5, KC_KP_6, \ - KC_KP_1, KC_KP_2, KC_KP_3, \ - KC_NUM_LOCK, KC_KP_0, KC_KP_DOT \ + KC_KP_7, KC_KP_8, KC_KP_9, + KC_KP_4, KC_KP_5, KC_KP_6, + KC_KP_1, KC_KP_2, KC_KP_3, + KC_NUM, KC_KP_0, KC_KP_DOT ), [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 ), [2] = 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 ), [3] = 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 ) }; diff --git a/keyboards/kprepublic/bm16a/keymaps/vial/keymap.c b/keyboards/kprepublic/bm16a/keymaps/vial/keymap.c index 59eae99218..8b55dd780e 100644 --- a/keyboards/kprepublic/bm16a/keymaps/vial/keymap.c +++ b/keyboards/kprepublic/bm16a/keymaps/vial/keymap.c @@ -23,8 +23,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_P0, KC_PDOT, KC_SPC, MO(1) ), [1] = LAYOUT_ortho_4x4( - RESET, KC_PAST, KC_PSLS, _______, - BL_TOGG, BL_DEC, BL_INC, BL_STEP, + QK_BOOT, KC_PAST, KC_PSLS, _______, + BL_TOGG, BL_DOWN, BL_UP, BL_STEP, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______ ), diff --git a/keyboards/lazydesigners/dimple/staggered/keymaps/vial/keymap.c b/keyboards/lazydesigners/dimple/staggered/keymaps/vial/keymap.c index d3bfed176c..70498628ef 100644 --- a/keyboards/lazydesigners/dimple/staggered/keymaps/vial/keymap.c +++ b/keyboards/lazydesigners/dimple/staggered/keymaps/vial/keymap.c @@ -7,7 +7,7 @@ */ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT(KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_UP, KC_DOT, KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT), + [0] = LAYOUT(QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_UP, KC_DOT, KC_LCTL, KC_LGUI, KC_LALT, KC_NO, KC_NO, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT(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, 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, 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), [2] = LAYOUT(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, 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, 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), [3] = LAYOUT(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, 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, 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) diff --git a/keyboards/maple_computing/lets_split_eh/keymaps/vial/config.h b/keyboards/maple_computing/lets_split_eh/keymaps/vial/config.h index 1943383f87..9035c86ce7 100644 --- a/keyboards/maple_computing/lets_split_eh/keymaps/vial/config.h +++ b/keyboards/maple_computing/lets_split_eh/keymaps/vial/config.h @@ -9,3 +9,8 @@ #define VIAL_UNLOCK_COMBO_ROWS { 0, 0 } #define VIAL_UNLOCK_COMBO_COLS { 0, 1 } + +// undefine animations to save space +#undef RGBLIGHT_EFFECT_CHRISTMAS +#undef RGBLIGHT_EFFECT_RGB_TEST +#undef RGBLIGHT_EFFECT_ALTERNATING diff --git a/keyboards/mechlovin/kay65/keymaps/vial/keymap.c b/keyboards/mechlovin/kay65/keymaps/vial/keymap.c index 3dd5a6b2e7..0373951553 100644 --- a/keyboards/mechlovin/kay65/keymaps/vial/keymap.c +++ b/keyboards/mechlovin/kay65/keymaps/vial/keymap.c @@ -19,7 +19,7 @@ along with this program. If not, see . enum my_keycodes { LOGO_LED_ON = QK_KB_0, - LOGO_LED_OFF = QK_KB_1 + LOGO_LED_OFF }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { @@ -44,13 +44,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) { switch (keycode) { case LOGO_LED_ON: if (record->event.pressed) { - writePinHigh(D7); - } + writePinHigh(D7); + } break; case LOGO_LED_OFF: if (record->event.pressed) { - writePinLow(D7); - } + writePinLow(D7); + } break; } return true; diff --git a/keyboards/misterdeck/info.json b/keyboards/misterdeck/info.json deleted file mode 100644 index 523abd9bd3..0000000000 --- a/keyboards/misterdeck/info.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "keyboard_name": "misterdeck", - "keyboard": "misterdeck", - "url": "https://github.com/michaelw/vial-qmk", - "maintainer": "michaelw", - "width": 3, - "height": 4, - "keymap": "default", - "layouts": { - "LAYOUT_horizontal": { - "key_count": 12, - "layout": [ - { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 }, { "x": 3, "y": 0 }, - { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 }, { "x": 3, "y": 1 }, - { "x": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 }, { "x": 3, "y": 2 } - ] - }, - "LAYOUT_vertical_right": { - "key_count": 12, - "layout": [ - { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 }, - { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 }, - { "x": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 }, - { "x": 0, "y": 3 }, { "x": 1, "y": 3 }, { "x": 2, "y": 3 } - ] - }, - "LAYOUT_vertical_left": { - "key_count": 12, - "layout": [ - { "x": 0, "y": 0 }, { "x": 1, "y": 0 }, { "x": 2, "y": 0 }, - { "x": 0, "y": 1 }, { "x": 1, "y": 1 }, { "x": 2, "y": 1 }, - { "x": 0, "y": 2 }, { "x": 1, "y": 2 }, { "x": 2, "y": 2 }, - { "x": 0, "y": 3 }, { "x": 1, "y": 3 }, { "x": 2, "y": 3 } - ] - } - }, - "layers": [ - [ - "KC_F13", - "KC_F14", - "KC_F15", - "KC_F16", - "KC_F17", - "KC_F18" - ] - ] -} diff --git a/keyboards/misterdeck/keymaps/default/keymap.c b/keyboards/misterdeck/keymaps/default/keymap.c deleted file mode 100644 index bd500c6a89..0000000000 --- a/keyboards/misterdeck/keymaps/default/keymap.c +++ /dev/null @@ -1,70 +0,0 @@ -#include QMK_KEYBOARD_H -#include "quantum.h" - -#define NUMPAD TO(_NUMPAD) -enum layers { - _NUMPAD = 0, - _FUNC2, - _MOUSE, - _CTRL, -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_NUMPAD] = LAYOUT( - KC_P7, KC_P8, KC_P9, LT(_CTRL,KC_P0), - KC_P4, KC_P5, KC_P6, TT(_MOUSE), - KC_P1, KC_P2, KC_P3, TT(_FUNC2) - ), - - [_FUNC2] = LAYOUT( - KC_F17, KC_F18, KC_F19, NUMPAD, - KC_F14, KC_F15, KC_F16, _______, - KC_F11, KC_F12, KC_F13, _______ - ), - - [_MOUSE] = LAYOUT( - _______, _______, KC_WH_D, NUMPAD, - _______, _______, KC_BTN1, _______, - _______, _______, KC_WH_U, _______ - ), - - [_CTRL] = LAYOUT( - KC_MUTE, RGB_TOG, _______, _______, - KC_VOLU, RGB_RMOD, _______, _______, - KC_VOLD, RGB_MOD, _______, _______ - ), - -}; - -static const rgblight_segment_t PROGMEM mrd_numpad_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {0, 4, HSV_GREEN} -); -static const rgblight_segment_t PROGMEM mrd_mouse_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {4, 4, HSV_YELLOW} -); -static const rgblight_segment_t PROGMEM mrd_ctrl_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {8, 4, HSV_PURPLE} -); -static const rgblight_segment_t PROGMEM mrd_func2_layer[] = RGBLIGHT_LAYER_SEGMENTS( - {12, 4, HSV_BLUE} -); - -// Now define the array of layers. Later layers take precedence -static const rgblight_segment_t* const PROGMEM mrd_rgb_layers[] = RGBLIGHT_LAYERS_LIST( - mrd_numpad_layer, - mrd_func2_layer, - mrd_mouse_layer, - mrd_ctrl_layer -); - -void keyboard_post_init_user(void) { - // Enable the LED layers - rgblight_layers = mrd_rgb_layers; -} - -layer_state_t layer_state_set_user(layer_state_t state) { - rgblight_set_layer_state(1, layer_state_cmp(state, _FUNC2)); - rgblight_set_layer_state(2, layer_state_cmp(state, _MOUSE)); - rgblight_set_layer_state(3, layer_state_cmp(state, _CTRL)); - return state; -} diff --git a/keyboards/misterdeck/misterdeck.c b/keyboards/misterdeck/misterdeck.c deleted file mode 100644 index b3aca2f0ea..0000000000 --- a/keyboards/misterdeck/misterdeck.c +++ /dev/null @@ -1 +0,0 @@ -#include "misterdeck.h" diff --git a/keyboards/misterdeck/misterdeck.h b/keyboards/misterdeck/misterdeck.h deleted file mode 100644 index aae45b7f8e..0000000000 --- a/keyboards/misterdeck/misterdeck.h +++ /dev/null @@ -1,10 +0,0 @@ -#pragma once - -#include "quantum.h" - -#define LAYOUT_h( K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11 ) \ - { { K00, K01, K02, K03 }, \ - { K04, K05, K06, K07 }, \ - { K08, K09, K10, K11 } \ - } -#define LAYOUT LAYOUT_h diff --git a/keyboards/misterdeck/readme.md b/keyboards/misterdeck/readme.md deleted file mode 100644 index ff08fb2da1..0000000000 --- a/keyboards/misterdeck/readme.md +++ /dev/null @@ -1,27 +0,0 @@ -# misterdeck - ┌───┬───┬───┬───┐ - │K00│K01│K02│K03| - ├───┼───┼───┼───┤ - │K04│K05│K06│K07| - ├───┼───┼───┼───┤ - │K08│K09│K10│K11| - └───┴───┴───┴───┘ - -A 12-key mechanical keypad: https://www.thingiverse.com/thing:4627779 - -Keyboard Maintainer: [michaelw](https://github.com/michaelw) - -## Build -Make example for this keyboard (after setting up your build environment): - - make misterdeck:via - -Only vial support for now. - - -See 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). - -## TODO - -* support for 4 analog sliders -* mixed MIDI mode diff --git a/keyboards/misterdeck/rules.mk b/keyboards/misterdeck/rules.mk deleted file mode 100644 index e701c3a0fb..0000000000 --- a/keyboards/misterdeck/rules.mk +++ /dev/null @@ -1,31 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = caterina - -# Build Options -# change yes to no to disable -# -LTO_ENABLE = yes - -BOOTMAGIC_ENABLE = yes -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output diff --git a/keyboards/mt/split75/keymaps/vial/config.h b/keyboards/mt/split75/keymaps/vial/config.h index ce2fe1cfe5..0edac28398 100644 --- a/keyboards/mt/split75/keymaps/vial/config.h +++ b/keyboards/mt/split75/keymaps/vial/config.h @@ -17,4 +17,4 @@ #define VIAL_UNLOCK_COMBO_ROWS { 5, 6 } #define VIAL_UNLOCK_COMBO_COLS { 0, 11 } -#define DRIVER_LED_TOTAL RGBLED_NUM +#define RGB_MATRIX_LED_COUNT RGBLED_NUM diff --git a/keyboards/neodox/keymaps/vial/keymap.c b/keyboards/neodox/keymaps/vial/keymap.c index 460e298978..4278fe6a4c 100644 --- a/keyboards/neodox/keymaps/vial/keymap.c +++ b/keyboards/neodox/keymaps/vial/keymap.c @@ -40,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ KC_LSFT ,KC_Z ,KC_X ,KC_C ,KC_V ,KC_B ,KC_ADPU ,KC_PGDN , KC_HOME ,KC_ADEN ,KC_N ,KC_M ,KC_COMM ,KC_DOT ,KC_SLSH ,KC_RSFT , //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤ - KC_LGUI ,KC_PPLS ,KC_PMNS ,KC_ALAS , KC_CTPL , KC_BSPC ,KC_DEL , KC_ENT ,KC_SPC , KC_RALT , KC_LEFT ,KC_DOWN ,KC_UP ,KC_RGHT + KC_LGUI ,KC_PPLS ,KC_PMNS ,KC_ALAS , KC_CTPL , KC_BSPC ,KC_DEL , KC_ENT ,KC_SPC , KC_RALT , KC_LEFT ,KC_DOWN ,KC_UP ,KC_RGHT //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘ ), @@ -54,7 +54,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ _______ ,KC_PERC ,KC_CIRC ,KC_LPRN ,KC_RPRN ,KC_TILD ,_______ ,_______ , _______ ,_______ ,XXXXXXX ,KC_P1 ,KC_P2 ,KC_P3 ,KC_PENT ,XXXXXXX , //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤ - _______ ,_______ ,_______ ,_______ , _______ , _______ ,_______ , _______ ,_______ , KC_P0 , KC_P0 ,KC_PDOT ,KC_PENT ,XXXXXXX + _______ ,_______ ,_______ ,_______ , _______ , _______ ,_______ , _______ ,_______ , KC_P0 , KC_P0 ,KC_PDOT ,KC_PENT ,XXXXXXX //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘ ), @@ -68,7 +68,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,_______ , _______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤ - XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , KC_BTN1 , KC_BTN2 ,_______ , _______ ,_______ , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX + XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , KC_BTN1 , KC_BTN2 ,_______ , _______ ,_______ , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘ ), @@ -76,13 +76,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { //┌────────┬────────┬────────┬────────┬────────┬────────┐ ┌────────┬────────┬────────┬────────┬────────┬────────┐ XXXXXXX ,KC_F1 ,KC_F2 ,KC_F3 ,KC_F4 ,KC_F5 , KC_F6 ,KC_F7 ,KC_F8 ,KC_F9 ,KC_F10 ,XXXXXXX , //├────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┤ - XXXXXXX ,RESET ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI , RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX , + XXXXXXX ,QK_BOOT ,RGB_M_P ,RGB_TOG ,RGB_MOD ,RGB_HUD ,RGB_HUI , RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI ,XXXXXXX ,XXXXXXX ,XXXXXXX , //├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ ├────────┼────────┼────────┼────────┼────────┼────────┼────────┤ XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , //├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┐ ┌────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤ XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,_______ ,XXXXXXX , XXXXXXX ,_______ ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , //├────────┼────────┼────────┼────────┼────┬───┴────┬───┼────────┼────────┤ ├────────┼────────┼───┬────┴───┬────┼────────┼────────┼────────┼────────┤ - XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX + XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX ,XXXXXXX , XXXXXXX , XXXXXXX ,XXXXXXX ,XXXXXXX ,XXXXXXX //└────────┴────────┴────────┴────────┘ └────────┘ └────────┴────────┘ └────────┴────────┘ └────────┘ └────────┴────────┴────────┴────────┘ ) }; diff --git a/keyboards/novelkeys/nk87/keymaps/vial/keymap.c b/keyboards/novelkeys/nk87/keymaps/vial/keymap.c index 860924e409..11097e6d1a 100644 --- a/keyboards/novelkeys/nk87/keymaps/vial/keymap.c +++ b/keyboards/novelkeys/nk87/keymaps/vial/keymap.c @@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT_all( /* FN */ KC_PWR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, 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, KC_TRNS, + KC_TRNS, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC, S1_INC, S2_DEC, S2_INC, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, EF_DEC, EF_INC, H1_DEC, H1_INC, H2_DEC, H2_INC, BR_DEC, BR_INC, ES_DEC, ES_INC, KC_TRNS, KC_VOLU, KC_TRNS, KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT diff --git a/keyboards/pancake/rev1/config.h b/keyboards/pancake/rev1/config.h deleted file mode 100644 index e05a618e4a..0000000000 --- a/keyboards/pancake/rev1/config.h +++ /dev/null @@ -1,30 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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 . - */ -#pragma once -#include "config_common.h" - -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5342 // SB -#define PRODUCT_ID 0x504B // PK -#define DEVICE_VER 0x0001 -#define MANUFACTURER Spaceman -#define PRODUCT Pancake - -/* key matrix size */ -#define MATRIX_ROWS 4 -#define MATRIX_COLS 12 - -#define DIODE_DIRECTION COL2ROW diff --git a/keyboards/pancake/rev1/feather/config.h b/keyboards/pancake/rev1/feather/config.h deleted file mode 100644 index e72b25f3db..0000000000 --- a/keyboards/pancake/rev1/feather/config.h +++ /dev/null @@ -1,28 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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 . - */ -#pragma once -#include "config_common.h" - -/* Pancake default pinout */ -#define MATRIX_ROW_PINS { B5, D7, C6, D0 } -#define MATRIX_COL_PINS { C7, D6, B7, B6, F0, D2, D3, F1, F4, F5, F6, F7 } -#define UNUSED_PINS - -#define AdafruitBleResetPin D4 -#define AdafruitBleCSPin B4 -#define AdafruitBleIRQPin E6 - -#define VIA_HAS_BROKEN_KEYCODES diff --git a/keyboards/pancake/rev1/feather/rules.mk b/keyboards/pancake/rev1/feather/rules.mk deleted file mode 100644 index fb77e328e8..0000000000 --- a/keyboards/pancake/rev1/feather/rules.mk +++ /dev/null @@ -1,37 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Processor frequency -F_CPU = 8000000 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = caterina - -# Build Options -# comment out to disable the options. -# -BLUETOOTH = AdafruitBLE -BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not be enabled -AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port. - -LAYOUTS = ortho_4x12 planck_mit - -# Disable unsupported hardware -RGBLIGHT_SUPPORTED = no -AUDIO_SUPPORTED = no -BACKLIGHT_SUPPORTED = no diff --git a/keyboards/pancake/rev1/info.json b/keyboards/pancake/rev1/info.json deleted file mode 100644 index 6f88d5337c..0000000000 --- a/keyboards/pancake/rev1/info.json +++ /dev/null @@ -1,112 +0,0 @@ -{ - "keyboard_name": "Pancake", - "url": "", - "maintainer": "Spaceman", - "width": 12, - "height": 4, - "layouts": { - "LAYOUT_planck_mit": { - "key_count": 47, - "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 8, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 8, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 8, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, - { "w": 2, "x": 5, "y": 3 }, - { "w": 1, "x": 7, "y": 3 }, - { "w": 1, "x": 8, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 } ] - }, - "LAYOUT_ortho_4x12": { - "key_count": 48, - "layout": [ - { "w": 1, "x": 0, "y": 0 }, - { "w": 1, "x": 1, "y": 0 }, - { "w": 1, "x": 2, "y": 0 }, - { "w": 1, "x": 3, "y": 0 }, - { "w": 1, "x": 4, "y": 0 }, - { "w": 1, "x": 5, "y": 0 }, - { "w": 1, "x": 6, "y": 0 }, - { "w": 1, "x": 7, "y": 0 }, - { "w": 1, "x": 8, "y": 0 }, - { "w": 1, "x": 9, "y": 0 }, - { "w": 1, "x": 10, "y": 0 }, - { "w": 1, "x": 11, "y": 0 }, - { "w": 1, "x": 0, "y": 1 }, - { "w": 1, "x": 1, "y": 1 }, - { "w": 1, "x": 2, "y": 1 }, - { "w": 1, "x": 3, "y": 1 }, - { "w": 1, "x": 4, "y": 1 }, - { "w": 1, "x": 5, "y": 1 }, - { "w": 1, "x": 6, "y": 1 }, - { "w": 1, "x": 7, "y": 1 }, - { "w": 1, "x": 8, "y": 1 }, - { "w": 1, "x": 9, "y": 1 }, - { "w": 1, "x": 10, "y": 1 }, - { "w": 1, "x": 11, "y": 1 }, - { "w": 1, "x": 0, "y": 2 }, - { "w": 1, "x": 1, "y": 2 }, - { "w": 1, "x": 2, "y": 2 }, - { "w": 1, "x": 3, "y": 2 }, - { "w": 1, "x": 4, "y": 2 }, - { "w": 1, "x": 5, "y": 2 }, - { "w": 1, "x": 6, "y": 2 }, - { "w": 1, "x": 7, "y": 2 }, - { "w": 1, "x": 8, "y": 2 }, - { "w": 1, "x": 9, "y": 2 }, - { "w": 1, "x": 10, "y": 2 }, - { "w": 1, "x": 11, "y": 2 }, - { "w": 1, "x": 0, "y": 3 }, - { "w": 1, "x": 1, "y": 3 }, - { "w": 1, "x": 2, "y": 3 }, - { "w": 1, "x": 3, "y": 3 }, - { "w": 1, "x": 4, "y": 3 }, - { "w": 1, "x": 5, "y": 3 }, - { "w": 1, "x": 6, "y": 3 }, - { "w": 1, "x": 7, "y": 3 }, - { "w": 1, "x": 8, "y": 3 }, - { "w": 1, "x": 9, "y": 3 }, - { "w": 1, "x": 10, "y": 3 }, - { "w": 1, "x": 11, "y": 3 } ] - } - } -} diff --git a/keyboards/pancake/rev1/keymaps/default/keymap.c b/keyboards/pancake/rev1/keymaps/default/keymap.c deleted file mode 100644 index cebc6fccba..0000000000 --- a/keyboards/pancake/rev1/keymaps/default/keymap.c +++ /dev/null @@ -1,90 +0,0 @@ -#include QMK_KEYBOARD_H -enum layers { - _DEFAULT, - _LOWER, - _RAISE, - _FN -}; - -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) -#define FN MO(_FN) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* Default - * ,-----------------------------------------------------------------------------------. - * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Tab | A | S | D | F | G | H | J | K | L | " | ; | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | N | M | , | . | Up |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Ctrl | Alt | GUI | FN | Lower| Space |Raise | / | Left | Down |Right | - * `-----------------------------------------------------------------------------------' - */ -[_DEFAULT] = LAYOUT_ortho_4x12( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_SCLN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT , - KC_LCTL, KC_LALT, KC_LGUI, FN, LOWER, KC_SPC, KC_SPC, RAISE, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT -), - - -/* Lower - * ,-----------------------------------------------------------------------------------. - * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | _ | + | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | { | } | Vol+ | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | ? | | Vol- | | - * `-----------------------------------------------------------------------------------' - */ -[_LOWER] = LAYOUT_ortho_4x12( - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, - _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, _______, KC_PIPE, - _______, _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, KC_VOLU, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_QUES, _______, KC_VOLD, _______ -), - -/* Raise - * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | | - | = | | \ | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | [ | ] | Vol- | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | Vol+ | | - * `-----------------------------------------------------------------------------------' - */ -[_RAISE] = LAYOUT_ortho_4x12( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, _______, KC_BSLS, - _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_VOLU, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______ -), - - /* FN - * ,-----------------------------------------------------------------------------------. - * | Reset| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | | | F11 | F12 | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | TRNS | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_FN] = LAYOUT_ortho_4x12( - 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, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ -), - - -}; - diff --git a/keyboards/pancake/rev1/keymaps/default/readme.md b/keyboards/pancake/rev1/keymaps/default/readme.md deleted file mode 100644 index 7eb8cc6d8d..0000000000 --- a/keyboards/pancake/rev1/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default keymap for Pancake - -designed by: Spaceman diff --git a/keyboards/pancake/rev1/keymaps/via/keymap.c b/keyboards/pancake/rev1/keymaps/via/keymap.c deleted file mode 100644 index a0cda2ee7c..0000000000 --- a/keyboards/pancake/rev1/keymaps/via/keymap.c +++ /dev/null @@ -1,105 +0,0 @@ -/* Copyright 2020 Spaceman - * - * 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 -enum layers { - _DEFAULT, - _LOWER, - _RAISE, - _FN -}; - -#define LOWER MO(_LOWER) -#define RAISE MO(_RAISE) -#define FN MO(_FN) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* Default - * ,-----------------------------------------------------------------------------------. - * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Tab | A | S | D | F | G | H | J | K | L | " | ; | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | N | M | , | . | Up |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Ctrl | Alt | GUI | FN | Lower| Space |Raise | / | Left | Down |Right | - * `-----------------------------------------------------------------------------------' - */ -[_DEFAULT] = LAYOUT_ortho_4x12( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_SCLN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT , - KC_LCTL, KC_LALT, KC_LGUI, FN, LOWER, KC_SPC, KC_SPC, RAISE, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT -), - - -/* Lower - * ,-----------------------------------------------------------------------------------. - * | ~ | ! | @ | # | $ | % | ^ | & | * | ( | ) | Bksp | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | _ | + | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | { | } | Vol+ | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | ? | | Vol- | | - * `-----------------------------------------------------------------------------------' - */ -[_LOWER] = LAYOUT_ortho_4x12( - KC_TILD, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, - _______, _______, _______, _______, _______, _______, _______, _______, KC_UNDS, KC_PLUS, _______, KC_PIPE, - _______, _______, _______, _______, _______, _______, _______, _______, KC_LCBR, KC_RCBR, KC_VOLU, _______, - _______, _______, _______, _______, _______, _______, _______, _______, KC_QUES, _______, KC_VOLD, _______ -), - -/* Raise - * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | | - | = | | \ | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | [ | ] | Vol- | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | Vol+ | | - * `-----------------------------------------------------------------------------------' - */ -[_RAISE] = LAYOUT_ortho_4x12( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, _______, KC_BSLS, - _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_VOLU, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______ -), - - /* FN - * ,-----------------------------------------------------------------------------------. - * | Reset| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | | | F11 | F12 | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | TRNS | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_FN] = LAYOUT_ortho_4x12( - 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, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ -), - - -}; - diff --git a/keyboards/pancake/rev1/keymaps/via/rules.mk b/keyboards/pancake/rev1/keymaps/via/rules.mk deleted file mode 100644 index 36b7ba9cbc..0000000000 --- a/keyboards/pancake/rev1/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/pancake/rev1/promicro/config.h b/keyboards/pancake/rev1/promicro/config.h deleted file mode 100644 index ee02bff2b8..0000000000 --- a/keyboards/pancake/rev1/promicro/config.h +++ /dev/null @@ -1,22 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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 . - */ -#pragma once -#include "config_common.h" - -/* Pancake default pinout */ -#define MATRIX_ROW_PINS { B1, B3, B2, B6 } -#define MATRIX_COL_PINS { F4, F5, F6, F7, E6, B4, B5, D7, C6, D4, D0, D1 } -#define UNUSED_PINS \ No newline at end of file diff --git a/keyboards/pancake/rev1/promicro/rules.mk b/keyboards/pancake/rev1/promicro/rules.mk deleted file mode 100644 index 7287f3a0d4..0000000000 --- a/keyboards/pancake/rev1/promicro/rules.mk +++ /dev/null @@ -1,33 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -# Teensy halfkay -# Pro Micro caterina -# Atmel DFU atmel-dfu -# LUFA DFU lufa-dfu -# QMK DFU qmk-dfu -# ATmega32A bootloadHID -# ATmega328P USBasp -BOOTLOADER = caterina - -# Build Options -# comment out to disable the options. -# -BOOTMAGIC_ENABLE = full # Virtual DIP switch configuration -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -NKRO_ENABLE = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -BACKLIGHT_ENABLE = no # Custom backlighting code is used, so this should not be enabled -AUDIO_ENABLE = no # This can be enabled if a speaker is connected to the expansion port. Not compatible with RGBLIGHT below -RGBLIGHT_ENABLE = no # This can be enabled if a ws2812 strip is connected to the expansion port. - -LAYOUTS = ortho_4x12 planck_mit - -# Disable unsupported hardware -RGBLIGHT_SUPPORTED = no -AUDIO_SUPPORTED = no -BACKLIGHT_SUPPORTED = no diff --git a/keyboards/pancake/rev1/readme.md b/keyboards/pancake/rev1/readme.md deleted file mode 100644 index 2537db9ece..0000000000 --- a/keyboards/pancake/rev1/readme.md +++ /dev/null @@ -1,13 +0,0 @@ -# Pancake - -Ortho 40% Ortho Keyboard with an option for the adafruit feather - -* Keyboard Maintainer: [Spaceman](https://github.com/Spaceman) -* Hardware Availability: [MKUltra.Click](https://mkultra.click/group-buy-pancake-keyboard-kit) - -Make example for this keyboard (after setting up your build environment): - - make spaceman/pancake/rev1/feather:default - make spaceman/pancake/rev1/promicro:default - -See 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/pancake/rev1/rev1.c b/keyboards/pancake/rev1/rev1.c deleted file mode 100644 index d226653296..0000000000 --- a/keyboards/pancake/rev1/rev1.c +++ /dev/null @@ -1,16 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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 "rev1.h" diff --git a/keyboards/pancake/rev1/rev1.h b/keyboards/pancake/rev1/rev1.h deleted file mode 100644 index 312d789b42..0000000000 --- a/keyboards/pancake/rev1/rev1.h +++ /dev/null @@ -1,44 +0,0 @@ -/* Copyright 2019 Spaceman - * - * 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 . - */ -#pragma once - -#include "quantum.h" - -#define LAYOUT_planck_mit( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \ - k300, k301, k302, k303, k304, k305, k307, k308, k309, k310, k311 \ -) \ -{ \ - { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \ - { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \ - { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }, \ - { k300, k301, k302, k303, k304, k305, k305, k307, k308, k309, k310, k311 } \ -} - -#define LAYOUT_ortho_4x12( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311 \ -) \ -{ \ - { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \ - { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \ - { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }, \ - { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311 } \ -} diff --git a/keyboards/pancake/rev2/info.json b/keyboards/pancake/rev2/info.json deleted file mode 100644 index d8451fec53..0000000000 --- a/keyboards/pancake/rev2/info.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "keyboard_name": "Pancake 2", - "keyboard_folder": "pancake/rev2", - "url": "", - "maintainer": "Spaceman", - "width": 13, - "height": 4, - "layouts": { - "LAYOUT_ortho_4x12": { - "layout": [ - {"x":0, "y":0}, - {"x":1, "y":0}, - {"x":2, "y":0}, - {"x":3, "y":0}, - {"x":4, "y":0}, - {"x":5, "y":0}, - {"x":7, "y":0}, - {"x":8, "y":0}, - {"x":9, "y":0}, - {"x":10, "y":0}, - {"x":11, "y":0}, - {"x":12, "y":0}, - {"x":0, "y":1}, - {"x":1, "y":1}, - {"x":2, "y":1}, - {"x":3, "y":1}, - {"x":4, "y":1}, - {"x":5, "y":1}, - {"x":7, "y":1}, - {"x":8, "y":1}, - {"x":9, "y":1}, - {"x":10, "y":1}, - {"x":11, "y":1}, - {"x":12, "y":1}, - {"x":0, "y":2}, - {"x":1, "y":2}, - {"x":2, "y":2}, - {"x":3, "y":2}, - {"x":4, "y":2}, - {"x":5, "y":2}, - {"x":7, "y":2}, - {"x":8, "y":2}, - {"x":9, "y":2}, - {"x":10, "y":2}, - {"x":11, "y":2}, - {"x":12, "y":2}, - {"x":0, "y":3}, - {"x":1, "y":3}, - {"x":2, "y":3}, - {"x":3, "y":3}, - {"x":4, "y":3}, - {"x":5, "y":3, "w":1.5}, - {"x":6.5, "y":3, "w":1.5}, - {"x":8, "y":3}, - {"x":9, "y":3}, - {"x":10, "y":3}, - {"x":11, "y":3}, - {"x":12, "y":3} - ] - } - } -} diff --git a/keyboards/pancake/rev2/keymaps/default/readme.md b/keyboards/pancake/rev2/keymaps/default/readme.md deleted file mode 100644 index 7eb8cc6d8d..0000000000 --- a/keyboards/pancake/rev2/keymaps/default/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default keymap for Pancake - -designed by: Spaceman diff --git a/keyboards/pancake/rev2/keymaps/via/keymap.c b/keyboards/pancake/rev2/keymaps/via/keymap.c deleted file mode 100644 index 33a27bc491..0000000000 --- a/keyboards/pancake/rev2/keymaps/via/keymap.c +++ /dev/null @@ -1,84 +0,0 @@ - /* Copyright Spaceman 2021 - * - * 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 -enum layers { - _DEFAULT, - _RAISE, - _FN -}; - -#define RAISE MO(_RAISE) -#define FN MO(_FN) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* Default - * ,-----------------------------------------------------------------------------------. - * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Tab | A | S | D | F | G | H | J | K | L | " | ; | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | N | M | , | . | Up |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Ctrl | Alt | GUI | FN | Lower| Space | Del | / | Left | Down |Right | - * `-----------------------------------------------------------------------------------' - */ -[_DEFAULT] = LAYOUT_ortho_4x12( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_SCLN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT , - KC_LCTL, KC_LALT, KC_LGUI, FN, RAISE, KC_SPC, KC_SPC, KC_DEL, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT -), - -/* Raise - * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | | - | = | | \ | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | [ | ] | Vol- | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | Vol+ | | - * `-----------------------------------------------------------------------------------' - */ -[_RAISE] = LAYOUT_ortho_4x12( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, _______, KC_BSLS, - _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_VOLU, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______ -), - - /* FN - * ,-----------------------------------------------------------------------------------. - * | Reset| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | | | F11 | F12 | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | TRNS | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_FN] = LAYOUT_ortho_4x12( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ -), - - -}; diff --git a/keyboards/pancake/rev2/keymaps/via/pancakev2.json b/keyboards/pancake/rev2/keymaps/via/pancakev2.json deleted file mode 100644 index c49c4f3d84..0000000000 --- a/keyboards/pancake/rev2/keymaps/via/pancakev2.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "Pancake_v2 by Spaceman*", - "vendorId": "0x5342", - "productId": "0x5032", - "lighting": "none", - "matrix": { - "rows": 4, - "cols": 12 - }, - "layouts": { - "keymap":[ - ["0,0","0,1","0,2","0,3","0,4","0,5",{"x":1},"0,6","0,7","0,8","0,9","0,10","0,11"], - ["1,0","1,1","1,2","1,3","1,4","1,5",{"x":1},"1,6","1,7","1,8","1,9","1,10","1,11"], - ["2,0","2,1","2,2","2,3","2,4","2,5",{"x":1},"2,6","2,7","2,8","2,9","2,10","2,11"], - ["3,0","3,1","3,2","3,3","3,4",{"w":1.5},"3,5",{"w":1.5},"3,6","3,7","3,8","3,9","3,10","3,11"] - ] - } -} diff --git a/keyboards/pancake/rev2/keymaps/via/readme.md b/keyboards/pancake/rev2/keymaps/via/readme.md deleted file mode 100644 index 7eb8cc6d8d..0000000000 --- a/keyboards/pancake/rev2/keymaps/via/readme.md +++ /dev/null @@ -1,3 +0,0 @@ -# Default keymap for Pancake - -designed by: Spaceman diff --git a/keyboards/pancake/rev2/keymaps/via/rules.mk b/keyboards/pancake/rev2/keymaps/via/rules.mk deleted file mode 100644 index 36b7ba9cbc..0000000000 --- a/keyboards/pancake/rev2/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes diff --git a/keyboards/pancake/rev2/keymaps/vial/keymap.c b/keyboards/pancake/rev2/keymaps/vial/keymap.c deleted file mode 100644 index 33a27bc491..0000000000 --- a/keyboards/pancake/rev2/keymaps/vial/keymap.c +++ /dev/null @@ -1,84 +0,0 @@ - /* Copyright Spaceman 2021 - * - * 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 -enum layers { - _DEFAULT, - _RAISE, - _FN -}; - -#define RAISE MO(_RAISE) -#define FN MO(_FN) - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - -/* Default - * ,-----------------------------------------------------------------------------------. - * | Esc | Q | W | E | R | T | Y | U | I | O | P | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | Tab | A | S | D | F | G | H | J | K | L | " | ; | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | Shift| Z | X | C | V | B | N | M | , | . | Up |Enter | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | Ctrl | Alt | GUI | FN | Lower| Space | Del | / | Left | Down |Right | - * `-----------------------------------------------------------------------------------' - */ -[_DEFAULT] = LAYOUT_ortho_4x12( - KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_SCLN, - KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_ENT , - KC_LCTL, KC_LALT, KC_LGUI, FN, RAISE, KC_SPC, KC_SPC, KC_DEL, KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT -), - -/* Raise - * ,-----------------------------------------------------------------------------------. - * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | Bksp | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | | - | = | | \ | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | [ | ] | Vol- | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | | | | | | | Vol+ | | - * `-----------------------------------------------------------------------------------' - */ -[_RAISE] = LAYOUT_ortho_4x12( - KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_BSPC, - _______, _______, _______, _______, _______, _______, _______, _______, KC_MINS, KC_EQL, _______, KC_BSLS, - _______, _______, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_VOLU, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______ -), - - /* FN - * ,-----------------------------------------------------------------------------------. - * | Reset| F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | | - * |------+------+------+------+------+-------------+------+------+------+------+------| - * | | | | | | | | | | F11 | F12 | | - * |------+------+------+------+------+------|------+------+------+------+------+------| - * | | | | | | | | | | | | | - * |------+------+------+------+------+------+------+------+------+------+------+------| - * | | | | TRNS | | | | | | | | - * `-----------------------------------------------------------------------------------' - */ -[_FN] = LAYOUT_ortho_4x12( - _______, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F11, KC_F12, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, - _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ -), - - -}; diff --git a/keyboards/pancake/rev2/readme.md b/keyboards/pancake/rev2/readme.md deleted file mode 100644 index e8b65c4888..0000000000 --- a/keyboards/pancake/rev2/readme.md +++ /dev/null @@ -1,12 +0,0 @@ -# Pancake 2 - -Ortho 40% Ortho Keyboard with an OLED Display - -* Keyboard Maintainer: [Spaceman](https://github.com/Spaceman) -* Hardware Availability: [MKUltra.Click](https://mkultra.click/pancake-2/) - -Make example for this keyboard (after setting up your build environment): - - make spaceman/pancake/rev2:default - -See 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/pancake/rev2/rev2.c b/keyboards/pancake/rev2/rev2.c deleted file mode 100644 index c1786cb01f..0000000000 --- a/keyboards/pancake/rev2/rev2.c +++ /dev/null @@ -1,54 +0,0 @@ -/* Copyright 2020 Spaceman - * - * 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 "rev2.h" - - -#ifdef OLED_DRIVER_ENABLE -__attribute__((weak)) oled_rotation_t oled_init_user(oled_rotation_t rotation) { - return OLED_ROTATION_270; -} -__attribute__((weak)) void oled_task_user(void) { - static const char PROGMEM pancake_logo[] = { - 0x00, 0x00, 0x3e, 0x0a, 0x04, 0x00, 0x3c, 0x0a, 0x3c, 0x00, 0x3e, 0x0c, 0x18, 0x3e, 0x00, 0x3e, - 0x22, 0x22, 0x00, 0x3c, 0x0a, 0x3c, 0x00, 0x3e, 0x08, 0x36, 0x00, 0x3e, 0x2a, 0x22, 0x00, 0x00, - 0x00, 0x30, 0xc8, 0x84, 0x84, 0x02, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x01, 0x01, 0x19, 0x1d, - 0x1d, 0x0d, 0x01, 0x01, 0x01, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x84, 0x84, 0xc8, 0x30, 0x00, - 0x00, 0x63, 0x94, 0x08, 0x08, 0x11, 0x71, 0x17, 0x13, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x62, - 0xe2, 0x22, 0x22, 0x22, 0x22, 0x22, 0x22, 0x11, 0x11, 0x11, 0x31, 0x08, 0x08, 0x94, 0x63, 0x00, - 0x00, 0x00, 0x03, 0x01, 0x01, 0x02, 0x02, 0x02, 0x02, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, - 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x06, 0x02, 0x02, 0x02, 0x01, 0x01, 0x00, 0x00, 0x00 }; - oled_write_raw_P(pancake_logo, sizeof(pancake_logo)); - // Host Keyboard Layer Status - oled_set_cursor(0, 4); - oled_write_P(PSTR("\nLAYER\n-----\n"), false); - - switch (get_highest_layer(layer_state)) { - case 0: - oled_write_P(PSTR("DEFLT\n"), false); - break; - case 2: - oled_write_P(PSTR("FUNCT\n"), false); - break; - case 1: - oled_write_P(PSTR("RAISE\n"), false); - break; - default: - // Or use the write_ln shortcut over adding '\n' to the end of your string - oled_write_ln_P(PSTR("Undefined"), false); - break; - } -} -#endif diff --git a/keyboards/pancake/rev2/rev2.h b/keyboards/pancake/rev2/rev2.h deleted file mode 100644 index 628b1b39ac..0000000000 --- a/keyboards/pancake/rev2/rev2.h +++ /dev/null @@ -1,31 +0,0 @@ -/* Copyright 2020 Spaceman - * - * 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 . - */ -#pragma once - -#include "quantum.h" - -#define LAYOUT_ortho_4x12( \ - k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \ - k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \ - k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \ - k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311 \ -) \ -{ \ - { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \ - { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 }, \ - { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }, \ - { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311 } \ -} diff --git a/keyboards/pancake/rev2/rules.mk b/keyboards/pancake/rev2/rules.mk deleted file mode 100644 index 5b231a4e34..0000000000 --- a/keyboards/pancake/rev2/rules.mk +++ /dev/null @@ -1,25 +0,0 @@ -# MCU name -MCU = atmega32u4 - -# Bootloader selection -BOOTLOADER = atmel-dfu - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE -SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend -# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work -NKRO_ENABLE = yes # USB Nkey Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -BLUETOOTH_ENABLE = no # Enable Bluetooth -AUDIO_ENABLE = no # Audio output -OLED_DRIVER_ENABLE = yes - -LAYOUTS = ortho_4x12 diff --git a/keyboards/preonic/rev1/keymaps/vial/keymap.c b/keyboards/preonic/rev1/keymaps/vial/keymap.c index fe62441049..40d56ed41b 100644 --- a/keyboards/preonic/rev1/keymaps/vial/keymap.c +++ b/keyboards/preonic/rev1/keymaps/vial/keymap.c @@ -16,7 +16,9 @@ */ #include QMK_KEYBOARD_H +#ifdef AUDIO_ENABLE #include "muse.h" +#endif enum preonic_layers { _QWERTY, @@ -45,7 +47,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_DEL, KC_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_ENT, - _______, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC, KC_SPC, FN_MO23, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT + _______, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC, KC_SPC, TL_UPPR, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT ), /* Lower @@ -105,8 +107,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { */ [_ADJUST] = LAYOUT_preonic_grid( KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, - _______, RESET, DEBUG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, - _______, _______, MU_MOD, AU_ON, AU_OFF, _______, _______, _______, _______, _______, _______, _______, + _______, QK_BOOT, DB_TOGG, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, + _______, _______, MU_NEXT, AU_ON, AU_OFF, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MU_ON, MU_OFF, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ ) @@ -167,8 +169,8 @@ bool dip_switch_update_user(uint8_t index, bool active) { } -void matrix_scan_user(void) { #ifdef AUDIO_ENABLE +void matrix_scan_user(void) { if (muse_mode) { if (muse_counter == 0) { uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()]; @@ -185,15 +187,15 @@ void matrix_scan_user(void) { muse_counter = 0; } } -#endif } bool music_mask_user(uint16_t keycode) { switch (keycode) { - case FN_MO13: - case FN_MO23: + case TL_LOWR: + case TL_UPPR: return false; default: return true; } } +#endif diff --git a/keyboards/preonic/rev1/keymaps/vial/post_rules.mk b/keyboards/preonic/rev1/keymaps/vial/post_rules.mk new file mode 100644 index 0000000000..53b56feae3 --- /dev/null +++ b/keyboards/preonic/rev1/keymaps/vial/post_rules.mk @@ -0,0 +1,3 @@ +ifeq ($(strip $(AUDIO_ENABLE)),yes) + SRC += muse.c +endif diff --git a/keyboards/preonic/rev1/keymaps/vial/rules.mk b/keyboards/preonic/rev1/keymaps/vial/rules.mk index ac5e7320f3..f7a1e17a6b 100644 --- a/keyboards/preonic/rev1/keymaps/vial/rules.mk +++ b/keyboards/preonic/rev1/keymaps/vial/rules.mk @@ -1,8 +1,5 @@ -SRC += muse.c - VIA_ENABLE = yes VIAL_ENABLE = yes MOUSEKEY_ENABLE = yes AUDIO_ENABLE = no -LTO_ENABLE = yes -QMK_SETTINGS = no +QMK_SETTINGS = yes diff --git a/keyboards/primekb/meridian/keymaps/vial/keymap.c b/keyboards/primekb/meridian/keymaps/vial/keymap.c index 62921a11db..6d5d01bec5 100644 --- a/keyboards/primekb/meridian/keymaps/vial/keymap.c +++ b/keyboards/primekb/meridian/keymaps/vial/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_RALT, KC_RGUI, KC_RGUI, KC_RCTL ), [1] = LAYOUT_split_bs_rshift( - 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, KC_DEL, KC_BSPC, + QK_BOOT, 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_BSPC, _______, _______, KC_PGUP, _______, _______, _______, _______, _______, KC_UP, _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_HOME, KC_PGDN, KC_END, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, diff --git a/keyboards/rainkeebs/plop/keymaps/via/keymap.c b/keyboards/rainkeebs/plop/keymaps/via/keymap.c deleted file mode 100644 index d80d879835..0000000000 --- a/keyboards/rainkeebs/plop/keymaps/via/keymap.c +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright 2023 Regan Palmer (@rainkeebs) -// SPDX-License-Identifier: GPL-2.0-or-later -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - - [0] = LAYOUT( - QK_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, - LT(3,KC_TAB), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT, - KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_RSPC, - KC_LCTL, KC_LGUI, KC_LALT, LT(1,KC_SPC), KC_SPC, KC_RALT,KC_RGUI, KC_RCTL), - - [1] = LAYOUT( - KC_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_DEL, - CTL_T(KC_TAB), KC_MINS, KC_EQL, KC_QUOT, KC_SCLN, KC_DLR, KC_LEFT, KC_DOWN, KC_UP,KC_RGHT, KC_ENT, - LSFT_T(KC_LCBR), KC_TILDE, KC_AT, KC_HASH, KC_PIPE, KC_CIRCUMFLEX, KC_EQUAL, KC_QUOTE,KC_NUHS, KC_SLSH, RSFT_T(KC_RCBR), - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - [2] = LAYOUT( - KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_TRNS, - QK_RBT, KC_PLUS, KC_UNDS, KC_BSLS, KC_COLN, KC_DLR, KC_HOME, KC_PGDN, KC_PGUP,KC_END, KC_TRNS, - LSFT_T(KC_LABK), KC_EXLM, KC_PERC,KC_BSLS, KC_AMPR, KC_AT, KC_CIRCUMFLEX, KC_DQUO,KC_LCBR, KC_RCBR, RSFT_T(KC_RABK), - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), - - [3] = LAYOUT( - KC_GRAVE, LSFT(KC_1), LSFT(KC_2), LSFT(KC_3), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), LSFT(KC_7), LSFT(KC_8), LSFT(KC_9), LSFT(KC_0), KC_TRNS, - KC_TAB, KC_MINS, KC_EQL, KC_QUOT, KC_SCLN, KC_DLR, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, - LSFT_T(KC_LCBR), KC_TILDE, KC_AT, KC_HASH, KC_PIPE, KC_CIRCUMFLEX, KC_EQUAL, KC_QUOTE,KC_LBRC, KC_RBRC, RSFT_T(KC_RCBR), - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) - - -}; diff --git a/keyboards/rainkeebs/plop/keymaps/via/rules.mk b/keyboards/rainkeebs/plop/keymaps/via/rules.mk deleted file mode 100644 index 036bd6d1c3..0000000000 --- a/keyboards/rainkeebs/plop/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/smithrune/iron165r2/keymaps/vial/keymap.c b/keyboards/smithrune/iron165r2/keymaps/vial/keymap.c index ff29126638..d77bd14655 100644 --- a/keyboards/smithrune/iron165r2/keymaps/vial/keymap.c +++ b/keyboards/smithrune/iron165r2/keymaps/vial/keymap.c @@ -16,28 +16,28 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { -[0] = LAYOUT( /* Base */ - KC_GESC, 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, +[0] = LAYOUT_all( /* Base */ + QK_GESC, 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_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_NUHS, KC_ENTER,KC_PGDN, 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, KC_END, - KC_LCTRL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL ), -[1] = LAYOUT( +[1] = LAYOUT_all( QK_BOOT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), -[2] = LAYOUT( +[2] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS ), -[3] = LAYOUT( +[3] = LAYOUT_all( KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/pancake/rev2/keymaps/vial/config.h b/keyboards/spaceman/pancake/rev2/keymaps/vial/config.h similarity index 100% rename from keyboards/pancake/rev2/keymaps/vial/config.h rename to keyboards/spaceman/pancake/rev2/keymaps/vial/config.h diff --git a/keyboards/pancake/rev2/keymaps/default/keymap.c b/keyboards/spaceman/pancake/rev2/keymaps/vial/keymap.c similarity index 100% rename from keyboards/pancake/rev2/keymaps/default/keymap.c rename to keyboards/spaceman/pancake/rev2/keymaps/vial/keymap.c diff --git a/keyboards/pancake/rev2/keymaps/vial/rules.mk b/keyboards/spaceman/pancake/rev2/keymaps/vial/rules.mk similarity index 100% rename from keyboards/pancake/rev2/keymaps/vial/rules.mk rename to keyboards/spaceman/pancake/rev2/keymaps/vial/rules.mk diff --git a/keyboards/pancake/rev2/keymaps/vial/vial.json b/keyboards/spaceman/pancake/rev2/keymaps/vial/vial.json similarity index 100% rename from keyboards/pancake/rev2/keymaps/vial/vial.json rename to keyboards/spaceman/pancake/rev2/keymaps/vial/vial.json diff --git a/keyboards/adalyn/keymaps/vial/config.h b/keyboards/tominabox1/adalyn/keymaps/vial/config.h similarity index 100% rename from keyboards/adalyn/keymaps/vial/config.h rename to keyboards/tominabox1/adalyn/keymaps/vial/config.h diff --git a/keyboards/adalyn/keymaps/vial/keymap.c b/keyboards/tominabox1/adalyn/keymaps/vial/keymap.c similarity index 100% rename from keyboards/adalyn/keymaps/vial/keymap.c rename to keyboards/tominabox1/adalyn/keymaps/vial/keymap.c diff --git a/keyboards/adalyn/keymaps/vial/rules.mk b/keyboards/tominabox1/adalyn/keymaps/vial/rules.mk similarity index 100% rename from keyboards/adalyn/keymaps/vial/rules.mk rename to keyboards/tominabox1/adalyn/keymaps/vial/rules.mk diff --git a/keyboards/adalyn/keymaps/vial/vial.json b/keyboards/tominabox1/adalyn/keymaps/vial/vial.json similarity index 100% rename from keyboards/adalyn/keymaps/vial/vial.json rename to keyboards/tominabox1/adalyn/keymaps/vial/vial.json diff --git a/keyboards/velocifire/sun20pro/config.h b/keyboards/velocifire/sun20pro/config.h index 8dfd18cc6c..df56760dd1 100644 --- a/keyboards/velocifire/sun20pro/config.h +++ b/keyboards/velocifire/sun20pro/config.h @@ -13,8 +13,8 @@ #define VENDOR_ID 0x0002 #define PRODUCT_ID 0x0002 #define DEVICE_VER 0x0001 -#define MANUFACTURER Velocifire -#define PRODUCT Sun20pro +#define MANUFACTURER "Velocifire" +#define PRODUCT "Sun20pro" /* key matrix size */ #define MATRIX_ROWS 5 @@ -63,7 +63,7 @@ # define RGBLIGHT_ANIMATIONS // RGB Matrix # ifdef RGB_MATRIX_ENABLE -# define DRIVER_LED_TOTAL RGBLED_NUM +# define RGB_MATRIX_LED_COUNT RGBLED_NUM // RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: diff --git a/keyboards/velocifire/sun20pro/keymaps/default/keymap.c b/keyboards/velocifire/sun20pro/keymaps/default/keymap.c index a9b8683825..050d743b00 100644 --- a/keyboards/velocifire/sun20pro/keymaps/default/keymap.c +++ b/keyboards/velocifire/sun20pro/keymaps/default/keymap.c @@ -3,7 +3,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { LAYOUT( - KC_MUTE, KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS, + KC_MUTE, KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, KC_P7, KC_P8, KC_P9, KC_P4, KC_P5, KC_P6, KC_PPLS, KC_P1, KC_P2, KC_P3, diff --git a/keyboards/wavtype/p01_ultra/keymaps/ansi_7u/keymap.c b/keyboards/wavtype/p01_ultra/keymaps/ansi_7u/keymap.c deleted file mode 100644 index d397e2eada..0000000000 --- a/keyboards/wavtype/p01_ultra/keymaps/ansi_7u/keymap.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 wavtype - * - * 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_tkl_ansi_7u( - 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_PSCR, KC_SLCK, KC_PAUS, - 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_INS, KC_HOME, 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_DEL, KC_END, 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_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_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), - - [1] = LAYOUT_tkl_ansi_7u( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,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,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS) -}; diff --git a/keyboards/wavtype/p01_ultra/keymaps/iso/keymap.c b/keyboards/wavtype/p01_ultra/keymaps/iso/keymap.c deleted file mode 100644 index 1b4e2b4223..0000000000 --- a/keyboards/wavtype/p01_ultra/keymaps/iso/keymap.c +++ /dev/null @@ -1,34 +0,0 @@ -/* Copyright 2021 wavtype - * - * 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_tkl_iso( - 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_PSCR, KC_SLCK, KC_PAUS, - 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_INS, KC_HOME, 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_DEL, KC_END, 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_NUHS, KC_ENT, - 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, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), - - [1] = LAYOUT_tkl_iso( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,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,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS) -}; diff --git a/keyboards/xelus/ninjin/keymaps/vial/keymap.c b/keyboards/xelus/ninjin/keymaps/vial/keymap.c index fa549f0280..23c65adece 100644 --- a/keyboards/xelus/ninjin/keymaps/vial/keymap.c +++ b/keyboards/xelus/ninjin/keymaps/vial/keymap.c @@ -26,7 +26,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LWIN, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), [1] = LAYOUT_tkl_ansi_tsangan( - RESET, KC_TRNS, KC_TRNS, KC_TRNS, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 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/xelus/valor/rev2/keymaps/vial/keymap.c b/keyboards/xelus/valor/rev2/keymaps/vial/keymap.c index d98ffe8e95..20ac204777 100644 --- a/keyboards/xelus/valor/rev2/keymaps/vial/keymap.c +++ b/keyboards/xelus/valor/rev2/keymaps/vial/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #ifdef RGB_MATRIX_ENABLE -void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { // caps lock cyan if (host_keyboard_led_state().caps_lock) { RGB_MATRIX_INDICATOR_SET_COLOR(27, 0, 128, 128); @@ -75,5 +75,6 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { RGB_MATRIX_INDICATOR_SET_COLOR(24, 128, 128, 128); break; } + return false; } #endif diff --git a/keyboards/ymdk/id75/board.h b/keyboards/ymdk/id75/board.h index f3349f57eb..49270b36a0 100644 --- a/keyboards/ymdk/id75/board.h +++ b/keyboards/ymdk/id75/board.h @@ -13,13 +13,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ + #pragma once -#include_next "board.h" - +#include_next #undef STM32_HSECLK #define STM32_HSECLK 16000000 - - -#define BOARD_YANDR_BIU_F103 diff --git a/keyboards/ymdk/id75/chconf.h b/keyboards/ymdk/id75/chconf.h deleted file mode 100644 index eb600c53cf..0000000000 --- a/keyboards/ymdk/id75/chconf.h +++ /dev/null @@ -1,41 +0,0 @@ -/* Copyright 2020 QMK - * - * 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 . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/sowbug/68keys/chconf.h -r platforms/chibios/common/configs/chconf.h` - */ - -#pragma once - -#define CH_CFG_ST_TIMEDELTA 0 - -#define CH_CFG_USE_REGISTRY TRUE - -#define CH_CFG_USE_WAITEXIT TRUE - -#define CH_CFG_USE_CONDVARS TRUE - -#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE - -#define CH_CFG_USE_MESSAGES TRUE - -#define CH_CFG_USE_MAILBOXES TRUE - -#define CH_CFG_USE_HEAP TRUE - -#include_next - diff --git a/keyboards/ymdk/id75/config.h b/keyboards/ymdk/id75/config.h index 527011e35b..4b315ab376 100644 --- a/keyboards/ymdk/id75/config.h +++ b/keyboards/ymdk/id75/config.h @@ -1,4 +1,4 @@ -/* Copyright 2021 Mike Tsao +/* Copyright 2021 MT * * 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 @@ -14,112 +14,70 @@ * along with this program. If not, see . */ - - - -// config.h - #pragma once -#include "config_common.h" +#if defined(RGB_MATRIX_ENABLE) +# define RGB_DI_PIN B9 +# define RGB_MATRIX_LED_COUNT 89 -// USB Device descriptor parameter -#define VENDOR_ID 0x6964 // ID -#define PRODUCT_ID 0x0075 -#define DEVICE_VER 0x0001 -#define MANUFACTURER MT -#define PRODUCT ID75 Rev +# define RGB_DISABLE_WHEN_USB_SUSPENDED -#undef STM32_HSECLK -#define STM32_HSECLK 8000000 +# define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define TAPPING_TOGGLE 2 +# define WS2812_PWM_DRIVER PWMD4 +# define WS2812_PWM_CHANNEL 4 +# define WS2812_PWM_PAL_MODE 2 +# define WS2812_DMA_STREAM STM32_DMA1_STREAM7 +# define WS2812_DMA_CHANNEL 7 -// key matrix size -#define MATRIX_ROWS 5 -#define MATRIX_COLS 15 - -/* - * Keyboard Matrix Assignments - * - * Change this to how you wired your keyboard - * COLS: AVR pins used for columns, left to right - * ROWS: AVR pins used for rows, top to bottom - * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode) - * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode) - * - */ -#define MATRIX_ROW_PINS \ - { B2, B1, B0, A7, B10 } -#define MATRIX_COL_PINS \ - { A10, A9, A8, B15, B14, B13, B12, A5, A6, A4, A3, A2, A1, A0, A15 } - -// COL2ROW or ROW2COL -#define DIODE_DIRECTION ROW2COL - -#define RGB_DI_PIN B9 - -// Want backlighting and RGB Matrix patterns? See the note in the readme, -// apply the patches, and then uncomment the line below as well as the ones -// in rules.mk. -// -// #define BACKLIGHT_PIN rgb_matrix -#define RGB_MATRIX_KEYPRESSES -#define RGBLED_NUM 89 -#define DRIVER_LED_TOTAL RGBLED_NUM -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 -#define WS2812_PWM_DRIVER PWMD4 -#define WS2812_PWM_CHANNEL 4 -#define WS2812_PWM_PAL_MODE 2 -#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -#define WS2812_DMA_CHANNEL 7 - -// RGB Matrix Animation modes. Explicitly enabled // For full list of effects, see: // https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -#define ENABLE_RGB_MATRIX_ALPHAS_MODS -#define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -#define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_BREATHING -#define ENABLE_RGB_MATRIX_BAND_SAT -#define ENABLE_RGB_MATRIX_BAND_VAL -#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -#define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -#define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -#define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -#define ENABLE_RGB_MATRIX_CYCLE_ALL -#define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -#define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -#define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -#define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -#define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -#define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -#define ENABLE_RGB_MATRIX_DUAL_BEACON -#define ENABLE_RGB_MATRIX_RAINBOW_BEACON -#define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -#define ENABLE_RGB_MATRIX_RAINDROPS -#define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -#define ENABLE_RGB_MATRIX_HUE_BREATHING -#define ENABLE_RGB_MATRIX_HUE_PENDULUM -#define ENABLE_RGB_MATRIX_HUE_WAVE -#define ENABLE_RGB_MATRIX_PIXEL_RAIN -#define ENABLE_RGB_MATRIX_PIXEL_FLOW -#define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined -#define ENABLE_RGB_MATRIX_TYPING_HEATMAP -#define ENABLE_RGB_MATRIX_DIGITAL_RAIN -// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -#define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -#define ENABLE_RGB_MATRIX_SPLASH -#define ENABLE_RGB_MATRIX_MULTISPLASH -#define ENABLE_RGB_MATRIX_SOLID_SPLASH -#define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +# if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +# endif +# if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES) +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +# endif +#endif diff --git a/keyboards/ymdk/id75/halconf.h b/keyboards/ymdk/id75/halconf.h index dbcfcacfa3..612ce4fc4a 100644 --- a/keyboards/ymdk/id75/halconf.h +++ b/keyboards/ymdk/id75/halconf.h @@ -14,16 +14,8 @@ * along with this program. If not, see . */ -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/sowbug/68keys/halconf.h -r platforms/chibios/common/configs/halconf.h` - */ - #pragma once #define HAL_USE_PWM TRUE -#define HAL_USE_SPI TRUE - #include_next - diff --git a/keyboards/ymdk/id75/id75.c b/keyboards/ymdk/id75/id75.c index a1bb2daabe..dc56797cad 100644 --- a/keyboards/ymdk/id75/id75.c +++ b/keyboards/ymdk/id75/id75.c @@ -1,4 +1,4 @@ -/* Copyright 2021 Mike Tsao +/* Copyright 2021 MT * * 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 @@ -14,55 +14,17 @@ * along with this program. If not, see . */ -// 68keys.c - -#include "id75.h" +#include "quantum.h" #ifdef RGB_MATRIX_ENABLE -led_config_t g_led_config = { { - // Key Matrix to LED Index -{ 74, 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, 63, 62, 61, 60 }, -{ 59, 58, 57, 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45 }, -{ 44, 43, 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30 }, -{ 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15 }, -{ 14, 13, 12, 11, 10, 9, 8, 7, 6, 5, 4, 3, 2, 1, 0 } -}, { - // LED Index to Physical Position -{224, 64}, {208, 64}, {192, 64}, {176, 64}, {160, 64}, {144, 64}, {128, 64}, {112, 64}, {96, 64}, {80, 64}, {64, 64}, {48, 64}, {32, 64}, {16, 64}, {0, 64}, -{224, 48}, {208, 48}, {192, 48}, {176, 48}, {160, 48}, {144, 48}, {128, 48}, {112, 48}, {96, 48}, {80, 48}, {64, 48}, {48, 48}, {32, 48}, {16, 48}, {0, 48}, -{224, 32}, {208, 32}, {192, 32}, {176, 32}, {160, 32}, {144, 32}, {128, 32}, {112, 32}, {96, 32}, {80, 32}, {64, 32}, {48, 32}, {32, 32}, {16, 32}, {0, 32}, -{224, 16}, {208, 16}, {192, 16}, {176, 16}, {160, 16}, {144, 16}, {128, 16}, {112, 16}, {96, 16}, {80, 16}, {64, 16}, {48, 16}, {32, 16}, {16, 16}, {0, 16}, -{224, 0}, {208, 0}, {192, 0}, {176, 0}, {160, 0}, {144, 0}, {128, 0}, {112, 0}, {96, 0}, {80, 0}, {64, 0}, {48, 0}, {32, 0}, {16, 0}, {0, 0}, -{0, 64}, {38, 64}, {76, 64}, {114, 64}, {152, 64}, {190, 64}, {224, 64}, {0, 0}, {38, 0}, {76, 0}, {114, 0}, {152, 0}, {190, 0}, {224, 0}, -}, { - // LED Index to Flag -4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, -4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, -4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, -4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, -4,4,4,4,4,4,4,4,4,4,4,4,4,4,4, -2,2,2,2,2,2,2,2,2,2,2,2,2,2, -} }; +bool rgb_matrix_indicators_kb(void) { + if (!rgb_matrix_indicators_user()) { + return false; + } -void suspend_power_down_kb(void) -{ - rgb_matrix_set_suspend_state(true); -} - -void suspend_wakeup_init_kb(void) -{ - rgb_matrix_set_suspend_state(false); -} -void rgb_matrix_indicators_kb(void) { - if (host_keyboard_led_state().caps_lock) { // Capslock = RED - //rgb_matrix_set_color(44, 200, 0, 0); + if (host_keyboard_led_state().caps_lock) { // Capslock = RED rgb_matrix_set_color(44, 200, 0, 0); - - } - //if (host_keyboard_led_state().scroll_lock) { // Capslock = RED - // rgb_matrix_set_color(15, 200, 0, 0); - - // } + } + return true; } - -#endif // #ifdef RGB_MATRIX_ENABLE +#endif diff --git a/keyboards/ymdk/id75/id75.h b/keyboards/ymdk/id75/id75.h deleted file mode 100644 index b90e753767..0000000000 --- a/keyboards/ymdk/id75/id75.h +++ /dev/null @@ -1,42 +0,0 @@ -/* Copyright 2018 MechMerlin - * - * 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 . - */ - -#pragma once - -#include "quantum.h" - -/* This a shortcut to help you visually see your layout. - * - * The first section contains all of the arguments representing the physical - * layout of the board and position of the keys. - * - * The second converts the arguments into a two-dimensional array which - * represents the switch matrix. - */ -#define LAYOUT_ortho_5x15( \ - k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, \ - k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, \ - k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, \ - k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, \ - k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E \ -) { \ - { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E }, \ - { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E }, \ - { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E }, \ - { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E }, \ - { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E } \ -} - diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/info.json index fe24920f81..ff4a14964f 100644 --- a/keyboards/ymdk/id75/info.json +++ b/keyboards/ymdk/id75/info.json @@ -1,10 +1,202 @@ { - "keyboard_name": "idobao/id75/v2", - "url": "", - "maintainer": "qmk", - "layouts": { - "LAYOUT_ortho_5x15": { - "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}] - } - } + "manufacturer": "YMDK", + "keyboard_name": "Idobao x YMDK ID75", + "maintainer": "qmk", + "bootloader": "uf2boot", + "board": "STM32_F103_STM32DUINO", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "A5", "A6", "A4", "A3", "A2", "A1", "A0", "A15"], + "rows": ["B2", "B1", "B0", "A7", "B10"] + }, + "processor": "STM32F103", + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 4, "matrix": [4, 14], "x": 224, "y": 64 }, + { "flags": 4, "matrix": [4, 13], "x": 208, "y": 64 }, + { "flags": 4, "matrix": [4, 12], "x": 192, "y": 64 }, + { "flags": 4, "matrix": [4, 11], "x": 176, "y": 64 }, + { "flags": 4, "matrix": [4, 10], "x": 160, "y": 64 }, + { "flags": 4, "matrix": [4, 9], "x": 144, "y": 64 }, + { "flags": 4, "matrix": [4, 8], "x": 128, "y": 64 }, + { "flags": 4, "matrix": [4, 7], "x": 112, "y": 64 }, + { "flags": 4, "matrix": [4, 6], "x": 96, "y": 64 }, + { "flags": 4, "matrix": [4, 5], "x": 80, "y": 64 }, + { "flags": 4, "matrix": [4, 4], "x": 64, "y": 64 }, + { "flags": 4, "matrix": [4, 3], "x": 48, "y": 64 }, + { "flags": 4, "matrix": [4, 2], "x": 32, "y": 64 }, + { "flags": 4, "matrix": [4, 1], "x": 16, "y": 64 }, + { "flags": 4, "matrix": [4, 0], "x": 0, "y": 64 }, + { "flags": 4, "matrix": [3, 14], "x": 224, "y": 48 }, + { "flags": 4, "matrix": [3, 13], "x": 208, "y": 48 }, + { "flags": 4, "matrix": [3, 12], "x": 192, "y": 48 }, + { "flags": 4, "matrix": [3, 11], "x": 176, "y": 48 }, + { "flags": 4, "matrix": [3, 10], "x": 160, "y": 48 }, + { "flags": 4, "matrix": [3, 9], "x": 144, "y": 48 }, + { "flags": 4, "matrix": [3, 8], "x": 128, "y": 48 }, + { "flags": 4, "matrix": [3, 7], "x": 112, "y": 48 }, + { "flags": 4, "matrix": [3, 6], "x": 96, "y": 48 }, + { "flags": 4, "matrix": [3, 5], "x": 80, "y": 48 }, + { "flags": 4, "matrix": [3, 4], "x": 64, "y": 48 }, + { "flags": 4, "matrix": [3, 3], "x": 48, "y": 48 }, + { "flags": 4, "matrix": [3, 2], "x": 32, "y": 48 }, + { "flags": 4, "matrix": [3, 1], "x": 16, "y": 48 }, + { "flags": 4, "matrix": [3, 0], "x": 0, "y": 48 }, + { "flags": 4, "matrix": [2, 14], "x": 224, "y": 32 }, + { "flags": 4, "matrix": [2, 13], "x": 208, "y": 32 }, + { "flags": 4, "matrix": [2, 12], "x": 192, "y": 32 }, + { "flags": 4, "matrix": [2, 11], "x": 176, "y": 32 }, + { "flags": 4, "matrix": [2, 10], "x": 160, "y": 32 }, + { "flags": 4, "matrix": [2, 9], "x": 144, "y": 32 }, + { "flags": 4, "matrix": [2, 8], "x": 128, "y": 32 }, + { "flags": 4, "matrix": [2, 7], "x": 112, "y": 32 }, + { "flags": 4, "matrix": [2, 6], "x": 96, "y": 32 }, + { "flags": 4, "matrix": [2, 5], "x": 80, "y": 32 }, + { "flags": 4, "matrix": [2, 4], "x": 64, "y": 32 }, + { "flags": 4, "matrix": [2, 3], "x": 48, "y": 32 }, + { "flags": 4, "matrix": [2, 2], "x": 32, "y": 32 }, + { "flags": 4, "matrix": [2, 1], "x": 16, "y": 32 }, + { "flags": 4, "matrix": [2, 0], "x": 0, "y": 32 }, + { "flags": 4, "matrix": [1, 14], "x": 224, "y": 16 }, + { "flags": 4, "matrix": [1, 13], "x": 208, "y": 16 }, + { "flags": 4, "matrix": [1, 12], "x": 192, "y": 16 }, + { "flags": 4, "matrix": [1, 11], "x": 176, "y": 16 }, + { "flags": 4, "matrix": [1, 10], "x": 160, "y": 16 }, + { "flags": 4, "matrix": [1, 9], "x": 144, "y": 16 }, + { "flags": 4, "matrix": [1, 8], "x": 128, "y": 16 }, + { "flags": 4, "matrix": [1, 7], "x": 112, "y": 16 }, + { "flags": 4, "matrix": [1, 6], "x": 96, "y": 16 }, + { "flags": 4, "matrix": [1, 5], "x": 80, "y": 16 }, + { "flags": 4, "matrix": [1, 4], "x": 64, "y": 16 }, + { "flags": 4, "matrix": [1, 3], "x": 48, "y": 16 }, + { "flags": 4, "matrix": [1, 2], "x": 32, "y": 16 }, + { "flags": 4, "matrix": [1, 1], "x": 16, "y": 16 }, + { "flags": 4, "matrix": [1, 0], "x": 0, "y": 16 }, + { "flags": 4, "matrix": [0, 14], "x": 224, "y": 0 }, + { "flags": 4, "matrix": [0, 13], "x": 208, "y": 0 }, + { "flags": 4, "matrix": [0, 12], "x": 192, "y": 0 }, + { "flags": 4, "matrix": [0, 11], "x": 176, "y": 0 }, + { "flags": 4, "matrix": [0, 10], "x": 160, "y": 0 }, + { "flags": 4, "matrix": [0, 9], "x": 144, "y": 0 }, + { "flags": 4, "matrix": [0, 8], "x": 128, "y": 0 }, + { "flags": 4, "matrix": [0, 7], "x": 112, "y": 0 }, + { "flags": 4, "matrix": [0, 6], "x": 96, "y": 0 }, + { "flags": 4, "matrix": [0, 5], "x": 80, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 64, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 48, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 32, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 16, "y": 0 }, + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 2, "x": 0, "y": 64 }, + { "flags": 2, "x": 38, "y": 64 }, + { "flags": 2, "x": 76, "y": 64 }, + { "flags": 2, "x": 114, "y": 64 }, + { "flags": 2, "x": 152, "y": 64 }, + { "flags": 2, "x": 190, "y": 64 }, + { "flags": 2, "x": 224, "y": 64 }, + { "flags": 2, "x": 0, "y": 0 }, + { "flags": 2, "x": 38, "y": 0 }, + { "flags": 2, "x": 76, "y": 0 }, + { "flags": 2, "x": 114, "y": 0 }, + { "flags": 2, "x": 152, "y": 0 }, + { "flags": 2, "x": 190, "y": 0 }, + { "flags": 2, "x": 224, "y": 0 } + ], + "max_brightness": 128 + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x0075", + "vid": "0x594D" + }, + "community_layouts": [ "ortho_5x15" ], + "layouts": { + "LAYOUT_ortho_5x15": { + "layout": [ + { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "k08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": "k0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "k0B", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "k0C", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "k0D", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, + { "label": "k0E", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 }, + { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, + { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, + { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 }, + { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 }, + { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1 }, + { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5, "y": 1 }, + { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6, "y": 1 }, + { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7, "y": 1 }, + { "label": "k18", "matrix": [1, 8], "w": 1, "x": 8, "y": 1 }, + { "label": "k19", "matrix": [1, 9], "w": 1, "x": 9, "y": 1 }, + { "label": "k1A", "matrix": [1, 10], "w": 1, "x": 10, "y": 1 }, + { "label": "k1B", "matrix": [1, 11], "w": 1, "x": 11, "y": 1 }, + { "label": "k1C", "matrix": [1, 12], "w": 1, "x": 12, "y": 1 }, + { "label": "k1D", "matrix": [1, 13], "w": 1, "x": 13, "y": 1 }, + { "label": "k1E", "matrix": [1, 14], "w": 1, "x": 14, "y": 1 }, + { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, + { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, + { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, + { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 }, + { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 }, + { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 }, + { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 }, + { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 }, + { "label": "k28", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 }, + { "label": "k29", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 }, + { "label": "k2A", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 }, + { "label": "k2B", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 }, + { "label": "k2C", "matrix": [2, 12], "w": 1, "x": 12, "y": 2 }, + { "label": "k2D", "matrix": [2, 13], "w": 1, "x": 13, "y": 2 }, + { "label": "k2E", "matrix": [2, 14], "w": 1, "x": 14, "y": 2 }, + { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, + { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, + { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, + { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }, + { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3 }, + { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5, "y": 3 }, + { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6, "y": 3 }, + { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7, "y": 3 }, + { "label": "k38", "matrix": [3, 8], "w": 1, "x": 8, "y": 3 }, + { "label": "k39", "matrix": [3, 9], "w": 1, "x": 9, "y": 3 }, + { "label": "k3A", "matrix": [3, 10], "w": 1, "x": 10, "y": 3 }, + { "label": "k3B", "matrix": [3, 11], "w": 1, "x": 11, "y": 3 }, + { "label": "k3C", "matrix": [3, 12], "w": 1, "x": 12, "y": 3 }, + { "label": "k3D", "matrix": [3, 13], "w": 1, "x": 13, "y": 3 }, + { "label": "k3E", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 }, + { "label": "k40", "matrix": [4, 0], "w": 1, "x": 0, "y": 4 }, + { "label": "k41", "matrix": [4, 1], "w": 1, "x": 1, "y": 4 }, + { "label": "k42", "matrix": [4, 2], "w": 1, "x": 2, "y": 4 }, + { "label": "k43", "matrix": [4, 3], "w": 1, "x": 3, "y": 4 }, + { "label": "k44", "matrix": [4, 4], "w": 1, "x": 4, "y": 4 }, + { "label": "k45", "matrix": [4, 5], "w": 1, "x": 5, "y": 4 }, + { "label": "k46", "matrix": [4, 6], "w": 1, "x": 6, "y": 4 }, + { "label": "k47", "matrix": [4, 7], "w": 1, "x": 7, "y": 4 }, + { "label": "k48", "matrix": [4, 8], "w": 1, "x": 8, "y": 4 }, + { "label": "k49", "matrix": [4, 9], "w": 1, "x": 9, "y": 4 }, + { "label": "k4A", "matrix": [4, 10], "w": 1, "x": 10, "y": 4 }, + { "label": "k4B", "matrix": [4, 11], "w": 1, "x": 11, "y": 4 }, + { "label": "k4C", "matrix": [4, 12], "w": 1, "x": 12, "y": 4 }, + { "label": "k4D", "matrix": [4, 13], "w": 1, "x": 13, "y": 4 }, + { "label": "k4E", "matrix": [4, 14], "w": 1, "x": 14, "y": 4 } + ] + } + } } diff --git a/keyboards/ymdk/id75/keymaps/default/keymap.c b/keyboards/ymdk/id75/keymaps/default/keymap.c deleted file mode 100644 index de7581ea03..0000000000 --- a/keyboards/ymdk/id75/keymaps/default/keymap.c +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright 2020 IFo Hancroft - * - * 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_ortho_5x15( - 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_BSLS, KC_GRV, - 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_BSPC, KC_DEL, - 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_ENT, KC_PGUP, - 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_RSFT, KC_UP, KC_PGDN, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RCTL, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT - ), - - [1] = LAYOUT_ortho_5x15( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [2] = LAYOUT_ortho_5x15( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - - [3] = LAYOUT_ortho_5x15( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, 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/ymdk/id75/keymaps/default/keymap.json b/keyboards/ymdk/id75/keymaps/default/keymap.json new file mode 100644 index 0000000000..cfea8be494 --- /dev/null +++ b/keyboards/ymdk/id75/keymaps/default/keymap.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "author": "qmk", + "notes": "", + "keyboard": "ymdk/id75", + "keymap": "default", + "layout": "LAYOUT_ortho_5x15", + "layers": [ + [ + "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_BSLS", "KC_GRV", + "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_BSPC", "KC_DEL", + "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_ENT", "KC_PGUP", + "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "MO(1)", "KC_UP", "KC_PGDN", + "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_SPC", "KC_SPC", "KC_SPC", "KC_SPC", "KC_SPC", "KC_RALT", "KC_RCTL", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT" + ], + [ + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "RGB_MOD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "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" + ] + ] +} diff --git a/keyboards/ymdk/id75/keymaps/vial/config.h b/keyboards/ymdk/id75/keymaps/vial/config.h index 1a0642f943..2e0adf9351 100644 --- a/keyboards/ymdk/id75/keymaps/vial/config.h +++ b/keyboards/ymdk/id75/keymaps/vial/config.h @@ -7,10 +7,7 @@ #define VIAL_UNLOCK_COMBO_ROWS {0, 1} #define VIAL_UNLOCK_COMBO_COLS {0, 1} -#define DYNAMIC_KEYMAP_LAYER_COUNT 4 #define DYNAMIC_KEYMAP_MACRO_COUNT 32 #define VIAL_COMBO_ENTRIES 32 // number of combos used, each entry take 10 byte in EEPROM #define VIAL_TAP_DANCE_ENTRIES 48 // number of tap dances used, each entry take 10 byte in EEPROM #define VIAL_KEY_OVERRIDE_ENTRIES 8 // number of key override used, each entry take 10 byte in EEPROM -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/ymdk/id75/keymaps/vial/keymap.c b/keyboards/ymdk/id75/keymaps/vial/keymap.c index 6091a6c5cd..c4867b0d94 100644 --- a/keyboards/ymdk/id75/keymaps/vial/keymap.c +++ b/keyboards/ymdk/id75/keymaps/vial/keymap.c @@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, 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, 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 ), [2] = LAYOUT_ortho_5x15( @@ -48,26 +48,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [4] = LAYOUT_ortho_5x15( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - [5] = LAYOUT_ortho_5x15( - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - + ) }; -#define MAGIC_BOOT 0x544F4F42UL -#define MAGIC_REG *(volatile uint32_t*)0x20004000 -void bootloader_jump(void) { - MAGIC_REG = MAGIC_BOOT; - NVIC_SystemReset(); -} \ No newline at end of file diff --git a/keyboards/ymdk/id75/ld/STM32F103xB_uf2.ld b/keyboards/ymdk/id75/ld/STM32F103xB_uf2.ld deleted file mode 100644 index d8786a9e11..0000000000 --- a/keyboards/ymdk/id75/ld/STM32F103xB_uf2.ld +++ /dev/null @@ -1,88 +0,0 @@ -/* - ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -/* - * ST32F103xB memory setup. - */ -MEMORY -{ - flash0 (rx) : org = 0x08000000 + 16K, len = 128k - 16K - flash1 (rx) : org = 0x00000000, len = 0 - flash2 (rx) : org = 0x00000000, len = 0 - flash3 (rx) : org = 0x00000000, len = 0 - flash4 (rx) : org = 0x00000000, len = 0 - flash5 (rx) : org = 0x00000000, len = 0 - flash6 (rx) : org = 0x00000000, len = 0 - flash7 (rx) : org = 0x00000000, len = 0 - ram0 (wx) : org = 0x20000000, len = 20k - ram1 (wx) : org = 0x00000000, len = 0 - ram2 (wx) : org = 0x00000000, len = 0 - ram3 (wx) : org = 0x00000000, len = 0 - ram4 (wx) : org = 0x00000000, len = 0 - ram5 (wx) : org = 0x00000000, len = 0 - ram6 (wx) : org = 0x00000000, len = 0 - ram7 (wx) : org = 0x00000000, len = 0 -} - -/* For each data/text section two region are defined, a virtual region - and a load region (_LMA suffix).*/ - -/* Flash region to be used for exception vectors.*/ -REGION_ALIAS("VECTORS_FLASH", flash0); -REGION_ALIAS("VECTORS_FLASH_LMA", flash0); - -/* Flash region to be used for constructors and destructors.*/ -REGION_ALIAS("XTORS_FLASH", flash0); -REGION_ALIAS("XTORS_FLASH_LMA", flash0); - -/* Flash region to be used for code text.*/ -REGION_ALIAS("TEXT_FLASH", flash0); -REGION_ALIAS("TEXT_FLASH_LMA", flash0); - -/* Flash region to be used for read only data.*/ -REGION_ALIAS("RODATA_FLASH", flash0); -REGION_ALIAS("RODATA_FLASH_LMA", flash0); - -/* Flash region to be used for various.*/ -REGION_ALIAS("VARIOUS_FLASH", flash0); -REGION_ALIAS("VARIOUS_FLASH_LMA", flash0); - -/* Flash region to be used for RAM(n) initialization data.*/ -REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0); - -/* RAM region to be used for Main stack. This stack accommodates the processing - of all exceptions and interrupts.*/ -REGION_ALIAS("MAIN_STACK_RAM", ram0); - -/* RAM region to be used for the process stack. This is the stack used by - the main() function.*/ -REGION_ALIAS("PROCESS_STACK_RAM", ram0); - -/* RAM region to be used for data segment.*/ -REGION_ALIAS("DATA_RAM", ram0); -REGION_ALIAS("DATA_RAM_LMA", flash0); - -/* RAM region to be used for BSS segment.*/ -REGION_ALIAS("BSS_RAM", ram0); - -/* RAM region to be used for the default heap.*/ -REGION_ALIAS("HEAP_RAM", ram0); - -/* Generic rules inclusion.*/ -INCLUDE rules.ld - -/* TinyUF2 bootloader reset support */ -_board_dfu_dbl_tap = ORIGIN(ram0) + 20k - 4; /* this is based off the linker file for tinyuf2 */ diff --git a/keyboards/ymdk/id75/ld/board.h b/keyboards/ymdk/id75/ld/board.h deleted file mode 100644 index 016f097d35..0000000000 --- a/keyboards/ymdk/id75/ld/board.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2022 JasonRen(biu) - * - * 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 . - */ -#pragma once - -#include_next "board.h" - - -#undef STM32_HSECLK -#define STM32_HSECLK 8000000 - - -#define BOARD_YANDR_BIU_F103 diff --git a/keyboards/ymdk/id75/mcuconf.h b/keyboards/ymdk/id75/mcuconf.h index c3933296db..0d3de3dad5 100644 --- a/keyboards/ymdk/id75/mcuconf.h +++ b/keyboards/ymdk/id75/mcuconf.h @@ -14,11 +14,6 @@ * along with this program. If not, see . */ -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/sowbug/68keys/mcuconf.h -r platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h` - */ - #pragma once #include_next @@ -26,5 +21,5 @@ #undef STM32_PWM_USE_TIM4 #define STM32_PWM_USE_TIM4 TRUE -#undef STM32_PLLXTPRE +#undef STM32_PLLXTPRE #define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2 diff --git a/keyboards/ymdk/id75/readme.md b/keyboards/ymdk/id75/readme.md index 7129ed91d7..8fd0ddf616 100644 --- a/keyboards/ymdk/id75/readme.md +++ b/keyboards/ymdk/id75/readme.md @@ -1,51 +1,30 @@ -- First of all: **YMDK** has an existing 10-layer **Vial** firmware available for their ID75 keyboard, (but with only 15 Macros, and too many unused layers that taking up the EEPROM space on the chip). - You may just ask **YMDK** to email a copy to you and skip the needs to compile the firmware yourself. -- -- This code was original from **YMDK** service representative, with minor configuration fix and added required files to to port it to be **vial-qmk** ready. -- **YMDK** service representative refused to upload the source code to **qmk** GIT hub nor did they wanted to show how to setup and compile the vial firmware to the **uf2** format for their id75 keyboard, which make is a huge barriers for inexperience users to make modification on this keyboard. - - The **misconduct** of **YMDK** failed to release the **full** source code of the distributed vial-qmk firmware for **id75** is against the **Copyright laws.** -- Because the **qmk framework** is released under **GPL v2 license**, which requires all vendors who uses the **qmk** firmware **MUST** release the source code with the binaries in their products. -- -- This firmware is both **via** and **vial** compatible, you may use either configurator tool to configure the keyboard. But the **vial** is noticeably better and provides a whole lot extra features, like tap dance, combos, key override, etc. -- -- **WARNING**: This code is for for **Idobao/YMDK** version of **id75** keyboard which runs on the **STM32F103C8T6** chip/MCU (a.k.a. the **Blue pills**). It is not compatible with the **Idobao's** other id75 keyboard which might use other chip/MCU, e.g. : **ATmega32** -- -- **WARNING**: the code is compliable and lightly tested working. you might need fix any issue you may encounter. -- Rarely, you may see error when use this firmware with the **vial** configurator tool, but it won't affect the usage of the keyboard in any ways. You may dismiss the error by just close (kill) and reopen the **vial** configurator tool. -- -- You need a working environment to be able to compile the code, for Windows, it is **MSYS**. - Follow the steps in below location to setup your **Vial-Qmk** environment: - https://get.vial.today/docs/porting-to-vial.html -- (you may need to follow the link inside above link if you also need to set up the **QMK** development environment, **MSYS**) -- -- Steps to to pull and compile the source code from https://github.com/fghxu/vial-qmk.git -- **Note**: this user repo was forked out from the official **vial-qmk repo** at (https://github.com/vial-kb/vial-qmk) on 2022/11/06 at: SHA-1: 9c21e30b6c51b690b992d9616bc444ccd2ed5273 -- Alternatively, you may also compile you id75 firmware using the the official **vial-qmk** repo: just copy over the below directory to the same location in **vial-qmk** repo. The rest of the steps described below should work. -- ``` - ....\vial-qmk\keyboards\ymdk\id75\ - ``` -- -- Below steps are performed within the **MSYS**, and, suppose you will check out the **vial-qmk** repo at : d:/qmk/ - ``` sh - cd /d/qmk - git clone https://github.com/fghxu/vial-qmk.git - cd /d/qmk/vial-qmk - make git-submodule - ``` - - Optional: (between compilations), delete the .build folder under /d/qmk/vial-qmk/ (just in case it caches the old definitions) - - To compile the firmware: - ``` sh - make ymdk/id75:vial - ``` -- -- You will have the firmware named "**ymdk_id75_vial.uf2**" created and placed under d:/qmk/vial-qmk/. - Please follow the YMDK id75's instruction to reset the keyboard and copy the above **.uf2** file under the USB drive. i.e.: - - if you already have configured the QMK RESET key on your current keyboard, you don't need to open the keyboard to press the hardware reset key. Just press the key to reset the keyboard to BootLoader mode. - - otherwise, double push the hardware reset button in the back of the PCB. - - there will be a USB drive appears in Windows/My Computer, drag the .uf2 to the USB drive. the USB key will auto ejected and keyboard is ready. You are all set. - - open the **vial** configurator tool and start configure the keyboard in your own way. -- -- Good Luck! \ No newline at end of file +# Idobao x YMDK ID75 + +![Idobao x YMDK ID75](https://imgur.com/bhVfzrzh.jpg) + +A 75-key, 5-row ortholinear keyboard with per-key and underglow RGB LEDs. + +* Keyboard Maintainer: [The QMK Community](https://github.com/qmk) +* Hardware Supported: [Idobao x YMDK ID75 PCB (APM32F103CBT6)](https://www.aliexpress.com/item/3256804537842097.html) + * This PCB uses an ARM Cortex-M3 MCU with 128kb flash. **It is not the same as `idobao/id75` or `ymdk/ymd75`.** +* Hardware Availability: [YMDK](https://ymdkey.com/products/id75-75-keys-ortholinear-layout-qmk-anodized-aluminum-case-plate-hot-swappable-hot-swap-type-c-pcb-mechanical-keyboard-kit), [AliExpress (YMDK Store)](https://www.aliexpress.com/item/2255800125183974.html), [Amazon](https://www.amazon.com/Ortholinear-Anodized-Aluminum-hot-swappable-Mechanical/dp/B07ZQ8CD88) + +Make example for this keyboard (after setting up your build environment): + + make ymdk/id75:default + +Flashing example for this keyboard: + + make ymdk/id75:default:flash + +See 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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear the emulated EEPROM, so it is a good first step if the keyboard is misbehaving. +* **Physical reset button**: Press the button on the back of the PCB twice in quick succession. +* **Keycode in layout**: Press the key mapped to `QK_BOOT`. In the pre-supplied keymaps it is on the second layer, in the bottom-right corner. + +After entering the bootloader through one of the three methods above, the keyboard will appear as a USB mass storage device named `MT.KEY`. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded. diff --git a/keyboards/ymdk/id75/rules.mk b/keyboards/ymdk/id75/rules.mk index e97f7fa737..8a9f88a9e1 100644 --- a/keyboards/ymdk/id75/rules.mk +++ b/keyboards/ymdk/id75/rules.mk @@ -1,32 +1,6 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -# BOOTLOADER = stm32duino - -MCU_LDSCRIPT = STM32F103xB_uf2 -BOARD = STM32_F103_STM32DUINO -BOOTLOADER = tinyuf2 -FIRMWARE_FORMAT = uf2 -MCU_STARTUP ?= stm32f1xx - - # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = WS2812 + WS2812_DRIVER = pwm # Enter lower-power sleep mode when on the ChibiOS idle thread OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE