Merge pull request #45 from team4099/2025-auto

Updated auto fields
team4099 · Feb 8, 2025 · b378406 · b378406
2 parents 907288d + c300cc0
commit b378406
Show file tree

Hide file tree

Showing 2 changed files with 60 additions and 11 deletions.
diff --git a/scoutingapp/src/components/inputs/IncrementNumberInput.tsx b/scoutingapp/src/components/inputs/IncrementNumberInput.tsx
@@ -28,7 +28,7 @@ function IncrementNumberInput(props: ComponentSetup) {
                 >
                     -
                 </button>
-                <div className={`flex w-1/3 h-full text-2xl float-left items-center ${color == "red" ? "bg-red-400" : color == "yellow" ? "bg-amber-300" : color == "blue" ? "bg-blue-500" : color == "green" ? "bg-green-400" : "bg-white"}`}>
+                <div className={`flex w-1/3 h-full text-2xl float-left items-center ${color == "red" ? "bg-red-400" : color == "yellow" ? "bg-amber-300" : color == "blue" ? "bg-blue-500" : color == "green" ? "bg-green-400" : color == "purple" ? "bg-purple-400" : color == "orange" ? "bg-orange-400" : "bg-white"}`}>
                     <p className={"text-center w-full"}>{counter}</p>
                 </div>
                 <button

diff --git a/scoutingapp/src/config/structure.json b/scoutingapp/src/config/structure.json
@@ -74,28 +74,73 @@
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Auto Speaker Cycles",
+                "text": "Auto Coral L1 Cycles",
                 "placeholder": [
                     "0"
                 ],
-                "id": "AutoSpeaker"
+                "options": [
+                    "red"
+                ],
+                "id": "AutoCoralL1"
             },
             {
                 "type": "IncrementNumberInput",
-                "text": "Auto Amp Cycles",
+                "text": "Auto Coral L2 Cycles",
                 "placeholder": [
                     "0"
                 ],
-                "id": "AutoAmp"
+                "options": [
+                    "orange"
+                ],
+                "id": "AutoCoralL2"
             },
             {
-                "type": "GenericToggle",
-                "text": "Did they intake from the centerline during auto?",
-                "id": "AutoCenterline"
+                "type": "IncrementNumberInput",
+                "text": "Auto Coral L3 Cycles",
+                "placeholder": [
+                    "0"
+                ],
+                "options": [
+                    "yellow"
+                ],
+                "id": "AutoCoralL3"
+            },
+            {
+                "type": "IncrementNumberInput",
+                "text": "Auto Coral L4 Cycles",
+                "placeholder": [
+                    "0"
+                ],
+                "options": [
+                    "green"
+                ],
+                "id": "AutoCoralL4"
+            },
+            {
+                "type": "IncrementNumberInput",
+                "text": "Auto Barge Cycles",
+                "placeholder": [
+                    "0"
+                ],
+                "options": [
+                    "blue"
+                ],
+                "id": "AutoBarge"
+            },
+            {
+                "type": "IncrementNumberInput",
+                "text": "Auto Processor Cycles",
+                "placeholder": [
+                    "0"
+                ],
+                "options": [
+                    "purple"
+                ],
+                "id": "AutoProcessor"
             },
             {
                 "type": "GenericToggle",
-                "text": "Did they leave the starting zone (white line)?",
+                "text": "Did they leave the starting zone (black line)?",
                 "id": "AutoLeave"
             },
             {
@@ -272,8 +317,12 @@
                 "Alliance",
                 "DriverStation",
                 "TeamNumber",
-                "AutoSpeaker",
-                "AutoAmp",
+                "AutoCoralL1",
+                "AutoCoralL2",
+                "AutoCoralL3",
+                "AutoCoralL4",
+                "AutoBarge",
+                "AutoProcessor",
                 "AutoCenterline",
                 "AutoLeave",
                 "AutoNotes",