[Keyboard] Rename soda/{mango,pocket} (#22151)

Co-authored-by: Joel Challis <git@zvecr.com>

17 files changed, 590 insertions, 0 deletions

diff --git a/keyboards/magic_force/mf17/config.h b/keyboards/magic_force/mf17/config.h
new file mode 100644
index 0000000000..6e9f18cd5d
--- /dev/null
+++ b/keyboards/magic_force/mf17/config.h
@@ -0,0 +1,14 @@
+// Copyright 2023 devzhaoyou (@gevzhaoyou)
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+
+#pragma once
+
+#define RGB_MATRIX_LED_COUNT 17
+
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES
+
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 180 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED //
+
diff --git a/keyboards/magic_force/mf17/info.json b/keyboards/magic_force/mf17/info.json
new file mode 100644
index 0000000000..397a5c879a
--- /dev/null
+++ 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/magic_force/mf17/keymaps/default/keymap.c b/keyboards/magic_force/mf17/keymaps/default/keymap.c
new file mode 100755
index 0000000000..7497c87514
--- /dev/null
+++ b/keyboards/magic_force/mf17/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/*
+Copyright 2012,2013 gezhaoyou <gezhaoyou@126.com>
+
+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 <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_numpad_5x4(
+        KC_NUM_LOCK,            KC_PSLS,    KC_PAST,        LT(1, KC_PMNS),
+        KC_P7,                  KC_P8,      KC_P9,
+        KC_P4,                  KC_P5,      KC_P6,          KC_PPLS,
+        KC_P1,                  KC_P2,      KC_P3,
+                                KC_P0,      KC_PDOT,        KC_PENT),
+   [1] = LAYOUT_numpad_5x4(
+        KC_TRNS,                KC_CALCULATOR,          KC_BSPC,    KC_TRNS,
+        RGB_MODE_FORWARD,       RGB_VAI,                RGB_HUI,
+        RGB_SPD,                RGB_TOG,                RGB_SPI,    QK_BOOTLOADER,
+        RGB_MODE_REVERSE,       RGB_VAD,                RGB_HUD,
+                                KC_TRNS,                KC_TRNS,    QK_CLEAR_EEPROM),
+};
\ No newline at end of file
diff --git a/keyboards/magic_force/mf17/keymaps/via/keymap.c b/keyboards/magic_force/mf17/keymaps/via/keymap.c
new file mode 100755
index 0000000000..059598a680
--- /dev/null
+++ b/keyboards/magic_force/mf17/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2012,2013 gezhaoyou <gezhaoyou@126.com>
+
+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 <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_numpad_5x4(
+        KC_NUM_LOCK,            KC_PSLS,    KC_PAST,        LT(1, KC_PMNS),
+        KC_P7,                  KC_P8,      KC_P9,
+        KC_P4,                  KC_P5,      KC_P6,          KC_PPLS,
+        KC_P1,                  KC_P2,      KC_P3,
+                                KC_P0,      KC_PDOT,        KC_PENT),
+   [1] = LAYOUT_numpad_5x4(
+        KC_TRNS,                KC_CALCULATOR,          KC_BSPC,    KC_TRNS,
+        RGB_MODE_FORWARD,       RGB_VAI,                RGB_HUI,
+        RGB_SPD,                RGB_TOG,                RGB_SPI,    QK_BOOTLOADER,
+        RGB_MODE_REVERSE,       RGB_VAD,                RGB_HUD,
+                                KC_TRNS,                KC_TRNS,    QK_CLEAR_EEPROM),
+};
+
diff --git a/keyboards/magic_force/mf17/keymaps/via/rules.mk b/keyboards/magic_force/mf17/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/magic_force/mf17/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/magic_force/mf17/readme.md b/keyboards/magic_force/mf17/readme.md
new file mode 100644
index 0000000000..bb75cadfe9
--- /dev/null
+++ 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/magic_force/mf17/rules.mk b/keyboards/magic_force/mf17/rules.mk
new file mode 100644
index 0000000000..7ff128fa69
--- /dev/null
+++ b/keyboards/magic_force/mf17/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank
\ No newline at end of file
diff --git a/keyboards/magic_force/mf34/chconf.h b/keyboards/magic_force/mf34/chconf.h
new file mode 100644
index 0000000000..61b37ebf37
--- /dev/null
+++ b/keyboards/magic_force/mf34/chconf.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 <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define CH_CFG_ST_FREQUENCY 10000
+
+#define CH_CFG_OPTIMIZE_SPEED FALSE
+
+#define CH_CFG_USE_CONDVARS_TIMEOUT FALSE
+
+#include_next <chconf.h>
+
diff --git a/keyboards/magic_force/mf34/config.h b/keyboards/magic_force/mf34/config.h
new file mode 100644
index 0000000000..ce02ad5d68
--- /dev/null
+++ b/keyboards/magic_force/mf34/config.h
@@ -0,0 +1,77 @@
+/*
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+// The number of LEDs connected
+#define RGB_MATRIX_LED_COUNT 34
+
+#ifdef RGB_MATRIX_ENABLE
+#        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+#        define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#        define RGB_MATRIX_KEYPRESSES
+#        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
+// enabled only if RGB_MATRIX_FRAMEBUFFER_EFFECTS is defined
+#        define ENABLE_RGB_MATRIX_TYPING_HEATMAP
+#        define ENABLE_RGB_MATRIX_DIGITAL_RAIN
+// enabled only of RGB_MATRIX_KEYPRESSES or RGB_MATRIX_KEYRELEASES is defined
+#        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
+
+// rgb EFFCET --end
diff --git a/keyboards/magic_force/mf34/info.json b/keyboards/magic_force/mf34/info.json
new file mode 100644
index 0000000000..86b08087cb
--- /dev/null
+++ 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/magic_force/mf34/keymaps/default/keymap.c b/keyboards/magic_force/mf34/keymaps/default/keymap.c
new file mode 100755
index 0000000000..4d65df2d73
--- /dev/null
+++ b/keyboards/magic_force/mf34/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2012,2013 gezhaoyou <gezhaoyou@126.com>
+
+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 <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+               KC_ESC,     MO(1),   KC_EQL,     KC_LPRN,    KC_RPRN,    KC_CALCULATOR,  KC_BSPC,
+               KC_INSERT,  KC_HOME, KC_PGUP,    KC_NUM_LOCK,    KC_PSLS,    KC_PAST,        KC_PMNS,
+               KC_DEL,     KC_END,  KC_PGDN,    KC_P7,      KC_P8,      KC_P9,
+                                                KC_P4,      KC_P5,      KC_P6,          KC_PPLS,
+                           KC_UP,               KC_P1,      KC_P2,      KC_P3,
+               KC_LEFT,    KC_DOWN, KC_RGHT,                KC_P0,      KC_PDOT,        KC_PENT),
+   [_FN] = LAYOUT(
+               KC_TRNS,             KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,               KC_TRNS, QK_BOOTLOADER,
+               RGB_TOG,   RGB_HUI, RGB_MODE_FORWARD,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,
+               KC_TRNS,             RGB_HUD, RGB_MODE_REVERSE,  KC_TRNS, KC_TRNS, KC_TRNS,
+                                                                KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,
+                        RGB_VAI,                                KC_TRNS, KC_TRNS, KC_TRNS,
+               RGB_SPD, RGB_VAD, RGB_SPI,                       KC_TRNS, KC_TRNS, QK_CLEAR_EEPROM),
+};
+
diff --git a/keyboards/magic_force/mf34/keymaps/via/keymap.c b/keyboards/magic_force/mf34/keymaps/via/keymap.c
new file mode 100755
index 0000000000..4d65df2d73
--- /dev/null
+++ b/keyboards/magic_force/mf34/keymaps/via/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2012,2013 gezhaoyou <gezhaoyou@126.com>
+
+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 <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+               KC_ESC,     MO(1),   KC_EQL,     KC_LPRN,    KC_RPRN,    KC_CALCULATOR,  KC_BSPC,
+               KC_INSERT,  KC_HOME, KC_PGUP,    KC_NUM_LOCK,    KC_PSLS,    KC_PAST,        KC_PMNS,
+               KC_DEL,     KC_END,  KC_PGDN,    KC_P7,      KC_P8,      KC_P9,
+                                                KC_P4,      KC_P5,      KC_P6,          KC_PPLS,
+                           KC_UP,               KC_P1,      KC_P2,      KC_P3,
+               KC_LEFT,    KC_DOWN, KC_RGHT,                KC_P0,      KC_PDOT,        KC_PENT),
+   [_FN] = LAYOUT(
+               KC_TRNS,             KC_TRNS, KC_TRNS,           KC_TRNS, KC_TRNS,               KC_TRNS, QK_BOOTLOADER,
+               RGB_TOG,   RGB_HUI, RGB_MODE_FORWARD,  KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS,
+               KC_TRNS,             RGB_HUD, RGB_MODE_REVERSE,  KC_TRNS, KC_TRNS, KC_TRNS,
+                                                                KC_TRNS, KC_TRNS, KC_TRNS,      KC_TRNS,
+                        RGB_VAI,                                KC_TRNS, KC_TRNS, KC_TRNS,
+               RGB_SPD, RGB_VAD, RGB_SPI,                       KC_TRNS, KC_TRNS, QK_CLEAR_EEPROM),
+};
+
diff --git a/keyboards/magic_force/mf34/keymaps/via/rules.mk b/keyboards/magic_force/mf34/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/magic_force/mf34/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/magic_force/mf34/mcuconf.h b/keyboards/magic_force/mf34/mcuconf.h
new file mode 100644
index 0000000000..e139ee3683
--- /dev/null
+++ b/keyboards/magic_force/mf34/mcuconf.h
@@ -0,0 +1,22 @@
+/* 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 <http://www.gnu.org/licenses/>.
+ */
+ 
+#pragma once
+
+#include_next <mcuconf.h>
+
+#undef STM32_I2C_USE_DMA
+#define STM32_I2C_USE_DMA FALSE
diff --git a/keyboards/magic_force/mf34/mf34.c b/keyboards/magic_force/mf34/mf34.c
new file mode 100644
index 0000000000..8cced36866
--- /dev/null
+++ b/keyboards/magic_force/mf34/mf34.c
@@ -0,0 +1,48 @@
+/*
+Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.com>
+
+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 <http://www.gnu.org/licenses/>.
+*/
+
+#include "quantum.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+// RGB Matrix 
+led_config_t g_led_config = {
+	{
+    	// Key Matrix to LED Index
+        {  0,  1,  2,  3 , 4,  5,  6},
+        {  7,  8,  9,  10, 11, 12, 13 },
+        {  14, 15, 16, 17, 18, 19, NO_LED },
+        {  NO_LED, NO_LED, NO_LED, 20, 21, 22, 23 },
+        {  NO_LED, 24, NO_LED, 25, 26, 27, NO_LED },
+        {  28, 29, 30, NO_LED, 31, 32, 33 }
+	}, {
+		{0,  0}, {37,  0}, {74,  0}, {112,  0}, {149,  0}, {186,  0}, {224,  0},
+        {0, 12}, {37, 12}, {74, 12}, {112, 12}, {149, 12}, {186, 12}, {224, 12},
+        {0, 24}, {37, 24}, {74, 24}, {112, 17}, {149, 17}, {186, 17},
+                                     {112, 38}, {149, 38}, {186, 38}, {224, 38},
+                 {37, 51},           {112, 51}, {149, 51}, {186, 51},
+        {0, 64}, {37, 64}, {74, 64},            {149, 64}, {186, 64}, {224, 64}
+	}, {
+        4,      4,      4,          4,      4,      4,      4,
+        4,      4,      4,          4,      4,      4,      4,
+        4,      4,      4,          4,      4,      4,
+                                    4,      4,      4,      4,
+                4,                  4,      4,      4,
+        4,      4,      4,                  4,      4,      4
+	}
+};
+#endif
diff --git a/keyboards/magic_force/mf34/readme.md b/keyboards/magic_force/mf34/readme.md
new file mode 100644
index 0000000000..25a72d644f
--- /dev/null
+++ 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/magic_force/mf34/rules.mk b/keyboards/magic_force/mf34/rules.mk
new file mode 100644
index 0000000000..24a8c52e48
--- /dev/null
+++ b/keyboards/magic_force/mf34/rules.mk
@@ -0,0 +1,11 @@
+RGB_MATRIX_ENABLE = yes
+
+BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Enable N-Key Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+AUDIO_ENABLE = no           # Audio output
+