From b4ece24c7dfa741ddef70a92166cd21930df55fd Mon Sep 17 00:00:00 2001
From: Less/Rikki <86894501+lesshonor@users.noreply.github.com>
Date: Sun, 22 Dec 2024 16:03:03 -0500
Subject: move ymdk/id75 to revision (#24590)
---
data/mappings/keyboard_aliases.hjson | 3 +
keyboards/ymdk/id75/board.h | 22 ---
keyboards/ymdk/id75/config.h | 23 ---
keyboards/ymdk/id75/f103/board.h | 22 +++
keyboards/ymdk/id75/f103/config.h | 23 +++
keyboards/ymdk/id75/f103/halconf.h | 21 +++
keyboards/ymdk/id75/f103/keyboard.json | 13 ++
keyboards/ymdk/id75/f103/mcuconf.h | 25 ++++
keyboards/ymdk/id75/f103/rules.mk | 5 +
keyboards/ymdk/id75/halconf.h | 21 ---
keyboards/ymdk/id75/info.json | 240 +++++++++++++++++++++++++++++++
keyboards/ymdk/id75/keyboard.json | 251 ---------------------------------
keyboards/ymdk/id75/mcuconf.h | 25 ----
keyboards/ymdk/id75/readme.md | 12 +-
keyboards/ymdk/id75/rules.mk | 5 -
15 files changed, 359 insertions(+), 352 deletions(-)
delete mode 100644 keyboards/ymdk/id75/board.h
delete mode 100644 keyboards/ymdk/id75/config.h
create mode 100644 keyboards/ymdk/id75/f103/board.h
create mode 100644 keyboards/ymdk/id75/f103/config.h
create mode 100644 keyboards/ymdk/id75/f103/halconf.h
create mode 100644 keyboards/ymdk/id75/f103/keyboard.json
create mode 100644 keyboards/ymdk/id75/f103/mcuconf.h
create mode 100644 keyboards/ymdk/id75/f103/rules.mk
delete mode 100644 keyboards/ymdk/id75/halconf.h
create mode 100644 keyboards/ymdk/id75/info.json
delete mode 100644 keyboards/ymdk/id75/keyboard.json
delete mode 100644 keyboards/ymdk/id75/mcuconf.h
delete mode 100644 keyboards/ymdk/id75/rules.mk
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson
index 72f6994c09..098c299e58 100644
--- a/data/mappings/keyboard_aliases.hjson
+++ b/data/mappings/keyboard_aliases.hjson
@@ -1515,6 +1515,9 @@
"ymd96": {
"target": "ymdk/ymd96"
},
+ "ymdk/id75": {
+ "target": "ymdk/id75/f103"
+ },
"ymdk_np21": {
"target": "ymdk/np21"
},
diff --git a/keyboards/ymdk/id75/board.h b/keyboards/ymdk/id75/board.h
deleted file mode 100644
index 49270b36a0..0000000000
--- a/keyboards/ymdk/id75/board.h
+++ /dev/null
@@ -1,22 +0,0 @@
-/* Copyright 2022 JasonRen(biu)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-#pragma once
-
-#include_next
-
-#undef STM32_HSECLK
-#define STM32_HSECLK 16000000
diff --git a/keyboards/ymdk/id75/config.h b/keyboards/ymdk/id75/config.h
deleted file mode 100644
index cb5ac78304..0000000000
--- a/keyboards/ymdk/id75/config.h
+++ /dev/null
@@ -1,23 +0,0 @@
-/* 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
-
-#define WS2812_PWM_DRIVER PWMD4
-#define WS2812_PWM_CHANNEL 4
-#define WS2812_PWM_PAL_MODE 2
-#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
-#define WS2812_PWM_DMA_CHANNEL 7
diff --git a/keyboards/ymdk/id75/f103/board.h b/keyboards/ymdk/id75/f103/board.h
new file mode 100644
index 0000000000..49270b36a0
--- /dev/null
+++ b/keyboards/ymdk/id75/f103/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/f103/config.h b/keyboards/ymdk/id75/f103/config.h
new file mode 100644
index 0000000000..cb5ac78304
--- /dev/null
+++ b/keyboards/ymdk/id75/f103/config.h
@@ -0,0 +1,23 @@
+/* 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
+
+#define WS2812_PWM_DRIVER PWMD4
+#define WS2812_PWM_CHANNEL 4
+#define WS2812_PWM_PAL_MODE 2
+#define WS2812_PWM_DMA_STREAM STM32_DMA1_STREAM7
+#define WS2812_PWM_DMA_CHANNEL 7
diff --git a/keyboards/ymdk/id75/f103/halconf.h b/keyboards/ymdk/id75/f103/halconf.h
new file mode 100644
index 0000000000..612ce4fc4a
--- /dev/null
+++ b/keyboards/ymdk/id75/f103/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/f103/keyboard.json b/keyboards/ymdk/id75/f103/keyboard.json
new file mode 100644
index 0000000000..5b1974b3f2
--- /dev/null
+++ b/keyboards/ymdk/id75/f103/keyboard.json
@@ -0,0 +1,13 @@
+{
+ "manufacturer": "YMDK",
+ "bootloader": "uf2boot",
+ "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",
+ "ws2812": {
+ "driver": "pwm",
+ "pin": "B9"
+ }
+}
diff --git a/keyboards/ymdk/id75/f103/mcuconf.h b/keyboards/ymdk/id75/f103/mcuconf.h
new file mode 100644
index 0000000000..0d3de3dad5
--- /dev/null
+++ b/keyboards/ymdk/id75/f103/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/f103/rules.mk b/keyboards/ymdk/id75/f103/rules.mk
new file mode 100644
index 0000000000..dbee20ab05
--- /dev/null
+++ b/keyboards/ymdk/id75/f103/rules.mk
@@ -0,0 +1,5 @@
+# Configure for 128K flash
+MCU_LDSCRIPT = STM32F103xB
+
+# Wildcard to allow APM32 MCU
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
diff --git a/keyboards/ymdk/id75/halconf.h b/keyboards/ymdk/id75/halconf.h
deleted file mode 100644
index 612ce4fc4a..0000000000
--- a/keyboards/ymdk/id75/halconf.h
+++ /dev/null
@@ -1,21 +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 .
- */
-
-#pragma once
-
-#define HAL_USE_PWM TRUE
-
-#include_next
diff --git a/keyboards/ymdk/id75/info.json b/keyboards/ymdk/id75/info.json
new file mode 100644
index 0000000000..bbe4d1c73e
--- /dev/null
+++ b/keyboards/ymdk/id75/info.json
@@ -0,0 +1,240 @@
+{
+ "keyboard_name": "Idobao x YMDK ID75",
+ "maintainer": "qmk",
+ "diode_direction": "ROW2COL",
+ "features": {
+ "bootmagic": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "rgb_matrix": {
+ "animations": {
+ "alphas_mods": true,
+ "band_pinwheel_sat": true,
+ "band_pinwheel_val": true,
+ "band_sat": true,
+ "band_spiral_sat": true,
+ "band_spiral_val": true,
+ "band_val": true,
+ "breathing": true,
+ "cycle_all": true,
+ "cycle_left_right": true,
+ "cycle_out_in": true,
+ "cycle_out_in_dual": true,
+ "cycle_pinwheel": true,
+ "cycle_spiral": true,
+ "cycle_up_down": true,
+ "digital_rain": true,
+ "dual_beacon": true,
+ "gradient_left_right": true,
+ "gradient_up_down": true,
+ "hue_breathing": true,
+ "hue_pendulum": true,
+ "hue_wave": true,
+ "jellybean_raindrops": true,
+ "multisplash": true,
+ "pixel_flow": true,
+ "pixel_fractal": true,
+ "pixel_rain": true,
+ "rainbow_beacon": true,
+ "rainbow_moving_chevron": true,
+ "rainbow_pinwheels": true,
+ "raindrops": true,
+ "solid_multisplash": true,
+ "solid_reactive": true,
+ "solid_reactive_cross": true,
+ "solid_reactive_multicross": true,
+ "solid_reactive_multinexus": true,
+ "solid_reactive_multiwide": true,
+ "solid_reactive_nexus": true,
+ "solid_reactive_simple": true,
+ "solid_reactive_wide": true,
+ "solid_splash": true,
+ "splash": true,
+ "typing_heatmap": true
+ },
+ "driver": "ws2812",
+ "layout": [
+ {"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": 4},
+ {"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, "flags": 2}
+ ],
+ "max_brightness": 128,
+ "sleep": true
+ },
+ "usb": {
+ "device_version": "0.0.1",
+ "pid": "0x0075",
+ "vid": "0x594D"
+ },
+ "community_layouts": ["ortho_5x15"],
+ "layouts": {
+ "LAYOUT_ortho_5x15": {
+ "layout": [
+ {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
+ {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
+ {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
+ {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0},
+ {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
+ {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0},
+ {"label": "k06", "matrix": [0, 6], "x": 6, "y": 0},
+ {"label": "k07", "matrix": [0, 7], "x": 7, "y": 0},
+ {"label": "k08", "matrix": [0, 8], "x": 8, "y": 0},
+ {"label": "k09", "matrix": [0, 9], "x": 9, "y": 0},
+ {"label": "k0A", "matrix": [0, 10], "x": 10, "y": 0},
+ {"label": "k0B", "matrix": [0, 11], "x": 11, "y": 0},
+ {"label": "k0C", "matrix": [0, 12], "x": 12, "y": 0},
+ {"label": "k0D", "matrix": [0, 13], "x": 13, "y": 0},
+ {"label": "k0E", "matrix": [0, 14], "x": 14, "y": 0},
+ {"label": "k10", "matrix": [1, 0], "x": 0, "y": 1},
+ {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1},
+ {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1},
+ {"label": "k13", "matrix": [1, 3], "x": 3, "y": 1},
+ {"label": "k14", "matrix": [1, 4], "x": 4, "y": 1},
+ {"label": "k15", "matrix": [1, 5], "x": 5, "y": 1},
+ {"label": "k16", "matrix": [1, 6], "x": 6, "y": 1},
+ {"label": "k17", "matrix": [1, 7], "x": 7, "y": 1},
+ {"label": "k18", "matrix": [1, 8], "x": 8, "y": 1},
+ {"label": "k19", "matrix": [1, 9], "x": 9, "y": 1},
+ {"label": "k1A", "matrix": [1, 10], "x": 10, "y": 1},
+ {"label": "k1B", "matrix": [1, 11], "x": 11, "y": 1},
+ {"label": "k1C", "matrix": [1, 12], "x": 12, "y": 1},
+ {"label": "k1D", "matrix": [1, 13], "x": 13, "y": 1},
+ {"label": "k1E", "matrix": [1, 14], "x": 14, "y": 1},
+ {"label": "k20", "matrix": [2, 0], "x": 0, "y": 2},
+ {"label": "k21", "matrix": [2, 1], "x": 1, "y": 2},
+ {"label": "k22", "matrix": [2, 2], "x": 2, "y": 2},
+ {"label": "k23", "matrix": [2, 3], "x": 3, "y": 2},
+ {"label": "k24", "matrix": [2, 4], "x": 4, "y": 2},
+ {"label": "k25", "matrix": [2, 5], "x": 5, "y": 2},
+ {"label": "k26", "matrix": [2, 6], "x": 6, "y": 2},
+ {"label": "k27", "matrix": [2, 7], "x": 7, "y": 2},
+ {"label": "k28", "matrix": [2, 8], "x": 8, "y": 2},
+ {"label": "k29", "matrix": [2, 9], "x": 9, "y": 2},
+ {"label": "k2A", "matrix": [2, 10], "x": 10, "y": 2},
+ {"label": "k2B", "matrix": [2, 11], "x": 11, "y": 2},
+ {"label": "k2C", "matrix": [2, 12], "x": 12, "y": 2},
+ {"label": "k2D", "matrix": [2, 13], "x": 13, "y": 2},
+ {"label": "k2E", "matrix": [2, 14], "x": 14, "y": 2},
+ {"label": "k30", "matrix": [3, 0], "x": 0, "y": 3},
+ {"label": "k31", "matrix": [3, 1], "x": 1, "y": 3},
+ {"label": "k32", "matrix": [3, 2], "x": 2, "y": 3},
+ {"label": "k33", "matrix": [3, 3], "x": 3, "y": 3},
+ {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3},
+ {"label": "k35", "matrix": [3, 5], "x": 5, "y": 3},
+ {"label": "k36", "matrix": [3, 6], "x": 6, "y": 3},
+ {"label": "k37", "matrix": [3, 7], "x": 7, "y": 3},
+ {"label": "k38", "matrix": [3, 8], "x": 8, "y": 3},
+ {"label": "k39", "matrix": [3, 9], "x": 9, "y": 3},
+ {"label": "k3A", "matrix": [3, 10], "x": 10, "y": 3},
+ {"label": "k3B", "matrix": [3, 11], "x": 11, "y": 3},
+ {"label": "k3C", "matrix": [3, 12], "x": 12, "y": 3},
+ {"label": "k3D", "matrix": [3, 13], "x": 13, "y": 3},
+ {"label": "k3E", "matrix": [3, 14], "x": 14, "y": 3},
+ {"label": "k40", "matrix": [4, 0], "x": 0, "y": 4},
+ {"label": "k41", "matrix": [4, 1], "x": 1, "y": 4},
+ {"label": "k42", "matrix": [4, 2], "x": 2, "y": 4},
+ {"label": "k43", "matrix": [4, 3], "x": 3, "y": 4},
+ {"label": "k44", "matrix": [4, 4], "x": 4, "y": 4},
+ {"label": "k45", "matrix": [4, 5], "x": 5, "y": 4},
+ {"label": "k46", "matrix": [4, 6], "x": 6, "y": 4},
+ {"label": "k47", "matrix": [4, 7], "x": 7, "y": 4},
+ {"label": "k48", "matrix": [4, 8], "x": 8, "y": 4},
+ {"label": "k49", "matrix": [4, 9], "x": 9, "y": 4},
+ {"label": "k4A", "matrix": [4, 10], "x": 10, "y": 4},
+ {"label": "k4B", "matrix": [4, 11], "x": 11, "y": 4},
+ {"label": "k4C", "matrix": [4, 12], "x": 12, "y": 4},
+ {"label": "k4D", "matrix": [4, 13], "x": 13, "y": 4},
+ {"label": "k4E", "matrix": [4, 14], "x": 14, "y": 4}
+ ]
+ }
+ }
+}
diff --git a/keyboards/ymdk/id75/keyboard.json b/keyboards/ymdk/id75/keyboard.json
deleted file mode 100644
index db0c108542..0000000000
--- a/keyboards/ymdk/id75/keyboard.json
+++ /dev/null
@@ -1,251 +0,0 @@
-{
- "manufacturer": "YMDK",
- "keyboard_name": "Idobao x YMDK ID75",
- "maintainer": "qmk",
- "bootloader": "uf2boot",
- "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",
- "ws2812": {
- "driver": "pwm",
- "pin": "B9"
- },
- "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},
- {"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,
- "sleep": true
- },
- "usb": {
- "device_version": "0.0.1",
- "pid": "0x0075",
- "vid": "0x594D"
- },
- "community_layouts": ["ortho_5x15"],
- "layouts": {
- "LAYOUT_ortho_5x15": {
- "layout": [
- {"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
- {"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
- {"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
- {"label": "k03", "matrix": [0, 3], "x": 3, "y": 0},
- {"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
- {"label": "k05", "matrix": [0, 5], "x": 5, "y": 0},
- {"label": "k06", "matrix": [0, 6], "x": 6, "y": 0},
- {"label": "k07", "matrix": [0, 7], "x": 7, "y": 0},
- {"label": "k08", "matrix": [0, 8], "x": 8, "y": 0},
- {"label": "k09", "matrix": [0, 9], "x": 9, "y": 0},
- {"label": "k0A", "matrix": [0, 10], "x": 10, "y": 0},
- {"label": "k0B", "matrix": [0, 11], "x": 11, "y": 0},
- {"label": "k0C", "matrix": [0, 12], "x": 12, "y": 0},
- {"label": "k0D", "matrix": [0, 13], "x": 13, "y": 0},
- {"label": "k0E", "matrix": [0, 14], "x": 14, "y": 0},
- {"label": "k10", "matrix": [1, 0], "x": 0, "y": 1},
- {"label": "k11", "matrix": [1, 1], "x": 1, "y": 1},
- {"label": "k12", "matrix": [1, 2], "x": 2, "y": 1},
- {"label": "k13", "matrix": [1, 3], "x": 3, "y": 1},
- {"label": "k14", "matrix": [1, 4], "x": 4, "y": 1},
- {"label": "k15", "matrix": [1, 5], "x": 5, "y": 1},
- {"label": "k16", "matrix": [1, 6], "x": 6, "y": 1},
- {"label": "k17", "matrix": [1, 7], "x": 7, "y": 1},
- {"label": "k18", "matrix": [1, 8], "x": 8, "y": 1},
- {"label": "k19", "matrix": [1, 9], "x": 9, "y": 1},
- {"label": "k1A", "matrix": [1, 10], "x": 10, "y": 1},
- {"label": "k1B", "matrix": [1, 11], "x": 11, "y": 1},
- {"label": "k1C", "matrix": [1, 12], "x": 12, "y": 1},
- {"label": "k1D", "matrix": [1, 13], "x": 13, "y": 1},
- {"label": "k1E", "matrix": [1, 14], "x": 14, "y": 1},
- {"label": "k20", "matrix": [2, 0], "x": 0, "y": 2},
- {"label": "k21", "matrix": [2, 1], "x": 1, "y": 2},
- {"label": "k22", "matrix": [2, 2], "x": 2, "y": 2},
- {"label": "k23", "matrix": [2, 3], "x": 3, "y": 2},
- {"label": "k24", "matrix": [2, 4], "x": 4, "y": 2},
- {"label": "k25", "matrix": [2, 5], "x": 5, "y": 2},
- {"label": "k26", "matrix": [2, 6], "x": 6, "y": 2},
- {"label": "k27", "matrix": [2, 7], "x": 7, "y": 2},
- {"label": "k28", "matrix": [2, 8], "x": 8, "y": 2},
- {"label": "k29", "matrix": [2, 9], "x": 9, "y": 2},
- {"label": "k2A", "matrix": [2, 10], "x": 10, "y": 2},
- {"label": "k2B", "matrix": [2, 11], "x": 11, "y": 2},
- {"label": "k2C", "matrix": [2, 12], "x": 12, "y": 2},
- {"label": "k2D", "matrix": [2, 13], "x": 13, "y": 2},
- {"label": "k2E", "matrix": [2, 14], "x": 14, "y": 2},
- {"label": "k30", "matrix": [3, 0], "x": 0, "y": 3},
- {"label": "k31", "matrix": [3, 1], "x": 1, "y": 3},
- {"label": "k32", "matrix": [3, 2], "x": 2, "y": 3},
- {"label": "k33", "matrix": [3, 3], "x": 3, "y": 3},
- {"label": "k34", "matrix": [3, 4], "x": 4, "y": 3},
- {"label": "k35", "matrix": [3, 5], "x": 5, "y": 3},
- {"label": "k36", "matrix": [3, 6], "x": 6, "y": 3},
- {"label": "k37", "matrix": [3, 7], "x": 7, "y": 3},
- {"label": "k38", "matrix": [3, 8], "x": 8, "y": 3},
- {"label": "k39", "matrix": [3, 9], "x": 9, "y": 3},
- {"label": "k3A", "matrix": [3, 10], "x": 10, "y": 3},
- {"label": "k3B", "matrix": [3, 11], "x": 11, "y": 3},
- {"label": "k3C", "matrix": [3, 12], "x": 12, "y": 3},
- {"label": "k3D", "matrix": [3, 13], "x": 13, "y": 3},
- {"label": "k3E", "matrix": [3, 14], "x": 14, "y": 3},
- {"label": "k40", "matrix": [4, 0], "x": 0, "y": 4},
- {"label": "k41", "matrix": [4, 1], "x": 1, "y": 4},
- {"label": "k42", "matrix": [4, 2], "x": 2, "y": 4},
- {"label": "k43", "matrix": [4, 3], "x": 3, "y": 4},
- {"label": "k44", "matrix": [4, 4], "x": 4, "y": 4},
- {"label": "k45", "matrix": [4, 5], "x": 5, "y": 4},
- {"label": "k46", "matrix": [4, 6], "x": 6, "y": 4},
- {"label": "k47", "matrix": [4, 7], "x": 7, "y": 4},
- {"label": "k48", "matrix": [4, 8], "x": 8, "y": 4},
- {"label": "k49", "matrix": [4, 9], "x": 9, "y": 4},
- {"label": "k4A", "matrix": [4, 10], "x": 10, "y": 4},
- {"label": "k4B", "matrix": [4, 11], "x": 11, "y": 4},
- {"label": "k4C", "matrix": [4, 12], "x": 12, "y": 4},
- {"label": "k4D", "matrix": [4, 13], "x": 13, "y": 4},
- {"label": "k4E", "matrix": [4, 14], "x": 14, "y": 4}
- ]
- }
- }
-}
diff --git a/keyboards/ymdk/id75/mcuconf.h b/keyboards/ymdk/id75/mcuconf.h
deleted file mode 100644
index 0d3de3dad5..0000000000
--- a/keyboards/ymdk/id75/mcuconf.h
+++ /dev/null
@@ -1,25 +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 .
- */
-
-#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
index 9315745f71..4f7e779458 100644
--- a/keyboards/ymdk/id75/readme.md
+++ b/keyboards/ymdk/id75/readme.md
@@ -5,17 +5,18 @@
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 Supported: [Idobao x YMDK ID75](https://www.aliexpress.com/item/3256804537842097.html). **This is not the same PCB as `idobao/id75` or `ymdk/ymd75`.**
+ This keyboard has had multiple PCB revisions, some of which may not work with the firmware in this repository. **Check your PCB before flashing.**
+ * `f103`: (Geehy APM32F103CBT6, uf2boot)
* 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
+ make ymdk/id75/f103:default
Flashing example for this keyboard:
- make ymdk/id75:default:flash
+ make ymdk/id75/f103: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).
@@ -27,4 +28,5 @@ Enter the bootloader in 3 ways:
* **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.
+After entering the bootloader through one of the three methods above, the keyboard will appear as a USB mass storage device. 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.
+- `f103`: The volume name is `MT.KEY`.
diff --git a/keyboards/ymdk/id75/rules.mk b/keyboards/ymdk/id75/rules.mk
deleted file mode 100644
index dbee20ab05..0000000000
--- a/keyboards/ymdk/id75/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# Configure for 128K flash
-MCU_LDSCRIPT = STM32F103xB
-
-# Wildcard to allow APM32 MCU
-DFU_SUFFIX_ARGS = -p FFFF -v FFFF
--
cgit v1.2.3