From 0c727b680fc096f8cbe73e7f5cf62320422dd5b5 Mon Sep 17 00:00:00 2001
From: gezhaoyou <gezhaoyou@126.com>
Date: Tue, 6 Jun 2023 09:50:15 +0800
Subject: [PATCH 1/3] Add keymap v2 and v3 for soda/mango

---
 src/soda/mango/mango.json | 57 +++++++++++++++++++++++++++++++++++++
 v3/soda/mango/mango.json  | 60 +++++++++++++++++++++++++++++++++++++++
 2 files changed, 117 insertions(+)
 create mode 100644 src/soda/mango/mango.json
 create mode 100644 v3/soda/mango/mango.json

diff --git a/src/soda/mango/mango.json b/src/soda/mango/mango.json
new file mode 100644
index 0000000000..04b9b42575
--- /dev/null
+++ b/src/soda/mango/mango.json
@@ -0,0 +1,57 @@
+{
+    "name": "MF17",
+    "vendorId": "0x1A54",
+    "productId": "0x4F5D",
+    "matrix": {"rows": 5,"cols":4},
+    "lighting": "qmk_rgblight",
+    "layouts": {
+      "keymap": [
+          [
+            "0,0",
+            "0,1",
+            "0,2",
+            "0,3",
+            {
+              "x": 0.25,
+              "f": 4,
+              "w": 14,
+              "h": 5,
+              "d": true
+            }
+          ],
+          [
+            {
+              "f": 3
+            },
+            "1,0",
+            "1,1",
+            "1,2",
+            {
+              "h": 2
+            },
+            "2,3"
+          ],
+          [
+            "2,0",
+            "2,1",
+            "2,2"
+          ],
+          [
+            "3,0",
+            "3,1",
+            "3,2",
+            {
+              "h": 2
+            },
+            "4,3"
+          ],
+          [
+            {
+              "w": 2
+            },
+            "4,1",
+            "4,2"
+          ]
+        ]
+    }
+}
diff --git a/v3/soda/mango/mango.json b/v3/soda/mango/mango.json
new file mode 100644
index 0000000000..99f515e517
--- /dev/null
+++ b/v3/soda/mango/mango.json
@@ -0,0 +1,60 @@
+{
+    "name": "MF17",
+    "vendorId": "0x1A54",
+    "productId": "0x4F5D",
+    "keycodes": ["qmk_lighting"],
+    "menus": ["qmk_rgb_matrix"],
+
+    "matrix": {"rows": 5,"cols":4},
+
+    "layouts": {
+      "keymap": [
+          [
+            "0,0",
+            "0,1",
+            "0,2",
+            "0,3",
+            {
+              "x": 0.25,
+              "f": 4,
+              "w": 14,
+              "h": 5,
+              "d": true
+            }
+          ],
+          [
+            {
+              "f": 3
+            },
+            "1,0",
+            "1,1",
+            "1,2",
+            {
+              "h": 2
+            },
+            "2,3"
+          ],
+          [
+            "2,0",
+            "2,1",
+            "2,2"
+          ],
+          [
+            "3,0",
+            "3,1",
+            "3,2",
+            {
+              "h": 2
+            },
+            "4,3"
+          ],
+          [
+            {
+              "w": 2
+            },
+            "4,1",
+            "4,2"
+          ]
+        ]
+    }
+}

From 35711086096501bba8f05852d5279fb6f9ac7a85 Mon Sep 17 00:00:00 2001
From: gezhaoyou <gezhaoyou@126.com>
Date: Sun, 11 Jun 2023 15:52:27 +0800
Subject: [PATCH 2/3] rm soda/mango v2 json and update vendorId

---
 src/soda/mango/mango.json | 57 ---------------------------------------
 v3/soda/mango/mango.json  | 12 +--------
 2 files changed, 1 insertion(+), 68 deletions(-)
 delete mode 100644 src/soda/mango/mango.json

diff --git a/src/soda/mango/mango.json b/src/soda/mango/mango.json
deleted file mode 100644
index 04b9b42575..0000000000
--- a/src/soda/mango/mango.json
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-    "name": "MF17",
-    "vendorId": "0x1A54",
-    "productId": "0x4F5D",
-    "matrix": {"rows": 5,"cols":4},
-    "lighting": "qmk_rgblight",
-    "layouts": {
-      "keymap": [
-          [
-            "0,0",
-            "0,1",
-            "0,2",
-            "0,3",
-            {
-              "x": 0.25,
-              "f": 4,
-              "w": 14,
-              "h": 5,
-              "d": true
-            }
-          ],
-          [
-            {
-              "f": 3
-            },
-            "1,0",
-            "1,1",
-            "1,2",
-            {
-              "h": 2
-            },
-            "2,3"
-          ],
-          [
-            "2,0",
-            "2,1",
-            "2,2"
-          ],
-          [
-            "3,0",
-            "3,1",
-            "3,2",
-            {
-              "h": 2
-            },
-            "4,3"
-          ],
-          [
-            {
-              "w": 2
-            },
-            "4,1",
-            "4,2"
-          ]
-        ]
-    }
-}
diff --git a/v3/soda/mango/mango.json b/v3/soda/mango/mango.json
index 99f515e517..72ceb8cfc0 100644
--- a/v3/soda/mango/mango.json
+++ b/v3/soda/mango/mango.json
@@ -13,19 +13,9 @@
             "0,0",
             "0,1",
             "0,2",
-            "0,3",
-            {
-              "x": 0.25,
-              "f": 4,
-              "w": 14,
-              "h": 5,
-              "d": true
-            }
+            "0,3"
           ],
           [
-            {
-              "f": 3
-            },
             "1,0",
             "1,1",
             "1,2",

From 874c24297e1bcaa7afa60801b510869f0e65d93a Mon Sep 17 00:00:00 2001
From: gezhaoyou <gezhaoyou@126.com>
Date: Mon, 12 Jun 2023 09:26:41 +0800
Subject: [PATCH 3/3] update soda/mango

---
 v3/soda/mango/mango.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/v3/soda/mango/mango.json b/v3/soda/mango/mango.json
index 72ceb8cfc0..da5f17107e 100644
--- a/v3/soda/mango/mango.json
+++ b/v3/soda/mango/mango.json
@@ -1,6 +1,6 @@
 {
     "name": "MF17",
-    "vendorId": "0x1A54",
+    "vendorId": "0x3A54",
     "productId": "0x4F5D",
     "keycodes": ["qmk_lighting"],
     "menus": ["qmk_rgb_matrix"],