From e09fbcfa03fa1786d67fe5ad2537c92fcc129d72 Mon Sep 17 00:00:00 2001 From: ARBjork Date: Sat, 24 Feb 2024 14:17:06 -0600 Subject: [PATCH 1/6] Update match-scouting.json --- config/match-scouting.json | 204 ++++++++++++++++++++++++++++++++++--- 1 file changed, 191 insertions(+), 13 deletions(-) diff --git a/config/match-scouting.json b/config/match-scouting.json index 1650a055..277c9c2a 100644 --- a/config/match-scouting.json +++ b/config/match-scouting.json @@ -54,7 +54,15 @@ ], "class": "silver timer", "type": "match-control", - "executables": [] + "executables": [ + { + "type": "layer", + "args": [ + 1, + 2 + ] + } + ] }, { "id": "broken", @@ -67,7 +75,15 @@ ], "class": "red", "type": "action", - "executables": [] + "executables": [ + { + "type": "layer", + "args": [ + 1, + 2 + ] + } + ] }, { "id": "aStop", @@ -80,7 +96,15 @@ ], "class": "red", "type": "action", - "executables": [] + "executables": [ + { + "type": "layer", + "args": [ + 1, + 2 + ] + } + ] }, { "id": "undo", @@ -93,6 +117,160 @@ ], "class": "pink", "type": "undo", + "executables": [ + { + "type": "layer", + "args": [ + 1, + 2 + ] + } + ] + }, + { + "id": "groundPickup", + "displayText": "Ground", + "gridArea": [ + "3", + "8", + "4", + "10" + ], + "class": "orange", + "type": "action", + "executables": [ + { + "type": "layer", + "args": [ + 1, + 2 + ] + } + ] + }, + { + "id": "leave", + "displayText": "Leave", + "gridArea": [ + "3", + "4", + "4", + "7" + ], + "class": "gray", + "type": "action", + "executables": [ + { + "type": "layer", + "args": [ + 1, + 2 + ] + } + ] + }, + { + "id": "scoreAmp", + "displayText": "Score Amp", + "gridArea": [ + "6", + "1", + "7", + "3" + ], + "class": "green", + "type": "action", + "executables": [ + { + "type": "layer", + "args": [ + 1, + 2 + ] + } + ] + }, + { + "id": "scoreSpeaker", + "displayText": "Speaker", + "gridArea": [ + "6", + "8", + "7", + "10" + ], + "class": "green", + "type": "action", + "executables": [ + { + "type": "layer", + "args": [ + 1, + 2 + ] + } + ] + }, + { + "id": "miss", + "displayText": "Miss", + "gridArea": [ + "5", + "8", + "6", + "10" + ], + "class": "red", + "type": "action", + "executables": [ + { + "type": "layer", + "args": [ + 1, + 2 + ] + } + ] + } + ], + [ + { + "id": "startGame", + "displayText": "Start", + "gridArea": [ + "1", + "4", + "2", + "7" + ], + "class": "silver timer", + "type": "match-control", + "executables": [] + }, + { + "id": "broken", + "displayText": "Disabled", + "gridArea": [ + "1", + "1", + "2", + "3" + ], + "class": "red", + "type": "action", + "executables": [] + }, + { + "id": "aStop", + "displayText": "A-Stop", + "gridArea": [ + "2", + "1", + "3", + "3" + ], + "class": "red", + "type": "action", "executables": [] }, { @@ -242,8 +420,8 @@ { "type": "layer", "args": [ - 2, - 4 + 3, + 5 ] } ] @@ -276,8 +454,8 @@ { "type": "layer", "args": [ - 2, - 3 + 3, + 4 ] } ] @@ -390,8 +568,8 @@ { "type": "layer", "args": [ - 2, - 4 + 4, + 5 ] } ] @@ -424,8 +602,8 @@ { "type": "layer", "args": [ - 3, - 2 + 4, + 3 ] } ] @@ -577,8 +755,8 @@ { "type": "layer", "args": [ - 4, - 2 + 5, + 3 ] } ] From e36de8dd10dd86548d3feb1fa3bf0d06f650d1ea Mon Sep 17 00:00:00 2001 From: Jinan Parves Date: Wed, 28 Feb 2024 16:49:45 -0600 Subject: [PATCH 2/6] Update match-scouting.json --- config/match-scouting.json | 250 ++++++------------------------------- 1 file changed, 36 insertions(+), 214 deletions(-) diff --git a/config/match-scouting.json b/config/match-scouting.json index 277c9c2a..3c744a22 100644 --- a/config/match-scouting.json +++ b/config/match-scouting.json @@ -54,15 +54,7 @@ ], "class": "silver timer", "type": "match-control", - "executables": [ - { - "type": "layer", - "args": [ - 1, - 2 - ] - } - ] + "executables": [] }, { "id": "broken", @@ -75,15 +67,7 @@ ], "class": "red", "type": "action", - "executables": [ - { - "type": "layer", - "args": [ - 1, - 2 - ] - } - ] + "executables": [] }, { "id": "aStop", @@ -96,15 +80,7 @@ ], "class": "red", "type": "action", - "executables": [ - { - "type": "layer", - "args": [ - 1, - 2 - ] - } - ] + "executables": [] }, { "id": "undo", @@ -117,15 +93,7 @@ ], "class": "pink", "type": "undo", - "executables": [ - { - "type": "layer", - "args": [ - 1, - 2 - ] - } - ] + "executables": [] }, { "id": "groundPickup", @@ -138,163 +106,17 @@ ], "class": "orange", "type": "action", - "executables": [ - { - "type": "layer", - "args": [ - 1, - 2 - ] - } - ] + "executables": [] }, { "id": "leave", "displayText": "Leave", - "gridArea": [ - "3", - "4", - "4", - "7" - ], - "class": "gray", - "type": "action", - "executables": [ - { - "type": "layer", - "args": [ - 1, - 2 - ] - } - ] - }, - { - "id": "scoreAmp", - "displayText": "Score Amp", - "gridArea": [ - "6", - "1", - "7", - "3" - ], - "class": "green", - "type": "action", - "executables": [ - { - "type": "layer", - "args": [ - 1, - 2 - ] - } - ] - }, - { - "id": "scoreSpeaker", - "displayText": "Speaker", "gridArea": [ "6", "8", "7", "10" ], - "class": "green", - "type": "action", - "executables": [ - { - "type": "layer", - "args": [ - 1, - 2 - ] - } - ] - }, - { - "id": "miss", - "displayText": "Miss", - "gridArea": [ - "5", - "8", - "6", - "10" - ], - "class": "red", - "type": "action", - "executables": [ - { - "type": "layer", - "args": [ - 1, - 2 - ] - } - ] - } - ], - [ - { - "id": "startGame", - "displayText": "Start", - "gridArea": [ - "1", - "4", - "2", - "7" - ], - "class": "silver timer", - "type": "match-control", - "executables": [] - }, - { - "id": "broken", - "displayText": "Disabled", - "gridArea": [ - "1", - "1", - "2", - "3" - ], - "class": "red", - "type": "action", - "executables": [] - }, - { - "id": "aStop", - "displayText": "A-Stop", - "gridArea": [ - "2", - "1", - "3", - "3" - ], - "class": "red", - "type": "action", - "executables": [] - }, - { - "id": "groundPickup", - "displayText": "Ground", - "gridArea": [ - "3", - "8", - "4", - "10" - ], - "class": "orange", - "type": "action", - "executables": [] - }, - { - "id": "leave", - "displayText": "Leave", - "gridArea": [ - "3", - "4", - "4", - "7" - ], "class": "gray", "type": "action", "executables": [] @@ -316,12 +138,12 @@ "id": "scoreSpeaker", "displayText": "Speaker", "gridArea": [ - "6", - "8", - "7", - "10" + "3", + "4", + "4", + "7" ], - "class": "green", + "class": "gray", "type": "action", "executables": [] }, @@ -409,10 +231,10 @@ "id": "park", "displayText": "Park", "gridArea": [ - "3", - "4", - "4", - "7" + "6", + "8", + "7", + "10" ], "class": "gray", "type": "action", @@ -420,8 +242,8 @@ { "type": "layer", "args": [ - 3, - 5 + 2, + 4 ] } ] @@ -454,8 +276,8 @@ { "type": "layer", "args": [ - 3, - 4 + 2, + 3 ] } ] @@ -464,10 +286,10 @@ "id": "scoreSpeaker", "displayText": "Speaker", "gridArea": [ - "6", - "8", - "7", - "10" + "3", + "4", + "4", + "7" ], "class": "gray", "type": "action", @@ -557,10 +379,10 @@ "id": "park", "displayText": "Park", "gridArea": [ - "3", - "4", - "4", - "7" + "6", + "8", + "7", + "10" ], "class": "gray", "type": "action", @@ -568,8 +390,8 @@ { "type": "layer", "args": [ - 4, - 5 + 3, + 4 ] } ] @@ -602,8 +424,8 @@ { "type": "layer", "args": [ - 4, - 3 + 3, + 2 ] } ] @@ -612,10 +434,10 @@ "id": "scoreAmpedSpeaker", "displayText": "Speaker", "gridArea": [ - "6", - "8", - "7", - "10" + "3", + "4", + "4", + "7" ], "class": "green", "type": "action", @@ -755,8 +577,8 @@ { "type": "layer", "args": [ - 5, - 3 + 4, + 2 ] } ] From 7bbaf4d3c9deb155a6ca7dfab920de3ff95800ae Mon Sep 17 00:00:00 2001 From: Jinan Parves Date: Wed, 28 Feb 2024 17:07:46 -0600 Subject: [PATCH 3/6] Added 4 speaker buttons Updated to add the subwoofer, wing, podium and midfield buttons --- config/match-scouting.json | 125 ++++++++++++++++++++++++++++++++++++- 1 file changed, 122 insertions(+), 3 deletions(-) diff --git a/config/match-scouting.json b/config/match-scouting.json index 3c744a22..6442b7a3 100644 --- a/config/match-scouting.json +++ b/config/match-scouting.json @@ -136,7 +136,7 @@ }, { "id": "scoreSpeaker", - "displayText": "Speaker", + "displayText": "Subwoofer", "gridArea": [ "3", "4", @@ -147,6 +147,45 @@ "type": "action", "executables": [] }, + { + "id": "scoreSpeaker", + "displayText": "Podium", + "gridArea": [ + "4", + "4", + "5", + "7" + ], + "class": "gray", + "type": "action", + "executables": [] + }, + { + "id": "scoreSpeaker", + "displayText": "Wing", + "gridArea": [ + "5", + "4", + "6", + "7" + ], + "class": "gray", + "type": "action", + "executables": [] + }, + { + "id": "scoreSpeaker", + "displayText": "Midfield", + "gridArea": [ + "6", + "4", + "7", + "7" + ], + "class": "gray", + "type": "action", + "executables": [] + }, { "id": "miss", "displayText": "Miss", @@ -284,7 +323,7 @@ }, { "id": "scoreSpeaker", - "displayText": "Speaker", + "displayText": "Subwoofer", "gridArea": [ "3", "4", @@ -295,6 +334,47 @@ "type": "action", "executables": [] }, + { + "id": "scoreSpeaker", + "displayText": "Podium", + "gridArea": [ + "4", + "4", + "5", + "7" + ], + "class": "gray", + "type": "action", + "executables": [] + }, + { + "id": "scoreSpeaker", + "displayText": "Wing", + "gridArea": [ + "5", + "4", + "6", + "7" + ], + "class": "gray", + "type": "action", + "executables": [] + }, + { + "id": "scoreSpeaker", + "displayText": "Midfield", + "gridArea": [ + "6", + "4", + "7", + "7" + ], + "class": "gray", + "type": "action", + "executables": [] + }, + + { "id": "miss", "displayText": "Miss", @@ -432,7 +512,7 @@ }, { "id": "scoreAmpedSpeaker", - "displayText": "Speaker", + "displayText": "Subwoofer", "gridArea": [ "3", "4", @@ -443,6 +523,45 @@ "type": "action", "executables": [] }, + { + "id": "scoreAmpedSpeaker", + "displayText": "Podium", + "gridArea": [ + "4", + "4", + "5", + "7" + ], + "class": "green", + "type": "action", + "executables": [] + }, + { + "id": "scoreAmpedSpeaker", + "displayText": "Wing", + "gridArea": [ + "5", + "4", + "6", + "7" + ], + "class": "green", + "type": "action", + "executables": [] + }, + { + "id": "scoreAmpedSpeaker", + "displayText": "Midfield", + "gridArea": [ + "6", + "4", + "7", + "7" + ], + "class": "green", + "type": "action", + "executables": [] + }, { "id": "miss", "displayText": "Miss", From e2f2759edce7a81de6dd736ffb1e1fd5cd04e5ad Mon Sep 17 00:00:00 2001 From: Jinan Parves Date: Wed, 28 Feb 2024 17:35:35 -0600 Subject: [PATCH 4/6] updated positioning of buttons switched wing and podium --- config/match-scouting.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/match-scouting.json b/config/match-scouting.json index 6442b7a3..fff39ff7 100644 --- a/config/match-scouting.json +++ b/config/match-scouting.json @@ -149,7 +149,7 @@ }, { "id": "scoreSpeaker", - "displayText": "Podium", + "displayText": "Wing", "gridArea": [ "4", "4", @@ -162,7 +162,7 @@ }, { "id": "scoreSpeaker", - "displayText": "Wing", + "displayText": "Podium", "gridArea": [ "5", "4", @@ -336,7 +336,7 @@ }, { "id": "scoreSpeaker", - "displayText": "Podium", + "displayText": "Wing", "gridArea": [ "4", "4", @@ -349,7 +349,7 @@ }, { "id": "scoreSpeaker", - "displayText": "Wing", + "displayText": "Podium", "gridArea": [ "5", "4", @@ -525,7 +525,7 @@ }, { "id": "scoreAmpedSpeaker", - "displayText": "Podium", + "displayText": "Wing", "gridArea": [ "4", "4", @@ -538,7 +538,7 @@ }, { "id": "scoreAmpedSpeaker", - "displayText": "Wing", + "displayText": "Podium", "gridArea": [ "5", "4", From a103fc075945ae96655fb3fafcb63ac88d5554b8 Mon Sep 17 00:00:00 2001 From: Jinan Parves Date: Wed, 28 Feb 2024 18:51:29 -0600 Subject: [PATCH 5/6] changed auto time start from 131 to 135 seconds --- config/match-scouting.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/match-scouting.json b/config/match-scouting.json index fff39ff7..59634c93 100644 --- a/config/match-scouting.json +++ b/config/match-scouting.json @@ -7,7 +7,7 @@ "displayText": "Auto", "variables": {} }, - "131000": { + "135000": { "layer": 2, "displayText": "Teleop", "variables": {} From e2875f1c23a2e4cadd4d6daa6a344e786ded0e5c Mon Sep 17 00:00:00 2001 From: faiz muhammad Date: Thu, 29 Feb 2024 16:36:48 -0600 Subject: [PATCH 6/6] added shot location pie chart --- config/analysis-modules.json | 26 ++++++++++++++++++++++++++ config/analysis-pipeline.json | 28 +++++++++++++++++++++++++--- config/match-scouting.json | 16 ++++++++-------- 3 files changed, 59 insertions(+), 11 deletions(-) diff --git a/config/analysis-modules.json b/config/analysis-modules.json index 9903fae6..ba5b0ea5 100644 --- a/config/analysis-modules.json +++ b/config/analysis-modules.json @@ -155,6 +155,32 @@ ] } }, + { + "view": "team", + "module": "Pie", + "position": "main", + "name": "Shot Location Distribution", + "options": { + "slices": [ + { + "name": "Subwoofer", + "path": "counts.scoreSubwoofer" + }, + { + "name": "Wing", + "path": "counts.scoreWing" + }, + { + "name": "Podium", + "path": "counts.scorePodium" + }, + { + "name": "Midfield", + "path": "counts.scoreMidfield" + } + ] + } + }, { "view": "team", "module": "Bar", diff --git a/config/analysis-pipeline.json b/config/analysis-pipeline.json index 38a6444f..d002ffb8 100644 --- a/config/analysis-pipeline.json +++ b/config/analysis-pipeline.json @@ -1,4 +1,17 @@ [ + { + "type": "team", + "name": "sum", + "outputPath": "counts.scoreSpeaker", + "options": { + "addends": [ + "counts.scoreSubwoofer", + "counts.scoreWing", + "counts.scorePodium", + "counts.scoreMidfield" + ] + } + }, { "type": "tmp", "name": "countActions", @@ -61,7 +74,10 @@ ], "scores": [ "scoreAmp", - "scoreSpeaker", + "scoreSubwoofer", + "scoreWing", + "scorePodium", + "scoreMidfield", "scoreAmpedSpeaker" ], "misses": [ @@ -221,7 +237,10 @@ "weightedPaths": { "countsAuto.leave": 2, "countsAuto.scoreAmp": 2, - "countsAuto.scoreSpeaker": 5 + "countsAuto.scoreSubwoofer": 5, + "countsAuto.scoreWing": 5, + "countsAuto.scorePodium": 5, + "countsAuto.scoreMidfield": 5 } } }, @@ -232,7 +251,10 @@ "options": { "weightedPaths": { "countsTeleop.scoreAmp": 1, - "countsTeleop.scoreSpeaker": 2, + "countsTeleop.scoreSubwoofer": 2, + "countsTeleop.scoreWing": 2, + "countsTeleop.scorePodium": 2, + "countsTeleop.scoreMidfield": 2, "countsTeleop.scoreAmpedSpeaker": 5 } } diff --git a/config/match-scouting.json b/config/match-scouting.json index 59634c93..ca763ca8 100644 --- a/config/match-scouting.json +++ b/config/match-scouting.json @@ -135,7 +135,7 @@ "executables": [] }, { - "id": "scoreSpeaker", + "id": "scoreSubwoofer", "displayText": "Subwoofer", "gridArea": [ "3", @@ -148,7 +148,7 @@ "executables": [] }, { - "id": "scoreSpeaker", + "id": "scoreWing", "displayText": "Wing", "gridArea": [ "4", @@ -161,7 +161,7 @@ "executables": [] }, { - "id": "scoreSpeaker", + "id": "scorePodium", "displayText": "Podium", "gridArea": [ "5", @@ -174,7 +174,7 @@ "executables": [] }, { - "id": "scoreSpeaker", + "id": "scoreMidfield", "displayText": "Midfield", "gridArea": [ "6", @@ -322,7 +322,7 @@ ] }, { - "id": "scoreSpeaker", + "id": "scoreSubwoofer", "displayText": "Subwoofer", "gridArea": [ "3", @@ -335,7 +335,7 @@ "executables": [] }, { - "id": "scoreSpeaker", + "id": "scoreWing", "displayText": "Wing", "gridArea": [ "4", @@ -348,7 +348,7 @@ "executables": [] }, { - "id": "scoreSpeaker", + "id": "scorePodium", "displayText": "Podium", "gridArea": [ "5", @@ -361,7 +361,7 @@ "executables": [] }, { - "id": "scoreSpeaker", + "id": "scoreMidfield", "displayText": "Midfield", "gridArea": [ "6",