From bdf68a36b2ae4296d4ad0ca21d6041e05d2d2293 Mon Sep 17 00:00:00 2001 From: Moritz Vieli Date: Sat, 10 Aug 2024 09:50:54 +0200 Subject: [PATCH 1/2] described matrix channelOrder in more detail --- docs/fixture-format.md | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/docs/fixture-format.md b/docs/fixture-format.md index a3c7bc8bc7..eb1698f0ab 100644 --- a/docs/fixture-format.md +++ b/docs/fixture-format.md @@ -299,7 +299,7 @@ Then, either use the resolved channel keys directly in a mode's channel list, or { "insert": "matrixChannels", // static value for matrix channels "repeatFor": "eachPixelXYZ", // see below - "channelOrder": "perPixel", // or "perChannel" + "channelOrder": "perPixel", // see below "templateChannels": [ "Red $pixelKey", "Green $pixelKey", @@ -319,6 +319,16 @@ Then, either use the resolved channel keys directly in a mode's channel list, or * `"eachPixelGroup"`: Gets computed into an array of all pixel group keys, ordered by appearance in the JSON file. - For the above [matrix structure](#matrix-structure) example, this results in `["Inner ring", "Middle ring", "Outer ring"]`. +`channelOrder` defines how the channels are ordered. Possible values are: + +* `"perPixel"`: For the above [matrix structure](#matrix-structure) example, this results in + - `["Red Inner ring", "Green Inner ring", "Blue Inner ring"]` + - `["Red Middle ring", "Green Middle ring", "Blue Middle ring"]` + - `["Red Outer ring", "Green Outer ring", "Blue Outer ring"]` +* `"perChannel"`: For the above [matrix structure](#matrix-structure) example, this results in + - `["Red Inner ring", " Red Middle ring", "Red Outer ring"]` + - `["Green Inner ring", "Green Middle ring", "Green Outer ring"]` + - `["Blue Inner ring", "Blue Middle ring", "Blue Outer ring"]` ### Wheels From b3dc4f6aef4b035ce86cf40af3398b9afc9b0757 Mon Sep 17 00:00:00 2001 From: "Moritz A. Vieli" Date: Tue, 20 Aug 2024 16:48:59 +0200 Subject: [PATCH 2/2] Update docs/fixture-format.md Co-authored-by: Ken Harris --- docs/fixture-format.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/fixture-format.md b/docs/fixture-format.md index eb1698f0ab..29fcd711cd 100644 --- a/docs/fixture-format.md +++ b/docs/fixture-format.md @@ -326,7 +326,7 @@ Then, either use the resolved channel keys directly in a mode's channel list, or - `["Red Middle ring", "Green Middle ring", "Blue Middle ring"]` - `["Red Outer ring", "Green Outer ring", "Blue Outer ring"]` * `"perChannel"`: For the above [matrix structure](#matrix-structure) example, this results in - - `["Red Inner ring", " Red Middle ring", "Red Outer ring"]` + - `["Red Inner ring", "Red Middle ring", "Red Outer ring"]` - `["Green Inner ring", "Green Middle ring", "Green Outer ring"]` - `["Blue Inner ring", "Blue Middle ring", "Blue Outer ring"]`