From 2720acc13eec37feb2f9222326249205b47e7d98 Mon Sep 17 00:00:00 2001 From: honorless <86894501+lesshonor@users.noreply.github.com> Date: Tue, 28 Feb 2023 11:32:11 -0500 Subject: [PATCH 1/7] [keyboard] ymdk/id75 --- keyboards/ymdk/id75/board.h | 22 ++ keyboards/ymdk/id75/chconf.h | 40 ++++ keyboards/ymdk/id75/config.h | 83 +++++++ keyboards/ymdk/id75/halconf.h | 21 ++ keyboards/ymdk/id75/id75.c | 30 +++ keyboards/ymdk/id75/info.json | 208 ++++++++++++++++++ .../ymdk/id75/keymaps/default/keymap.json | 24 ++ keyboards/ymdk/id75/keymaps/via/keymap.json | 38 ++++ keyboards/ymdk/id75/keymaps/via/rules.mk | 2 + keyboards/ymdk/id75/mcuconf.h | 25 +++ keyboards/ymdk/id75/readme.md | 30 +++ keyboards/ymdk/id75/rules.mk | 6 + 12 files changed, 529 insertions(+) create mode 100644 keyboards/ymdk/id75/board.h create mode 100644 keyboards/ymdk/id75/chconf.h create mode 100644 keyboards/ymdk/id75/config.h create mode 100644 keyboards/ymdk/id75/halconf.h create mode 100644 keyboards/ymdk/id75/id75.c create mode 100644 keyboards/ymdk/id75/info.json create mode 100644 keyboards/ymdk/id75/keymaps/default/keymap.json create mode 100644 keyboards/ymdk/id75/keymaps/via/keymap.json create mode 100644 keyboards/ymdk/id75/keymaps/via/rules.mk create mode 100644 keyboards/ymdk/id75/mcuconf.h create mode 100644 keyboards/ymdk/id75/readme.md create mode 100644 keyboards/ymdk/id75/rules.mk diff --git a/keyboards/ymdk/id75/board.h b/keyboards/ymdk/id75/board.h new file mode 100644 index 000000000000..49270b36a050 --- /dev/null +++ b/keyboards/ymdk/id75/board.h @@ -0,0 +1,22 @@ +/* Copyright 2022 JasonRen(biu) + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include_next + +#undef STM32_HSECLK +#define STM32_HSECLK 16000000 diff --git a/keyboards/ymdk/id75/chconf.h b/keyboards/ymdk/id75/chconf.h new file mode 100644 index 000000000000..ab81b6d3a3fa --- /dev/null +++ b/keyboards/ymdk/id75/chconf.h @@ -0,0 +1,40 @@ +/* Copyright 2020 QMK + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +/* + * This file was auto-generated by: + * `qmk chibios-confmigrate -i keyboards/sowbug/68keys/chconf.h -r platforms/chibios/common/configs/chconf.h` + */ + +#pragma once + +#define CH_CFG_ST_TIMEDELTA 0 + +#define CH_CFG_USE_REGISTRY TRUE + +#define CH_CFG_USE_WAITEXIT TRUE + +#define CH_CFG_USE_CONDVARS TRUE + +#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE + +#define CH_CFG_USE_MESSAGES TRUE + +#define CH_CFG_USE_MAILBOXES TRUE + +#define CH_CFG_USE_HEAP TRUE + +#include_next diff --git a/keyboards/ymdk/id75/config.h b/keyboards/ymdk/id75/config.h new file mode 100644 index 000000000000..49f6dfbf7bd7 --- /dev/null +++ b/keyboards/ymdk/id75/config.h @@ -0,0 +1,83 @@ +/* Copyright 2021 MT + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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 + +#if defined(RGB_MATRIX_ENABLE) + +# define RGB_MATRIX_LED_COUNT 89 + +# define RGB_DISABLE_WHEN_USB_SUSPENDED + +# define RGB_MATRIX_KEYPRESSES +# define RGB_MATRIX_FRAMEBUFFER_EFFECTS + +# define WS2812_PWM_DRIVER PWMD4 +# define WS2812_PWM_CHANNEL 4 +# define WS2812_PWM_PAL_MODE 2 +# define WS2812_DMA_STREAM STM32_DMA1_STREAM7 +# define WS2812_DMA_CHANNEL 7 + +// For full list of effects, see: +// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects +# define ENABLE_RGB_MATRIX_ALPHAS_MODS +# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN +# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_BREATHING +# define ENABLE_RGB_MATRIX_BAND_SAT +# define ENABLE_RGB_MATRIX_BAND_VAL +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT +# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT +# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL +# define ENABLE_RGB_MATRIX_CYCLE_ALL +# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT +# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN +# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN +# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL +# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL +# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL +# define ENABLE_RGB_MATRIX_DUAL_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_BEACON +# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS +# define ENABLE_RGB_MATRIX_RAINDROPS +# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS +# define ENABLE_RGB_MATRIX_HUE_BREATHING +# define ENABLE_RGB_MATRIX_HUE_PENDULUM +# define ENABLE_RGB_MATRIX_HUE_WAVE +# define ENABLE_RGB_MATRIX_PIXEL_RAIN +# define ENABLE_RGB_MATRIX_PIXEL_FLOW +# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL +# if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) +# define ENABLE_RGB_MATRIX_TYPING_HEATMAP +# define ENABLE_RGB_MATRIX_DIGITAL_RAIN +# endif +# if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES) +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS +# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS +# define ENABLE_RGB_MATRIX_SPLASH +# define ENABLE_RGB_MATRIX_MULTISPLASH +# define ENABLE_RGB_MATRIX_SOLID_SPLASH +# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH +# endif +#endif diff --git a/keyboards/ymdk/id75/halconf.h b/keyboards/ymdk/id75/halconf.h new file mode 100644 index 000000000000..612ce4fc4a8f --- /dev/null +++ b/keyboards/ymdk/id75/halconf.h @@ -0,0 +1,21 @@ +/* Copyright 2020 QMK + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#define HAL_USE_PWM TRUE + +#include_next diff --git a/keyboards/ymdk/id75/id75.c b/keyboards/ymdk/id75/id75.c new file mode 100644 index 000000000000..dc56797cad66 --- /dev/null +++ b/keyboards/ymdk/id75/id75.c @@ -0,0 +1,30 @@ +/* Copyright 2021 MT + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * 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" + +#ifdef RGB_MATRIX_ENABLE +bool rgb_matrix_indicators_kb(void) { + if (!rgb_matrix_indicators_user()) { + return false; + } + + if (host_keyboard_led_state().caps_lock) { // Capslock = RED + rgb_matrix_set_color(44, 200, 0, 0); + } + return true; +} +#endif diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/info.json new file mode 100644 index 000000000000..9a083363d18f --- /dev/null +++ b/keyboards/ymdk/id75/info.json @@ -0,0 +1,208 @@ +{ + "manufacturer": "YMDK", + "keyboard_name": "Idobao x YMDK ID75", + "maintainer": "qmk", + "bootloader": "uf2boot", + "board": "STM32_F103_STM32DUINO", + "diode_direction": "ROW2COL", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["A10", "A9", "A8", "B15", "B14", "B13", "B12", "A5", "A6", "A4", "A3", "A2", "A1", "A0", "A15"], + "rows": ["B2", "B1", "B0", "A7", "B10"] + }, + "processor": "STM32F103", + "rgb_matrix": { + "driver": "WS2812", + "layout": [ + { "flags": 4, "matrix": [4, 14], "x": 224, "y": 64 }, + { "flags": 4, "matrix": [4, 13], "x": 208, "y": 64 }, + { "flags": 4, "matrix": [4, 12], "x": 192, "y": 64 }, + { "flags": 4, "matrix": [4, 11], "x": 176, "y": 64 }, + { "flags": 4, "matrix": [4, 10], "x": 160, "y": 64 }, + { "flags": 4, "matrix": [4, 9], "x": 144, "y": 64 }, + { "flags": 4, "matrix": [4, 8], "x": 128, "y": 64 }, + { "flags": 4, "matrix": [4, 7], "x": 112, "y": 64 }, + { "flags": 4, "matrix": [4, 6], "x": 96, "y": 64 }, + { "flags": 4, "matrix": [4, 5], "x": 80, "y": 64 }, + { "flags": 4, "matrix": [4, 4], "x": 64, "y": 64 }, + { "flags": 4, "matrix": [4, 3], "x": 48, "y": 64 }, + { "flags": 4, "matrix": [4, 2], "x": 32, "y": 64 }, + { "flags": 4, "matrix": [4, 1], "x": 16, "y": 64 }, + { "flags": 4, "matrix": [4, 0], "x": 0, "y": 64 }, + { "flags": 4, "matrix": [3, 14], "x": 224, "y": 48 }, + { "flags": 4, "matrix": [3, 13], "x": 208, "y": 48 }, + { "flags": 4, "matrix": [3, 12], "x": 192, "y": 48 }, + { "flags": 4, "matrix": [3, 11], "x": 176, "y": 48 }, + { "flags": 4, "matrix": [3, 10], "x": 160, "y": 48 }, + { "flags": 4, "matrix": [3, 9], "x": 144, "y": 48 }, + { "flags": 4, "matrix": [3, 8], "x": 128, "y": 48 }, + { "flags": 4, "matrix": [3, 7], "x": 112, "y": 48 }, + { "flags": 4, "matrix": [3, 6], "x": 96, "y": 48 }, + { "flags": 4, "matrix": [3, 5], "x": 80, "y": 48 }, + { "flags": 4, "matrix": [3, 4], "x": 64, "y": 48 }, + { "flags": 4, "matrix": [3, 3], "x": 48, "y": 48 }, + { "flags": 4, "matrix": [3, 2], "x": 32, "y": 48 }, + { "flags": 4, "matrix": [3, 1], "x": 16, "y": 48 }, + { "flags": 4, "matrix": [3, 0], "x": 0, "y": 48 }, + { "flags": 4, "matrix": [2, 14], "x": 224, "y": 32 }, + { "flags": 4, "matrix": [2, 13], "x": 208, "y": 32 }, + { "flags": 4, "matrix": [2, 12], "x": 192, "y": 32 }, + { "flags": 4, "matrix": [2, 11], "x": 176, "y": 32 }, + { "flags": 4, "matrix": [2, 10], "x": 160, "y": 32 }, + { "flags": 4, "matrix": [2, 9], "x": 144, "y": 32 }, + { "flags": 4, "matrix": [2, 8], "x": 128, "y": 32 }, + { "flags": 4, "matrix": [2, 7], "x": 112, "y": 32 }, + { "flags": 4, "matrix": [2, 6], "x": 96, "y": 32 }, + { "flags": 4, "matrix": [2, 5], "x": 80, "y": 32 }, + { "flags": 4, "matrix": [2, 4], "x": 64, "y": 32 }, + { "flags": 4, "matrix": [2, 3], "x": 48, "y": 32 }, + { "flags": 4, "matrix": [2, 2], "x": 32, "y": 32 }, + { "flags": 4, "matrix": [2, 1], "x": 16, "y": 32 }, + { "flags": 4, "matrix": [2, 0], "x": 0, "y": 32 }, + { "flags": 4, "matrix": [1, 14], "x": 224, "y": 16 }, + { "flags": 4, "matrix": [1, 13], "x": 208, "y": 16 }, + { "flags": 4, "matrix": [1, 12], "x": 192, "y": 16 }, + { "flags": 4, "matrix": [1, 11], "x": 176, "y": 16 }, + { "flags": 4, "matrix": [1, 10], "x": 160, "y": 16 }, + { "flags": 4, "matrix": [1, 9], "x": 144, "y": 16 }, + { "flags": 4, "matrix": [1, 8], "x": 128, "y": 16 }, + { "flags": 4, "matrix": [1, 7], "x": 112, "y": 16 }, + { "flags": 4, "matrix": [1, 6], "x": 96, "y": 16 }, + { "flags": 4, "matrix": [1, 5], "x": 80, "y": 16 }, + { "flags": 4, "matrix": [1, 4], "x": 64, "y": 16 }, + { "flags": 4, "matrix": [1, 3], "x": 48, "y": 16 }, + { "flags": 4, "matrix": [1, 2], "x": 32, "y": 16 }, + { "flags": 4, "matrix": [1, 1], "x": 16, "y": 16 }, + { "flags": 4, "matrix": [1, 0], "x": 0, "y": 16 }, + { "flags": 4, "matrix": [0, 14], "x": 224, "y": 0 }, + { "flags": 4, "matrix": [0, 13], "x": 208, "y": 0 }, + { "flags": 4, "matrix": [0, 12], "x": 192, "y": 0 }, + { "flags": 4, "matrix": [0, 11], "x": 176, "y": 0 }, + { "flags": 4, "matrix": [0, 10], "x": 160, "y": 0 }, + { "flags": 4, "matrix": [0, 9], "x": 144, "y": 0 }, + { "flags": 4, "matrix": [0, 8], "x": 128, "y": 0 }, + { "flags": 4, "matrix": [0, 7], "x": 112, "y": 0 }, + { "flags": 4, "matrix": [0, 6], "x": 96, "y": 0 }, + { "flags": 4, "matrix": [0, 5], "x": 80, "y": 0 }, + { "flags": 4, "matrix": [0, 4], "x": 64, "y": 0 }, + { "flags": 4, "matrix": [0, 3], "x": 48, "y": 0 }, + { "flags": 4, "matrix": [0, 2], "x": 32, "y": 0 }, + { "flags": 4, "matrix": [0, 1], "x": 16, "y": 0 }, + { "flags": 4, "matrix": [0, 0], "x": 0, "y": 0 }, + { "flags": 2, "x": 0, "y": 64 }, + { "flags": 2, "x": 38, "y": 64 }, + { "flags": 2, "x": 76, "y": 64 }, + { "flags": 2, "x": 114, "y": 64 }, + { "flags": 2, "x": 152, "y": 64 }, + { "flags": 2, "x": 190, "y": 64 }, + { "flags": 2, "x": 224, "y": 64 }, + { "flags": 2, "x": 0, "y": 0 }, + { "flags": 2, "x": 38, "y": 0 }, + { "flags": 2, "x": 76, "y": 0 }, + { "flags": 2, "x": 114, "y": 0 }, + { "flags": 2, "x": 152, "y": 0 }, + { "flags": 2, "x": 190, "y": 0 }, + { "flags": 2, "x": 224, "y": 0 } + ], + "max_brightness": 128 + }, + "rgblight": { + "pin": "B9" + }, + "tapping": { + "toggle": 2 + }, + "usb": { + "device_version": "0.0.1", + "pid": "0x0075", + "vid": "0x594D" + }, + "community_layouts": [ "ortho_5x15" ], + "layouts": { + "LAYOUT_ortho_5x15": { + "layout": [ + { "label": "k00", "matrix": [0, 0], "w": 1, "x": 0, "y": 0 }, + { "label": "k01", "matrix": [0, 1], "w": 1, "x": 1, "y": 0 }, + { "label": "k02", "matrix": [0, 2], "w": 1, "x": 2, "y": 0 }, + { "label": "k03", "matrix": [0, 3], "w": 1, "x": 3, "y": 0 }, + { "label": "k04", "matrix": [0, 4], "w": 1, "x": 4, "y": 0 }, + { "label": "k05", "matrix": [0, 5], "w": 1, "x": 5, "y": 0 }, + { "label": "k06", "matrix": [0, 6], "w": 1, "x": 6, "y": 0 }, + { "label": "k07", "matrix": [0, 7], "w": 1, "x": 7, "y": 0 }, + { "label": "k08", "matrix": [0, 8], "w": 1, "x": 8, "y": 0 }, + { "label": "k09", "matrix": [0, 9], "w": 1, "x": 9, "y": 0 }, + { "label": "k0A", "matrix": [0, 10], "w": 1, "x": 10, "y": 0 }, + { "label": "k0B", "matrix": [0, 11], "w": 1, "x": 11, "y": 0 }, + { "label": "k0C", "matrix": [0, 12], "w": 1, "x": 12, "y": 0 }, + { "label": "k0D", "matrix": [0, 13], "w": 1, "x": 13, "y": 0 }, + { "label": "k0E", "matrix": [0, 14], "w": 1, "x": 14, "y": 0 }, + { "label": "k10", "matrix": [1, 0], "w": 1, "x": 0, "y": 1 }, + { "label": "k11", "matrix": [1, 1], "w": 1, "x": 1, "y": 1 }, + { "label": "k12", "matrix": [1, 2], "w": 1, "x": 2, "y": 1 }, + { "label": "k13", "matrix": [1, 3], "w": 1, "x": 3, "y": 1 }, + { "label": "k14", "matrix": [1, 4], "w": 1, "x": 4, "y": 1 }, + { "label": "k15", "matrix": [1, 5], "w": 1, "x": 5, "y": 1 }, + { "label": "k16", "matrix": [1, 6], "w": 1, "x": 6, "y": 1 }, + { "label": "k17", "matrix": [1, 7], "w": 1, "x": 7, "y": 1 }, + { "label": "k18", "matrix": [1, 8], "w": 1, "x": 8, "y": 1 }, + { "label": "k19", "matrix": [1, 9], "w": 1, "x": 9, "y": 1 }, + { "label": "k1A", "matrix": [1, 10], "w": 1, "x": 10, "y": 1 }, + { "label": "k1B", "matrix": [1, 11], "w": 1, "x": 11, "y": 1 }, + { "label": "k1C", "matrix": [1, 12], "w": 1, "x": 12, "y": 1 }, + { "label": "k1D", "matrix": [1, 13], "w": 1, "x": 13, "y": 1 }, + { "label": "k1E", "matrix": [1, 14], "w": 1, "x": 14, "y": 1 }, + { "label": "k20", "matrix": [2, 0], "w": 1, "x": 0, "y": 2 }, + { "label": "k21", "matrix": [2, 1], "w": 1, "x": 1, "y": 2 }, + { "label": "k22", "matrix": [2, 2], "w": 1, "x": 2, "y": 2 }, + { "label": "k23", "matrix": [2, 3], "w": 1, "x": 3, "y": 2 }, + { "label": "k24", "matrix": [2, 4], "w": 1, "x": 4, "y": 2 }, + { "label": "k25", "matrix": [2, 5], "w": 1, "x": 5, "y": 2 }, + { "label": "k26", "matrix": [2, 6], "w": 1, "x": 6, "y": 2 }, + { "label": "k27", "matrix": [2, 7], "w": 1, "x": 7, "y": 2 }, + { "label": "k28", "matrix": [2, 8], "w": 1, "x": 8, "y": 2 }, + { "label": "k29", "matrix": [2, 9], "w": 1, "x": 9, "y": 2 }, + { "label": "k2A", "matrix": [2, 10], "w": 1, "x": 10, "y": 2 }, + { "label": "k2B", "matrix": [2, 11], "w": 1, "x": 11, "y": 2 }, + { "label": "k2C", "matrix": [2, 12], "w": 1, "x": 12, "y": 2 }, + { "label": "k2D", "matrix": [2, 13], "w": 1, "x": 13, "y": 2 }, + { "label": "k2E", "matrix": [2, 14], "w": 1, "x": 14, "y": 2 }, + { "label": "k30", "matrix": [3, 0], "w": 1, "x": 0, "y": 3 }, + { "label": "k31", "matrix": [3, 1], "w": 1, "x": 1, "y": 3 }, + { "label": "k32", "matrix": [3, 2], "w": 1, "x": 2, "y": 3 }, + { "label": "k33", "matrix": [3, 3], "w": 1, "x": 3, "y": 3 }, + { "label": "k34", "matrix": [3, 4], "w": 1, "x": 4, "y": 3 }, + { "label": "k35", "matrix": [3, 5], "w": 1, "x": 5, "y": 3 }, + { "label": "k36", "matrix": [3, 6], "w": 1, "x": 6, "y": 3 }, + { "label": "k37", "matrix": [3, 7], "w": 1, "x": 7, "y": 3 }, + { "label": "k38", "matrix": [3, 8], "w": 1, "x": 8, "y": 3 }, + { "label": "k39", "matrix": [3, 9], "w": 1, "x": 9, "y": 3 }, + { "label": "k3A", "matrix": [3, 10], "w": 1, "x": 10, "y": 3 }, + { "label": "k3B", "matrix": [3, 11], "w": 1, "x": 11, "y": 3 }, + { "label": "k3C", "matrix": [3, 12], "w": 1, "x": 12, "y": 3 }, + { "label": "k3D", "matrix": [3, 13], "w": 1, "x": 13, "y": 3 }, + { "label": "k3E", "matrix": [3, 14], "w": 1, "x": 14, "y": 3 }, + { "label": "k40", "matrix": [4, 0], "w": 1, "x": 0, "y": 4 }, + { "label": "k41", "matrix": [4, 1], "w": 1, "x": 1, "y": 4 }, + { "label": "k42", "matrix": [4, 2], "w": 1, "x": 2, "y": 4 }, + { "label": "k43", "matrix": [4, 3], "w": 1, "x": 3, "y": 4 }, + { "label": "k44", "matrix": [4, 4], "w": 1, "x": 4, "y": 4 }, + { "label": "k45", "matrix": [4, 5], "w": 1, "x": 5, "y": 4 }, + { "label": "k46", "matrix": [4, 6], "w": 1, "x": 6, "y": 4 }, + { "label": "k47", "matrix": [4, 7], "w": 1, "x": 7, "y": 4 }, + { "label": "k48", "matrix": [4, 8], "w": 1, "x": 8, "y": 4 }, + { "label": "k49", "matrix": [4, 9], "w": 1, "x": 9, "y": 4 }, + { "label": "k4A", "matrix": [4, 10], "w": 1, "x": 10, "y": 4 }, + { "label": "k4B", "matrix": [4, 11], "w": 1, "x": 11, "y": 4 }, + { "label": "k4C", "matrix": [4, 12], "w": 1, "x": 12, "y": 4 }, + { "label": "k4D", "matrix": [4, 13], "w": 1, "x": 13, "y": 4 }, + { "label": "k4E", "matrix": [4, 14], "w": 1, "x": 14, "y": 4 } + ] + } + } +} diff --git a/keyboards/ymdk/id75/keymaps/default/keymap.json b/keyboards/ymdk/id75/keymaps/default/keymap.json new file mode 100644 index 000000000000..cfea8be49476 --- /dev/null +++ b/keyboards/ymdk/id75/keymaps/default/keymap.json @@ -0,0 +1,24 @@ +{ + "version": 1, + "author": "qmk", + "notes": "", + "keyboard": "ymdk/id75", + "keymap": "default", + "layout": "LAYOUT_ortho_5x15", + "layers": [ + [ + "KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSLS", "KC_GRV", + "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSPC", "KC_DEL", + "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_ENT", "KC_PGUP", + "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "MO(1)", "KC_UP", "KC_PGDN", + "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_SPC", "KC_SPC", "KC_SPC", "KC_SPC", "KC_SPC", "KC_RALT", "KC_RCTL", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT" + ], + [ + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "RGB_MOD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "QK_BOOT" + ] + ] +} diff --git a/keyboards/ymdk/id75/keymaps/via/keymap.json b/keyboards/ymdk/id75/keymaps/via/keymap.json new file mode 100644 index 000000000000..fadd888e561c --- /dev/null +++ b/keyboards/ymdk/id75/keymaps/via/keymap.json @@ -0,0 +1,38 @@ +{ + "version": 1, + "author": "qmk", + "notes": "", + "keyboard": "ymdk/id75", + "keymap": "via", + "layout": "LAYOUT_ortho_5x15", + "layers": [ + [ + "KC_ESC", "KC_1", "KC_2", "KC_3", "KC_4", "KC_5", "KC_6", "KC_7", "KC_8", "KC_9", "KC_0", "KC_MINS", "KC_EQL", "KC_BSLS", "KC_GRV", + "KC_TAB", "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC", "KC_BSPC", "KC_DEL", + "KC_CAPS", "KC_A", "KC_S", "KC_D", "KC_F", "KC_G", "KC_H", "KC_J", "KC_K", "KC_L", "KC_SCLN", "KC_QUOT", "KC_ENT", "KC_ENT", "KC_PGUP", + "KC_LSFT", "KC_Z", "KC_X", "KC_C", "KC_V", "KC_B", "KC_N", "KC_M", "KC_COMM", "KC_DOT", "KC_SLSH", "KC_RSFT", "MO(1)", "KC_UP", "KC_PGDN", + "KC_LCTL", "KC_LGUI", "KC_LALT", "KC_SPC", "KC_SPC", "KC_SPC", "KC_SPC", "KC_SPC", "KC_SPC", "KC_RALT", "KC_RCTL", "KC_RCTL", "KC_LEFT", "KC_DOWN", "KC_RGHT" + ], + [ + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "RGB_MOD", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "QK_BOOT" + ], + [ + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS" + ], + [ + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", + "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS" + ] + ] +} diff --git a/keyboards/ymdk/id75/keymaps/via/rules.mk b/keyboards/ymdk/id75/keymaps/via/rules.mk new file mode 100644 index 000000000000..6d6d45bac8b7 --- /dev/null +++ b/keyboards/ymdk/id75/keymaps/via/rules.mk @@ -0,0 +1,2 @@ +VIA_ENABLE = yes +LTO_ENABLE = yes # reduce firmware size diff --git a/keyboards/ymdk/id75/mcuconf.h b/keyboards/ymdk/id75/mcuconf.h new file mode 100644 index 000000000000..0d3de3dad51f --- /dev/null +++ b/keyboards/ymdk/id75/mcuconf.h @@ -0,0 +1,25 @@ +/* Copyright 2020 QMK + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +#pragma once + +#include_next + +#undef STM32_PWM_USE_TIM4 +#define STM32_PWM_USE_TIM4 TRUE + +#undef STM32_PLLXTPRE +#define STM32_PLLXTPRE STM32_PLLXTPRE_DIV2 diff --git a/keyboards/ymdk/id75/readme.md b/keyboards/ymdk/id75/readme.md new file mode 100644 index 000000000000..8fd0ddf61630 --- /dev/null +++ b/keyboards/ymdk/id75/readme.md @@ -0,0 +1,30 @@ +# Idobao x YMDK ID75 + +![Idobao x YMDK ID75](https://imgur.com/bhVfzrzh.jpg) + +A 75-key, 5-row ortholinear keyboard with per-key and underglow RGB LEDs. + +* Keyboard Maintainer: [The QMK Community](https://github.com/qmk) +* Hardware Supported: [Idobao x YMDK ID75 PCB (APM32F103CBT6)](https://www.aliexpress.com/item/3256804537842097.html) + * This PCB uses an ARM Cortex-M3 MCU with 128kb flash. **It is not the same as `idobao/id75` or `ymdk/ymd75`.** +* Hardware Availability: [YMDK](https://ymdkey.com/products/id75-75-keys-ortholinear-layout-qmk-anodized-aluminum-case-plate-hot-swappable-hot-swap-type-c-pcb-mechanical-keyboard-kit), [AliExpress (YMDK Store)](https://www.aliexpress.com/item/2255800125183974.html), [Amazon](https://www.amazon.com/Ortholinear-Anodized-Aluminum-hot-swappable-Mechanical/dp/B07ZQ8CD88) + +Make example for this keyboard (after setting up your build environment): + + make ymdk/id75:default + +Flashing example for this keyboard: + + make ymdk/id75:default:flash + +See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the top left key and plug in the keyboard. This will also clear the emulated EEPROM, so it is a good first step if the keyboard is misbehaving. +* **Physical reset button**: Press the button on the back of the PCB twice in quick succession. +* **Keycode in layout**: Press the key mapped to `QK_BOOT`. In the pre-supplied keymaps it is on the second layer, in the bottom-right corner. + +After entering the bootloader through one of the three methods above, the keyboard will appear as a USB mass storage device named `MT.KEY`. If the CLI is unable to find this device, the compiled `.uf2` file can be manually copied to it. The keyboard will reboot on completion with the new firmware loaded. diff --git a/keyboards/ymdk/id75/rules.mk b/keyboards/ymdk/id75/rules.mk new file mode 100644 index 000000000000..8a9f88a9e1b6 --- /dev/null +++ b/keyboards/ymdk/id75/rules.mk @@ -0,0 +1,6 @@ +# Wildcard to allow APM32 MCU +DFU_SUFFIX_ARGS = -p FFFF -v FFFF + +WS2812_DRIVER = pwm +# Enter lower-power sleep mode when on the ChibiOS idle thread +OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE From b98eebc9d5b9524e3c642899987ca01bda005573 Mon Sep 17 00:00:00 2001 From: honorless <86894501+lesshonor@users.noreply.github.com> Date: Tue, 28 Feb 2023 22:18:48 -0500 Subject: [PATCH 2/7] fixup: apply suggestions from code review --- keyboards/ymdk/id75/info.json | 3 --- keyboards/ymdk/id75/keymaps/via/keymap.json | 5 +++++ keyboards/ymdk/id75/keymaps/via/rules.mk | 2 -- 3 files changed, 5 insertions(+), 5 deletions(-) delete mode 100644 keyboards/ymdk/id75/keymaps/via/rules.mk diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/info.json index 9a083363d18f..fa7cfcc862e4 100644 --- a/keyboards/ymdk/id75/info.json +++ b/keyboards/ymdk/id75/info.json @@ -115,9 +115,6 @@ "rgblight": { "pin": "B9" }, - "tapping": { - "toggle": 2 - }, "usb": { "device_version": "0.0.1", "pid": "0x0075", diff --git a/keyboards/ymdk/id75/keymaps/via/keymap.json b/keyboards/ymdk/id75/keymaps/via/keymap.json index fadd888e561c..8be803d4a97e 100644 --- a/keyboards/ymdk/id75/keymaps/via/keymap.json +++ b/keyboards/ymdk/id75/keymaps/via/keymap.json @@ -2,6 +2,11 @@ "version": 1, "author": "qmk", "notes": "", + "config": { + "features": { + "via": true + } + }, "keyboard": "ymdk/id75", "keymap": "via", "layout": "LAYOUT_ortho_5x15", diff --git a/keyboards/ymdk/id75/keymaps/via/rules.mk b/keyboards/ymdk/id75/keymaps/via/rules.mk deleted file mode 100644 index 6d6d45bac8b7..000000000000 --- a/keyboards/ymdk/id75/keymaps/via/rules.mk +++ /dev/null @@ -1,2 +0,0 @@ -VIA_ENABLE = yes -LTO_ENABLE = yes # reduce firmware size From d109741d7e6f057a3a0e9f8d2bb3a9f3e0cab98c Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Wed, 1 Mar 2023 05:09:00 -0500 Subject: [PATCH 3/7] fixup: delete chconf.h per code review --- keyboards/ymdk/id75/chconf.h | 40 ------------------------------------ 1 file changed, 40 deletions(-) delete mode 100644 keyboards/ymdk/id75/chconf.h diff --git a/keyboards/ymdk/id75/chconf.h b/keyboards/ymdk/id75/chconf.h deleted file mode 100644 index ab81b6d3a3fa..000000000000 --- a/keyboards/ymdk/id75/chconf.h +++ /dev/null @@ -1,40 +0,0 @@ -/* Copyright 2020 QMK - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -/* - * This file was auto-generated by: - * `qmk chibios-confmigrate -i keyboards/sowbug/68keys/chconf.h -r platforms/chibios/common/configs/chconf.h` - */ - -#pragma once - -#define CH_CFG_ST_TIMEDELTA 0 - -#define CH_CFG_USE_REGISTRY TRUE - -#define CH_CFG_USE_WAITEXIT TRUE - -#define CH_CFG_USE_CONDVARS TRUE - -#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE - -#define CH_CFG_USE_MESSAGES TRUE - -#define CH_CFG_USE_MAILBOXES TRUE - -#define CH_CFG_USE_HEAP TRUE - -#include_next From 7af9dfd4cf8f906af23ea89dc217a94b06df6ced Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Wed, 1 Mar 2023 14:05:39 -0500 Subject: [PATCH 4/7] style: move RGB DI pin back to config.h Co-authored-by: jack <0x6a73@protonmail.com> --- keyboards/ymdk/id75/config.h | 2 +- keyboards/ymdk/id75/info.json | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/keyboards/ymdk/id75/config.h b/keyboards/ymdk/id75/config.h index 49f6dfbf7bd7..4b315ab376ee 100644 --- a/keyboards/ymdk/id75/config.h +++ b/keyboards/ymdk/id75/config.h @@ -17,7 +17,7 @@ #pragma once #if defined(RGB_MATRIX_ENABLE) - +# define RGB_DI_PIN B9 # define RGB_MATRIX_LED_COUNT 89 # define RGB_DISABLE_WHEN_USB_SUSPENDED diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/info.json index fa7cfcc862e4..ff4a14964f08 100644 --- a/keyboards/ymdk/id75/info.json +++ b/keyboards/ymdk/id75/info.json @@ -112,9 +112,6 @@ ], "max_brightness": 128 }, - "rgblight": { - "pin": "B9" - }, "usb": { "device_version": "0.0.1", "pid": "0x0075", From 4134d0075dcb673806cbc115a94c197b76b82297 Mon Sep 17 00:00:00 2001 From: honorless <86894501+lesshonor@users.noreply.github.com> Date: Wed, 22 Mar 2023 16:59:35 -0400 Subject: [PATCH 5/7] refactor: move rgbmatrix animations to info.json --- keyboards/ymdk/id75/config.h | 50 ----------------------------------- keyboards/ymdk/id75/info.json | 45 +++++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 50 deletions(-) diff --git a/keyboards/ymdk/id75/config.h b/keyboards/ymdk/id75/config.h index 4b315ab376ee..0f04e6e54a53 100644 --- a/keyboards/ymdk/id75/config.h +++ b/keyboards/ymdk/id75/config.h @@ -30,54 +30,4 @@ # define WS2812_PWM_PAL_MODE 2 # define WS2812_DMA_STREAM STM32_DMA1_STREAM7 # define WS2812_DMA_CHANNEL 7 - -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -# define ENABLE_RGB_MATRIX_ALPHAS_MODS -# define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN -# define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_BREATHING -# define ENABLE_RGB_MATRIX_BAND_SAT -# define ENABLE_RGB_MATRIX_BAND_VAL -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT -# define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT -# define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL -# define ENABLE_RGB_MATRIX_CYCLE_ALL -# define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT -# define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN -# define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN -# define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL -# define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL -# define ENABLE_RGB_MATRIX_CYCLE_SPIRAL -# define ENABLE_RGB_MATRIX_DUAL_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_BEACON -# define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS -# define ENABLE_RGB_MATRIX_RAINDROPS -# define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS -# define ENABLE_RGB_MATRIX_HUE_BREATHING -# define ENABLE_RGB_MATRIX_HUE_PENDULUM -# define ENABLE_RGB_MATRIX_HUE_WAVE -# define ENABLE_RGB_MATRIX_PIXEL_RAIN -# define ENABLE_RGB_MATRIX_PIXEL_FLOW -# define ENABLE_RGB_MATRIX_PIXEL_FRACTAL -# if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS) -# define ENABLE_RGB_MATRIX_TYPING_HEATMAP -# define ENABLE_RGB_MATRIX_DIGITAL_RAIN -# endif -# if defined(RGB_MATRIX_KEYPRESSES) || defined(RGB_MATRIX_KEYRELEASES) -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS -# define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS -# define ENABLE_RGB_MATRIX_SPLASH -# define ENABLE_RGB_MATRIX_MULTISPLASH -# define ENABLE_RGB_MATRIX_SOLID_SPLASH -# define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH -# endif #endif diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/info.json index ff4a14964f08..f620b0314c07 100644 --- a/keyboards/ymdk/id75/info.json +++ b/keyboards/ymdk/id75/info.json @@ -18,6 +18,51 @@ }, "processor": "STM32F103", "rgb_matrix": { + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, "driver": "WS2812", "layout": [ { "flags": 4, "matrix": [4, 14], "x": 224, "y": 64 }, From 048d60701a9620192cd559c2afe9b32c0d4c1dd1 Mon Sep 17 00:00:00 2001 From: honorless <86894501+lesshonor@users.noreply.github.com> Date: Wed, 29 Mar 2023 22:00:11 -0400 Subject: [PATCH 6/7] chores: prep for develop changes --- keyboards/ymdk/id75/config.h | 22 ++++++++++------------ keyboards/ymdk/id75/info.json | 3 +++ keyboards/ymdk/id75/rules.mk | 3 +++ 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/keyboards/ymdk/id75/config.h b/keyboards/ymdk/id75/config.h index 0f04e6e54a53..02e9d4a2833e 100644 --- a/keyboards/ymdk/id75/config.h +++ b/keyboards/ymdk/id75/config.h @@ -16,18 +16,16 @@ #pragma once -#if defined(RGB_MATRIX_ENABLE) -# define RGB_DI_PIN B9 -# define RGB_MATRIX_LED_COUNT 89 +#define RGB_DI_PIN B9 +#define RGB_MATRIX_LED_COUNT 89 -# define RGB_DISABLE_WHEN_USB_SUSPENDED +#define RGB_DISABLE_WHEN_USB_SUSPENDED -# define RGB_MATRIX_KEYPRESSES -# define RGB_MATRIX_FRAMEBUFFER_EFFECTS +#define RGB_MATRIX_KEYPRESSES +#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -# define WS2812_PWM_DRIVER PWMD4 -# define WS2812_PWM_CHANNEL 4 -# define WS2812_PWM_PAL_MODE 2 -# define WS2812_DMA_STREAM STM32_DMA1_STREAM7 -# define WS2812_DMA_CHANNEL 7 -#endif +#define WS2812_PWM_DRIVER PWMD4 +#define WS2812_PWM_CHANNEL 4 +#define WS2812_PWM_PAL_MODE 2 +#define WS2812_DMA_STREAM STM32_DMA1_STREAM7 +#define WS2812_DMA_CHANNEL 7 diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/info.json index f620b0314c07..5ed25bc28eb5 100644 --- a/keyboards/ymdk/id75/info.json +++ b/keyboards/ymdk/id75/info.json @@ -17,6 +17,9 @@ "rows": ["B2", "B1", "B0", "A7", "B10"] }, "processor": "STM32F103", + "ws2812": { + "driver": "pwm" + }, "rgb_matrix": { "animations": { "alphas_mods": true, diff --git a/keyboards/ymdk/id75/rules.mk b/keyboards/ymdk/id75/rules.mk index 8a9f88a9e1b6..61d5793cc2fc 100644 --- a/keyboards/ymdk/id75/rules.mk +++ b/keyboards/ymdk/id75/rules.mk @@ -1,3 +1,6 @@ +# Configure for 128K flash +#MCU_LDSCRIPT = STM32F103xB + # Wildcard to allow APM32 MCU DFU_SUFFIX_ARGS = -p FFFF -v FFFF From 8051bacc64c25cc5fe903ec9d960fa2b67abff2e Mon Sep 17 00:00:00 2001 From: Less/Rikki <86894501+lesshonor@users.noreply.github.com> Date: Sun, 2 Apr 2023 05:25:04 -0400 Subject: [PATCH 7/7] fix: direct-load imgur image Co-authored-by: Drashna Jaelre --- keyboards/ymdk/id75/readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/ymdk/id75/readme.md b/keyboards/ymdk/id75/readme.md index 8fd0ddf61630..9315745f71dd 100644 --- a/keyboards/ymdk/id75/readme.md +++ b/keyboards/ymdk/id75/readme.md @@ -1,6 +1,6 @@ # Idobao x YMDK ID75 -![Idobao x YMDK ID75](https://imgur.com/bhVfzrzh.jpg) +![Idobao x YMDK ID75](https://i.imgur.com/bhVfzrzh.jpg) A 75-key, 5-row ortholinear keyboard with per-key and underglow RGB LEDs.