Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

changed some fields in the ratings part of the scouting app #44

Closed
wants to merge 14 commits into from
Closed

changed some fields in the ratings part of the scouting app #44

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
7d287a7
Update structure.json
zandiac24 Jan 28, 2025
e579b02
added a teleop field
CodingMaster121 Jan 30, 2025
f157b9e
Merge pull request #43 from team4099/2025-notescouting
CodingMaster121 Feb 6, 2025
9f116b7
Removed tippy field duplicate
CodingMaster121 Feb 6, 2025
907288d
Merge branch '2025-notescouting' into main
CodingMaster121 Feb 6, 2025
c300cc0
made some minor changes to auto
CodingMaster121 Feb 8, 2025
b378406
Merge pull request #45 from team4099/2025-auto
CodingMaster121 Feb 8, 2025
9400789
finished adding teleop fields
CodingMaster121 Feb 8, 2025
7db98da
Merge branch 'main' into 2025-teleop
CodingMaster121 Feb 8, 2025
3f0f27a
Merge pull request #46 from team4099/2025-teleop
CodingMaster121 Feb 8, 2025
872b9e6
updated config.json
CodingMaster121 Feb 8, 2025
e5c6131
updated coral and algae cycle fields
CodingMaster121 Feb 8, 2025
cb85e15
added additional auto fields
CodingMaster121 Feb 8, 2025
57cbd0f
Reordered the auto fields
CodingMaster121 Feb 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions falconscoutcore/config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,31 @@
"Alliance",
"DriverStation",
"TeamNumber",
"AutoSpeaker",
"AutoAmp",
"AutoLeave",
"AutoCoralL1",
"AutoCoralL2",
"AutoCoralL3",
"AutoCoralL4",
"AutoBarge",
"AutoProcessor",
"AutoCenterline",
"AutoLeave",
"AutoNotes",
"TeleopSpeaker",
"TeleopAmp",
"TeleopTrap",
"TeleopPassing",
"TeleopCoralL1",
"TeleopCoralL2",
"TeleopCoralL3",
"TeleopCoralL4",
"TeleopAlgaeBarge",
"TeleopAlgaeProcessor",
"TeleopNotes",
"Parked",
"ClimbStatus",
"Harmonized",
"ClimbSpeed",
"EndgameNotes",
"Disabled",
"StabilityRating",
"RobotStyleType",
"DriverRating",
"DefenseTime",
"DefenseSkill",
"CounterDefenseSkill",
"IntakeDefenseRating",
"RatingNotes"
],
"qualitative_data_labels": [
Expand All @@ -38,11 +43,8 @@
"AutoDrivingSkills",
"AutoGeneralNotes",
"TeleopIntakeLocation",
"SpeakerAccuracy",
"AmpAccuracy",
"AligningSpeed",
"ScoringSpeed",
"IntakingSpeed",
"TeleopGeneralNotes",
"ClimbAlignmentSpeed",
"EndgameGeneralNotes"
],
"json_file": "./data/2024cur_match_data.json",
Expand Down
2 changes: 1 addition & 1 deletion scoutingapp/src/components/inputs/IncrementNumberInput.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
152 changes: 123 additions & 29 deletions scoutingapp/src/config/structure.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,33 +70,97 @@
},
{
"type": "GenericHeaderTwo",
"text": "Auto Game Pieces"
"text": "Auto"
},
{
"type": "GenericDropdown",
"text": "Robot Starting Position",
"options": [
"Far Coral Station",
"Middle",
"Close Coral Station"
],
"id": "StartingPosition"
},
{
"type": "GenericToggle",
"text": "Did they leave the starting zone (black line)?",
"id": "AutoLeave"
},
{
"type": "GenericCheckboxSelect",
"text": "Auto Scoring Side",
"options": [
"Far Coral Station",
"Close Coral Station"
],
"id": "ScoringSide"
},
{
"type": "IncrementNumberInput",
"text": "Auto Speaker Cycles",
"text": "Auto Coral L1 Cycles",
"placeholder": [
"0"
],
"id": "AutoSpeaker"
"options": [
"purple"
],
"id": "AutoCoralL1"
},
{
"type": "IncrementNumberInput",
"text": "Auto Amp Cycles",
"text": "Auto Coral L2 Cycles",
"placeholder": [
"0"
],
"id": "AutoAmp"
"options": [
"purple"
],
"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": [
"purple"
],
"id": "AutoCoralL3"
},
{
"type": "GenericToggle",
"text": "Did they leave the starting zone (white line)?",
"id": "AutoLeave"
"type": "IncrementNumberInput",
"text": "Auto Coral L4 Cycles",
"placeholder": [
"0"
],
"options": [
"purple"
],
"id": "AutoCoralL4"
},
{
"type": "IncrementNumberInput",
"text": "Auto Barge Cycles",
"placeholder": [
"0"
],
"options": [
"green"
],
"id": "AutoBarge"
},
{
"type": "IncrementNumberInput",
"text": "Auto Processor Cycles",
"placeholder": [
"0"
],
"options": [
"green"
],
"id": "AutoProcessor"
},
{
"type": "GenericTextArea",
Expand All @@ -108,52 +172,74 @@
},
{
"type": "GenericHeaderTwo",
"text": "Teleop Game Pieces"
"text": "Teleop"
},
{
"type": "IncrementNumberInput",
"text": "Teleop Speaker Cycles",
"text": "Teleop Coral L1 Cycles",
"placeholder": [
"0"
],
"options": [
"red"
"purple"
],
"id": "TeleopSpeaker"
"id": "TeleopCoralL1"
},
{
"type": "IncrementNumberInput",
"text": "Teleop Amp Cycles",
"text": "Teleop Coral L2 Cycles",
"placeholder": [
"0"
],
"options": [
"yellow"
"purple"
],
"id": "TeleopAmp"
"id": "TeleopCoralL2"
},
{
"type": "IncrementNumberInput",
"text": "Teleop/Endgame Trap Cycles",
"text": "Teleop Coral L3 Cycles",
"placeholder": [
"0"
],
"options": [
"green"
"purple"
],
"id": "TeleopTrap"
"id": "TeleopCoralL3"
},
{
"type": "IncrementNumberInput",
"text": "Coral L4 Cycles",
"text": "Teleop Coral L4 Cycles",
"placeholder": [
"0"
],
"options": [
"blue"
"purple"
],
"id": "TeleopCoralL4"
},
{
"type": "IncrementNumberInput",
"text": "Teleop Barge Cycles",
"placeholder": [
"0"
],
"options": [
"green"
],
"id": "TeleopAlgaeBarge"
},
{
"type": "IncrementNumberInput",
"text": "Teleop Processor Cycles",
"placeholder": [
"0"
],
"options": [
"green"
],
"id": "TeleopAlgaeProcessor"
},
{
"type": "GenericTextArea",
"text": "Teleop Qualitative Notes",
Expand Down Expand Up @@ -272,15 +358,23 @@
"Alliance",
"DriverStation",
"TeamNumber",
"AutoSpeaker",
"AutoAmp",
"AutoCenterline",
"StartingPosition",
"AutoLeave",
"ScoringSide",
"AutoCoralL1",
"AutoCoralL2",
"AutoCoralL3",
"AutoCoralL4",
"AutoBarge",
"AutoProcessor",
"AutoCenterline",
"AutoNotes",
"TeleopSpeaker",
"TeleopAmp",
"TeleopTrap",
"TeleopCoralL1",
"TeleopCoralL2",
"TeleopCoralL3",
"TeleopCoralL4",
"TeleopAlgaeBarge",
"TeleopAlgaeProcessor",
"TeleopNotes",
"Parked",
"ClimbStatus",
Expand Down
Loading