Browse Source

move ymdk/id75 to revision (#24590)

Less/Rikki 1 năm trước cách đây
mục cha
commit
b4ece24c7d

+ 3 - 0
data/mappings/keyboard_aliases.hjson

@@ -1515,6 +1515,9 @@
     "ymd96": {
         "target": "ymdk/ymd96"
     },
+    "ymdk/id75": {
+        "target": "ymdk/id75/f103"
+    },
     "ymdk_np21": {
         "target": "ymdk/np21"
     },

+ 0 - 0
keyboards/ymdk/id75/board.h → keyboards/ymdk/id75/f103/board.h


+ 0 - 0
keyboards/ymdk/id75/config.h → keyboards/ymdk/id75/f103/config.h


+ 0 - 0
keyboards/ymdk/id75/halconf.h → keyboards/ymdk/id75/f103/halconf.h


+ 13 - 0
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"
+    }
+}

+ 0 - 0
keyboards/ymdk/id75/mcuconf.h → keyboards/ymdk/id75/f103/mcuconf.h


+ 0 - 0
keyboards/ymdk/id75/rules.mk → keyboards/ymdk/id75/f103/rules.mk


+ 110 - 121
keyboards/ymdk/id75/keyboard.json → keyboards/ymdk/id75/info.json

@@ -1,8 +1,6 @@
 {
-    "manufacturer": "YMDK",
     "keyboard_name": "Idobao x YMDK ID75",
     "maintainer": "qmk",
-    "bootloader": "uf2boot",
     "diode_direction": "ROW2COL",
     "features": {
         "bootmagic": true,
@@ -11,152 +9,143 @@
         "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_sat": true,
             "band_spiral_sat": true,
             "band_spiral_val": true,
+            "band_val": true,
+            "breathing": 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,
+            "cycle_up_down": true,
+            "digital_rain": true,
             "dual_beacon": true,
-            "rainbow_beacon": true,
-            "rainbow_pinwheels": true,
-            "raindrops": true,
-            "jellybean_raindrops": true,
+            "gradient_left_right": true,
+            "gradient_up_down": true,
             "hue_breathing": true,
             "hue_pendulum": true,
             "hue_wave": true,
-            "pixel_rain": true,
+            "jellybean_raindrops": true,
+            "multisplash": true,
             "pixel_flow": true,
             "pixel_fractal": true,
-            "typing_heatmap": true,
-            "digital_rain": true,
-            "solid_reactive_simple": true,
+            "pixel_rain": true,
+            "rainbow_beacon": true,
+            "rainbow_moving_chevron": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "solid_multisplash": 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_reactive_multiwide": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
             "solid_splash": true,
-            "solid_multisplash": true
+            "splash": true,
+            "typing_heatmap": 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}
+            {"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

+ 7 - 5
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`.