From 5d7bc7e2c707ae3002b297b4d8a5a710bf809476 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Wed, 7 Dec 2022 15:16:57 +0700 Subject: [PATCH 01/38] add Zed1800, Oreum, Saber, and Zepsody PCB --- keyboards/mechlovin/zed1800/config.h | 54 +++ keyboards/mechlovin/zed1800/info.json | 9 + keyboards/mechlovin/zed1800/oreum/config.h | 29 ++ keyboards/mechlovin/zed1800/oreum/info.json | 357 +++++++++++++++++ .../zed1800/oreum/keymaps/default/keymap.c | 38 ++ .../zed1800/oreum/keymaps/via/config.h | 3 + .../zed1800/oreum/keymaps/via/keymap.c | 75 ++++ .../zed1800/oreum/keymaps/via/rules.mk | 1 + keyboards/mechlovin/zed1800/oreum/readme.md | 27 ++ keyboards/mechlovin/zed1800/oreum/rules.mk | 0 keyboards/mechlovin/zed1800/readme.md | 26 ++ keyboards/mechlovin/zed1800/rules.mk | 21 + keyboards/mechlovin/zed1800/saber/config.h | 43 ++ keyboards/mechlovin/zed1800/saber/info.json | 350 ++++++++++++++++ .../zed1800/saber/keymaps/default/keymap.c | 37 ++ .../zed1800/saber/keymaps/via/config.h | 3 + .../zed1800/saber/keymaps/via/keymap.c | 76 ++++ .../zed1800/saber/keymaps/via/rules.mk | 1 + keyboards/mechlovin/zed1800/saber/readme.md | 27 ++ keyboards/mechlovin/zed1800/saber/rules.mk | 0 keyboards/mechlovin/zed1800/zed1800.c | 17 + keyboards/mechlovin/zed1800/zed1800.h | 20 + keyboards/mechlovin/zed1800/zepsody/config.h | 33 ++ keyboards/mechlovin/zed1800/zepsody/info.json | 374 ++++++++++++++++++ .../zed1800/zepsody/keymaps/default/keymap.c | 38 ++ .../zed1800/zepsody/keymaps/via/config.h | 3 + .../zed1800/zepsody/keymaps/via/keymap.c | 60 +++ .../zed1800/zepsody/keymaps/via/rules.mk | 1 + keyboards/mechlovin/zed1800/zepsody/readme.md | 27 ++ keyboards/mechlovin/zed1800/zepsody/rules.mk | 0 30 files changed, 1750 insertions(+) create mode 100644 keyboards/mechlovin/zed1800/config.h create mode 100644 keyboards/mechlovin/zed1800/info.json create mode 100644 keyboards/mechlovin/zed1800/oreum/config.h create mode 100644 keyboards/mechlovin/zed1800/oreum/info.json create mode 100644 keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c create mode 100644 keyboards/mechlovin/zed1800/oreum/keymaps/via/config.h create mode 100644 keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c create mode 100644 keyboards/mechlovin/zed1800/oreum/keymaps/via/rules.mk create mode 100644 keyboards/mechlovin/zed1800/oreum/readme.md create mode 100644 keyboards/mechlovin/zed1800/oreum/rules.mk create mode 100644 keyboards/mechlovin/zed1800/readme.md create mode 100644 keyboards/mechlovin/zed1800/rules.mk create mode 100644 keyboards/mechlovin/zed1800/saber/config.h create mode 100644 keyboards/mechlovin/zed1800/saber/info.json create mode 100644 keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c create mode 100644 keyboards/mechlovin/zed1800/saber/keymaps/via/config.h create mode 100644 keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c create mode 100644 keyboards/mechlovin/zed1800/saber/keymaps/via/rules.mk create mode 100644 keyboards/mechlovin/zed1800/saber/readme.md create mode 100644 keyboards/mechlovin/zed1800/saber/rules.mk create mode 100644 keyboards/mechlovin/zed1800/zed1800.c create mode 100644 keyboards/mechlovin/zed1800/zed1800.h create mode 100644 keyboards/mechlovin/zed1800/zepsody/config.h create mode 100644 keyboards/mechlovin/zed1800/zepsody/info.json create mode 100644 keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c create mode 100644 keyboards/mechlovin/zed1800/zepsody/keymaps/via/config.h create mode 100644 keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c create mode 100644 keyboards/mechlovin/zed1800/zepsody/keymaps/via/rules.mk create mode 100644 keyboards/mechlovin/zed1800/zepsody/readme.md create mode 100644 keyboards/mechlovin/zed1800/zepsody/rules.mk diff --git a/keyboards/mechlovin/zed1800/config.h b/keyboards/mechlovin/zed1800/config.h new file mode 100644 index 000000000000..0aa5d08cd0f0 --- /dev/null +++ b/keyboards/mechlovin/zed1800/config.h @@ -0,0 +1,54 @@ +/* +Copyright 2022 Mechlovin' + +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" + +/* COL2ROW, ROW2COL */ +#define DIODE_DIRECTION COL2ROW + +#define LED_CAPS_LOCK_PIN C14 +#define LED_NUM_LOCK_PIN C15 + +#ifdef RGBLIGHT_ENABLE +#define RGBLIGHT_LIMIT_VAL 255 +# define RGBLIGHT_HUE_STEP 8 +# define RGBLIGHT_SAT_STEP 8 +# define RGBLIGHT_VAL_STEP 8 +# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ +# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ + +# define RGBLIGHT_EFFECT_BREATHING +# define RGBLIGHT_EFFECT_RAINBOW_MOOD +# define RGBLIGHT_EFFECT_RAINBOW_SWIRL +# define RGBLIGHT_EFFECT_SNAKE +# define RGBLIGHT_EFFECT_KNIGHT +# define RGBLIGHT_EFFECT_CHRISTMAS +# define RGBLIGHT_EFFECT_STATIC_GRADIENT +# define RGBLIGHT_EFFECT_RGB_TEST +# define RGBLIGHT_EFFECT_ALTERNATING +/*== customize breathing effect ==*/ +/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ +# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 +/*==== use exp() and sin() ====*/ +# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 +# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 +#endif + +/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ +#define DEBOUNCE 5 diff --git a/keyboards/mechlovin/zed1800/info.json b/keyboards/mechlovin/zed1800/info.json new file mode 100644 index 000000000000..c526008d7a84 --- /dev/null +++ b/keyboards/mechlovin/zed1800/info.json @@ -0,0 +1,9 @@ +{ + "manufacturer": "Mechlovin Studio", + "url": "", + "maintainer": "Mechlovin' Studio", + "usb": { + "vid": "0x4D4C", + "device_version": "0.0.1" + } +} diff --git a/keyboards/mechlovin/zed1800/oreum/config.h b/keyboards/mechlovin/zed1800/oreum/config.h new file mode 100644 index 000000000000..3ae09fe1c38d --- /dev/null +++ b/keyboards/mechlovin/zed1800/oreum/config.h @@ -0,0 +1,29 @@ +/* +Copyright 2022 Mechlovin' + +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" + +#define MATRIX_ROW_PINS { B8, B7, B6, B5, B4, B3} +#define MATRIX_COL_PINS { A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C13} + +#ifdef RGBLIGHT_ENABLE +#define RGBLIGHT_LAYERS +#define RGB_DI_PIN A15 +#define RGBLED_NUM 6 +#endif diff --git a/keyboards/mechlovin/zed1800/oreum/info.json b/keyboards/mechlovin/zed1800/oreum/info.json new file mode 100644 index 000000000000..ad4f055029a0 --- /dev/null +++ b/keyboards/mechlovin/zed1800/oreum/info.json @@ -0,0 +1,357 @@ +{ + "keyboard_name": "ZED1800-Oreum", + "usb": { + "pid": "0x1802", + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [0, 18], "x": 19.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5}, + {"matrix": [1, 14], "x": 14, "y": 1.5}, + {"matrix": [2, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.5, "y": 1.5}, + {"matrix": [1, 16], "x": 17.5, "y": 1.5}, + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.5, "y": 2.5}, + {"matrix": [2, 16], "x": 17.5, "y": 2.5}, + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [2, 18], "x": 19.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5}, + {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25}, + {"matrix": [4, 14], "x": 15.25, "y": 3.5}, + {"matrix": [3, 15], "x": 16.5, "y": 3.5}, + {"matrix": [3, 16], "x": 17.5, "y": 3.5}, + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + {"matrix": [3, 18], "x": 19.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 15], "x": 16.5, "y": 4.5}, + {"matrix": [4, 16], "x": 17.5, "y": 4.5}, + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [4, 18], "x": 19.5, "y": 4.5}, + + {"matrix": [4, 13], "x": 14.25, "y": 4.75}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.5}, + {"matrix": [5, 10], "x": 11, "y": 5.5}, + {"matrix": [5, 11], "x": 12, "y": 5.5}, + {"matrix": [5, 15], "x": 16.5, "y": 5.5}, + {"matrix": [5, 16], "x": 17.5, "y": 5.5}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + {"matrix": [5, 18], "x": 19.5, "y": 5.5}, + + {"matrix": [5, 12], "x": 13.25, "y": 5.75}, + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + {"matrix": [5, 14], "x": 15.25, "y": 5.75} + ] + }, + "LAYOUT_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [0, 18], "x": 19.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.5, "y": 1.5}, + {"matrix": [1, 16], "x": 17.5, "y": 1.5}, + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.5, "y": 2.5}, + {"matrix": [2, 16], "x": 17.5, "y": 2.5}, + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [3, 18], "x": 19.5, "y": 2.5, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + {"matrix": [4, 14], "x": 15.25, "y": 3.5}, + {"matrix": [3, 15], "x": 16.5, "y": 3.5}, + {"matrix": [3, 16], "x": 17.5, "y": 3.5}, + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 15], "x": 16.5, "y": 4.5}, + {"matrix": [4, 16], "x": 17.5, "y": 4.5}, + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2}, + + {"matrix": [4, 13], "x": 14.25, "y": 4.75}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.5}, + {"matrix": [5, 10], "x": 11, "y": 5.5}, + {"matrix": [5, 11], "x": 12, "y": 5.5}, + {"matrix": [5, 15], "x": 16.5, "y": 5.5, "w": 2}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + + {"matrix": [5, 12], "x": 13.25, "y": 5.75}, + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + {"matrix": [5, 14], "x": 15.25, "y": 5.75} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1.25, "y": 0}, + {"matrix": [0, 2], "x": 2.25, "y": 0}, + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.75, "y": 0}, + {"matrix": [0, 10], "x": 10.75, "y": 0}, + {"matrix": [0, 11], "x": 11.75, "y": 0}, + {"matrix": [0, 12], "x": 12.75, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [0, 18], "x": 19.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.5, "y": 1.5}, + {"matrix": [1, 16], "x": 17.5, "y": 1.5}, + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + {"matrix": [3, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.5, "y": 2.5}, + {"matrix": [2, 16], "x": 17.5, "y": 2.5}, + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [3, 18], "x": 19.5, "y": 2.5, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5}, + {"matrix": [4, 14], "x": 15.25, "y": 3.5}, + {"matrix": [3, 15], "x": 16.5, "y": 3.5}, + {"matrix": [3, 16], "x": 17.5, "y": 3.5}, + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 15], "x": 16.5, "y": 4.5}, + {"matrix": [4, 16], "x": 17.5, "y": 4.5}, + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2}, + + {"matrix": [4, 13], "x": 14.25, "y": 4.75}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.5, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.5, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.5}, + {"matrix": [5, 10], "x": 11, "y": 5.5}, + {"matrix": [5, 11], "x": 12, "y": 5.5}, + {"matrix": [5, 15], "x": 16.5, "y": 5.5, "w": 2}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + + {"matrix": [5, 12], "x": 13.25, "y": 5.75}, + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + {"matrix": [5, 14], "x": 15.25, "y": 5.75} + ] + } + } +} diff --git a/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c new file mode 100644 index 000000000000..ce072ce6155a --- /dev/null +++ b/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c @@ -0,0 +1,38 @@ +#include QMK_KEYBOARD_H + +#define LT1_CAP LT(1, KC_CAPS) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + 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_F13, KC_PSCR, KC_F9, KC_F10, KC_F11, KC_F12, + 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_NUM, KC_SLSH, KC_ASTR, KC_MINS, + 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_P7, KC_P8, KC_P9, KC_PPLS, + LT1_CAP, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_SPC, KC_ENT, KC_END, KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_SPC, KC_SPC, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_P1, KC_P2, KC_P3, KC_PEQL, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_P0, KC_P0, KC_PDOT, KC_PENT, KC_LEFT, KC_DOWN, KC_RGHT + ), + +}; + +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN}); + +// Now define the array of layers. Later layers take precedence +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = +RGBLIGHT_LAYERS_LIST( + my_capslock_layer, + my_numlock_layer, + my_scroll_layer + ); +void keyboard_post_init_user(void) { + rgblight_layers = my_rgb_layers; +} +// Activate rgb layer for caps when capslock is enabled +bool led_update_user(led_t led_state) { +rgblight_set_layer_state(0, led_state.caps_lock); +rgblight_set_layer_state(1, led_state.num_lock); +rgblight_set_layer_state(2, led_state.scroll_lock); +return true; +} \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/oreum/keymaps/via/config.h b/keyboards/mechlovin/zed1800/oreum/keymaps/via/config.h new file mode 100644 index 000000000000..f0dfd5dbfcd6 --- /dev/null +++ b/keyboards/mechlovin/zed1800/oreum/keymaps/via/config.h @@ -0,0 +1,3 @@ + +#define WEAR_LEVELING_BACKING_SIZE 4096 +#define WEAR_LEVELING_LOGICAL_SIZE 2048 diff --git a/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c new file mode 100644 index 000000000000..19cc5476f608 --- /dev/null +++ b/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c @@ -0,0 +1,75 @@ +/* Copyright 2022 Mechlovin' + * + * 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 + +#define LT1_CAP LT(1, KC_CAPS) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + 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_F13, KC_PSCR, KC_F9, KC_F10, KC_F11, KC_F12, //19 + 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_NUM, KC_SLSH, KC_ASTR, KC_MINS, //20 + 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_P7, KC_P8, KC_P9, KC_PPLS, //19 + LT1_CAP, 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_END, KC_P4, KC_P5, KC_P6, KC_PPLS, //19 + 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_PEQL, //18 + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_P0, KC_PDOT, KC_PENT //14 + ), + [1] = 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, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //20 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, 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_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, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //20 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, 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_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, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //20 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ) +}; + +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN}); + +// Now define the array of layers. Later layers take precedence +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = +RGBLIGHT_LAYERS_LIST( + my_capslock_layer, + my_numlock_layer, + my_scroll_layer + ); +void keyboard_post_init_user(void) { + rgblight_layers = my_rgb_layers; +} +// Activate rgb layer for caps when capslock is enabled +bool led_update_user(led_t led_state) { +rgblight_set_layer_state(0, led_state.caps_lock); +rgblight_set_layer_state(1, led_state.num_lock); +rgblight_set_layer_state(2, led_state.scroll_lock); +return true; +} \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/oreum/keymaps/via/rules.mk b/keyboards/mechlovin/zed1800/oreum/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/mechlovin/zed1800/oreum/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/oreum/readme.md b/keyboards/mechlovin/zed1800/oreum/readme.md new file mode 100644 index 000000000000..3858b9b564af --- /dev/null +++ b/keyboards/mechlovin/zed1800/oreum/readme.md @@ -0,0 +1,27 @@ +# Oreum + +![Oreum](https://i.imgur.com/Dxc1y0Ol.png) + +A PCB for Oreum Keyboard, base on ZED1800 PCB + +* Keyboard Maintainer: [mechlovin](https://github.com/mechlovin) +* Hardware Supported: The Oreum Keyboard, APM32F103 +* Hardware Availability: [Reddit GB](https://www.reddit.com/r/MechanicalKeyboards/comments/xjqddx/gb_oreum_cp_gb_has_started/) + +Make example for this keyboard (after setting up your build environment): + + make mechlovin/zed1800/oreum:default + +Flashing example for this keyboard: + + make mechlovin/zed1800/oreum: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 key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/mechlovin/zed1800/oreum/rules.mk b/keyboards/mechlovin/zed1800/oreum/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/mechlovin/zed1800/readme.md b/keyboards/mechlovin/zed1800/readme.md new file mode 100644 index 000000000000..e11c81d60768 --- /dev/null +++ b/keyboards/mechlovin/zed1800/readme.md @@ -0,0 +1,26 @@ +# ZED1800 + + +A platform design for Mechlovin' 1800-layout PCBs. + +* Keyboard Maintainer: [mechlovin](https://github.com/mechlovin) +* Hardware Supported: APM32F103 +* Hardware Availability: [Mechlovin' Studio](https://mechlovin.studio) + +Make example for this keyboard (after setting up your build environment): + + make mechlovin/zed1800:default + +Flashing example for this keyboard: + + make mechlovin/zed1800: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 key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/mechlovin/zed1800/rules.mk b/keyboards/mechlovin/zed1800/rules.mk new file mode 100644 index 000000000000..256e8f5d2b2f --- /dev/null +++ b/keyboards/mechlovin/zed1800/rules.mk @@ -0,0 +1,21 @@ +# MCU name +MCU = STM32F103 + +# Bootloader selection +BOOTLOADER = stm32duino + + +# 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 = yes # Console for debug +COMMAND_ENABLE = yes # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output + +DEFAULT_FOLDER = mechlovin/zed1800/saber \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/saber/config.h b/keyboards/mechlovin/zed1800/saber/config.h new file mode 100644 index 000000000000..d4de20825ee2 --- /dev/null +++ b/keyboards/mechlovin/zed1800/saber/config.h @@ -0,0 +1,43 @@ +/* +Copyright 2022 Mechlovin' + +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" + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 19 + +/* + * 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 { B8, B7, B6, B5, B4, B3} +#define MATRIX_COL_PINS { A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C13} + +#ifdef RGBLIGHT_ENABLE +#define RGBLIGHT_LAYERS +#define RGB_DI_PIN A15 +#define RGBLED_NUM 6 +#endif diff --git a/keyboards/mechlovin/zed1800/saber/info.json b/keyboards/mechlovin/zed1800/saber/info.json new file mode 100644 index 000000000000..4df3035015b1 --- /dev/null +++ b/keyboards/mechlovin/zed1800/saber/info.json @@ -0,0 +1,350 @@ +{ + "keyboard_name": "ZED1800-Saber1800", + "usb": { + "pid": "0x1803" + }, + "layouts": { + "LAYOUT_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [0, 18], "x": 19.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.5, "y": 1.5}, + {"matrix": [1, 16], "x": 17.5, "y": 1.5}, + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.5, "y": 2.5}, + {"matrix": [2, 16], "x": 17.5, "y": 2.5}, + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [2, 18], "x": 19.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 13], "x": 12.75, "y": 3.5, "w": 2.25}, + {"matrix": [3, 15], "x": 16.5, "y": 3.5}, + {"matrix": [3, 16], "x": 17.5, "y": 3.5}, + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + {"matrix": [3, 18], "x": 19.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 2.25}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + {"matrix": [4, 15], "x": 16.5, "y": 4.5}, + {"matrix": [4, 16], "x": 17.5, "y": 4.5}, + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2}, + + {"matrix": [4, 14], "x": 15.25, "y": 4.75}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 16], "x": 17.5, "y": 5.5}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + {"matrix": [5, 14], "x": 15.25, "y": 5.75}, + {"matrix": [5, 15], "x": 16.25, "y": 5.75} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [0, 18], "x": 19.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5, "w": 2}, + {"matrix": [2, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.5, "y": 1.5}, + {"matrix": [1, 16], "x": 17.5, "y": 1.5}, + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [3, 13], "x": 13.75, "y": 2.5, "w": 1.25, "h": 2}, + {"matrix": [3, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.5, "y": 2.5}, + {"matrix": [2, 16], "x": 17.5, "y": 2.5}, + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [2, 18], "x": 19.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5}, + {"matrix": [3, 15], "x": 16.5, "y": 3.5}, + {"matrix": [3, 16], "x": 17.5, "y": 3.5}, + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + {"matrix": [3, 18], "x": 19.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + {"matrix": [4, 15], "x": 16.5, "y": 4.5}, + {"matrix": [4, 16], "x": 17.5, "y": 4.5}, + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2}, + + {"matrix": [4, 14], "x": 15.25, "y": 4.75}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 16], "x": 17.5, "y": 5.5}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + {"matrix": [5, 14], "x": 15.25, "y": 5.75}, + {"matrix": [5, 15], "x": 16.25, "y": 5.75} + ] + }, + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 10], "x": 11, "y": 0}, + {"matrix": [0, 11], "x": 12, "y": 0}, + {"matrix": [0, 12], "x": 13, "y": 0}, + {"matrix": [0, 13], "x": 14, "y": 0}, + {"matrix": [0, 14], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 16.5, "y": 0}, + {"matrix": [0, 16], "x": 17.5, "y": 0}, + {"matrix": [0, 17], "x": 18.5, "y": 0}, + {"matrix": [0, 18], "x": 19.5, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2, "y": 1.5}, + {"matrix": [1, 3], "x": 3, "y": 1.5}, + {"matrix": [1, 4], "x": 4, "y": 1.5}, + {"matrix": [1, 5], "x": 5, "y": 1.5}, + {"matrix": [1, 6], "x": 6, "y": 1.5}, + {"matrix": [1, 7], "x": 7, "y": 1.5}, + {"matrix": [1, 8], "x": 8, "y": 1.5}, + {"matrix": [1, 9], "x": 9, "y": 1.5}, + {"matrix": [1, 10], "x": 10, "y": 1.5}, + {"matrix": [1, 11], "x": 11, "y": 1.5}, + {"matrix": [1, 12], "x": 12, "y": 1.5}, + {"matrix": [1, 13], "x": 13, "y": 1.5}, + {"matrix": [1, 14], "x": 14, "y": 1.5}, + {"matrix": [2, 14], "x": 15.25, "y": 1.5}, + {"matrix": [1, 15], "x": 16.5, "y": 1.5}, + {"matrix": [1, 16], "x": 17.5, "y": 1.5}, + {"matrix": [1, 17], "x": 18.5, "y": 1.5}, + {"matrix": [1, 18], "x": 19.5, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5}, + {"matrix": [2, 3], "x": 3.5, "y": 2.5}, + {"matrix": [2, 4], "x": 4.5, "y": 2.5}, + {"matrix": [2, 5], "x": 5.5, "y": 2.5}, + {"matrix": [2, 6], "x": 6.5, "y": 2.5}, + {"matrix": [2, 7], "x": 7.5, "y": 2.5}, + {"matrix": [2, 8], "x": 8.5, "y": 2.5}, + {"matrix": [2, 9], "x": 9.5, "y": 2.5}, + {"matrix": [2, 10], "x": 10.5, "y": 2.5}, + {"matrix": [2, 11], "x": 11.5, "y": 2.5}, + {"matrix": [2, 12], "x": 12.5, "y": 2.5}, + {"matrix": [2, 13], "x": 13.5, "y": 2.5, "w": 1.5}, + {"matrix": [3, 14], "x": 15.25, "y": 2.5}, + {"matrix": [2, 15], "x": 16.5, "y": 2.5}, + {"matrix": [2, 16], "x": 17.5, "y": 2.5}, + {"matrix": [2, 17], "x": 18.5, "y": 2.5}, + {"matrix": [2, 18], "x": 19.5, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.5}, + {"matrix": [3, 2], "x": 2.75, "y": 3.5}, + {"matrix": [3, 3], "x": 3.75, "y": 3.5}, + {"matrix": [3, 4], "x": 4.75, "y": 3.5}, + {"matrix": [3, 5], "x": 5.75, "y": 3.5}, + {"matrix": [3, 6], "x": 6.75, "y": 3.5}, + {"matrix": [3, 7], "x": 7.75, "y": 3.5}, + {"matrix": [3, 8], "x": 8.75, "y": 3.5}, + {"matrix": [3, 9], "x": 9.75, "y": 3.5}, + {"matrix": [3, 10], "x": 10.75, "y": 3.5}, + {"matrix": [3, 11], "x": 11.75, "y": 3.5}, + {"matrix": [3, 12], "x": 12.75, "y": 3.5}, + {"matrix": [3, 13], "x": 13.75, "y": 3.5, "w": 1.25}, + {"matrix": [3, 15], "x": 16.5, "y": 3.5}, + {"matrix": [3, 16], "x": 17.5, "y": 3.5}, + {"matrix": [3, 17], "x": 18.5, "y": 3.5}, + {"matrix": [3, 18], "x": 19.5, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5, "w": 1.25}, + {"matrix": [4, 1], "x": 1.25, "y": 4.5}, + {"matrix": [4, 2], "x": 2.25, "y": 4.5}, + {"matrix": [4, 3], "x": 3.25, "y": 4.5}, + {"matrix": [4, 4], "x": 4.25, "y": 4.5}, + {"matrix": [4, 5], "x": 5.25, "y": 4.5}, + {"matrix": [4, 6], "x": 6.25, "y": 4.5}, + {"matrix": [4, 7], "x": 7.25, "y": 4.5}, + {"matrix": [4, 8], "x": 8.25, "y": 4.5}, + {"matrix": [4, 9], "x": 9.25, "y": 4.5}, + {"matrix": [4, 10], "x": 10.25, "y": 4.5}, + {"matrix": [4, 11], "x": 11.25, "y": 4.5}, + {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 1.75}, + {"matrix": [4, 13], "x": 14, "y": 4.5}, + {"matrix": [4, 15], "x": 16.5, "y": 4.5}, + {"matrix": [4, 16], "x": 17.5, "y": 4.5}, + {"matrix": [4, 17], "x": 18.5, "y": 4.5}, + {"matrix": [4, 18], "x": 19.5, "y": 4.5}, + + {"matrix": [4, 14], "x": 15.25, "y": 4.75}, + + {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + {"matrix": [5, 1], "x": 1.5, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7}, + {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5}, + {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 16], "x": 17.5, "y": 5.5}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + {"matrix": [5, 18], "x": 19.5, "y": 5.5}, + + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + {"matrix": [5, 14], "x": 15.25, "y": 5.75}, + {"matrix": [5, 15], "x": 16.25, "y": 5.75} + ] + } + } +} diff --git a/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c new file mode 100644 index 000000000000..1f3b9ef03e82 --- /dev/null +++ b/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c @@ -0,0 +1,37 @@ +#include QMK_KEYBOARD_H + +#define LT1_CAP LT(1, KC_CAPS) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_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_HOME, KC_END, KC_PGUP, KC_PGDN, //18 + 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_PGUP, KC_NUM, KC_SLSH, KC_ASTR, KC_MINS, //19 + 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_P7, KC_P8, KC_P9, KC_PPLS, //19 + LT1_CAP, 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_P4, KC_P5, KC_P6, KC_PPLS, //17 + 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_P1, KC_P2, KC_P3, //16 + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT //12 + ), + +}; + +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN}); + +// Now define the array of layers. Later layers take precedence +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = +RGBLIGHT_LAYERS_LIST( + my_capslock_layer, + my_numlock_layer, + my_scroll_layer + ); +void keyboard_post_init_user(void) { + rgblight_layers = my_rgb_layers; +} +// Activate rgb layer for caps when capslock is enabled +bool led_update_user(led_t led_state) { +rgblight_set_layer_state(0, led_state.caps_lock); +rgblight_set_layer_state(1, led_state.num_lock); +rgblight_set_layer_state(2, led_state.scroll_lock); +return true; +} \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/saber/keymaps/via/config.h b/keyboards/mechlovin/zed1800/saber/keymaps/via/config.h new file mode 100644 index 000000000000..f0dfd5dbfcd6 --- /dev/null +++ b/keyboards/mechlovin/zed1800/saber/keymaps/via/config.h @@ -0,0 +1,3 @@ + +#define WEAR_LEVELING_BACKING_SIZE 4096 +#define WEAR_LEVELING_LOGICAL_SIZE 2048 diff --git a/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c new file mode 100644 index 000000000000..c32a508f4fc8 --- /dev/null +++ b/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c @@ -0,0 +1,76 @@ +/* Copyright 2022 Mechlovin' + * + * 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 + +#define LT1_CAP LT(1, KC_CAPS) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_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_HOME, KC_END, KC_PGUP, KC_PGDN, //18 + 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_PGUP, KC_NUM, KC_SLSH, KC_ASTR, KC_MINS, //19 + 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_P7, KC_P8, KC_P9, KC_PPLS, //19 + LT1_CAP, 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_P4, KC_P5, KC_P6, KC_PPLS, //17 + 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_P1, KC_P2, KC_P3, //16 + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT //12 + ), + [1] = LAYOUT_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, //18 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //16 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS //12 + ), + [2] = LAYOUT_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, //18 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //16 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS //12 + ), + [3] = LAYOUT_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, //18 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //16 + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS //12 + ) + +}; + +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN}); + +// Now define the array of layers. Later layers take precedence +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = +RGBLIGHT_LAYERS_LIST( + my_capslock_layer, + my_numlock_layer, + my_scroll_layer + ); +void keyboard_post_init_user(void) { + rgblight_layers = my_rgb_layers; +} +// Activate rgb layer for caps when capslock is enabled +bool led_update_user(led_t led_state) { +rgblight_set_layer_state(0, led_state.caps_lock); +rgblight_set_layer_state(1, led_state.num_lock); +rgblight_set_layer_state(2, led_state.scroll_lock); +return true; +} \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/saber/keymaps/via/rules.mk b/keyboards/mechlovin/zed1800/saber/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/mechlovin/zed1800/saber/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/saber/readme.md b/keyboards/mechlovin/zed1800/saber/readme.md new file mode 100644 index 000000000000..739df1a319e4 --- /dev/null +++ b/keyboards/mechlovin/zed1800/saber/readme.md @@ -0,0 +1,27 @@ +# Saber1800 + +![Saber1800](https://i.imgur.com/JO5btEDBl.png) + +A PCB for Saber1800 Keyboard, base on ZED1800 PCB + +* Keyboard Maintainer: [mechlovin](https://github.com/mechlovin) +* Hardware Supported: The Saber1800 Keyboard, APM32F103 +* Hardware Availability: Private GB + +Make example for this keyboard (after setting up your build environment): + + make mechlovin/zed1800/saber:default + +Flashing example for this keyboard: + + make mechlovin/zed1800/saber: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 key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/mechlovin/zed1800/saber/rules.mk b/keyboards/mechlovin/zed1800/saber/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/keyboards/mechlovin/zed1800/zed1800.c b/keyboards/mechlovin/zed1800/zed1800.c new file mode 100644 index 000000000000..f7f46b8fb628 --- /dev/null +++ b/keyboards/mechlovin/zed1800/zed1800.c @@ -0,0 +1,17 @@ +/* Copyright 2022 Mechlovin' Studio + * + * 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 "zed1800.h" diff --git a/keyboards/mechlovin/zed1800/zed1800.h b/keyboards/mechlovin/zed1800/zed1800.h new file mode 100644 index 000000000000..10324cae0012 --- /dev/null +++ b/keyboards/mechlovin/zed1800/zed1800.h @@ -0,0 +1,20 @@ +/* Copyright 2022 Mechlovin' + * + * 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" + diff --git a/keyboards/mechlovin/zed1800/zepsody/config.h b/keyboards/mechlovin/zed1800/zepsody/config.h new file mode 100644 index 000000000000..a71f5f9a7a0b --- /dev/null +++ b/keyboards/mechlovin/zed1800/zepsody/config.h @@ -0,0 +1,33 @@ +/* +Copyright 2022 Mechlovin' + +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" + +/* key matrix size */ +#define MATRIX_ROWS 6 +#define MATRIX_COLS 20 + +#define MATRIX_ROW_PINS { B8, B7, B6, B5, B4, B3} +#define MATRIX_COL_PINS { A10, A9, A8, A15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0} + +#ifdef RGBLIGHT_ENABLE +#define RGB_DI_PIN B15 +#define RGBLIGHT_LAYERS +#define RGBLED_NUM 6 +#endif diff --git a/keyboards/mechlovin/zed1800/zepsody/info.json b/keyboards/mechlovin/zed1800/zepsody/info.json new file mode 100644 index 000000000000..6278194ced33 --- /dev/null +++ b/keyboards/mechlovin/zed1800/zepsody/info.json @@ -0,0 +1,374 @@ +{ + "keyboard_name": "ZED1800-Zepsody", + "usb": { + "pid": "0x1801", + }, + "layouts": { + "LAYOUT_all": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 6], "x": 7, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + {"matrix": [0, 13], "x": 15, "y": 0}, + {"matrix": [0, 14], "x": 16, "y": 0}, + {"matrix": [0, 16], "x": 18, "y": 0}, + {"matrix": [0, 17], "x": 19, "y": 0}, + {"matrix": [0, 18], "x": 20, "y": 0}, + {"matrix": [0, 19], "x": 21, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2.5, "y": 1.5}, + {"matrix": [1, 3], "x": 3.5, "y": 1.5}, + {"matrix": [1, 4], "x": 4.5, "y": 1.5}, + {"matrix": [1, 5], "x": 5.5, "y": 1.5}, + {"matrix": [1, 6], "x": 6.5, "y": 1.5}, + {"matrix": [1, 7], "x": 7.5, "y": 1.5}, + {"matrix": [1, 8], "x": 8.5, "y": 1.5}, + {"matrix": [1, 9], "x": 9.5, "y": 1.5}, + {"matrix": [1, 10], "x": 10.5, "y": 1.5}, + {"matrix": [1, 11], "x": 11.5, "y": 1.5}, + {"matrix": [1, 12], "x": 12.5, "y": 1.5}, + {"matrix": [1, 13], "x": 13.5, "y": 1.5}, + {"matrix": [1, 14], "x": 14.5, "y": 1.5}, + {"matrix": [1, 15], "x": 15.5, "y": 1.5}, + {"matrix": [0, 15], "x": 16.5, "y": 1.5}, + {"matrix": [1, 16], "x": 18, "y": 1.5}, + {"matrix": [1, 17], "x": 19, "y": 1.5}, + {"matrix": [1, 18], "x": 20, "y": 1.5}, + {"matrix": [1, 19], "x": 21, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5, "w": 1.5}, + {"matrix": [2, 3], "x": 4, "y": 2.5}, + {"matrix": [2, 4], "x": 5, "y": 2.5}, + {"matrix": [2, 5], "x": 6, "y": 2.5}, + {"matrix": [2, 6], "x": 7, "y": 2.5}, + {"matrix": [2, 7], "x": 8, "y": 2.5}, + {"matrix": [2, 8], "x": 9, "y": 2.5}, + {"matrix": [2, 9], "x": 10, "y": 2.5}, + {"matrix": [2, 10], "x": 11, "y": 2.5}, + {"matrix": [2, 11], "x": 12, "y": 2.5}, + {"matrix": [2, 12], "x": 13, "y": 2.5}, + {"matrix": [2, 13], "x": 14, "y": 2.5}, + {"matrix": [2, 14], "x": 15, "y": 2.5}, + {"matrix": [2, 15], "x": 16, "y": 2.5, "w": 1.5}, + {"matrix": [2, 16], "x": 18, "y": 2.5}, + {"matrix": [2, 17], "x": 19, "y": 2.5}, + {"matrix": [2, 18], "x": 20, "y": 2.5}, + {"matrix": [2, 19], "x": 21, "y": 2.5}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3.5, "w": 1.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3.5}, + {"matrix": [3, 4], "x": 5.25, "y": 3.5}, + {"matrix": [3, 5], "x": 6.25, "y": 3.5}, + {"matrix": [3, 6], "x": 7.25, "y": 3.5}, + {"matrix": [3, 7], "x": 8.25, "y": 3.5}, + {"matrix": [3, 8], "x": 9.25, "y": 3.5}, + {"matrix": [3, 9], "x": 10.25, "y": 3.5}, + {"matrix": [3, 10], "x": 11.25, "y": 3.5}, + {"matrix": [3, 11], "x": 12.25, "y": 3.5}, + {"matrix": [3, 12], "x": 13.25, "y": 3.5}, + {"matrix": [3, 13], "x": 14.25, "y": 3.5}, + {"matrix": [3, 14], "x": 15.25, "y": 3.5}, + {"matrix": [3, 15], "x": 16.25, "y": 3.5, "w": 1.25}, + {"matrix": [3, 16], "x": 18, "y": 3.5}, + {"matrix": [3, 17], "x": 19, "y": 3.5}, + {"matrix": [3, 18], "x": 20, "y": 3.5}, + {"matrix": [3, 19], "x": 21, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1, "y": 4.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4.5}, + {"matrix": [4, 4], "x": 4.75, "y": 4.5}, + {"matrix": [4, 5], "x": 5.75, "y": 4.5}, + {"matrix": [4, 6], "x": 6.75, "y": 4.5}, + {"matrix": [4, 7], "x": 7.75, "y": 4.5}, + {"matrix": [4, 8], "x": 8.75, "y": 4.5}, + {"matrix": [4, 9], "x": 9.75, "y": 4.5}, + {"matrix": [4, 10], "x": 10.75, "y": 4.5}, + {"matrix": [4, 11], "x": 11.75, "y": 4.5}, + {"matrix": [4, 12], "x": 12.75, "y": 4.5}, + {"matrix": [4, 13], "x": 13.75, "y": 4.5}, + {"matrix": [4, 14], "x": 14.75, "y": 4.5, "w": 1.75}, + {"matrix": [4, 16], "x": 18, "y": 4.5}, + {"matrix": [4, 17], "x": 19, "y": 4.5}, + {"matrix": [4, 18], "x": 20, "y": 4.5}, + {"matrix": [4, 19], "x": 21, "y": 4.5}, + + {"matrix": [4, 15], "x": 16.75, "y": 4.75}, + + {"matrix": [5, 0], "x": 0, "y": 5.5}, + {"matrix": [5, 1], "x": 1, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 1.25}, + {"matrix": [5, 4], "x": 5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 8], "x": 6.25, "y": 5.5, "w": 6.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 13], "x": 14, "y": 5.5, "w": 1.5}, + {"matrix": [5, 17], "x": 19, "y": 5.5}, + {"matrix": [5, 18], "x": 20, "y": 5.5}, + {"matrix": [5, 19], "x": 21, "y": 5.5}, + + {"matrix": [5, 14], "x": 15.75, "y": 5.75}, + {"matrix": [5, 15], "x": 16.75, "y": 5.75}, + {"matrix": [5, 16], "x": 17.75, "y": 5.75} + ] + }, + "LAYOUT_ansi": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 6], "x": 7, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + {"matrix": [0, 13], "x": 15, "y": 0}, + {"matrix": [0, 14], "x": 16, "y": 0}, + {"matrix": [0, 16], "x": 18, "y": 0}, + {"matrix": [0, 17], "x": 19, "y": 0}, + {"matrix": [0, 18], "x": 20, "y": 0}, + {"matrix": [0, 19], "x": 21, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2.5, "y": 1.5}, + {"matrix": [1, 3], "x": 3.5, "y": 1.5}, + {"matrix": [1, 4], "x": 4.5, "y": 1.5}, + {"matrix": [1, 5], "x": 5.5, "y": 1.5}, + {"matrix": [1, 6], "x": 6.5, "y": 1.5}, + {"matrix": [1, 7], "x": 7.5, "y": 1.5}, + {"matrix": [1, 8], "x": 8.5, "y": 1.5}, + {"matrix": [1, 9], "x": 9.5, "y": 1.5}, + {"matrix": [1, 10], "x": 10.5, "y": 1.5}, + {"matrix": [1, 11], "x": 11.5, "y": 1.5}, + {"matrix": [1, 12], "x": 12.5, "y": 1.5}, + {"matrix": [1, 13], "x": 13.5, "y": 1.5}, + {"matrix": [1, 14], "x": 14.5, "y": 1.5}, + {"matrix": [1, 15], "x": 15.5, "y": 1.5, "w": 2}, + {"matrix": [1, 16], "x": 18, "y": 1.5}, + {"matrix": [1, 17], "x": 19, "y": 1.5}, + {"matrix": [1, 18], "x": 20, "y": 1.5}, + {"matrix": [1, 19], "x": 21, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5, "w": 1.5}, + {"matrix": [2, 3], "x": 4, "y": 2.5}, + {"matrix": [2, 4], "x": 5, "y": 2.5}, + {"matrix": [2, 5], "x": 6, "y": 2.5}, + {"matrix": [2, 6], "x": 7, "y": 2.5}, + {"matrix": [2, 7], "x": 8, "y": 2.5}, + {"matrix": [2, 8], "x": 9, "y": 2.5}, + {"matrix": [2, 9], "x": 10, "y": 2.5}, + {"matrix": [2, 10], "x": 11, "y": 2.5}, + {"matrix": [2, 11], "x": 12, "y": 2.5}, + {"matrix": [2, 12], "x": 13, "y": 2.5}, + {"matrix": [2, 13], "x": 14, "y": 2.5}, + {"matrix": [2, 14], "x": 15, "y": 2.5}, + {"matrix": [2, 15], "x": 16, "y": 2.5, "w": 1.5}, + {"matrix": [2, 16], "x": 18, "y": 2.5}, + {"matrix": [2, 17], "x": 19, "y": 2.5}, + {"matrix": [2, 18], "x": 20, "y": 2.5}, + {"matrix": [3, 19], "x": 21, "y": 2.5, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3.5, "w": 1.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3.5}, + {"matrix": [3, 4], "x": 5.25, "y": 3.5}, + {"matrix": [3, 5], "x": 6.25, "y": 3.5}, + {"matrix": [3, 6], "x": 7.25, "y": 3.5}, + {"matrix": [3, 7], "x": 8.25, "y": 3.5}, + {"matrix": [3, 8], "x": 9.25, "y": 3.5}, + {"matrix": [3, 9], "x": 10.25, "y": 3.5}, + {"matrix": [3, 10], "x": 11.25, "y": 3.5}, + {"matrix": [3, 11], "x": 12.25, "y": 3.5}, + {"matrix": [3, 12], "x": 13.25, "y": 3.5}, + {"matrix": [3, 13], "x": 14.25, "y": 3.5}, + {"matrix": [3, 15], "x": 15.25, "y": 3.5, "w": 2.25}, + {"matrix": [3, 16], "x": 18, "y": 3.5}, + {"matrix": [3, 17], "x": 19, "y": 3.5}, + {"matrix": [3, 18], "x": 20, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1, "y": 4.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 2.25}, + {"matrix": [4, 4], "x": 4.75, "y": 4.5}, + {"matrix": [4, 5], "x": 5.75, "y": 4.5}, + {"matrix": [4, 6], "x": 6.75, "y": 4.5}, + {"matrix": [4, 7], "x": 7.75, "y": 4.5}, + {"matrix": [4, 8], "x": 8.75, "y": 4.5}, + {"matrix": [4, 9], "x": 9.75, "y": 4.5}, + {"matrix": [4, 10], "x": 10.75, "y": 4.5}, + {"matrix": [4, 11], "x": 11.75, "y": 4.5}, + {"matrix": [4, 12], "x": 12.75, "y": 4.5}, + {"matrix": [4, 13], "x": 13.75, "y": 4.5}, + {"matrix": [4, 14], "x": 14.75, "y": 4.5, "w": 1.75}, + {"matrix": [4, 16], "x": 18, "y": 4.5}, + {"matrix": [4, 17], "x": 19, "y": 4.5}, + {"matrix": [4, 18], "x": 20, "y": 4.5}, + {"matrix": [5, 19], "x": 21, "y": 4.5, "h": 2}, + + {"matrix": [4, 15], "x": 16.75, "y": 4.75}, + + {"matrix": [5, 0], "x": 0, "y": 5.5}, + {"matrix": [5, 1], "x": 1, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 1.25}, + {"matrix": [5, 4], "x": 5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 8], "x": 6.25, "y": 5.5, "w": 6.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 13], "x": 14, "y": 5.5, "w": 1.5}, + {"matrix": [5, 17], "x": 19, "y": 5.5}, + {"matrix": [5, 18], "x": 20, "y": 5.5}, + + {"matrix": [5, 14], "x": 15.75, "y": 5.75}, + {"matrix": [5, 15], "x": 16.75, "y": 5.75}, + {"matrix": [5, 16], "x": 17.75, "y": 5.75} + ] + }, + "LAYOUT_iso": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2.5, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, + {"matrix": [0, 5], "x": 6, "y": 0}, + {"matrix": [0, 6], "x": 7, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, + {"matrix": [0, 9], "x": 10.5, "y": 0}, + {"matrix": [0, 10], "x": 11.5, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, + {"matrix": [0, 13], "x": 15, "y": 0}, + {"matrix": [0, 14], "x": 16, "y": 0}, + {"matrix": [0, 16], "x": 18, "y": 0}, + {"matrix": [0, 17], "x": 19, "y": 0}, + {"matrix": [0, 18], "x": 20, "y": 0}, + {"matrix": [0, 19], "x": 21, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.5}, + {"matrix": [1, 1], "x": 1, "y": 1.5}, + {"matrix": [1, 2], "x": 2.5, "y": 1.5}, + {"matrix": [1, 3], "x": 3.5, "y": 1.5}, + {"matrix": [1, 4], "x": 4.5, "y": 1.5}, + {"matrix": [1, 5], "x": 5.5, "y": 1.5}, + {"matrix": [1, 6], "x": 6.5, "y": 1.5}, + {"matrix": [1, 7], "x": 7.5, "y": 1.5}, + {"matrix": [1, 8], "x": 8.5, "y": 1.5}, + {"matrix": [1, 9], "x": 9.5, "y": 1.5}, + {"matrix": [1, 10], "x": 10.5, "y": 1.5}, + {"matrix": [1, 11], "x": 11.5, "y": 1.5}, + {"matrix": [1, 12], "x": 12.5, "y": 1.5}, + {"matrix": [1, 13], "x": 13.5, "y": 1.5}, + {"matrix": [1, 14], "x": 14.5, "y": 1.5}, + {"matrix": [1, 15], "x": 15.5, "y": 1.5, "w": 2}, + {"matrix": [1, 16], "x": 18, "y": 1.5}, + {"matrix": [1, 17], "x": 19, "y": 1.5}, + {"matrix": [1, 18], "x": 20, "y": 1.5}, + {"matrix": [1, 19], "x": 21, "y": 1.5}, + + {"matrix": [2, 0], "x": 0, "y": 2.5}, + {"matrix": [2, 1], "x": 1, "y": 2.5}, + {"matrix": [2, 2], "x": 2.5, "y": 2.5, "w": 1.5}, + {"matrix": [2, 3], "x": 4, "y": 2.5}, + {"matrix": [2, 4], "x": 5, "y": 2.5}, + {"matrix": [2, 5], "x": 6, "y": 2.5}, + {"matrix": [2, 6], "x": 7, "y": 2.5}, + {"matrix": [2, 7], "x": 8, "y": 2.5}, + {"matrix": [2, 8], "x": 9, "y": 2.5}, + {"matrix": [2, 9], "x": 10, "y": 2.5}, + {"matrix": [2, 10], "x": 11, "y": 2.5}, + {"matrix": [2, 11], "x": 12, "y": 2.5}, + {"matrix": [2, 12], "x": 13, "y": 2.5}, + {"matrix": [2, 13], "x": 14, "y": 2.5}, + {"matrix": [2, 14], "x": 15, "y": 2.5}, + {"matrix": [3, 15], "x": 16.25, "y": 2.5, "w": 1.25, "h": 2}, + {"matrix": [2, 16], "x": 18, "y": 2.5}, + {"matrix": [2, 17], "x": 19, "y": 2.5}, + {"matrix": [2, 18], "x": 20, "y": 2.5}, + {"matrix": [3, 19], "x": 21, "y": 2.5, "h": 2}, + + {"matrix": [3, 0], "x": 0, "y": 3.5}, + {"matrix": [3, 1], "x": 1, "y": 3.5}, + {"matrix": [3, 2], "x": 2.5, "y": 3.5, "w": 1.25}, + {"matrix": [3, 3], "x": 4.25, "y": 3.5}, + {"matrix": [3, 4], "x": 5.25, "y": 3.5}, + {"matrix": [3, 5], "x": 6.25, "y": 3.5}, + {"matrix": [3, 6], "x": 7.25, "y": 3.5}, + {"matrix": [3, 7], "x": 8.25, "y": 3.5}, + {"matrix": [3, 8], "x": 9.25, "y": 3.5}, + {"matrix": [3, 9], "x": 10.25, "y": 3.5}, + {"matrix": [3, 10], "x": 11.25, "y": 3.5}, + {"matrix": [3, 11], "x": 12.25, "y": 3.5}, + {"matrix": [3, 12], "x": 13.25, "y": 3.5}, + {"matrix": [3, 13], "x": 14.25, "y": 3.5}, + {"matrix": [3, 14], "x": 15.25, "y": 3.5}, + {"matrix": [3, 16], "x": 18, "y": 3.5}, + {"matrix": [3, 17], "x": 19, "y": 3.5}, + {"matrix": [3, 18], "x": 20, "y": 3.5}, + + {"matrix": [4, 0], "x": 0, "y": 4.5}, + {"matrix": [4, 1], "x": 1, "y": 4.5}, + {"matrix": [4, 2], "x": 2.5, "y": 4.5, "w": 1.25}, + {"matrix": [4, 3], "x": 3.75, "y": 4.5}, + {"matrix": [4, 4], "x": 4.75, "y": 4.5}, + {"matrix": [4, 5], "x": 5.75, "y": 4.5}, + {"matrix": [4, 6], "x": 6.75, "y": 4.5}, + {"matrix": [4, 7], "x": 7.75, "y": 4.5}, + {"matrix": [4, 8], "x": 8.75, "y": 4.5}, + {"matrix": [4, 9], "x": 9.75, "y": 4.5}, + {"matrix": [4, 10], "x": 10.75, "y": 4.5}, + {"matrix": [4, 11], "x": 11.75, "y": 4.5}, + {"matrix": [4, 12], "x": 12.75, "y": 4.5}, + {"matrix": [4, 13], "x": 13.75, "y": 4.5}, + {"matrix": [4, 14], "x": 14.75, "y": 4.5, "w": 1.75}, + {"matrix": [4, 16], "x": 18, "y": 4.5}, + {"matrix": [4, 17], "x": 19, "y": 4.5}, + {"matrix": [4, 18], "x": 20, "y": 4.5}, + {"matrix": [5, 19], "x": 21, "y": 4.5, "h": 2}, + + {"matrix": [4, 15], "x": 16.75, "y": 4.75}, + + {"matrix": [5, 0], "x": 0, "y": 5.5}, + {"matrix": [5, 1], "x": 1, "y": 5.5}, + {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 3], "x": 3.75, "y": 5.5, "w": 1.25}, + {"matrix": [5, 4], "x": 5, "y": 5.5, "w": 1.25}, + {"matrix": [5, 8], "x": 6.25, "y": 5.5, "w": 6.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 13], "x": 14, "y": 5.5, "w": 1.5}, + {"matrix": [5, 17], "x": 19, "y": 5.5}, + {"matrix": [5, 18], "x": 20, "y": 5.5}, + + {"matrix": [5, 14], "x": 15.75, "y": 5.75}, + {"matrix": [5, 15], "x": 16.75, "y": 5.75}, + {"matrix": [5, 16], "x": 17.75, "y": 5.75} + ] + } + } +} diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c new file mode 100644 index 000000000000..4041a6f4bfb1 --- /dev/null +++ b/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c @@ -0,0 +1,38 @@ +#include QMK_KEYBOARD_H + +#define LT1_CAP LT(1, KC_CAPS) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + [0] = LAYOUT_all( + KC_TRNS, KC_TRNS, 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_HOME, KC_END, KC_PGUP, KC_PGDN, + KC_TRNS, KC_TRNS, 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_NUM, KC_PSLS, KC_ASTR, KC_PMNS, + KC_TRNS, KC_TRNS, 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_P7, KC_P8, KC_P9, KC_PPLS, + KC_TRNS, KC_TRNS, LT1_CAP, 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_PPLS, + KC_TRNS, KC_TRNS, 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, + KC_TRNS, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PEQL + ), + +}; + +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN}); + +// Now define the array of layers. Later layers take precedence +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = +RGBLIGHT_LAYERS_LIST( + my_capslock_layer, + my_numlock_layer, + my_scroll_layer + ); +void keyboard_post_init_user(void) { + rgblight_layers = my_rgb_layers; +} +// Activate rgb layer for caps when capslock is enabled +bool led_update_user(led_t led_state) { +rgblight_set_layer_state(0, led_state.caps_lock); +rgblight_set_layer_state(1, led_state.num_lock); +rgblight_set_layer_state(2, led_state.scroll_lock); +return true; +} \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/via/config.h b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/config.h new file mode 100644 index 000000000000..f0dfd5dbfcd6 --- /dev/null +++ b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/config.h @@ -0,0 +1,3 @@ + +#define WEAR_LEVELING_BACKING_SIZE 4096 +#define WEAR_LEVELING_LOGICAL_SIZE 2048 diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c new file mode 100644 index 000000000000..2c6b0ff1ded1 --- /dev/null +++ b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c @@ -0,0 +1,60 @@ +/* Copyright 2022 Mechlovin' + * + * 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 + +#define LT1_CAP LT(1, KC_CAPS) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_all( + KC_TRNS, KC_TRNS, 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_HOME, KC_END, KC_PGUP, KC_PGDN, + KC_TRNS, KC_TRNS, 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_NUM, KC_PSLS, KC_ASTR, KC_PMNS, + KC_TRNS, KC_TRNS, 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_P7, KC_P8, KC_P9, KC_PPLS, + KC_TRNS, KC_TRNS, LT1_CAP, 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_PPLS, + KC_TRNS, KC_TRNS, 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, + KC_TRNS, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PEQL + ), + [1] = 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS + ), + +}; + +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN}); + +// Now define the array of layers. Later layers take precedence +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = +RGBLIGHT_LAYERS_LIST( + my_capslock_layer, + my_numlock_layer, + my_scroll_layer + ); +void keyboard_post_init_user(void) { + rgblight_layers = my_rgb_layers; +} +// Activate rgb layer for caps when capslock is enabled +bool led_update_user(led_t led_state) { +rgblight_set_layer_state(0, led_state.caps_lock); +rgblight_set_layer_state(1, led_state.num_lock); +rgblight_set_layer_state(2, led_state.scroll_lock); +return true; +} \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/via/rules.mk b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/zepsody/readme.md b/keyboards/mechlovin/zed1800/zepsody/readme.md new file mode 100644 index 000000000000..261b74abfde5 --- /dev/null +++ b/keyboards/mechlovin/zed1800/zepsody/readme.md @@ -0,0 +1,27 @@ +# Zepsody + +![Zepsody](https://i.imgur.com/KKq1UVxl.png) + +A PCB for Saber1800 Keyboard, base on ZED1800 PCB + +* Keyboard Maintainer: [mechlovin](https://github.com/mechlovin) +* Hardware Supported: The Zepsody Keyboard, APM32F103 +* Hardware Availability: [GH IC](https://geekhack.org/index.php?topic=118275.0) + +Make example for this keyboard (after setting up your build environment): + + make mechlovin/zed1800/zepsody:default + +Flashing example for this keyboard: + + make mechlovin/zed1800/zepsody: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 key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `RESET` if it is available diff --git a/keyboards/mechlovin/zed1800/zepsody/rules.mk b/keyboards/mechlovin/zed1800/zepsody/rules.mk new file mode 100644 index 000000000000..e69de29bb2d1 From d1e6703b67ee76a850ee296dd5893b256421fa32 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Thu, 15 Dec 2022 11:07:07 +0700 Subject: [PATCH 02/38] Add a GPL2+ compatible license --- keyboards/mechlovin/zed1800/config.h | 3 +++ .../zed1800/oreum/keymaps/default/keymap.c | 17 +++++++++++++++++ .../zed1800/oreum/keymaps/via/config.h | 3 --- .../zed1800/saber/keymaps/default/keymap.c | 17 +++++++++++++++++ .../zed1800/saber/keymaps/via/config.h | 3 --- .../zed1800/zepsody/keymaps/default/keymap.c | 17 +++++++++++++++++ .../zed1800/zepsody/keymaps/via/config.h | 3 --- 7 files changed, 54 insertions(+), 9 deletions(-) delete mode 100644 keyboards/mechlovin/zed1800/oreum/keymaps/via/config.h delete mode 100644 keyboards/mechlovin/zed1800/saber/keymaps/via/config.h delete mode 100644 keyboards/mechlovin/zed1800/zepsody/keymaps/via/config.h diff --git a/keyboards/mechlovin/zed1800/config.h b/keyboards/mechlovin/zed1800/config.h index 0aa5d08cd0f0..60fa12599d0d 100644 --- a/keyboards/mechlovin/zed1800/config.h +++ b/keyboards/mechlovin/zed1800/config.h @@ -52,3 +52,6 @@ along with this program. If not, see . /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ #define DEBOUNCE 5 + +#define WEAR_LEVELING_BACKING_SIZE 4096 +#define WEAR_LEVELING_LOGICAL_SIZE 2048 diff --git a/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c index ce072ce6155a..0fff2dfab754 100644 --- a/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c +++ b/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c @@ -1,3 +1,20 @@ +/* +Copyright 2022 Mechlovin' + +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 #define LT1_CAP LT(1, KC_CAPS) diff --git a/keyboards/mechlovin/zed1800/oreum/keymaps/via/config.h b/keyboards/mechlovin/zed1800/oreum/keymaps/via/config.h deleted file mode 100644 index f0dfd5dbfcd6..000000000000 --- a/keyboards/mechlovin/zed1800/oreum/keymaps/via/config.h +++ /dev/null @@ -1,3 +0,0 @@ - -#define WEAR_LEVELING_BACKING_SIZE 4096 -#define WEAR_LEVELING_LOGICAL_SIZE 2048 diff --git a/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c index 1f3b9ef03e82..fcb7c51e03ff 100644 --- a/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c +++ b/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c @@ -1,3 +1,20 @@ +/* +Copyright 2022 Mechlovin' + +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 #define LT1_CAP LT(1, KC_CAPS) diff --git a/keyboards/mechlovin/zed1800/saber/keymaps/via/config.h b/keyboards/mechlovin/zed1800/saber/keymaps/via/config.h deleted file mode 100644 index f0dfd5dbfcd6..000000000000 --- a/keyboards/mechlovin/zed1800/saber/keymaps/via/config.h +++ /dev/null @@ -1,3 +0,0 @@ - -#define WEAR_LEVELING_BACKING_SIZE 4096 -#define WEAR_LEVELING_LOGICAL_SIZE 2048 diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c index 4041a6f4bfb1..0baeb051b0d9 100644 --- a/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c +++ b/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c @@ -1,3 +1,20 @@ +/* +Copyright 2022 Mechlovin' + +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 #define LT1_CAP LT(1, KC_CAPS) diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/via/config.h b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/config.h deleted file mode 100644 index f0dfd5dbfcd6..000000000000 --- a/keyboards/mechlovin/zed1800/zepsody/keymaps/via/config.h +++ /dev/null @@ -1,3 +0,0 @@ - -#define WEAR_LEVELING_BACKING_SIZE 4096 -#define WEAR_LEVELING_LOGICAL_SIZE 2048 From 2e0abc065a37f368981ddce1ce4fa52437b88f48 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Mon, 16 Jan 2023 17:27:59 +0700 Subject: [PATCH 03/38] Update config.h --- keyboards/mechlovin/zed1800/saber/config.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/mechlovin/zed1800/saber/config.h b/keyboards/mechlovin/zed1800/saber/config.h index d4de20825ee2..a91b406c299e 100644 --- a/keyboards/mechlovin/zed1800/saber/config.h +++ b/keyboards/mechlovin/zed1800/saber/config.h @@ -34,10 +34,10 @@ along with this program. If not, see . * */ #define MATRIX_ROW_PINS { B8, B7, B6, B5, B4, B3} -#define MATRIX_COL_PINS { A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C13} +#define MATRIX_COL_PINS { A8, A15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C13} #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_LAYERS -#define RGB_DI_PIN A15 +#define RGB_DI_PIN B15 #define RGBLED_NUM 6 #endif From 2fb6e90447cff98f019936320f3bd2cc08b8f3f2 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Fri, 27 Jan 2023 16:12:05 +0700 Subject: [PATCH 04/38] Update keyboards/mechlovin/zed1800/saber/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/saber/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/mechlovin/zed1800/saber/config.h b/keyboards/mechlovin/zed1800/saber/config.h index a91b406c299e..c472a7290336 100644 --- a/keyboards/mechlovin/zed1800/saber/config.h +++ b/keyboards/mechlovin/zed1800/saber/config.h @@ -19,10 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 19 - /* * Keyboard Matrix Assignments * From ea58b3ac3cd79af884b98cce87544c102d27ec5e Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Fri, 27 Jan 2023 16:12:18 +0700 Subject: [PATCH 05/38] Update keyboards/mechlovin/zed1800/zepsody/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/zepsody/config.h | 4 ---- 1 file changed, 4 deletions(-) diff --git a/keyboards/mechlovin/zed1800/zepsody/config.h b/keyboards/mechlovin/zed1800/zepsody/config.h index a71f5f9a7a0b..a435f6493ee8 100644 --- a/keyboards/mechlovin/zed1800/zepsody/config.h +++ b/keyboards/mechlovin/zed1800/zepsody/config.h @@ -19,10 +19,6 @@ along with this program. If not, see . #include "config_common.h" -/* key matrix size */ -#define MATRIX_ROWS 6 -#define MATRIX_COLS 20 - #define MATRIX_ROW_PINS { B8, B7, B6, B5, B4, B3} #define MATRIX_COL_PINS { A10, A9, A8, A15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0} From 0106e5c982e246ee87f966da1b8c9b0e57f67c0d Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Fri, 27 Jan 2023 16:12:26 +0700 Subject: [PATCH 06/38] Update keyboards/mechlovin/zed1800/rules.mk Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/rules.mk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/keyboards/mechlovin/zed1800/rules.mk b/keyboards/mechlovin/zed1800/rules.mk index 256e8f5d2b2f..53e88993213a 100644 --- a/keyboards/mechlovin/zed1800/rules.mk +++ b/keyboards/mechlovin/zed1800/rules.mk @@ -1,10 +1,3 @@ -# MCU name -MCU = STM32F103 - -# Bootloader selection -BOOTLOADER = stm32duino - - # Build Options # change yes to no to disable # From c7dd6a91fd7145accb91b01c0b86c6ca143b3e81 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Fri, 27 Jan 2023 16:12:34 +0700 Subject: [PATCH 07/38] Update keyboards/mechlovin/zed1800/info.json Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/info.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/keyboards/mechlovin/zed1800/info.json b/keyboards/mechlovin/zed1800/info.json index c526008d7a84..a5af2e1928d6 100644 --- a/keyboards/mechlovin/zed1800/info.json +++ b/keyboards/mechlovin/zed1800/info.json @@ -5,5 +5,7 @@ "usb": { "vid": "0x4D4C", "device_version": "0.0.1" - } + }, + "processor": "STM32F103", + "bootloader": "stm32duino", } From af2865f4350f6c4bb71a61c15f5d2fc350c1e093 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Wed, 1 Feb 2023 13:37:04 +0700 Subject: [PATCH 08/38] Update keyboards/mechlovin/zed1800/zepsody/info.json Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/zepsody/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/mechlovin/zed1800/zepsody/info.json b/keyboards/mechlovin/zed1800/zepsody/info.json index 6278194ced33..f8e7a5291a57 100644 --- a/keyboards/mechlovin/zed1800/zepsody/info.json +++ b/keyboards/mechlovin/zed1800/zepsody/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "ZED1800-Zepsody", "usb": { - "pid": "0x1801", + "pid": "0x1801" }, "layouts": { "LAYOUT_all": { From 2487327f3ecc57cf96f37b0bac18224f15dfe4f8 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Wed, 1 Feb 2023 13:37:13 +0700 Subject: [PATCH 09/38] Update keyboards/mechlovin/zed1800/info.json Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/mechlovin/zed1800/info.json b/keyboards/mechlovin/zed1800/info.json index a5af2e1928d6..fe6b7c3a344d 100644 --- a/keyboards/mechlovin/zed1800/info.json +++ b/keyboards/mechlovin/zed1800/info.json @@ -7,5 +7,5 @@ "device_version": "0.0.1" }, "processor": "STM32F103", - "bootloader": "stm32duino", + "bootloader": "stm32duino" } From dd8e0b3a5fa2315982840f34e1bf523a469f81a4 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Wed, 1 Feb 2023 13:37:20 +0700 Subject: [PATCH 10/38] Update keyboards/mechlovin/zed1800/oreum/info.json Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/oreum/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/mechlovin/zed1800/oreum/info.json b/keyboards/mechlovin/zed1800/oreum/info.json index ad4f055029a0..699599e2e8f3 100644 --- a/keyboards/mechlovin/zed1800/oreum/info.json +++ b/keyboards/mechlovin/zed1800/oreum/info.json @@ -1,7 +1,7 @@ { "keyboard_name": "ZED1800-Oreum", "usb": { - "pid": "0x1802", + "pid": "0x1802" }, "layouts": { "LAYOUT_all": { From 009fc49a88e7b67ea81cff122871a0625bdaaa90 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Thu, 9 Feb 2023 13:42:24 +0700 Subject: [PATCH 11/38] Update info.json --- keyboards/mechlovin/zed1800/saber/info.json | 31 ++++++++++----------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/keyboards/mechlovin/zed1800/saber/info.json b/keyboards/mechlovin/zed1800/saber/info.json index 4df3035015b1..4edcb96b0082 100644 --- a/keyboards/mechlovin/zed1800/saber/info.json +++ b/keyboards/mechlovin/zed1800/saber/info.json @@ -95,25 +95,24 @@ {"matrix": [4, 10], "x": 10.25, "y": 4.5}, {"matrix": [4, 11], "x": 11.25, "y": 4.5}, {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + {"matrix": [4, 14], "x": 15.25, "y": 4.75}, {"matrix": [4, 15], "x": 16.5, "y": 4.5}, {"matrix": [4, 16], "x": 17.5, "y": 4.5}, {"matrix": [4, 17], "x": 18.5, "y": 4.5}, - {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2}, - - {"matrix": [4, 14], "x": 15.25, "y": 4.75}, - - {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5}, {"matrix": [5, 1], "x": 1.5, "y": 5.5}, {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7}, {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5}, {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5}, + {"matrix": [5, 13], "x": 14.25, "y": 5.75}, + {"matrix": [5, 14], "x": 15.25, "y": 5.75}, + {"matrix": [5, 15], "x": 16.25, "y": 5.75}, {"matrix": [5, 16], "x": 17.5, "y": 5.5}, {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2} - {"matrix": [5, 13], "x": 14.25, "y": 5.75}, - {"matrix": [5, 14], "x": 15.25, "y": 5.75}, - {"matrix": [5, 15], "x": 16.25, "y": 5.75} ] }, "LAYOUT_iso": { @@ -208,25 +207,23 @@ {"matrix": [4, 10], "x": 10.25, "y": 4.5}, {"matrix": [4, 11], "x": 11.25, "y": 4.5}, {"matrix": [4, 12], "x": 12.25, "y": 4.5, "w": 2.75}, + {"matrix": [4, 14], "x": 15.25, "y": 4.75}, {"matrix": [4, 15], "x": 16.5, "y": 4.5}, {"matrix": [4, 16], "x": 17.5, "y": 4.5}, {"matrix": [4, 17], "x": 18.5, "y": 4.5}, - {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2}, - - {"matrix": [4, 14], "x": 15.25, "y": 4.75}, - - {"matrix": [5, 0], "x": 0, "y": 5.5, "w": 1.5}, + + {"matrix": [5, 0], "x": 0, "y": 5.5}, {"matrix": [5, 1], "x": 1.5, "y": 5.5}, {"matrix": [5, 2], "x": 2.5, "y": 5.5, "w": 1.5}, {"matrix": [5, 7], "x": 4, "y": 5.5, "w": 7}, {"matrix": [5, 11], "x": 11, "y": 5.5, "w": 1.5}, {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5}, - {"matrix": [5, 16], "x": 17.5, "y": 5.5}, - {"matrix": [5, 17], "x": 18.5, "y": 5.5}, - {"matrix": [5, 13], "x": 14.25, "y": 5.75}, {"matrix": [5, 14], "x": 15.25, "y": 5.75}, - {"matrix": [5, 15], "x": 16.25, "y": 5.75} + {"matrix": [5, 15], "x": 16.25, "y": 5.75}, + {"matrix": [5, 16], "x": 17.5, "y": 5.5}, + {"matrix": [5, 17], "x": 18.5, "y": 5.5}, + {"matrix": [5, 18], "x": 19.5, "y": 4.5, "h": 2} ] }, "LAYOUT_all": { From 33eae52a6783afa0b7031c8edc61690e51dd2371 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:49:28 +0700 Subject: [PATCH 12/38] Update keyboards/mechlovin/zed1800/oreum/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/oreum/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/mechlovin/zed1800/oreum/config.h b/keyboards/mechlovin/zed1800/oreum/config.h index 3ae09fe1c38d..150405f82bc3 100644 --- a/keyboards/mechlovin/zed1800/oreum/config.h +++ b/keyboards/mechlovin/zed1800/oreum/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" - #define MATRIX_ROW_PINS { B8, B7, B6, B5, B4, B3} #define MATRIX_COL_PINS { A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C13} From bee10cf0fa94fdd6a3dc18db91f914305e4c6d2e Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:49:39 +0700 Subject: [PATCH 13/38] Update keyboards/mechlovin/zed1800/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/mechlovin/zed1800/config.h b/keyboards/mechlovin/zed1800/config.h index 60fa12599d0d..761103a4ec21 100644 --- a/keyboards/mechlovin/zed1800/config.h +++ b/keyboards/mechlovin/zed1800/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" - /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW From 4b8330d01048021c993ac97c8a75700ac2294350 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:50:01 +0700 Subject: [PATCH 14/38] Update keyboards/mechlovin/zed1800/zepsody/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/zepsody/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/mechlovin/zed1800/zepsody/config.h b/keyboards/mechlovin/zed1800/zepsody/config.h index a435f6493ee8..2d6fd901b64d 100644 --- a/keyboards/mechlovin/zed1800/zepsody/config.h +++ b/keyboards/mechlovin/zed1800/zepsody/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" - #define MATRIX_ROW_PINS { B8, B7, B6, B5, B4, B3} #define MATRIX_COL_PINS { A10, A9, A8, A15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0} From 0d26c850e20946a5c4948f3e999b4a3d15521953 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:50:10 +0700 Subject: [PATCH 15/38] Update keyboards/mechlovin/zed1800/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/mechlovin/zed1800/config.h b/keyboards/mechlovin/zed1800/config.h index 761103a4ec21..c9dc2bf924b7 100644 --- a/keyboards/mechlovin/zed1800/config.h +++ b/keyboards/mechlovin/zed1800/config.h @@ -48,8 +48,5 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif -/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */ -#define DEBOUNCE 5 - #define WEAR_LEVELING_BACKING_SIZE 4096 #define WEAR_LEVELING_LOGICAL_SIZE 2048 From afdd87553b1e977bd9b1a27f5fae4e223f9b5d4a Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:50:18 +0700 Subject: [PATCH 16/38] Update keyboards/mechlovin/zed1800/saber/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/saber/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/mechlovin/zed1800/saber/config.h b/keyboards/mechlovin/zed1800/saber/config.h index c472a7290336..f7f04f32f238 100644 --- a/keyboards/mechlovin/zed1800/saber/config.h +++ b/keyboards/mechlovin/zed1800/saber/config.h @@ -17,8 +17,6 @@ along with this program. If not, see . #pragma once -#include "config_common.h" - /* * Keyboard Matrix Assignments * From d328aae9c58a307e8194a227c725ee2906a562e0 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Fri, 10 Feb 2023 09:54:39 +0700 Subject: [PATCH 17/38] delete zed1800.c and zed1800.h --- keyboards/mechlovin/zed1800/zed1800.c | 17 ----------------- keyboards/mechlovin/zed1800/zed1800.h | 20 -------------------- 2 files changed, 37 deletions(-) delete mode 100644 keyboards/mechlovin/zed1800/zed1800.c delete mode 100644 keyboards/mechlovin/zed1800/zed1800.h diff --git a/keyboards/mechlovin/zed1800/zed1800.c b/keyboards/mechlovin/zed1800/zed1800.c deleted file mode 100644 index f7f46b8fb628..000000000000 --- a/keyboards/mechlovin/zed1800/zed1800.c +++ /dev/null @@ -1,17 +0,0 @@ -/* Copyright 2022 Mechlovin' Studio - * - * 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 "zed1800.h" diff --git a/keyboards/mechlovin/zed1800/zed1800.h b/keyboards/mechlovin/zed1800/zed1800.h deleted file mode 100644 index 10324cae0012..000000000000 --- a/keyboards/mechlovin/zed1800/zed1800.h +++ /dev/null @@ -1,20 +0,0 @@ -/* Copyright 2022 Mechlovin' - * - * 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" - From fc418469552a09e55374240f8a50555617dc5012 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Wed, 15 Mar 2023 14:10:23 +0700 Subject: [PATCH 18/38] Update keyboards/mechlovin/zed1800/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/mechlovin/zed1800/config.h b/keyboards/mechlovin/zed1800/config.h index c9dc2bf924b7..d68aeef24477 100644 --- a/keyboards/mechlovin/zed1800/config.h +++ b/keyboards/mechlovin/zed1800/config.h @@ -20,9 +20,6 @@ along with this program. If not, see . /* COL2ROW, ROW2COL */ #define DIODE_DIRECTION COL2ROW -#define LED_CAPS_LOCK_PIN C14 -#define LED_NUM_LOCK_PIN C15 - #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_LIMIT_VAL 255 # define RGBLIGHT_HUE_STEP 8 From 00264474789f3502fee0c90f54cd20bfc5b30e3d Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Wed, 15 Mar 2023 14:10:32 +0700 Subject: [PATCH 19/38] Update keyboards/mechlovin/zed1800/info.json Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/info.json | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/keyboards/mechlovin/zed1800/info.json b/keyboards/mechlovin/zed1800/info.json index fe6b7c3a344d..767108862bf4 100644 --- a/keyboards/mechlovin/zed1800/info.json +++ b/keyboards/mechlovin/zed1800/info.json @@ -6,6 +6,10 @@ "vid": "0x4D4C", "device_version": "0.0.1" }, + "indicators": { + "caps_lock": "C14", + "num_lock": "C15" + }, "processor": "STM32F103", "bootloader": "stm32duino" } From b885fe072e48753c7efc945d23cf2730165ad49b Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Wed, 15 Mar 2023 14:10:47 +0700 Subject: [PATCH 20/38] Update keyboards/mechlovin/zed1800/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/config.h | 6 ------ 1 file changed, 6 deletions(-) diff --git a/keyboards/mechlovin/zed1800/config.h b/keyboards/mechlovin/zed1800/config.h index d68aeef24477..f4c23f371bd4 100644 --- a/keyboards/mechlovin/zed1800/config.h +++ b/keyboards/mechlovin/zed1800/config.h @@ -37,12 +37,6 @@ along with this program. If not, see . # define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_RGB_TEST # define RGBLIGHT_EFFECT_ALTERNATING -/*== customize breathing effect ==*/ -/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/ -# define RGBLIGHT_BREATHE_TABLE_SIZE 256 // 256(default) or 128 or 64 -/*==== use exp() and sin() ====*/ -# define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85 // 1 to 2.7 -# define RGBLIGHT_EFFECT_BREATHE_MAX 255 // 0 to 255 #endif #define WEAR_LEVELING_BACKING_SIZE 4096 From 4acc4003a8a581e75da572db94bf00a266c0a5b0 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:36:55 +0700 Subject: [PATCH 21/38] Update keyboards/mechlovin/zed1800/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/mechlovin/zed1800/config.h b/keyboards/mechlovin/zed1800/config.h index f4c23f371bd4..480bba3abda6 100644 --- a/keyboards/mechlovin/zed1800/config.h +++ b/keyboards/mechlovin/zed1800/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -/* COL2ROW, ROW2COL */ -#define DIODE_DIRECTION COL2ROW - #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_LIMIT_VAL 255 # define RGBLIGHT_HUE_STEP 8 From 9be3c96fb76f96c546b8840a2afdb5e0c5bf0daa Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:37:13 +0700 Subject: [PATCH 22/38] Update keyboards/mechlovin/zed1800/oreum/info.json Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/oreum/info.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/keyboards/mechlovin/zed1800/oreum/info.json b/keyboards/mechlovin/zed1800/oreum/info.json index 699599e2e8f3..1ef2c4b24ff1 100644 --- a/keyboards/mechlovin/zed1800/oreum/info.json +++ b/keyboards/mechlovin/zed1800/oreum/info.json @@ -3,6 +3,11 @@ "usb": { "pid": "0x1802" }, + "matrix_pins": { + "cols": ["A8", "B15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"], + "rows": ["B8", "B7", "B6", "B5", "B4", "B3"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT_all": { "layout": [ From 184744ed6bb42a538b10447e071990fed5d9ff51 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:37:21 +0700 Subject: [PATCH 23/38] Update keyboards/mechlovin/zed1800/oreum/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/oreum/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/mechlovin/zed1800/oreum/config.h b/keyboards/mechlovin/zed1800/oreum/config.h index 150405f82bc3..ff4e89b331c8 100644 --- a/keyboards/mechlovin/zed1800/oreum/config.h +++ b/keyboards/mechlovin/zed1800/oreum/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROW_PINS { B8, B7, B6, B5, B4, B3} -#define MATRIX_COL_PINS { A8, B15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C13} - #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_LAYERS #define RGB_DI_PIN A15 From f6f095c21f174766c7a1e282e108c651bd87da56 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:37:30 +0700 Subject: [PATCH 24/38] Update keyboards/mechlovin/zed1800/saber/info.json Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/saber/info.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/keyboards/mechlovin/zed1800/saber/info.json b/keyboards/mechlovin/zed1800/saber/info.json index 4edcb96b0082..84e9a0906c94 100644 --- a/keyboards/mechlovin/zed1800/saber/info.json +++ b/keyboards/mechlovin/zed1800/saber/info.json @@ -3,6 +3,11 @@ "usb": { "pid": "0x1803" }, + "matrix_pins": { + "cols": ["A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"], + "rows": ["B8", "B7", "B6", "B5", "B4", "B3"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT_ansi": { "layout": [ From ef47346edd343e62ba428e84e1ede3bea59b30f2 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:37:38 +0700 Subject: [PATCH 25/38] Update keyboards/mechlovin/zed1800/saber/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/saber/config.h | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/keyboards/mechlovin/zed1800/saber/config.h b/keyboards/mechlovin/zed1800/saber/config.h index f7f04f32f238..b66e7cadf348 100644 --- a/keyboards/mechlovin/zed1800/saber/config.h +++ b/keyboards/mechlovin/zed1800/saber/config.h @@ -17,19 +17,6 @@ along with this program. If not, see . #pragma once -/* - * 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 { B8, B7, B6, B5, B4, B3} -#define MATRIX_COL_PINS { A8, A15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0, C13} - #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_LAYERS #define RGB_DI_PIN B15 From 9feedb724785e0f4f21fc5f79b1c80cec43d5062 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:37:48 +0700 Subject: [PATCH 26/38] Update keyboards/mechlovin/zed1800/zepsody/info.json Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/zepsody/info.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/keyboards/mechlovin/zed1800/zepsody/info.json b/keyboards/mechlovin/zed1800/zepsody/info.json index f8e7a5291a57..3962877ed8ed 100644 --- a/keyboards/mechlovin/zed1800/zepsody/info.json +++ b/keyboards/mechlovin/zed1800/zepsody/info.json @@ -3,6 +3,11 @@ "usb": { "pid": "0x1801" }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"], + "rows": ["B8", "B7", "B6", "B5", "B4", "B3"] + }, + "diode_direction": "COL2ROW", "layouts": { "LAYOUT_all": { "layout": [ From c84b2cd0a5f84000c59eb4c692fe5c9fd907b39d Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Sat, 18 Mar 2023 14:37:56 +0700 Subject: [PATCH 27/38] Update keyboards/mechlovin/zed1800/zepsody/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/zepsody/config.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/keyboards/mechlovin/zed1800/zepsody/config.h b/keyboards/mechlovin/zed1800/zepsody/config.h index 2d6fd901b64d..6b5272aca5be 100644 --- a/keyboards/mechlovin/zed1800/zepsody/config.h +++ b/keyboards/mechlovin/zed1800/zepsody/config.h @@ -17,9 +17,6 @@ along with this program. If not, see . #pragma once -#define MATRIX_ROW_PINS { B8, B7, B6, B5, B4, B3} -#define MATRIX_COL_PINS { A10, A9, A8, A15, B14, B13, B12, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3, A2, A1, A0} - #ifdef RGBLIGHT_ENABLE #define RGB_DI_PIN B15 #define RGBLIGHT_LAYERS From 3b37b5a6b2a3cb596c5b317bb07c9b2b9394c0e7 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Sat, 3 Jun 2023 15:06:27 +0700 Subject: [PATCH 28/38] move features to info.json --- keyboards/mechlovin/zed1800/config.h | 19 -------------- keyboards/mechlovin/zed1800/info.json | 26 ++++++++++++++++++- keyboards/mechlovin/zed1800/oreum/config.h | 2 -- keyboards/mechlovin/zed1800/oreum/info.json | 4 +++ keyboards/mechlovin/zed1800/rules.mk | 13 ---------- keyboards/mechlovin/zed1800/saber/config.h | 2 -- keyboards/mechlovin/zed1800/saber/info.json | 4 +++ keyboards/mechlovin/zed1800/zepsody/config.h | 2 -- keyboards/mechlovin/zed1800/zepsody/info.json | 4 +++ 9 files changed, 37 insertions(+), 39 deletions(-) diff --git a/keyboards/mechlovin/zed1800/config.h b/keyboards/mechlovin/zed1800/config.h index 480bba3abda6..9bfc776bcb46 100644 --- a/keyboards/mechlovin/zed1800/config.h +++ b/keyboards/mechlovin/zed1800/config.h @@ -17,24 +17,5 @@ along with this program. If not, see . #pragma once -#ifdef RGBLIGHT_ENABLE -#define RGBLIGHT_LIMIT_VAL 255 -# define RGBLIGHT_HUE_STEP 8 -# define RGBLIGHT_SAT_STEP 8 -# define RGBLIGHT_VAL_STEP 8 -# define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */ -# define RGBLIGHT_SLEEP /* If defined, the RGB lighting will be switched off when the host goes to sleep */ - -# define RGBLIGHT_EFFECT_BREATHING -# define RGBLIGHT_EFFECT_RAINBOW_MOOD -# define RGBLIGHT_EFFECT_RAINBOW_SWIRL -# define RGBLIGHT_EFFECT_SNAKE -# define RGBLIGHT_EFFECT_KNIGHT -# define RGBLIGHT_EFFECT_CHRISTMAS -# define RGBLIGHT_EFFECT_STATIC_GRADIENT -# define RGBLIGHT_EFFECT_RGB_TEST -# define RGBLIGHT_EFFECT_ALTERNATING -#endif - #define WEAR_LEVELING_BACKING_SIZE 4096 #define WEAR_LEVELING_LOGICAL_SIZE 2048 diff --git a/keyboards/mechlovin/zed1800/info.json b/keyboards/mechlovin/zed1800/info.json index 767108862bf4..a3d862fa8c11 100644 --- a/keyboards/mechlovin/zed1800/info.json +++ b/keyboards/mechlovin/zed1800/info.json @@ -11,5 +11,29 @@ "num_lock": "C15" }, "processor": "STM32F103", - "bootloader": "stm32duino" + "bootloader": "stm32duino", + "features": { + "bootmagic": true, + "command": true, + "console": true, + "extrakey": true, + "mousekey": true, + "rgblight": true, + "audio": false + }, + "rgblight": { + "sleep": true, + "animations": { + "alternating": true, + "breathing": true, + "christmas": true, + "knight": true, + "rainbow_mood": true, + "rainbow_swirl": true, + "rgb_test": true, + "snake": true, + "static_gradient": true, + "twinkle": true + } + } } diff --git a/keyboards/mechlovin/zed1800/oreum/config.h b/keyboards/mechlovin/zed1800/oreum/config.h index ff4e89b331c8..ec1ea49aab1f 100644 --- a/keyboards/mechlovin/zed1800/oreum/config.h +++ b/keyboards/mechlovin/zed1800/oreum/config.h @@ -19,6 +19,4 @@ along with this program. If not, see . #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_LAYERS -#define RGB_DI_PIN A15 -#define RGBLED_NUM 6 #endif diff --git a/keyboards/mechlovin/zed1800/oreum/info.json b/keyboards/mechlovin/zed1800/oreum/info.json index 1ef2c4b24ff1..78165a00ce1f 100644 --- a/keyboards/mechlovin/zed1800/oreum/info.json +++ b/keyboards/mechlovin/zed1800/oreum/info.json @@ -8,6 +8,10 @@ "rows": ["B8", "B7", "B6", "B5", "B4", "B3"] }, "diode_direction": "COL2ROW", + "rgblight": { + "pin": "A15", + "led_count": 6 + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/zed1800/rules.mk b/keyboards/mechlovin/zed1800/rules.mk index 53e88993213a..d007da3fa20c 100644 --- a/keyboards/mechlovin/zed1800/rules.mk +++ b/keyboards/mechlovin/zed1800/rules.mk @@ -1,14 +1 @@ -# 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 = yes # Console for debug -COMMAND_ENABLE = yes # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = yes # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output - DEFAULT_FOLDER = mechlovin/zed1800/saber \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/saber/config.h b/keyboards/mechlovin/zed1800/saber/config.h index b66e7cadf348..ec1ea49aab1f 100644 --- a/keyboards/mechlovin/zed1800/saber/config.h +++ b/keyboards/mechlovin/zed1800/saber/config.h @@ -19,6 +19,4 @@ along with this program. If not, see . #ifdef RGBLIGHT_ENABLE #define RGBLIGHT_LAYERS -#define RGB_DI_PIN B15 -#define RGBLED_NUM 6 #endif diff --git a/keyboards/mechlovin/zed1800/saber/info.json b/keyboards/mechlovin/zed1800/saber/info.json index 84e9a0906c94..a697cae56636 100644 --- a/keyboards/mechlovin/zed1800/saber/info.json +++ b/keyboards/mechlovin/zed1800/saber/info.json @@ -7,6 +7,10 @@ "cols": ["A8", "A15", "B14", "B13", "B12", "B11", "B10", "B2", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C13"], "rows": ["B8", "B7", "B6", "B5", "B4", "B3"] }, + "rgblight": { + "pin": "B15", + "led_count": 6 + }, "diode_direction": "COL2ROW", "layouts": { "LAYOUT_ansi": { diff --git a/keyboards/mechlovin/zed1800/zepsody/config.h b/keyboards/mechlovin/zed1800/zepsody/config.h index 6b5272aca5be..ec1ea49aab1f 100644 --- a/keyboards/mechlovin/zed1800/zepsody/config.h +++ b/keyboards/mechlovin/zed1800/zepsody/config.h @@ -18,7 +18,5 @@ along with this program. If not, see . #pragma once #ifdef RGBLIGHT_ENABLE -#define RGB_DI_PIN B15 #define RGBLIGHT_LAYERS -#define RGBLED_NUM 6 #endif diff --git a/keyboards/mechlovin/zed1800/zepsody/info.json b/keyboards/mechlovin/zed1800/zepsody/info.json index 3962877ed8ed..a96cd7e05532 100644 --- a/keyboards/mechlovin/zed1800/zepsody/info.json +++ b/keyboards/mechlovin/zed1800/zepsody/info.json @@ -8,6 +8,10 @@ "rows": ["B8", "B7", "B6", "B5", "B4", "B3"] }, "diode_direction": "COL2ROW", + "rgblight": { + "pin": "B15", + "led_count": 6 + }, "layouts": { "LAYOUT_all": { "layout": [ From 08b23de61d44a6492022d936ee2ebdd30c60c1b0 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Sun, 4 Jun 2023 14:11:35 +0700 Subject: [PATCH 29/38] renamed rgblight.pin to ws2812.pin --- keyboards/mechlovin/zed1800/oreum/info.json | 4 +++- keyboards/mechlovin/zed1800/saber/info.json | 4 +++- keyboards/mechlovin/zed1800/zepsody/info.json | 4 +++- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/keyboards/mechlovin/zed1800/oreum/info.json b/keyboards/mechlovin/zed1800/oreum/info.json index 78165a00ce1f..4a15f61ce492 100644 --- a/keyboards/mechlovin/zed1800/oreum/info.json +++ b/keyboards/mechlovin/zed1800/oreum/info.json @@ -9,9 +9,11 @@ }, "diode_direction": "COL2ROW", "rgblight": { - "pin": "A15", "led_count": 6 }, + "ws2812": { + "pin": "A15" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/mechlovin/zed1800/saber/info.json b/keyboards/mechlovin/zed1800/saber/info.json index a697cae56636..d921d95a9502 100644 --- a/keyboards/mechlovin/zed1800/saber/info.json +++ b/keyboards/mechlovin/zed1800/saber/info.json @@ -8,9 +8,11 @@ "rows": ["B8", "B7", "B6", "B5", "B4", "B3"] }, "rgblight": { - "pin": "B15", "led_count": 6 }, + "ws2812": { + "pin": "B15" + }, "diode_direction": "COL2ROW", "layouts": { "LAYOUT_ansi": { diff --git a/keyboards/mechlovin/zed1800/zepsody/info.json b/keyboards/mechlovin/zed1800/zepsody/info.json index a96cd7e05532..e2b0334aa65a 100644 --- a/keyboards/mechlovin/zed1800/zepsody/info.json +++ b/keyboards/mechlovin/zed1800/zepsody/info.json @@ -9,9 +9,11 @@ }, "diode_direction": "COL2ROW", "rgblight": { - "pin": "B15", "led_count": 6 }, + "ws2812": { + "pin": "B15" + }, "layouts": { "LAYOUT_all": { "layout": [ From a3632e290609eada8d0375049e2b2b58308a11a7 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Tue, 25 Jul 2023 17:58:04 +0700 Subject: [PATCH 30/38] Update keyboards/mechlovin/zed1800/zepsody/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/zepsody/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/mechlovin/zed1800/zepsody/config.h b/keyboards/mechlovin/zed1800/zepsody/config.h index ec1ea49aab1f..e9e3ce09ca11 100644 --- a/keyboards/mechlovin/zed1800/zepsody/config.h +++ b/keyboards/mechlovin/zed1800/zepsody/config.h @@ -17,6 +17,4 @@ along with this program. If not, see . #pragma once -#ifdef RGBLIGHT_ENABLE #define RGBLIGHT_LAYERS -#endif From 69c0625bf996c7a6f7b868560d884b73d76dac6c Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Tue, 25 Jul 2023 17:58:10 +0700 Subject: [PATCH 31/38] Update keyboards/mechlovin/zed1800/saber/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/saber/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/mechlovin/zed1800/saber/config.h b/keyboards/mechlovin/zed1800/saber/config.h index ec1ea49aab1f..e9e3ce09ca11 100644 --- a/keyboards/mechlovin/zed1800/saber/config.h +++ b/keyboards/mechlovin/zed1800/saber/config.h @@ -17,6 +17,4 @@ along with this program. If not, see . #pragma once -#ifdef RGBLIGHT_ENABLE #define RGBLIGHT_LAYERS -#endif From 5a0ac914ac7697146b6b47638bc47407614633de Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Tue, 25 Jul 2023 17:58:18 +0700 Subject: [PATCH 32/38] Update keyboards/mechlovin/zed1800/oreum/config.h Co-authored-by: Ryan --- keyboards/mechlovin/zed1800/oreum/config.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/mechlovin/zed1800/oreum/config.h b/keyboards/mechlovin/zed1800/oreum/config.h index ec1ea49aab1f..e9e3ce09ca11 100644 --- a/keyboards/mechlovin/zed1800/oreum/config.h +++ b/keyboards/mechlovin/zed1800/oreum/config.h @@ -17,6 +17,4 @@ along with this program. If not, see . #pragma once -#ifdef RGBLIGHT_ENABLE #define RGBLIGHT_LAYERS -#endif From 0112794176ce9a7aa6d16f2ca3802a0678ae75ea Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Thu, 10 Aug 2023 16:26:32 +0700 Subject: [PATCH 33/38] Update info.json --- keyboards/mechlovin/zed1800/zepsody/info.json | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/keyboards/mechlovin/zed1800/zepsody/info.json b/keyboards/mechlovin/zed1800/zepsody/info.json index e2b0334aa65a..dab92b26d7ed 100644 --- a/keyboards/mechlovin/zed1800/zepsody/info.json +++ b/keyboards/mechlovin/zed1800/zepsody/info.json @@ -14,6 +14,9 @@ "ws2812": { "pin": "B15" }, + "indicators": { + "scroll_lock": "C13" + }, "layouts": { "LAYOUT_all": { "layout": [ @@ -95,7 +98,7 @@ {"matrix": [3, 12], "x": 13.25, "y": 3.5}, {"matrix": [3, 13], "x": 14.25, "y": 3.5}, {"matrix": [3, 14], "x": 15.25, "y": 3.5}, - {"matrix": [3, 15], "x": 16.25, "y": 3.5, "w": 1.25}, + {"matrix": [3, 15], "x": 16.25, "y": 3.5, "w": 1.25 }, {"matrix": [3, 16], "x": 18, "y": 3.5}, {"matrix": [3, 17], "x": 19, "y": 3.5}, {"matrix": [3, 18], "x": 20, "y": 3.5}, @@ -116,12 +119,12 @@ {"matrix": [4, 12], "x": 12.75, "y": 4.5}, {"matrix": [4, 13], "x": 13.75, "y": 4.5}, {"matrix": [4, 14], "x": 14.75, "y": 4.5, "w": 1.75}, + {"matrix": [4, 15], "x": 16.75, "y": 4.75}, {"matrix": [4, 16], "x": 18, "y": 4.5}, {"matrix": [4, 17], "x": 19, "y": 4.5}, {"matrix": [4, 18], "x": 20, "y": 4.5}, {"matrix": [4, 19], "x": 21, "y": 4.5}, - {"matrix": [4, 15], "x": 16.75, "y": 4.75}, {"matrix": [5, 0], "x": 0, "y": 5.5}, {"matrix": [5, 1], "x": 1, "y": 5.5}, @@ -131,13 +134,13 @@ {"matrix": [5, 8], "x": 6.25, "y": 5.5, "w": 6.25}, {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5}, {"matrix": [5, 13], "x": 14, "y": 5.5, "w": 1.5}, + {"matrix": [5, 14], "x": 15.75, "y": 5.75}, + {"matrix": [5, 15], "x": 16.75, "y": 5.75}, + {"matrix": [5, 16], "x": 17.75, "y": 5.75}, {"matrix": [5, 17], "x": 19, "y": 5.5}, {"matrix": [5, 18], "x": 20, "y": 5.5}, - {"matrix": [5, 19], "x": 21, "y": 5.5}, + {"matrix": [5, 19], "x": 21, "y": 5.5} - {"matrix": [5, 14], "x": 15.75, "y": 5.75}, - {"matrix": [5, 15], "x": 16.75, "y": 5.75}, - {"matrix": [5, 16], "x": 17.75, "y": 5.75} ] }, "LAYOUT_ansi": { @@ -237,12 +240,12 @@ {"matrix": [4, 12], "x": 12.75, "y": 4.5}, {"matrix": [4, 13], "x": 13.75, "y": 4.5}, {"matrix": [4, 14], "x": 14.75, "y": 4.5, "w": 1.75}, + {"matrix": [4, 15], "x": 16.75, "y": 4.75}, {"matrix": [4, 16], "x": 18, "y": 4.5}, {"matrix": [4, 17], "x": 19, "y": 4.5}, {"matrix": [4, 18], "x": 20, "y": 4.5}, {"matrix": [5, 19], "x": 21, "y": 4.5, "h": 2}, - {"matrix": [4, 15], "x": 16.75, "y": 4.75}, {"matrix": [5, 0], "x": 0, "y": 5.5}, {"matrix": [5, 1], "x": 1, "y": 5.5}, @@ -252,12 +255,12 @@ {"matrix": [5, 8], "x": 6.25, "y": 5.5, "w": 6.25}, {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5}, {"matrix": [5, 13], "x": 14, "y": 5.5, "w": 1.5}, - {"matrix": [5, 17], "x": 19, "y": 5.5}, - {"matrix": [5, 18], "x": 20, "y": 5.5}, - {"matrix": [5, 14], "x": 15.75, "y": 5.75}, {"matrix": [5, 15], "x": 16.75, "y": 5.75}, - {"matrix": [5, 16], "x": 17.75, "y": 5.75} + {"matrix": [5, 16], "x": 17.75, "y": 5.75}, + {"matrix": [5, 17], "x": 19, "y": 5.5}, + {"matrix": [5, 18], "x": 20, "y": 5.5} + ] }, "LAYOUT_iso": { @@ -358,12 +361,12 @@ {"matrix": [4, 12], "x": 12.75, "y": 4.5}, {"matrix": [4, 13], "x": 13.75, "y": 4.5}, {"matrix": [4, 14], "x": 14.75, "y": 4.5, "w": 1.75}, + {"matrix": [4, 15], "x": 16.75, "y": 4.75}, {"matrix": [4, 16], "x": 18, "y": 4.5}, {"matrix": [4, 17], "x": 19, "y": 4.5}, {"matrix": [4, 18], "x": 20, "y": 4.5}, {"matrix": [5, 19], "x": 21, "y": 4.5, "h": 2}, - {"matrix": [4, 15], "x": 16.75, "y": 4.75}, {"matrix": [5, 0], "x": 0, "y": 5.5}, {"matrix": [5, 1], "x": 1, "y": 5.5}, @@ -373,12 +376,12 @@ {"matrix": [5, 8], "x": 6.25, "y": 5.5, "w": 6.25}, {"matrix": [5, 12], "x": 12.5, "y": 5.5, "w": 1.5}, {"matrix": [5, 13], "x": 14, "y": 5.5, "w": 1.5}, - {"matrix": [5, 17], "x": 19, "y": 5.5}, - {"matrix": [5, 18], "x": 20, "y": 5.5}, - {"matrix": [5, 14], "x": 15.75, "y": 5.75}, {"matrix": [5, 15], "x": 16.75, "y": 5.75}, - {"matrix": [5, 16], "x": 17.75, "y": 5.75} + {"matrix": [5, 16], "x": 17.75, "y": 5.75}, + {"matrix": [5, 17], "x": 19, "y": 5.5}, + {"matrix": [5, 18], "x": 20, "y": 5.5} + ] } } From d4406152f6fed37da5307187b986bea1c99ebf7d Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Wed, 25 Oct 2023 14:48:01 +0700 Subject: [PATCH 34/38] move rgblight_layer to the keyboard level --- .../zed1800/oreum/keymaps/default/keymap.c | 22 ----------- .../zed1800/oreum/keymaps/via/keymap.c | 22 ----------- .../zed1800/saber/keymaps/default/keymap.c | 22 ----------- .../zed1800/saber/keymaps/via/keymap.c | 22 ----------- keyboards/mechlovin/zed1800/zed1800.c | 39 +++++++++++++++++++ .../zed1800/zepsody/keymaps/default/keymap.c | 22 ----------- .../zed1800/zepsody/keymaps/via/keymap.c | 22 ----------- 7 files changed, 39 insertions(+), 132 deletions(-) create mode 100644 keyboards/mechlovin/zed1800/zed1800.c diff --git a/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c index 0fff2dfab754..63cb1b7a27cf 100644 --- a/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c +++ b/keyboards/mechlovin/zed1800/oreum/keymaps/default/keymap.c @@ -31,25 +31,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; - -const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN}); -const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN}); -const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN}); - -// Now define the array of layers. Later layers take precedence -const rgblight_segment_t* const PROGMEM my_rgb_layers[] = -RGBLIGHT_LAYERS_LIST( - my_capslock_layer, - my_numlock_layer, - my_scroll_layer - ); -void keyboard_post_init_user(void) { - rgblight_layers = my_rgb_layers; -} -// Activate rgb layer for caps when capslock is enabled -bool led_update_user(led_t led_state) { -rgblight_set_layer_state(0, led_state.caps_lock); -rgblight_set_layer_state(1, led_state.num_lock); -rgblight_set_layer_state(2, led_state.scroll_lock); -return true; -} \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c index 19cc5476f608..eb8fe1d096a9 100644 --- a/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c +++ b/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c @@ -51,25 +51,3 @@ 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 ) }; - -const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN}); -const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN}); -const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN}); - -// Now define the array of layers. Later layers take precedence -const rgblight_segment_t* const PROGMEM my_rgb_layers[] = -RGBLIGHT_LAYERS_LIST( - my_capslock_layer, - my_numlock_layer, - my_scroll_layer - ); -void keyboard_post_init_user(void) { - rgblight_layers = my_rgb_layers; -} -// Activate rgb layer for caps when capslock is enabled -bool led_update_user(led_t led_state) { -rgblight_set_layer_state(0, led_state.caps_lock); -rgblight_set_layer_state(1, led_state.num_lock); -rgblight_set_layer_state(2, led_state.scroll_lock); -return true; -} \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c index fcb7c51e03ff..5c151e7933b8 100644 --- a/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c +++ b/keyboards/mechlovin/zed1800/saber/keymaps/default/keymap.c @@ -30,25 +30,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; - -const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN}); -const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN}); -const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN}); - -// Now define the array of layers. Later layers take precedence -const rgblight_segment_t* const PROGMEM my_rgb_layers[] = -RGBLIGHT_LAYERS_LIST( - my_capslock_layer, - my_numlock_layer, - my_scroll_layer - ); -void keyboard_post_init_user(void) { - rgblight_layers = my_rgb_layers; -} -// Activate rgb layer for caps when capslock is enabled -bool led_update_user(led_t led_state) { -rgblight_set_layer_state(0, led_state.caps_lock); -rgblight_set_layer_state(1, led_state.num_lock); -rgblight_set_layer_state(2, led_state.scroll_lock); -return true; -} \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c index c32a508f4fc8..a53fff6c897b 100644 --- a/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c +++ b/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c @@ -52,25 +52,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; - -const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN}); -const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN}); -const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN}); - -// Now define the array of layers. Later layers take precedence -const rgblight_segment_t* const PROGMEM my_rgb_layers[] = -RGBLIGHT_LAYERS_LIST( - my_capslock_layer, - my_numlock_layer, - my_scroll_layer - ); -void keyboard_post_init_user(void) { - rgblight_layers = my_rgb_layers; -} -// Activate rgb layer for caps when capslock is enabled -bool led_update_user(led_t led_state) { -rgblight_set_layer_state(0, led_state.caps_lock); -rgblight_set_layer_state(1, led_state.num_lock); -rgblight_set_layer_state(2, led_state.scroll_lock); -return true; -} \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/zed1800.c b/keyboards/mechlovin/zed1800/zed1800.c new file mode 100644 index 000000000000..8bc3a23e7d6b --- /dev/null +++ b/keyboards/mechlovin/zed1800/zed1800.c @@ -0,0 +1,39 @@ +/* Copyright 2022 Mechlovin' Studio + * + * 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 "quantum.h" + +const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN}); +const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN}); + +// Now define the array of layers. Later layers take precedence +const rgblight_segment_t* const PROGMEM my_rgb_layers[] = +RGBLIGHT_LAYERS_LIST( + my_capslock_layer, + my_numlock_layer, + my_scroll_layer + ); +void keyboard_post_init_kb(void) { + rgblight_layers = my_rgb_layers; +} +// Activate rgb layer for caps when capslock is enabled +bool led_update_kb(led_t led_state) { +rgblight_set_layer_state(0, led_state.caps_lock); +rgblight_set_layer_state(1, led_state.num_lock); +rgblight_set_layer_state(2, led_state.scroll_lock); +return true; +} \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c b/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c index 0baeb051b0d9..8d1be55c1388 100644 --- a/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c +++ b/keyboards/mechlovin/zed1800/zepsody/keymaps/default/keymap.c @@ -31,25 +31,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; - -const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN}); -const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN}); -const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN}); - -// Now define the array of layers. Later layers take precedence -const rgblight_segment_t* const PROGMEM my_rgb_layers[] = -RGBLIGHT_LAYERS_LIST( - my_capslock_layer, - my_numlock_layer, - my_scroll_layer - ); -void keyboard_post_init_user(void) { - rgblight_layers = my_rgb_layers; -} -// Activate rgb layer for caps when capslock is enabled -bool led_update_user(led_t led_state) { -rgblight_set_layer_state(0, led_state.caps_lock); -rgblight_set_layer_state(1, led_state.num_lock); -rgblight_set_layer_state(2, led_state.scroll_lock); -return true; -} \ No newline at end of file diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c index 2c6b0ff1ded1..d3a47fe294f5 100644 --- a/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c +++ b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c @@ -36,25 +36,3 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), }; - -const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS({2, 1, HSV_GREEN}); -const rgblight_segment_t PROGMEM my_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, 1, HSV_GREEN}); -const rgblight_segment_t PROGMEM my_scroll_layer[] = RGBLIGHT_LAYER_SEGMENTS({1, 1, HSV_GREEN}); - -// Now define the array of layers. Later layers take precedence -const rgblight_segment_t* const PROGMEM my_rgb_layers[] = -RGBLIGHT_LAYERS_LIST( - my_capslock_layer, - my_numlock_layer, - my_scroll_layer - ); -void keyboard_post_init_user(void) { - rgblight_layers = my_rgb_layers; -} -// Activate rgb layer for caps when capslock is enabled -bool led_update_user(led_t led_state) { -rgblight_set_layer_state(0, led_state.caps_lock); -rgblight_set_layer_state(1, led_state.num_lock); -rgblight_set_layer_state(2, led_state.scroll_lock); -return true; -} \ No newline at end of file From d5c81c641bcf671ce37227d88909be41edcc4290 Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Mon, 13 Nov 2023 08:24:13 +0700 Subject: [PATCH 35/38] Update keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- .../zed1800/oreum/keymaps/via/keymap.c | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c index eb8fe1d096a9..5a0492241dd3 100644 --- a/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c +++ b/keyboards/mechlovin/zed1800/oreum/keymaps/via/keymap.c @@ -26,28 +26,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_PEQL, //18 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_P0, KC_PDOT, KC_PENT //14 ), - [1] = 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, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //20 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, 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_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, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //20 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, 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_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, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //20 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ) }; From 084104be882f33f9de0e120ab69d84910513b48a Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Mon, 13 Nov 2023 08:24:25 +0700 Subject: [PATCH 36/38] Update keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c index d3a47fe294f5..bb579ec5da6b 100644 --- a/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c +++ b/keyboards/mechlovin/zed1800/zepsody/keymaps/via/keymap.c @@ -26,13 +26,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_TRNS, KC_TRNS, 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, KC_TRNS, KC_TRNS, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PEQL ), - [1] = 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS - ), - }; From cfc8541f068a4ad72a08f24251f3d24d674a5dfc Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Mon, 13 Nov 2023 08:24:35 +0700 Subject: [PATCH 37/38] Update keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c Co-authored-by: Drashna Jaelre --- .../zed1800/saber/keymaps/via/keymap.c | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c b/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c index a53fff6c897b..86b00e31de87 100644 --- a/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c +++ b/keyboards/mechlovin/zed1800/saber/keymaps/via/keymap.c @@ -26,29 +26,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 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_P1, KC_P2, KC_P3, //16 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_P0, KC_PDOT, KC_PENT //12 ), - [1] = LAYOUT_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, //18 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //16 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS //12 - ), - [2] = LAYOUT_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, //18 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //16 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS //12 - ), - [3] = LAYOUT_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, //18 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //19 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, //16 - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS //12 - ) }; From a25ced9d2bfcae7b2ca6b2155db57cd12eb44dfa Mon Sep 17 00:00:00 2001 From: mechlovin <57231893+mechlovin@users.noreply.github.com> Date: Mon, 13 Nov 2023 08:24:51 +0700 Subject: [PATCH 38/38] Update keyboards/mechlovin/zed1800/zed1800.c Co-authored-by: Drashna Jaelre --- keyboards/mechlovin/zed1800/zed1800.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/mechlovin/zed1800/zed1800.c b/keyboards/mechlovin/zed1800/zed1800.c index 8bc3a23e7d6b..e86b4d5a5a89 100644 --- a/keyboards/mechlovin/zed1800/zed1800.c +++ b/keyboards/mechlovin/zed1800/zed1800.c @@ -32,8 +32,8 @@ void keyboard_post_init_kb(void) { } // Activate rgb layer for caps when capslock is enabled bool led_update_kb(led_t led_state) { -rgblight_set_layer_state(0, led_state.caps_lock); -rgblight_set_layer_state(1, led_state.num_lock); -rgblight_set_layer_state(2, led_state.scroll_lock); -return true; + rgblight_set_layer_state(0, led_state.caps_lock); + rgblight_set_layer_state(1, led_state.num_lock); + rgblight_set_layer_state(2, led_state.scroll_lock); + return true; } \ No newline at end of file