Add k7_pro and k10_pro; Update VIA json to match backlit effect list and fix k6_pro iso layout; Fix rtc issue

4 files changed, 205 insertions, 13 deletions

diff --git a/keyboards/keychron/k6_pro/via_json/k6_pro_ansi_rgb.json b/keyboards/keychron/k6_pro/via_json/k6_pro_ansi_rgb.json
index 2381b27b11..39f1933b08 100644
--- a/keyboards/keychron/k6_pro/via_json/k6_pro_ansi_rgb.json
+++ b/keyboards/keychron/k6_pro/via_json/k6_pro_ansi_rgb.json
@@ -3,7 +3,67 @@
   "vendorId": "0x3434",
   "productId": "0x0260",
   "keycodes": ["qmk_lighting"],
-  "menus": ["qmk_rgb_matrix"],
+  "menus": [
+    {
+      "label": "Lighting",
+      "content": [
+        {
+          "label": "Backlight",
+          "content": [
+            {
+              "label": "Brightness",
+              "type": "range",
+              "options": [0, 255],
+              "content": ["id_qmk_rgb_matrix_brightness", 3, 1]
+            },
+            {
+              "label": "Effect",
+              "type": "dropdown",
+              "content": ["id_qmk_rgb_matrix_effect", 3, 2],
+              "options": [
+                ["None", 0],
+                ["Solid Color", 1],
+                ["Breathing", 2],
+                ["Band Spiral Val", 3],
+                ["Cycle All", 4],
+                ["Cycle Left Right", 5],
+                ["Cycle Up Down", 6],
+                ["Rainbow Moving Chevron", 7],
+                ["Cycle Out In", 8],
+                ["Cycle Out In Dual", 9],
+                ["Cycle Pinwheel", 10],
+                ["Cycle Spiral", 11],
+                ["Dual Beacon", 12],
+                ["Rainbow Beacon", 13],
+                ["Jellybean Raindrops", 14],
+                ["Pixel Rain", 15],
+                ["Typing Heatmap", 16],
+                ["Digital Rain", 17],
+                ["Reactive Simple", 18],
+                ["Reactive Multiwide", 19],
+                ["Reactive Multinexus", 20],
+                ["Splash", 21],
+                ["Solid Splash", 22]
+              ]
+            },
+            {
+              "showIf": "{id_qmk_rgb_matrix_effect} > 1",
+              "label": "Effect Speed",
+              "type": "range",
+              "options": [0, 255],
+              "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3]
+            },
+            {
+              "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ",
+              "label": "Color",
+              "type": "color",
+              "content": ["id_qmk_rgb_matrix_color", 3, 4]
+            }
+          ]
+        }
+      ]
+    }
+  ],
   "customKeycodes": [
     {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"},
     {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"},
diff --git a/keyboards/keychron/k6_pro/via_json/k6_pro_iso_rgb.json b/keyboards/keychron/k6_pro/via_json/k6_pro_iso_rgb.json
index ddce48dce3..47519ca522 100644
--- a/keyboards/keychron/k6_pro/via_json/k6_pro_iso_rgb.json
+++ b/keyboards/keychron/k6_pro/via_json/k6_pro_iso_rgb.json
@@ -3,7 +3,67 @@
   "vendorId": "0x3434",
   "productId": "0x0261",
   "keycodes": ["qmk_lighting"],
-  "menus": ["qmk_rgb_matrix"],
+  "menus": [
+    {
+      "label": "Lighting",
+      "content": [
+        {
+          "label": "Backlight",
+          "content": [
+            {
+              "label": "Brightness",
+              "type": "range",
+              "options": [0, 255],
+              "content": ["id_qmk_rgb_matrix_brightness", 3, 1]
+            },
+            {
+              "label": "Effect",
+              "type": "dropdown",
+              "content": ["id_qmk_rgb_matrix_effect", 3, 2],
+              "options": [
+                ["None", 0],
+                ["Solid Color", 1],
+                ["Breathing", 2],
+                ["Band Spiral Val", 3],
+                ["Cycle All", 4],
+                ["Cycle Left Right", 5],
+                ["Cycle Up Down", 6],
+                ["Rainbow Moving Chevron", 7],
+                ["Cycle Out In", 8],
+                ["Cycle Out In Dual", 9],
+                ["Cycle Pinwheel", 10],
+                ["Cycle Spiral", 11],
+                ["Dual Beacon", 12],
+                ["Rainbow Beacon", 13],
+                ["Jellybean Raindrops", 14],
+                ["Pixel Rain", 15],
+                ["Typing Heatmap", 16],
+                ["Digital Rain", 17],
+                ["Reactive Simple", 18],
+                ["Reactive Multiwide", 19],
+                ["Reactive Multinexus", 20],
+                ["Splash", 21],
+                ["Solid Splash", 22]
+              ]
+            },
+            {
+              "showIf": "{id_qmk_rgb_matrix_effect} > 1",
+              "label": "Effect Speed",
+              "type": "range",
+              "options": [0, 255],
+              "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3]
+            },
+            {
+              "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ",
+              "label": "Color",
+              "type": "color",
+              "content": ["id_qmk_rgb_matrix_color", 3, 4]
+            }
+          ]
+        }
+      ]
+    }
+  ],
   "customKeycodes": [
     {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"},
     {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"},
@@ -75,9 +135,18 @@
       "1,11",
       "1,12",
       {
-        "w":1.50
+        "x": 0.25,
+        "c": "#777777",
+        "w": 1.25,
+        "h": 2,
+        "w2": 1.5,
+        "h2": 1,
+        "x2": -0.25
       },
       "1,13",
+      {
+        "c": "#cccccc"
+      },
       "1,14"
     ],
     [
@@ -100,12 +169,9 @@
       "2,9",
       "2,10",
       "2,11",
-      {
-        "w":2.25,
-        "c": "#777777"
-      },
       "2,13",
       {
+        "x": 1.25,
         "c": "#cccccc"
       },
       "2,14"
diff --git a/keyboards/keychron/k6_pro/via_json/k6_pro_iso_white.json b/keyboards/keychron/k6_pro/via_json/k6_pro_iso_white.json
index aeff2195bb..c2bffbad7c 100644
--- a/keyboards/keychron/k6_pro/via_json/k6_pro_iso_white.json
+++ b/keyboards/keychron/k6_pro/via_json/k6_pro_iso_white.json
@@ -74,9 +74,18 @@
       "1,11",
       "1,12",
       {
-        "w":1.50
+        "x": 0.25,
+        "c": "#777777",
+        "w": 1.25,
+        "h": 2,
+        "w2": 1.5,
+        "h2": 1,
+        "x2": -0.25
       },
       "1,13",
+      {
+        "c": "#cccccc"
+      },
       "1,14"
     ],
     [
@@ -99,12 +108,9 @@
       "2,9",
       "2,10",
       "2,11",
-      {
-        "w":2.25,
-        "c": "#777777"
-      },
       "2,13",
       {
+        "x": 1.25,
         "c": "#cccccc"
       },
       "2,14"
diff --git a/keyboards/keychron/k6_pro/via_json/k6_pro_jis_rgb.json b/keyboards/keychron/k6_pro/via_json/k6_pro_jis_rgb.json
index 4cb47705e5..93b943d022 100644
--- a/keyboards/keychron/k6_pro/via_json/k6_pro_jis_rgb.json
+++ b/keyboards/keychron/k6_pro/via_json/k6_pro_jis_rgb.json
@@ -3,7 +3,67 @@
   "vendorId": "0x3434",
   "productId": "0x0262",
   "keycodes": ["qmk_lighting"],
-  "menus": ["qmk_rgb_matrix"],
+  "menus": [
+    {
+      "label": "Lighting",
+      "content": [
+        {
+          "label": "Backlight",
+          "content": [
+            {
+              "label": "Brightness",
+              "type": "range",
+              "options": [0, 255],
+              "content": ["id_qmk_rgb_matrix_brightness", 3, 1]
+            },
+            {
+              "label": "Effect",
+              "type": "dropdown",
+              "content": ["id_qmk_rgb_matrix_effect", 3, 2],
+              "options": [
+                ["None", 0],
+                ["Solid Color", 1],
+                ["Breathing", 2],
+                ["Band Spiral Val", 3],
+                ["Cycle All", 4],
+                ["Cycle Left Right", 5],
+                ["Cycle Up Down", 6],
+                ["Rainbow Moving Chevron", 7],
+                ["Cycle Out In", 8],
+                ["Cycle Out In Dual", 9],
+                ["Cycle Pinwheel", 10],
+                ["Cycle Spiral", 11],
+                ["Dual Beacon", 12],
+                ["Rainbow Beacon", 13],
+                ["Jellybean Raindrops", 14],
+                ["Pixel Rain", 15],
+                ["Typing Heatmap", 16],
+                ["Digital Rain", 17],
+                ["Reactive Simple", 18],
+                ["Reactive Multiwide", 19],
+                ["Reactive Multinexus", 20],
+                ["Splash", 21],
+                ["Solid Splash", 22]
+              ]
+            },
+            {
+              "showIf": "{id_qmk_rgb_matrix_effect} > 1",
+              "label": "Effect Speed",
+              "type": "range",
+              "options": [0, 255],
+              "content": ["id_qmk_rgb_matrix_effect_speed", 3, 3]
+            },
+            {
+              "showIf": "{id_qmk_rgb_matrix_effect} != 0 && ( {id_qmk_rgb_matrix_effect} < 4 || {id_qmk_rgb_matrix_effect} == 18 || ({id_qmk_rgb_matrix_effect} > 17 && {id_qmk_rgb_matrix_effect} != 21) ) ",
+              "label": "Color",
+              "type": "color",
+              "content": ["id_qmk_rgb_matrix_color", 3, 4]
+            }
+          ]
+        }
+      ]
+    }
+  ],
   "customKeycodes": [
     {"name": "Left Option", "title": "Left Option", "shortName": "LOpt"},
     {"name": "Right Option", "title": "Right Option", "shortName": "ROpt"},