commit 75e1a0d61062a63198c12491a4c471ed32217d78 parent 96ea2773816921b6fa84ff6b89390ad90767430c Author: Jeayo Keh <gezhaoyou@126.com> Date: Thu, 9 Nov 2023 01:45:24 +0800 [Keyboard] Rename soda/{mango,pocket} (#22151) Co-authored-by: Joel Challis <git@zvecr.com> Diffstat:
22 files changed, 253 insertions(+), 248 deletions(-)
diff --git a/data/mappings/keyboard_aliases.hjson b/data/mappings/keyboard_aliases.hjson @@ -1215,6 +1215,12 @@ "setta21": { "target": "salicylic_acid3/setta21" }, + "soda/mango": { + "target": "magic_force/mf17" + }, + "soda/pocket": { + "target": "magic_force/mf34" + }, "space_space/rev1": { "target": "qpockets/space_space/rev1" }, diff --git a/keyboards/soda/mango/config.h b/keyboards/magic_force/mf17/config.h diff --git a/keyboards/magic_force/mf17/info.json b/keyboards/magic_force/mf17/info.json @@ -0,0 +1,124 @@ +{ + "manufacturer": "MagicForce", + "keyboard_name": "MF17", + "url": "https://github.com/gezhaoyou", + "maintainer": "MagicForce", + "diode_direction": "ROW2COL", + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "matrix_pins": { + "cols": ["A6", "A5", "A4", "A3"], + "rows": ["B10", "B2", "B1", "B0", "A7"] + }, + "usb": { + "device_version": "1.0.0", + "force_nkro": true, + "vid": "0x3A54", + "pid": "0x4F5D" + }, + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true, + "rgb_matrix": true + }, + "ws2812": { + "pin": "A2" + }, + "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, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "rainbow_moving_chevron": 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_fractal": true, + "pixel_flow": true, + "pixel_rain": 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": 1, "matrix": [0, 0], "x": 0, "y": 0}, + {"flags": 1, "matrix": [0, 1], "x": 75, "y": 0}, + {"flags": 1, "matrix": [0, 2], "x": 150, "y": 0}, + {"flags": 1, "matrix": [0, 3], "x": 224, "y": 0}, + {"flags": 1, "matrix": [1, 0], "x": 0, "y": 16}, + {"flags": 1, "matrix": [1, 1], "x": 75, "y": 16}, + {"flags": 1, "matrix": [1, 2], "x": 150, "y": 16}, + {"flags": 1, "matrix": [2, 0], "x": 0, "y": 32}, + {"flags": 1, "matrix": [2, 1], "x": 75, "y": 32}, + {"flags": 1, "matrix": [2, 2], "x": 150, "y": 32}, + {"flags": 1, "matrix": [2, 3], "x": 224, "y": 24}, + {"flags": 1, "matrix": [3, 0], "x": 0, "y": 48}, + {"flags": 1, "matrix": [3, 1], "x": 75, "y": 48}, + {"flags": 1, "matrix": [3, 2], "x": 150, "y": 48}, + {"flags": 1, "matrix": [4, 0], "x": 32, "y": 64}, + {"flags": 1, "matrix": [4, 1], "x": 150, "y": 64}, + {"flags": 1, "matrix": [4, 2], "x": 224, "y": 64} + ] + }, + "indicators": { + "caps_lock": "B15", + "on_state": 0 + }, + "community_layouts": ["numpad_5x4"], + "layouts": { + "LAYOUT_numpad_5x4": { + "layout": [ + {"label": "Num Lock", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "/", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "*", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "-", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "7", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "8", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "9", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "4", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "5", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "6", "matrix": [2, 2], "x": 2, "y": 2}, + {"h": 2, "label": "+", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "1", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "2", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "3", "matrix": [3, 2], "x": 2, "y": 3}, + {"label": "0", "matrix": [4, 0], "w": 2, "x": 0, "y": 4}, + {"label": ".", "matrix": [4, 2], "x": 2, "y": 4}, + {"h": 2, "label": "Enter", "matrix": [3, 3], "x": 3, "y": 3} + ] + } + } +} diff --git a/keyboards/soda/mango/keymaps/default/keymap.c b/keyboards/magic_force/mf17/keymaps/default/keymap.c diff --git a/keyboards/soda/mango/keymaps/via/keymap.c b/keyboards/magic_force/mf17/keymaps/via/keymap.c diff --git a/keyboards/soda/mango/keymaps/via/rules.mk b/keyboards/magic_force/mf17/keymaps/via/rules.mk diff --git a/keyboards/magic_force/mf17/readme.md b/keyboards/magic_force/mf17/readme.md @@ -0,0 +1,22 @@ +# MF-17 + +A customizable 17 keyboard, support both HOTSWAP and SOLDER. + +* Keyboard Maintainer: [gezhaoyou](https://github.com/gezhaoyou) +* Hardware Supported: [gezhaoyou](https://github.com/gezhaoyou) +Make example for this keyboard (after setting up your build environment): + + make magic_force/mf17:default + +Flashing example for this keyboard: + + make magic_force/mf17: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 2 ways: + +* **Physical reset button**: Briefly press the button: [boot] first, then press button: [reset] on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/soda/mango/rules.mk b/keyboards/magic_force/mf17/rules.mk diff --git a/keyboards/soda/pocket/chconf.h b/keyboards/magic_force/mf34/chconf.h diff --git a/keyboards/soda/pocket/config.h b/keyboards/magic_force/mf34/config.h diff --git a/keyboards/magic_force/mf34/info.json b/keyboards/magic_force/mf34/info.json @@ -0,0 +1,78 @@ +{ + "keyboard_name": "MagicForce", + "url": "", + "maintainer": "MagicForce", + "manufacturer": "MagicForce", + "usb": { + "vid": "0x1A53", + "pid": "0x4F51", + "device_version": "1.0.2", + "force_nkro": true + }, + "indicators": { + "num_lock": "B15" + }, + "ws2812": { + "pin": "C15" + }, + "rgb_matrix": { + "driver": "ws2812" + }, + "matrix_pins": { + "cols": ["A2", "A1", "B14", "B4", "B5", "B6", "B7"], + "rows": ["A7", "B0", "B1", "B2", "B10", "B11"] + }, + "diode_direction": "ROW2COL", + "processor": "STM32F072", + "bootloader": "stm32-dfu", + "layouts": { + "LAYOUT": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + + {"matrix": [0, 3], "x": 3.25, "y": 0}, + {"matrix": [0, 4], "x": 4.25, "y": 0}, + {"matrix": [0, 5], "x": 5.25, "y": 0}, + {"matrix": [0, 6], "x": 6.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + + {"matrix": [1, 3], "x": 3.25, "y": 1.25}, + {"matrix": [1, 4], "x": 4.25, "y": 1.25}, + {"matrix": [1, 5], "x": 5.25, "y": 1.25}, + {"matrix": [1, 6], "x": 6.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25}, + {"matrix": [2, 1], "x": 1, "y": 2.25}, + {"matrix": [2, 2], "x": 2, "y": 2.25}, + + {"matrix": [2, 3], "x": 3.25, "y": 2.25}, + {"matrix": [2, 4], "x": 4.25, "y": 2.25}, + {"matrix": [2, 5], "x": 5.25, "y": 2.25}, + + {"matrix": [3, 3], "x": 3.25, "y": 3.25}, + {"matrix": [3, 4], "x": 4.25, "y": 3.25}, + {"matrix": [3, 5], "x": 5.25, "y": 3.25}, + {"matrix": [3, 6], "x": 6.25, "y": 2.25, "h": 2}, + + {"matrix": [4, 1], "x": 1, "y": 4.25}, + + {"matrix": [4, 3], "x": 3.25, "y": 4.25}, + {"matrix": [4, 4], "x": 4.25, "y": 4.25}, + {"matrix": [4, 5], "x": 5.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25}, + {"matrix": [5, 1], "x": 1, "y": 5.25}, + {"matrix": [5, 2], "x": 2, "y": 5.25}, + + {"matrix": [5, 4], "x": 3.25, "y": 5.25, "w": 2}, + {"matrix": [5, 5], "x": 5.25, "y": 5.25}, + {"matrix": [5, 6], "x": 6.25, "y": 4.25, "h": 2} + ] + } + } +} diff --git a/keyboards/soda/pocket/keymaps/default/keymap.c b/keyboards/magic_force/mf34/keymaps/default/keymap.c diff --git a/keyboards/soda/pocket/keymaps/via/keymap.c b/keyboards/magic_force/mf34/keymaps/via/keymap.c diff --git a/keyboards/soda/pocket/keymaps/via/rules.mk b/keyboards/magic_force/mf34/keymaps/via/rules.mk diff --git a/keyboards/soda/pocket/mcuconf.h b/keyboards/magic_force/mf34/mcuconf.h diff --git a/keyboards/soda/pocket/pocket.c b/keyboards/magic_force/mf34/mf34.c diff --git a/keyboards/magic_force/mf34/readme.md b/keyboards/magic_force/mf34/readme.md @@ -0,0 +1,23 @@ +# MF-34 + +A customizable 34 keyboard, support both HOTSWAP and SOLDER. + +* Keyboard Maintainer: [gezhaoyou](https://github.com/gezhaoyou) +* Hardware Supported: [gezhaoyou](https://github.com/gezhaoyou) + +Make example for this keyboard (after setting up your build environment): + + make magic_force/mf34:default + +Flashing example for this keyboard: + + make magic_force/mf34:default:flash + +## Bootloader + +Enter the bootloader in 2 ways: + +* **Physical reset button**: Briefly press the button: [boot] first, then press button: [reset] on the back of the PCB +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available + +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). diff --git a/keyboards/soda/pocket/rules.mk b/keyboards/magic_force/mf34/rules.mk diff --git a/keyboards/soda/mango/info.json b/keyboards/soda/mango/info.json @@ -1,124 +0,0 @@ -{ - "manufacturer": "Soda", - "keyboard_name": "Mango", - "url": "https://github.com/gezhaoyou", - "maintainer": "JeayoKeh", - "diode_direction": "ROW2COL", - "processor": "STM32F072", - "bootloader": "stm32-dfu", - "matrix_pins": { - "cols": ["A6", "A5", "A4", "A3"], - "rows": ["B10", "B2", "B1", "B0", "A7"] - }, - "usb": { - "device_version": "1.0.0", - "force_nkro": true, - "vid": "0x3A54", - "pid": "0x4F5D" - }, - "features": { - "bootmagic": true, - "extrakey": true, - "mousekey": true, - "nkro": true, - "rgb_matrix": true - }, - "ws2812": { - "pin": "A2" - }, - "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, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "rainbow_moving_chevron": 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_fractal": true, - "pixel_flow": true, - "pixel_rain": 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": 1, "matrix": [0, 0], "x": 0, "y": 0}, - {"flags": 1, "matrix": [0, 1], "x": 75, "y": 0}, - {"flags": 1, "matrix": [0, 2], "x": 150, "y": 0}, - {"flags": 1, "matrix": [0, 3], "x": 224, "y": 0}, - {"flags": 1, "matrix": [1, 0], "x": 0, "y": 16}, - {"flags": 1, "matrix": [1, 1], "x": 75, "y": 16}, - {"flags": 1, "matrix": [1, 2], "x": 150, "y": 16}, - {"flags": 1, "matrix": [2, 0], "x": 0, "y": 32}, - {"flags": 1, "matrix": [2, 1], "x": 75, "y": 32}, - {"flags": 1, "matrix": [2, 2], "x": 150, "y": 32}, - {"flags": 1, "matrix": [2, 3], "x": 224, "y": 24}, - {"flags": 1, "matrix": [3, 0], "x": 0, "y": 48}, - {"flags": 1, "matrix": [3, 1], "x": 75, "y": 48}, - {"flags": 1, "matrix": [3, 2], "x": 150, "y": 48}, - {"flags": 1, "matrix": [4, 0], "x": 32, "y": 64}, - {"flags": 1, "matrix": [4, 1], "x": 150, "y": 64}, - {"flags": 1, "matrix": [4, 2], "x": 224, "y": 64} - ] - }, - "indicators": { - "caps_lock": "B15", - "on_state": 0 - }, - "community_layouts": ["numpad_5x4"], - "layouts": { - "LAYOUT_numpad_5x4": { - "layout": [ - {"label": "Num Lock", "matrix": [0, 0], "x": 0, "y": 0}, - {"label": "/", "matrix": [0, 1], "x": 1, "y": 0}, - {"label": "*", "matrix": [0, 2], "x": 2, "y": 0}, - {"label": "-", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "7", "matrix": [1, 0], "x": 0, "y": 1}, - {"label": "8", "matrix": [1, 1], "x": 1, "y": 1}, - {"label": "9", "matrix": [1, 2], "x": 2, "y": 1}, - {"label": "4", "matrix": [2, 0], "x": 0, "y": 2}, - {"label": "5", "matrix": [2, 1], "x": 1, "y": 2}, - {"label": "6", "matrix": [2, 2], "x": 2, "y": 2}, - {"h": 2, "label": "+", "matrix": [1, 3], "x": 3, "y": 1}, - {"label": "1", "matrix": [3, 0], "x": 0, "y": 3}, - {"label": "2", "matrix": [3, 1], "x": 1, "y": 3}, - {"label": "3", "matrix": [3, 2], "x": 2, "y": 3}, - {"label": "0", "matrix": [4, 0], "w": 2, "x": 0, "y": 4}, - {"label": ".", "matrix": [4, 2], "x": 2, "y": 4}, - {"h": 2, "label": "Enter", "matrix": [3, 3], "x": 3, "y": 3} - ] - } - } -} diff --git a/keyboards/soda/mango/readme.md b/keyboards/soda/mango/readme.md @@ -1,23 +0,0 @@ -# mango-17 - -A customizable 17 keyboard, support both HOTSWAP and SOLDER. - -* Keyboard Maintainer: [gezhaoyou](https://github.com/gezhaoyou) -* Hardware Supported: [gezhaoyou](https://github.com/gezhaoyou) - -Make example for this keyboard (after setting up your build environment): - - make soda/mango:default - -Flashing example for this keyboard: - - make soda/mango: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 2 ways: - -* **Physical reset button**: Briefly press the button: [boot] first, then press button: [reset] on the back of the PCB -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/soda/pocket/info.json b/keyboards/soda/pocket/info.json @@ -1,78 +0,0 @@ -{ - "keyboard_name": "Pocket", - "url": "", - "maintainer": "qmk", - "manufacturer": "gezhaoyou", - "usb": { - "vid": "0x1A53", - "pid": "0x4F51", - "device_version": "1.0.2", - "force_nkro": true - }, - "indicators": { - "num_lock": "B15" - }, - "ws2812": { - "pin": "C15" - }, - "rgb_matrix": { - "driver": "ws2812" - }, - "matrix_pins": { - "cols": ["A2", "A1", "B14", "B4", "B5", "B6", "B7"], - "rows": ["A7", "B0", "B1", "B2", "B10", "B11"] - }, - "diode_direction": "ROW2COL", - "processor": "STM32F072", - "bootloader": "stm32-dfu", - "layouts": { - "LAYOUT": { - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0}, - {"matrix": [0, 1], "x": 1, "y": 0}, - {"matrix": [0, 2], "x": 2, "y": 0}, - - {"matrix": [0, 3], "x": 3.25, "y": 0}, - {"matrix": [0, 4], "x": 4.25, "y": 0}, - {"matrix": [0, 5], "x": 5.25, "y": 0}, - {"matrix": [0, 6], "x": 6.25, "y": 0}, - - {"matrix": [1, 0], "x": 0, "y": 1.25}, - {"matrix": [1, 1], "x": 1, "y": 1.25}, - {"matrix": [1, 2], "x": 2, "y": 1.25}, - - {"matrix": [1, 3], "x": 3.25, "y": 1.25}, - {"matrix": [1, 4], "x": 4.25, "y": 1.25}, - {"matrix": [1, 5], "x": 5.25, "y": 1.25}, - {"matrix": [1, 6], "x": 6.25, "y": 1.25}, - - {"matrix": [2, 0], "x": 0, "y": 2.25}, - {"matrix": [2, 1], "x": 1, "y": 2.25}, - {"matrix": [2, 2], "x": 2, "y": 2.25}, - - {"matrix": [2, 3], "x": 3.25, "y": 2.25}, - {"matrix": [2, 4], "x": 4.25, "y": 2.25}, - {"matrix": [2, 5], "x": 5.25, "y": 2.25}, - - {"matrix": [3, 3], "x": 3.25, "y": 3.25}, - {"matrix": [3, 4], "x": 4.25, "y": 3.25}, - {"matrix": [3, 5], "x": 5.25, "y": 3.25}, - {"matrix": [3, 6], "x": 6.25, "y": 2.25, "h": 2}, - - {"matrix": [4, 1], "x": 1, "y": 4.25}, - - {"matrix": [4, 3], "x": 3.25, "y": 4.25}, - {"matrix": [4, 4], "x": 4.25, "y": 4.25}, - {"matrix": [4, 5], "x": 5.25, "y": 4.25}, - - {"matrix": [5, 0], "x": 0, "y": 5.25}, - {"matrix": [5, 1], "x": 1, "y": 5.25}, - {"matrix": [5, 2], "x": 2, "y": 5.25}, - - {"matrix": [5, 4], "x": 3.25, "y": 5.25, "w": 2}, - {"matrix": [5, 5], "x": 5.25, "y": 5.25}, - {"matrix": [5, 6], "x": 6.25, "y": 4.25, "h": 2} - ] - } - } -} diff --git a/keyboards/soda/pocket/readme.md b/keyboards/soda/pocket/readme.md @@ -1,23 +0,0 @@ -# Pocket-34 - -A customizable 34 keyboard, support both HOTSWAP and SOLDER. - -* Keyboard Maintainer: [gezhaoyou](https://github.com/gezhaoyou) -* Hardware Supported: [gezhaoyou](https://github.com/gezhaoyou) - -Make example for this keyboard (after setting up your build environment): - - make soda/pocket:default - -Flashing example for this keyboard: - - make soda/pocket:default:flash - -## Bootloader - -Enter the bootloader in 2 ways: - -* **Physical reset button**: Briefly press the button: [boot] first, then press button: [reset] on the back of the PCB -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available - -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).