Merge pull request #103 from HuskieRobotics/dropButton-2-start-game-b…

…uttons Added a drop button and 2 start game buttons. Also fixed an analysis module display error.
HuskieRobotics · Mar 15, 2024 · 2e9dc50 · 2e9dc50
2 parents 803bc9f + e3ff8b4
commit 2e9dc50
Show file tree

Hide file tree

Showing 4 changed files with 211 additions and 116 deletions.
diff --git a/config/analysis-modules.json b/config/analysis-modules.json
@@ -122,14 +122,7 @@
                     "name": "Amp",
                     "path": "counts.scoreAmp"
                 },
-                {
-                    "name": "Speaker",
-                    "path": "counts.scoreSpeaker"
-                },
-                {
-                    "name": "Amped Speaker",
-                    "path": "counts.scoreAmpedSpeaker"
-                },
+
                 {
                     "name": "Miss",
                     "path": "counts.miss"
@@ -155,32 +148,6 @@
             ]
         }
     },
-    {
-        "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",
@@ -319,31 +286,5 @@
                 }
             ]
         }
-    },
-    {
-        "view": "match",
-        "module": "Pie",
-        "position": "main",
-        "name": "Shot Distribution",
-        "options": {
-            "slices": [
-                {
-                    "name": "Amp",
-                    "path": "averages.scoreAmp"
-                },
-                {
-                    "name": "Speaker",
-                    "path": "averages.scoreSpeaker"
-                },
-                {
-                    "name": "Amped Speaker",
-                    "path": "averages.scoreAmpedSpeaker"
-                },
-                {
-                    "name": "Miss",
-                    "path": "averages.miss"
-                }
-            ]
-        }
     }
 ]
diff --git a/config/analysis-pipeline.json b/config/analysis-pipeline.json
@@ -1,6 +1,22 @@
 [
-    {  
+    {
+        "type": "tmp",
+        "name": "countActions",
+        "outputPath": "counts",
+        "options": {
+            "all": true
+        }
+      },
+      {
         "type": "team",
+        "name": "countActions",
+        "outputPath": "counts",
+        "options": {
+            "all": true
+        }
+      },
+    {  
+        "type": "tmp",
         "name": "sum",
         "outputPath": "counts.scoreSpeaker",
         "options": {
@@ -12,12 +28,106 @@
             ]
         }
     },
-    {
+    {  
+        "type": "team",
+        "name": "sum",
+        "outputPath": "CountsTotalSubwoofer",
+        "options": {
+            "addends": [
+                "counts.scoreSubwoofer",
+                "counts.scoreAmpedSubwoofer"
+            ]
+        }
+    },
+    {  
+        "type": "team",
+        "name": "sum",
+        "outputPath": "CountsTotalPodium",
+        "options": {
+            "addends": [
+                "counts.scorePodium",
+                "counts.scoreAmpedPodium"
+            ]
+        }
+    },
+    {  
+        "type": "team",
+        "name": "sum",
+        "outputPath": "CountsTotalWing",
+        "options": {
+            "addends": [
+                "counts.scoreWing",
+                "counts.scoreAmpedWing"
+            ]
+        }
+    },
+    {  
+
+        "type": "team",
+        "name": "sum",
+        "outputPath": "CountsTotalMidfield",
+        "options": {
+            "addends": [
+                "counts.scoreMidfield",
+                "counts.scoreAmpedMidfield"
+            ]
+        }
+    },
+    {  
+        "type": "team",
+        "name": "average",
+        "outputPath": "averages.scoreSpeaker",
+        "options": {
+            "path": "counts.scoreSpeaker"
+        }
+    },
+    {  
+        "type": "team",
+        "name": "average",
+        "outputPath": "averages.scoreAmp",
+        "options": {
+            "path": "counts.scoreAmp"
+        }
+    },
+    {  
         "type": "tmp",
-        "name": "countActions",
-        "outputPath": "counts",
+        "name": "sum",
+        "outputPath": "counts.scoreAmpedSpeaker",
         "options": {
-            "all": true
+            "addends": [
+                "counts.scoreAmpedSubwoofer",
+                "counts.scoreAmpedWing",
+                "counts.scoreAmpedPodium",
+                "counts.scoreAmpedMidfield"
+            ]
+        }
+    },
+    {  
+        "type": "tmp",
+        "name": "sum",
+        "outputPath": "CountsTotalSpeaker",
+        "options": {
+            "addends": [
+                "counts.scoreAmpedSpeaker",
+                "counts.scoreSpeaker"
+            ]
+        }
+    },
+
+    {  
+        "type": "team",
+        "name": "average",
+        "outputPath": "averages.totalSpeaker",
+        "options": {
+            "path": "CountsTotalSpeaker"
+        }
+    },
+    {  
+        "type": "team",
+        "name": "average",
+        "outputPath": "averages.scoreAmpedSpeaker",
+        "options": {
+            "path": "counts.scoreAmpedSpeaker"
         }
     },
     {
@@ -78,7 +188,10 @@
                 "scoreWing",
                 "scorePodium",
                 "scoreMidfield",
-                "scoreAmpedSpeaker"
+                "scoreAmpedSubwoofer",
+                "scoreAmpedWing",
+                "scoreAmpedPodium",
+                "scoreAmpedMidfield"
             ],
             "misses": [
                 "miss"
@@ -255,7 +368,10 @@
                 "countsTeleop.scoreWing": 2,
                 "countsTeleop.scorePodium": 2,
                 "countsTeleop.scoreMidfield": 2,
-                "countsTeleop.scoreAmpedSpeaker": 5
+                "countsTeleop.scoreAmpedSubwoofer": 5,
+                "countsTeleop.scoreAmpedWing": 5,
+                "countsTeleop.scoreAmpedPodium": 5,
+                "countsTeleop.scoreAmpedMidfield": 5
             }
         }
     },