Resolve conflict merging master to develop (#18297)

* Discourage use of ENCODER_MAP at keyboard level (#18286)

* Discourage use of ENCODER_MAP at keyboard level

* Update docs/feature_encoders.md

Co-authored-by: Ryan <fauxpark@gmail.com>

Co-authored-by: Ryan <fauxpark@gmail.com>

* Fungo rev1: fix QMK Configurator key sequence (#18293)

* info.json: correct JSON syntax; friendly formatting

* info.json: fix key sequence

Co-authored-by: Joel Challis <git@zvecr.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
Co-authored-by: James Young <18669334+noroadsleft@users.noreply.github.com>

1 files changed, 77 insertions, 91 deletions

diff --git a/keyboards/fungo/rev1/info.json b/keyboards/fungo/rev1/info.json
index d34e95d578..6941d70d81 100644
--- a/keyboards/fungo/rev1/info.json
+++ b/keyboards/fungo/rev1/info.json
@@ -11,101 +11,87 @@
   "layouts": {
     "LAYOUT_fungo_split_num": {
       "layout": [
-                {"x": 0, "y": 0.375},
-                {"x": 1, "y": 0.375},
-                {"x": 2, "y": 0.125},
-                {"x": 3, "y": 0},
-                {"x": 4, "y": 0.125},
-                {"x": 5, "y": 0.25},
-                {"x": 6, "y": 0.5},
+        {"x":0, "y":0.375},
+        {"x":1, "y":0.375},
+        {"x":2, "y":0.125},
+        {"x":3, "y":0},
+        {"x":4, "y":0.125},
+        {"x":5, "y":0.25},
+        {"x":6, "y":0.5},
+        {"x":12, "y":0.5},
+        {"x":13, "y":0.25},
+        {"x":14, "y":0.125},
+        {"x":15, "y":0},
+        {"x":16, "y":0.125},
+        {"x":17, "y":0.375},
+        {"x":18, "y":0.375},
 
-                {"x": 12, "y": 0.5},
-                {"x": 13, "y": 0.25},
-                {"x": 14, "y": 0.125},
-                {"x": 15, "y": 0},
-                {"x": 16, "y": 0.125},
-                {"x": 17, "y": 0.375},
-                {"x": 18, "y": 0.375},
-				
+        {"x":0, "y":1.375},
+        {"x":1, "y":1.375},
+        {"x":2, "y":1.125},
+        {"x":3, "y":1},
+        {"x":4, "y":1.125},
+        {"x":5, "y":1.25},
+        {"x":6, "y":1.5},
+        {"x":12, "y":1.5},
+        {"x":13, "y":1.25},
+        {"x":14, "y":1.125},
+        {"x":15, "y":1},
+        {"x":16, "y":1.125},
+        {"x":17, "y":1.375},
+        {"x":18, "y":1.375},
 
-                {"x": 0, "y": 1.375},
-                {"x": 1, "y": 1.375},
-                {"x": 2, "y": 1.125},
-                {"x": 3, "y": 1},
-                {"x": 4, "y": 1.125},
-                {"x": 5, "y": 1.25},
-                {"x": 6, "y": 1.5},
+        {"x":0, "y":2.375},
+        {"x":1, "y":2.375},
+        {"x":2, "y":2.125},
+        {"x":3, "y":2},
+        {"x":4, "y":2.125},
+        {"x":5, "y":2.25},
+        {"x":6, "y":2.5},
+        {"x":12, "y":2.5},
+        {"x":13, "y":2.25},
+        {"x":14, "y":2.125},
+        {"x":15, "y":2},
+        {"x":16, "y":2.125},
+        {"x":17, "y":2.375},
+        {"x":18, "y":2.375},
 
-                {"x": 12, "y": 1.5},
-                {"x": 13, "y": 1.25},
-                {"x": 14, "y": 1.125},
-                {"x": 15, "y": 1},
-                {"x": 16, "y": 1.125},
-                {"x": 17, "y": 1.375},
-                {"x": 18, "y": 1.375},
-				
-		{"x": 0, "y": 2.375},
-                {"x": 1, "y": 2.375},
-                {"x": 2, "y": 2.125},
-                {"x": 3, "y": 2},
-                {"x": 4, "y": 2.125},
-                {"x": 5, "y": 2.25},
-                {"x": 6, "y": 2.5},
+        {"x":0, "y":3.375},
+        {"x":1, "y":3.375},
+        {"x":2, "y":3.125},
+        {"x":3, "y":3},
+        {"x":4, "y":3.125},
+        {"x":5, "y":3.25},
+        {"x":6, "y":3.5},
+        {"x":7, "y":4},
+        {"x":8.25, "y":3.75},
+        {"x":9.75, "y":3.75},
+        {"x":11, "y":4},
+        {"x":12, "y":3.5},
+        {"x":13, "y":3.25},
+        {"x":14, "y":3.125},
+        {"x":15, "y":3},
+        {"x":16, "y":3.125},
+        {"x":17, "y":3.375},
+        {"x":18, "y":3.375},
 
-                {"x": 12, "y": 2.5},
-                {"x": 13, "y": 2.25},
-                {"x": 14, "y": 2.125},
-                {"x": 15, "y": 2},
-                {"x": 16, "y": 2.125},
-                {"x": 17, "y": 2.375},
-                {"x": 18, "y": 2.375},
-				
-		{"x": 0, "y": 3.375},
-                {"x": 1, "y": 3.375},
-                {"x": 2, "y": 3.125},
-                {"x": 3, "y": 3},
-                {"x": 4, "y": 3.125},
-                {"x": 5, "y": 3.25},
-                {"x": 6, "y": 3.5},
-
-                {"x": 12, "y": 3.5},
-                {"x": 13, "y": 3.25},
-                {"x": 14, "y": 3.125},
-                {"x": 15, "y": 3},
-                {"x": 16, "y": 3.125},
-                {"x": 17, "y": 3.375},
-                {"x": 18, "y": 3.375},
-				
-		{"x": 0, "y": 4.375},
-                {"x": 1, "y": 4.375},
-                {"x": 2, "y": 4.25},
-                {"x": 3, "y": 4.25},
-                {"x": 5.25, "y": 3},
-		{"x": 5.75, "y": 5},
-		{"x": 7, "y": 4},
-					
-                {"x": 11, "y": 4},	
-                {"x": 13.25, "y": 5},	
-		{"x": 13.75, "y": 3},
-                {"x": 15, "y": 4.25},		
-                {"x": 16, "y": 4.25},				
-                {"x": 17, "y": 4.375},
-                {"x": 18, "y": 4.375},
-
-
-                {"x": 7, "y": 5},
-		{"x": 8.25, "y": 3.75},
-		{"x": 8.25, "y": 4.75},
-
-		{"x": 9.75, "y": 4.75},
-		{"x": 9.75, "y": 3.75},
-		{"x": 11, "y": 5},
-
-				
-				
-    
-                
-            ]
+        {"x":0, "y":4.375},
+        {"x":1, "y":4.375},
+        {"x":2, "y":4.25},
+        {"x":3, "y":4.25},
+        {"x":4.333, "y":4.25},
+        {"x":5.667, "y":4.625},
+        {"x":7, "y":5},
+        {"x":8.25, "y":4.75},
+        {"x":9.75, "y":4.75},
+        {"x":11, "y":5},
+        {"x":12.333, "y":4.625},
+        {"x":13.667, "y":4.25},
+        {"x":15, "y":4.25},
+        {"x":16, "y":4.25},
+        {"x":17, "y":4.375},
+        {"x":18, "y":4.375}
+      ]
     }
   }
 }