Fix boardsource/lulu RGB matrix (#18407)

* Fix ordering of entries for RGB matrix.

* Fix typos in RGB matrix definition.

These matrix indices overlapped.

* Improve positions in RGB matrix.

The rotary encoder and the key below that are in a new column.
The rotary encoder's height is inbetween rows.
The key below is kind of off-axis and thus hard to pin down to a
specific location.

The modifer keys in the bottom row are staggered compared to the other
columns.

1 files changed, 45 insertions, 45 deletions

diff --git a/keyboards/boardsource/lulu/info.json b/keyboards/boardsource/lulu/info.json
index 3418cd6e7a..8c3b03d1d2 100644
--- a/keyboards/boardsource/lulu/info.json
+++ b/keyboards/boardsource/lulu/info.json
@@ -36,70 +36,70 @@
       { "flags": 2, "x": 17, "y": 10 },
       { "flags": 2, "x": 51, "y": 10 },
       { "flags": 2, "x": 86, "y": 10 },
+      { "flags": 4, "matrix": [0, 5], "x": 86,  "y": 0 },
+      { "flags": 4, "matrix": [0, 4], "x": 68,  "y": 0 },
+      { "flags": 4, "matrix": [0, 3], "x": 51,  "y": 0 },
+      { "flags": 4, "matrix": [0, 2], "x": 34,  "y": 0 },
+      { "flags": 4, "matrix": [0, 1], "x": 17,  "y": 0 },
+      { "flags": 1, "matrix": [0, 0], "x": 0,  "y": 0 },
+      { "flags": 1, "matrix": [1, 0], "x": 0,  "y": 16 },
+      { "flags": 4, "matrix": [1, 1], "x": 17,  "y": 16 },
+      { "flags": 4, "matrix": [1, 2], "x": 34,  "y": 16 },
+      { "flags": 4, "matrix": [1, 3], "x": 51,  "y": 16 },
+      { "flags": 4, "matrix": [1, 4], "x": 68,  "y": 16 },
+      { "flags": 4, "matrix": [1, 5], "x": 86,  "y": 16 },
+      { "flags": 4, "matrix": [2, 5], "x": 86,  "y": 32 },
+      { "flags": 4, "matrix": [2, 4], "x": 68,  "y": 32 },
+      { "flags": 4, "matrix": [2, 3], "x": 51,  "y": 32 },
+      { "flags": 4, "matrix": [2, 2], "x": 34,  "y": 32 },
+      { "flags": 4, "matrix": [2, 1], "x": 17,  "y": 32 },
+      { "flags": 1, "matrix": [2, 0], "x": 0,  "y": 32 },
+      { "flags": 1, "matrix": [3, 0], "x": 0,  "y": 48 },
+      { "flags": 4, "matrix": [3, 1], "x": 17,  "y": 48 },
+      { "flags": 4, "matrix": [3, 2], "x": 34,  "y": 48 },
+      { "flags": 4, "matrix": [3, 3], "x": 51,  "y": 48 },
+      { "flags": 4, "matrix": [3, 4], "x": 68,  "y": 48 },
+      { "flags": 4, "matrix": [3, 5], "x": 86,  "y": 48 },
+      { "flags": 4, "matrix": [4, 5], "x": 103,  "y": 40 },
+      { "flags": 1, "matrix": [4, 4], "x": 96,  "y": 64 },
+      { "flags": 1, "matrix": [4, 3], "x": 77,  "y": 64 },
+      { "flags": 1, "matrix": [4, 2], "x": 60,  "y": 64 },
+      { "flags": 1, "matrix": [4, 1], "x": 43,  "y": 64 },
       { "flags": 2, "x": 137, "y": 55 },
       { "flags": 2, "x": 172, "y": 55 },
       { "flags": 2, "x": 206, "y": 40 },
       { "flags": 2, "x": 206, "y": 10 },
       { "flags": 2, "x": 172, "y": 10 },
       { "flags": 2, "x": 137, "y": 10 },
-      { "flags": 1, "matrix": [0, 0], "x": 0,  "y": 0 },
-      { "flags": 4, "matrix": [0, 1], "x": 17,  "y": 0 },
-      { "flags": 4, "matrix": [0, 2], "x": 34,  "y": 0 },
-      { "flags": 4, "matrix": [0, 3], "x": 51,  "y": 0 },
-      { "flags": 4, "matrix": [0, 4], "x": 68,  "y": 0 },
-      { "flags": 4, "matrix": [0, 5], "x": 86,  "y": 0 },
       { "flags": 4, "matrix": [5, 5], "x": 137,  "y": 0 },
       { "flags": 4, "matrix": [5, 4], "x": 155,  "y": 0 },
       { "flags": 4, "matrix": [5, 3], "x": 172,  "y": 0 },
       { "flags": 4, "matrix": [5, 2], "x": 189,  "y": 0 },
       { "flags": 4, "matrix": [5, 1], "x": 206,  "y": 0 },
       { "flags": 1, "matrix": [5, 0], "x": 224,  "y": 0 },
-      { "flags": 1, "matrix": [1, 0], "x": 0,  "y": 16 },
-      { "flags": 4, "matrix": [1, 1], "x": 17,  "y": 16 },
-      { "flags": 4, "matrix": [1, 2], "x": 34,  "y": 16 },
-      { "flags": 4, "matrix": [1, 3], "x": 51,  "y": 16 },
-      { "flags": 4, "matrix": [1, 4], "x": 68,  "y": 16 },
-      { "flags": 4, "matrix": [1, 5], "x": 86,  "y": 16 },
-      { "flags": 4, "matrix": [6, 5], "x": 137,  "y": 16 },
-      { "flags": 4, "matrix": [6, 4], "x": 155,  "y": 16 },
-      { "flags": 4, "matrix": [6, 3], "x": 172,  "y": 16 },
-      { "flags": 4, "matrix": [6, 2], "x": 189,  "y": 16 },
+      { "flags": 1, "matrix": [6, 0], "x": 224,  "y": 16 },
       { "flags": 4, "matrix": [6, 1], "x": 206,  "y": 16 },
-      { "flags": 1, "matrix": [6, 4], "x": 224,  "y": 16 },
-      { "flags": 1, "matrix": [2, 0], "x": 0,  "y": 32 },
-      { "flags": 4, "matrix": [2, 1], "x": 17,  "y": 32 },
-      { "flags": 4, "matrix": [2, 2], "x": 34,  "y": 32 },
-      { "flags": 4, "matrix": [2, 3], "x": 51,  "y": 32 },
-      { "flags": 4, "matrix": [2, 4], "x": 68,  "y": 32 },
-      { "flags": 4, "matrix": [2, 5], "x": 86,  "y": 32 },
+      { "flags": 4, "matrix": [6, 2], "x": 189,  "y": 16 },
+      { "flags": 4, "matrix": [6, 3], "x": 172,  "y": 16 },
+      { "flags": 4, "matrix": [6, 4], "x": 155,  "y": 16 },
+      { "flags": 4, "matrix": [6, 5], "x": 137,  "y": 16 },
       { "flags": 4, "matrix": [7, 5], "x": 137,  "y": 32 },
       { "flags": 4, "matrix": [7, 4], "x": 155,  "y": 32 },
       { "flags": 4, "matrix": [7, 3], "x": 172,  "y": 32 },
       { "flags": 4, "matrix": [7, 2], "x": 189,  "y": 32 },
       { "flags": 4, "matrix": [7, 1], "x": 206,  "y": 32 },
-      { "flags": 1, "matrix": [7, 4], "x": 224,  "y": 32 },
-      { "flags": 1, "matrix": [3, 0], "x": 0,  "y": 48 },
-      { "flags": 4, "matrix": [3, 1], "x": 17,  "y": 48 },
-      { "flags": 4, "matrix": [3, 2], "x": 34,  "y": 48 },
-      { "flags": 4, "matrix": [3, 3], "x": 51,  "y": 48 },
-      { "flags": 4, "matrix": [3, 4], "x": 68,  "y": 48 },
-      { "flags": 4, "matrix": [3, 5], "x": 86,  "y": 48 },
-      { "flags": 4, "matrix": [4, 5], "x": 103,  "y": 48 },
-      { "flags": 4, "matrix": [9, 5], "x": 120,  "y": 48 },
-      { "flags": 4, "matrix": [8, 5], "x": 137,  "y": 48 },
-      { "flags": 4, "matrix": [8, 4], "x": 155,  "y": 48 },
-      { "flags": 4, "matrix": [8, 3], "x": 172,  "y": 48 },
-      { "flags": 4, "matrix": [8, 2], "x": 189,  "y": 48 },
+      { "flags": 1, "matrix": [7, 0], "x": 224,  "y": 32 },
+      { "flags": 1, "matrix": [8, 0], "x": 224,  "y": 48 },
       { "flags": 4, "matrix": [8, 1], "x": 206,  "y": 48 },
-      { "flags": 1, "matrix": [8, 4], "x": 224,  "y": 48 },
-      { "flags": 1, "matrix": [4, 1], "x": 34,  "y": 64 },
-      { "flags": 1, "matrix": [4, 2], "x": 51,  "y": 64 },
-      { "flags": 1, "matrix": [4, 3], "x": 68,  "y": 64 },
-      { "flags": 1, "matrix": [4, 4], "x": 86,  "y": 64 },
-      { "flags": 1, "matrix": [9, 4], "x": 137,  "y": 64 },
-      { "flags": 1, "matrix": [9, 3], "x": 155,  "y": 64 },
-      { "flags": 1, "matrix": [9, 2], "x": 172,  "y": 64 },
-      { "flags": 1, "matrix": [9, 1], "x": 189,  "y": 64 }
+      { "flags": 4, "matrix": [8, 2], "x": 189,  "y": 48 },
+      { "flags": 4, "matrix": [8, 3], "x": 172,  "y": 48 },
+      { "flags": 4, "matrix": [8, 4], "x": 155,  "y": 48 },
+      { "flags": 4, "matrix": [8, 5], "x": 137,  "y": 48 },
+      { "flags": 4, "matrix": [9, 5], "x": 120,  "y": 40 },
+      { "flags": 1, "matrix": [9, 4], "x": 127,  "y": 64 },
+      { "flags": 1, "matrix": [9, 3], "x": 146,  "y": 64 },
+      { "flags": 1, "matrix": [9, 2], "x": 163,  "y": 64 },
+      { "flags": 1, "matrix": [9, 1], "x": 180,  "y": 64 }
     ]
   },
   "layouts": {