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

keyboards/zvecr/zv48/info.json

@@ -56,7 +56,7 @@
     "layouts": {
         "LAYOUT_ortho_4x12": {
             "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
+                {"matrix": [0, 0], "x": 0, "y": 0, "encoder": 0},
                 {"matrix": [0, 1], "x": 1, "y": 0},
                 {"matrix": [0, 2], "x": 2, "y": 0},
                 {"matrix": [0, 3], "x": 3, "y": 0},
@@ -67,7 +67,7 @@
                 {"matrix": [4, 3], "x": 8, "y": 0},
                 {"matrix": [4, 2], "x": 9, "y": 0},
                 {"matrix": [4, 1], "x": 10, "y": 0},
-                {"matrix": [4, 0], "x": 11, "y": 0},
+                {"matrix": [4, 0], "x": 11, "y": 0, "encoder": 1},
 
                 {"matrix": [1, 0], "x": 0, "y": 1},
                 {"matrix": [1, 1], "x": 1, "y": 1},

lib/python/qmk/info.py

@@ -58,8 +58,13 @@ def _get_key_left_position(key):
 def _find_invalid_encoder_index(info_data):
     """Perform additional validation of encoders
     """
-    enc_count = len(info_data.get('encoder', {}).get('rotary', []))
-    enc_count += len(info_data.get('split', {}).get('encoder', {}).get('right', {}).get('rotary', []))
+    enc_left = info_data.get('encoder', {}).get('rotary', [])
+    enc_right = []
+
+    if info_data.get('split', {}).get('enabled', False):
+        enc_right = info_data.get('split', {}).get('encoder', {}).get('right', {}).get('rotary', enc_left)
+
+    enc_count = len(enc_left) + len(enc_right)
 
     ret = []
     layouts = info_data.get('layouts', {})