commit: 751482580ed992acdbafc262c281e5d179cebe69
parent c973ee1445c5121fcf2dfdbf7ffcd1a6b7a8ed9c
Author: QMK Bot <hello@qmk.fm>
Date: Mon, 24 Jun 2024 08:20:17 +0000
Merge remote-tracking branch 'origin/master' into develop
Diffstat:
3 files changed, 193 insertions(+), 191 deletions(-)
diff --git a/keyboards/custommk/ergostrafer_rgb/info.json b/keyboards/custommk/ergostrafer_rgb/info.json
@@ -1,189 +0,0 @@
-{
- "manufacturer": "customMK",
- "keyboard_name": "ErgoStrafer RGB",
- "maintainer": "customMK",
- "bootloader": "stm32-dfu",
- "diode_direction": "ROW2COL",
- "dynamic_keymap": {
- "layer_count": 32
- },
- "eeprom": {
- "driver": "spi"
- },
- "encoder": {
- "rotary": [
- {"pin_a": "A8", "pin_b": "A4", "resolution": 2},
- {"pin_a": "B12", "pin_b": "B14", "resolution": 2},
- {"pin_a": "B15", "pin_b": "A15", "resolution": 2}
- ]
- },
- "features": {
- "audio": true,
- "bootmagic": true,
- "encoder": true,
- "extrakey": true,
- "mousekey": true,
- "nkro": true,
- "rgb_matrix": true
- },
- "matrix_pins": {
- "cols": ["B0", "A1", "A2", "A3", "A6", "B6", "B10"],
- "rows": ["C13", "C14", "C15", "B1", "A7", "A5"]
- },
- "processor": "STM32F411",
- "qmk": {
- "tap_keycode_delay": 10
- },
- "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
- },
- "center_point": [112, 112],
- "driver": "ws2812",
- "layout": [
- {"matrix": [0, 1], "x": 32, "y": 45, "flags": 4},
- {"matrix": [0, 2], "x": 57, "y": 40, "flags": 4},
- {"matrix": [0, 3], "x": 83, "y": 38, "flags": 4},
- {"matrix": [0, 4], "x": 109, "y": 40, "flags": 4},
- {"matrix": [0, 5], "x": 134, "y": 45, "flags": 4},
- {"x": 136, "y": 18, "flags": 4},
- {"matrix": [0, 0], "x": 167, "y": 11, "flags": 4},
- {"matrix": [1, 0], "x": 170, "y": 33, "flags": 4},
- {"matrix": [2, 0], "x": 174, "y": 54, "flags": 4},
- {"x": 195, "y": 57, "flags": 4},
- {"x": 211, "y": 81, "flags": 4},
- {"x": 193, "y": 90, "flags": 4},
- {"matrix": [0, 6], "x": 171, "y": 90, "flags": 4},
- {"matrix": [2, 5], "x": 143, "y": 90, "flags": 4},
- {"matrix": [1, 5], "x": 140, "y": 67, "flags": 4},
- {"matrix": [1, 4], "x": 118, "y": 61, "flags": 4},
- {"matrix": [2, 3], "x": 95, "y": 58, "flags": 4},
- {"matrix": [1, 3], "x": 71, "y": 58, "flags": 4},
- {"matrix": [1, 2], "x": 48, "y": 61, "flags": 4},
- {"matrix": [1, 1], "x": 26, "y": 67, "flags": 4},
- {"matrix": [3, 0], "x": 0, "y": 90, "flags": 4},
- {"matrix": [2, 1], "x": 23, "y": 90, "flags": 4},
- {"matrix": [2, 2], "x": 52, "y": 87, "flags": 4},
- {"matrix": [3, 3], "x": 83, "y": 85, "flags": 4},
- {"matrix": [2, 4], "x": 114, "y": 87, "flags": 4},
- {"matrix": [3, 5], "x": 139, "y": 113, "flags": 4},
- {"matrix": [1, 6], "x": 167, "y": 114, "flags": 4},
- {"x": 207, "y": 112, "flags": 4},
- {"matrix": [5, 6], "x": 224, "y": 146, "flags": 4},
- {"matrix": [3, 6], "x": 184, "y": 147, "flags": 4},
- {"matrix": [2, 6], "x": 156, "y": 147, "flags": 4},
- {"matrix": [4, 5], "x": 127, "y": 135, "flags": 4},
- {"matrix": [3, 4], "x": 111, "y": 112, "flags": 4},
- {"matrix": [4, 3], "x": 83, "y": 112, "flags": 4},
- {"matrix": [3, 2], "x": 55, "y": 112, "flags": 4},
- {"matrix": [3, 1], "x": 20, "y": 114, "flags": 4},
- {"matrix": [4, 1], "x": 15, "y": 138, "flags": 4},
- {"matrix": [5, 1], "x": 14, "y": 162, "flags": 4},
- {"matrix": [4, 2], "x": 52, "y": 137, "flags": 4},
- {"matrix": [5, 3], "x": 83, "y": 139, "flags": 4},
- {"x": 83, "y": 164, "flags": 4},
- {"x": 104, "y": 144, "flags": 4},
- {"matrix": [5, 5], "x": 121, "y": 173, "flags": 4},
- {"matrix": [4, 6], "x": 167, "y": 173, "flags": 4}
- ],
- "max_brightness": 120,
- "sat_steps": 8,
- "speed_steps": 10,
- "val_steps": 8
- },
- "url": "https://shop.custommk.com/collections/ergostrafer/products/ergostrafer",
- "usb": {
- "device_version": "1.0.0",
- "pid": "0xFAB9",
- "vid": "0xF35B"
- },
- "ws2812": {
- "driver": "pwm",
- "pin": "A10"
- },
- "layouts": {
- "LAYOUT": {
- "layout": [
- {"label": "F9", "matrix": [0, 0], "x": 7.5, "y": 0},
- {"label": "7", "matrix": [0, 1], "x": 1.5, "y": 1.25},
- {"label": "8", "matrix": [0, 2], "x": 2.5, "y": 1.25},
- {"label": "9", "matrix": [0, 3], "x": 3.5, "y": 1.25},
- {"label": "0", "matrix": [0, 4], "x": 4.5, "y": 1.25},
- {"label": "-", "matrix": [0, 5], "x": 5.5, "y": 1.25},
- {"label": "T", "matrix": [0, 6], "x": 7.25, "y": 3.25, "w": 1.5},
- {"label": "PrtScr", "matrix": [1, 0], "x": 7.5, "y": 1},
- {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.25},
- {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.25},
- {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.25},
- {"label": "5", "matrix": [1, 4], "x": 5, "y": 2.25},
- {"label": "6", "matrix": [1, 5], "x": 6, "y": 2.25},
- {"label": "G", "matrix": [1, 6], "x": 7.25, "y": 4.25, "w": 1.5},
- {"label": "F5", "matrix": [2, 0], "x": 7.5, "y": 2},
- {"label": "Tab", "matrix": [2, 1], "x": 1, "y": 3.5},
- {"label": "Q", "matrix": [2, 2], "x": 2.5, "y": 3.4},
- {"label": "4", "matrix": [2, 3], "x": 4, "y": 2.25},
- {"label": "E", "matrix": [2, 4], "x": 4.5, "y": 3.4},
- {"label": "R", "matrix": [2, 5], "x": 6, "y": 3.3},
- {"label": "B", "matrix": [2, 6], "x": 6.5, "y": 5.75, "w": 1.5},
- {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5},
- {"label": "L Alt", "matrix": [3, 1], "x": 0.25, "y": 4.75, "w": 1.5},
- {"label": "A", "matrix": [3, 2], "x": 2.5, "y": 4.5},
- {"label": "W", "matrix": [3, 3], "x": 3.5, "y": 3.4},
- {"label": "D", "matrix": [3, 4], "x": 4.5, "y": 4.5},
- {"label": "F", "matrix": [3, 5], "x": 6, "y": 4.3},
- {"label": "P", "matrix": [3, 6], "x": 8, "y": 5.75},
- {"label": "L Shift", "matrix": [4, 1], "x": 0.25, "y": 5.75, "w": 1.5},
- {"label": "Z", "matrix": [4, 2], "x": 2.5, "y": 5.6},
- {"label": "S", "matrix": [4, 3], "x": 3.5, "y": 4.5},
- {"label": "V", "matrix": [4, 5], "x": 5, "y": 5.75, "w": 1.5},
- {"label": "Space", "matrix": [4, 6], "x": 6.5, "y": 6.85, "w": 1.75},
- {"label": "L Ctrl Duck", "matrix": [5, 1], "x": 0.25, "y": 6.75, "w": 1.5},
- {"label": "X", "matrix": [5, 3], "x": 3.5, "y": 5.6},
- {"label": "C", "matrix": [5, 5], "x": 4.75, "y": 6.85, "w": 1.75},
- {"label": "L Ctrl", "matrix": [5, 6], "x": 9.5, "y": 5.75}
- ]
- }
- }
-}
-\ No newline at end of file
diff --git a/keyboards/custommk/ergostrafer_rgb/keyboard.json b/keyboards/custommk/ergostrafer_rgb/keyboard.json
@@ -0,0 +1,192 @@
+{
+ "manufacturer": "customMK",
+ "keyboard_name": "ErgoStrafer RGB",
+ "maintainer": "customMK",
+ "bootloader": "stm32-dfu",
+ "diode_direction": "ROW2COL",
+ "audio": {
+ "driver": "pwm_hardware"
+ },
+ "dynamic_keymap": {
+ "layer_count": 32
+ },
+ "eeprom": {
+ "driver": "spi"
+ },
+ "encoder": {
+ "rotary": [
+ {"pin_a": "A8", "pin_b": "A4", "resolution": 2},
+ {"pin_a": "B12", "pin_b": "B14", "resolution": 2},
+ {"pin_a": "B15", "pin_b": "A15", "resolution": 2}
+ ]
+ },
+ "features": {
+ "audio": true,
+ "bootmagic": true,
+ "encoder": true,
+ "extrakey": true,
+ "mousekey": true,
+ "nkro": true,
+ "rgb_matrix": true
+ },
+ "matrix_pins": {
+ "cols": ["B0", "A1", "A2", "A3", "A6", "B6", "B10"],
+ "rows": ["C13", "C14", "C15", "B1", "A7", "A5"]
+ },
+ "processor": "STM32F411",
+ "qmk": {
+ "tap_keycode_delay": 10
+ },
+ "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
+ },
+ "center_point": [112, 112],
+ "driver": "ws2812",
+ "layout": [
+ {"matrix": [0, 1], "x": 32, "y": 45, "flags": 4},
+ {"matrix": [0, 2], "x": 57, "y": 40, "flags": 4},
+ {"matrix": [0, 3], "x": 83, "y": 38, "flags": 4},
+ {"matrix": [0, 4], "x": 109, "y": 40, "flags": 4},
+ {"matrix": [0, 5], "x": 134, "y": 45, "flags": 4},
+ {"x": 136, "y": 18, "flags": 4},
+ {"matrix": [0, 0], "x": 167, "y": 11, "flags": 4},
+ {"matrix": [1, 0], "x": 170, "y": 33, "flags": 4},
+ {"matrix": [2, 0], "x": 174, "y": 54, "flags": 4},
+ {"x": 195, "y": 57, "flags": 4},
+ {"x": 211, "y": 81, "flags": 4},
+ {"x": 193, "y": 90, "flags": 4},
+ {"matrix": [0, 6], "x": 171, "y": 90, "flags": 4},
+ {"matrix": [2, 5], "x": 143, "y": 90, "flags": 4},
+ {"matrix": [1, 5], "x": 140, "y": 67, "flags": 4},
+ {"matrix": [1, 4], "x": 118, "y": 61, "flags": 4},
+ {"matrix": [2, 3], "x": 95, "y": 58, "flags": 4},
+ {"matrix": [1, 3], "x": 71, "y": 58, "flags": 4},
+ {"matrix": [1, 2], "x": 48, "y": 61, "flags": 4},
+ {"matrix": [1, 1], "x": 26, "y": 67, "flags": 4},
+ {"matrix": [3, 0], "x": 0, "y": 90, "flags": 4},
+ {"matrix": [2, 1], "x": 23, "y": 90, "flags": 4},
+ {"matrix": [2, 2], "x": 52, "y": 87, "flags": 4},
+ {"matrix": [3, 3], "x": 83, "y": 85, "flags": 4},
+ {"matrix": [2, 4], "x": 114, "y": 87, "flags": 4},
+ {"matrix": [3, 5], "x": 139, "y": 113, "flags": 4},
+ {"matrix": [1, 6], "x": 167, "y": 114, "flags": 4},
+ {"x": 207, "y": 112, "flags": 4},
+ {"matrix": [5, 6], "x": 224, "y": 146, "flags": 4},
+ {"matrix": [3, 6], "x": 184, "y": 147, "flags": 4},
+ {"matrix": [2, 6], "x": 156, "y": 147, "flags": 4},
+ {"matrix": [4, 5], "x": 127, "y": 135, "flags": 4},
+ {"matrix": [3, 4], "x": 111, "y": 112, "flags": 4},
+ {"matrix": [4, 3], "x": 83, "y": 112, "flags": 4},
+ {"matrix": [3, 2], "x": 55, "y": 112, "flags": 4},
+ {"matrix": [3, 1], "x": 20, "y": 114, "flags": 4},
+ {"matrix": [4, 1], "x": 15, "y": 138, "flags": 4},
+ {"matrix": [5, 1], "x": 14, "y": 162, "flags": 4},
+ {"matrix": [4, 2], "x": 52, "y": 137, "flags": 4},
+ {"matrix": [5, 3], "x": 83, "y": 139, "flags": 4},
+ {"x": 83, "y": 164, "flags": 4},
+ {"x": 104, "y": 144, "flags": 4},
+ {"matrix": [5, 5], "x": 121, "y": 173, "flags": 4},
+ {"matrix": [4, 6], "x": 167, "y": 173, "flags": 4}
+ ],
+ "max_brightness": 120,
+ "sat_steps": 8,
+ "speed_steps": 10,
+ "val_steps": 8
+ },
+ "url": "https://shop.custommk.com/collections/ergostrafer/products/ergostrafer",
+ "usb": {
+ "device_version": "1.0.0",
+ "pid": "0xFAB9",
+ "vid": "0xF35B"
+ },
+ "ws2812": {
+ "driver": "pwm",
+ "pin": "A10"
+ },
+ "layouts": {
+ "LAYOUT": {
+ "layout": [
+ {"label": "F9", "matrix": [0, 0], "x": 7.5, "y": 0},
+ {"label": "7", "matrix": [0, 1], "x": 1.5, "y": 1.25},
+ {"label": "8", "matrix": [0, 2], "x": 2.5, "y": 1.25},
+ {"label": "9", "matrix": [0, 3], "x": 3.5, "y": 1.25},
+ {"label": "0", "matrix": [0, 4], "x": 4.5, "y": 1.25},
+ {"label": "-", "matrix": [0, 5], "x": 5.5, "y": 1.25},
+ {"label": "T", "matrix": [0, 6], "x": 7.25, "y": 3.25, "w": 1.5},
+ {"label": "PrtScr", "matrix": [1, 0], "x": 7.5, "y": 1},
+ {"label": "1", "matrix": [1, 1], "x": 1, "y": 2.25},
+ {"label": "2", "matrix": [1, 2], "x": 2, "y": 2.25},
+ {"label": "3", "matrix": [1, 3], "x": 3, "y": 2.25},
+ {"label": "5", "matrix": [1, 4], "x": 5, "y": 2.25},
+ {"label": "6", "matrix": [1, 5], "x": 6, "y": 2.25},
+ {"label": "G", "matrix": [1, 6], "x": 7.25, "y": 4.25, "w": 1.5},
+ {"label": "F5", "matrix": [2, 0], "x": 7.5, "y": 2},
+ {"label": "Tab", "matrix": [2, 1], "x": 1, "y": 3.5},
+ {"label": "Q", "matrix": [2, 2], "x": 2.5, "y": 3.4},
+ {"label": "4", "matrix": [2, 3], "x": 4, "y": 2.25},
+ {"label": "E", "matrix": [2, 4], "x": 4.5, "y": 3.4},
+ {"label": "R", "matrix": [2, 5], "x": 6, "y": 3.3},
+ {"label": "B", "matrix": [2, 6], "x": 6.5, "y": 5.75, "w": 1.5},
+ {"label": "Caps Lock", "matrix": [3, 0], "x": 0, "y": 3.5},
+ {"label": "L Alt", "matrix": [3, 1], "x": 0.25, "y": 4.75, "w": 1.5},
+ {"label": "A", "matrix": [3, 2], "x": 2.5, "y": 4.5},
+ {"label": "W", "matrix": [3, 3], "x": 3.5, "y": 3.4},
+ {"label": "D", "matrix": [3, 4], "x": 4.5, "y": 4.5},
+ {"label": "F", "matrix": [3, 5], "x": 6, "y": 4.3},
+ {"label": "P", "matrix": [3, 6], "x": 8, "y": 5.75},
+ {"label": "L Shift", "matrix": [4, 1], "x": 0.25, "y": 5.75, "w": 1.5},
+ {"label": "Z", "matrix": [4, 2], "x": 2.5, "y": 5.6},
+ {"label": "S", "matrix": [4, 3], "x": 3.5, "y": 4.5},
+ {"label": "V", "matrix": [4, 5], "x": 5, "y": 5.75, "w": 1.5},
+ {"label": "Space", "matrix": [4, 6], "x": 6.5, "y": 6.85, "w": 1.75},
+ {"label": "L Ctrl Duck", "matrix": [5, 1], "x": 0.25, "y": 6.75, "w": 1.5},
+ {"label": "X", "matrix": [5, 3], "x": 3.5, "y": 5.6},
+ {"label": "C", "matrix": [5, 5], "x": 4.75, "y": 6.85, "w": 1.75},
+ {"label": "L Ctrl", "matrix": [5, 6], "x": 9.5, "y": 5.75}
+ ]
+ }
+ }
+}
+\ No newline at end of file
diff --git a/keyboards/custommk/ergostrafer_rgb/rules.mk b/keyboards/custommk/ergostrafer_rgb/rules.mk
@@ -1 +0,0 @@
-AUDIO_DRIVER = pwm_hardware
