Merge remote-tracking branch 'origin/develop' into xap

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"
     },

keyboards/magic_force/mf17/info.json

@@ -1,8 +1,8 @@
 {
-    "manufacturer": "Soda",
-    "keyboard_name": "Mango",
+    "manufacturer": "MagicForce",
+    "keyboard_name": "MF17",
     "url": "https://github.com/gezhaoyou",
-    "maintainer": "JeayoKeh",
+    "maintainer": "MagicForce",
     "diode_direction": "ROW2COL",
     "processor": "STM32F072",
     "bootloader": "stm32-dfu",

keyboards/magic_force/mf17/readme.md

@@ -1,17 +1,16 @@
-# mango-17
+# 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 soda/mango:default
+    make magic_force/mf17:default
 
 Flashing example for this keyboard:
 
-    make soda/mango:default:flash
+    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).
 

keyboards/magic_force/mf34/info.json

@@ -1,8 +1,8 @@
 {
-    "keyboard_name": "Pocket",
+    "keyboard_name": "MagicForce",
     "url": "",
-    "maintainer": "qmk",
-    "manufacturer": "gezhaoyou",
+    "maintainer": "MagicForce",
+    "manufacturer": "MagicForce",
     "usb": {
         "vid": "0x1A53",
         "pid": "0x4F51",

keyboards/magic_force/mf34/readme.md

@@ -1,4 +1,4 @@
-# Pocket-34
+# MF-34
 
 A customizable 34  keyboard, support both HOTSWAP and SOLDER.
 
@@ -7,11 +7,11 @@ A customizable 34  keyboard, support both HOTSWAP and SOLDER.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make soda/pocket:default
+    make magic_force/mf34:default
 
 Flashing example for this keyboard:
 
-    make soda/pocket:default:flash
+    make magic_force/mf34:default:flash
 
 ## Bootloader
 

keyboards/rmi_kb/herringbone/pro/info.json

@@ -15,7 +15,7 @@
     "diode_direction": "COL2ROW",
     "encoder": {
         "rotary": [
-            {"pin_a": "C3", "pin_b": "C2"}
+            {"pin_a": "C3", "pin_b": "C2", "resolution": 2}
         ]
     },
     "processor": "atmega32a",
@@ -247,9 +247,7 @@
 
                 {"matrix": [0, 13], "x": 14, "y": 0},
 
-                {"matrix": [6, 0], "x": 15.25, "y": 0},
-                {"matrix": [0, 14], "x": 16.25, "y": 0},
-                {"matrix": [6, 1], "x": 17.25, "y": 0},
+                {"matrix": [0, 14], "x": 15.5, "y": 0},
 
                 {"matrix": [1, 0], "x": 0, "y": 1.25},
                 {"matrix": [1, 1], "x": 1, "y": 1.25},
@@ -329,7 +327,9 @@
                 {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.5},
                 {"matrix": [5, 10], "x": 11.5, "y": 5.25, "w": 1.5},
 
-                {"matrix": [5, 13], "x": 14.25, "y": 5.5}
+                {"matrix": [5, 12], "x": 13.25, "y": 5.5},
+                {"matrix": [5, 13], "x": 14.25, "y": 5.5},
+                {"matrix": [5, 14], "x": 15.25, "y": 5.5}
             ]
         }
     }