Skip to content

Commit

Permalink
Merge pull request #101 from HuskieRobotics/speaker-inputs
Browse files Browse the repository at this point in the history 
added speaker locations and changed auto timing (131 s -> 135 s)
  • Loading branch information
@faizmuhammad12
faizmuhammad12 authored Mar 4, 2024
2 parents 96d9625 + e2875f1 commit 803bc9f
Show file tree
Hide file tree
Showing 3 changed files with 196 additions and 29 deletions.
26 changes: 26 additions & 0 deletions config/analysis-modules.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
28 changes: 25 additions & 3 deletions config/analysis-pipeline.json
View file
Original file line number Diff line number Diff line change
@@ -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",
Expand Down Expand Up @@ -61,7 +74,10 @@
],
"scores": [
"scoreAmp",
"scoreSpeaker",
"scoreSubwoofer",
"scoreWing",
"scorePodium",
"scoreMidfield",
"scoreAmpedSpeaker"
],
"misses": [
Expand Down Expand Up @@ -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
}
}
},
Expand All @@ -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
}
}
Expand Down
171 changes: 145 additions & 26 deletions config/match-scouting.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"displayText": "Auto",
"variables": {}
},
"131000": {
"135000": {
"layer": 2,
"displayText": "Teleop",
"variables": {}
Expand Down Expand Up @@ -112,10 +112,10 @@
"id": "leave",
"displayText": "Leave",
"gridArea": [
"3",
"4",
"4",
"7"
"6",
"8",
"7",
"10"
],
"class": "gray",
"type": "action",
Expand All @@ -135,15 +135,54 @@
"executables": []
},
{
"id": "scoreSpeaker",
"displayText": "Speaker",
"id": "scoreSubwoofer",
"displayText": "Subwoofer",
"gridArea": [
"3",
"4",
"4",
"7"
],
"class": "gray",
"type": "action",
"executables": []
},
{
"id": "scoreWing",
"displayText": "Wing",
"gridArea": [
"4",
"4",
"5",
"7"
],
"class": "gray",
"type": "action",
"executables": []
},
{
"id": "scorePodium",
"displayText": "Podium",
"gridArea": [
"5",
"4",
"6",
"8",
"7"
],
"class": "gray",
"type": "action",
"executables": []
},
{
"id": "scoreMidfield",
"displayText": "Midfield",
"gridArea": [
"6",
"4",
"7",
"10"
"7"
],
"class": "green",
"class": "gray",
"type": "action",
"executables": []
},
Expand Down Expand Up @@ -231,10 +270,10 @@
"id": "park",
"displayText": "Park",
"gridArea": [
"3",
"4",
"4",
"7"
"6",
"8",
"7",
"10"
],
"class": "gray",
"type": "action",
Expand Down Expand Up @@ -283,18 +322,59 @@
]
},
{
"id": "scoreSpeaker",
"displayText": "Speaker",
"id": "scoreSubwoofer",
"displayText": "Subwoofer",
"gridArea": [
"3",
"4",
"4",
"7"
],
"class": "gray",
"type": "action",
"executables": []
},
{
"id": "scoreWing",
"displayText": "Wing",
"gridArea": [
"4",
"4",
"5",
"7"
],
"class": "gray",
"type": "action",
"executables": []
},
{
"id": "scorePodium",
"displayText": "Podium",
"gridArea": [
"5",
"4",
"6",
"8",
"7"
],
"class": "gray",
"type": "action",
"executables": []
},
{
"id": "scoreMidfield",
"displayText": "Midfield",
"gridArea": [
"6",
"4",
"7",
"10"
"7"
],
"class": "gray",
"type": "action",
"executables": []
},


{
"id": "miss",
"displayText": "Miss",
Expand Down Expand Up @@ -379,18 +459,18 @@
"id": "park",
"displayText": "Park",
"gridArea": [
"3",
"4",
"4",
"7"
"6",
"8",
"7",
"10"
],
"class": "gray",
"type": "action",
"executables": [
{
"type": "layer",
"args": [
2,
3,
4
]
}
Expand Down Expand Up @@ -432,12 +512,51 @@
},
{
"id": "scoreAmpedSpeaker",
"displayText": "Speaker",
"displayText": "Subwoofer",
"gridArea": [
"3",
"4",
"4",
"7"
],
"class": "green",
"type": "action",
"executables": []
},
{
"id": "scoreAmpedSpeaker",
"displayText": "Wing",
"gridArea": [
"4",
"4",
"5",
"7"
],
"class": "green",
"type": "action",
"executables": []
},
{
"id": "scoreAmpedSpeaker",
"displayText": "Podium",
"gridArea": [
"5",
"4",
"6",
"8",
"7"
],
"class": "green",
"type": "action",
"executables": []
},
{
"id": "scoreAmpedSpeaker",
"displayText": "Midfield",
"gridArea": [
"6",
"4",
"7",
"10"
"7"
],
"class": "green",
"type": "action",
Expand Down

0 comments on commit 803bc9f

Please sign in to comment.