Skip to content

pick an algae off the reef in auto- logic #238

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

Merged
linglejack06 merged 20 commits into from
Apr 28, 2025
Merged

pick an algae off the reef in auto- logic #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
e8cf645
wip, sim testing atm
minhlpnguyen Apr 2, 2025
f99d05c
Add barge algae flag
aidnem Apr 3, 2025
08d8d88
(#227) Fix review comments: Add NetScore desired location, remove unn…
aidnem Apr 16, 2025
825f06e
Merge branch 'main' into 227-hardcode-barge-auto
aidnem Apr 16, 2025
5b2d80d
(#227) Seperate StartWarmup trigger into StartWarmup and StartFarWarm…
aidnem Apr 16, 2025
eeb7d47
(#227) Rename command to indicate that it automatically drives to a l…
aidnem Apr 16, 2025
23b3d07
actually it might be having issues because it already thinks it has a…
minhlpnguyen Apr 16, 2025
1652530
Many debugging
minhlpnguyen Apr 16, 2025
30ec158
(#227) Barge auto can now drive away after intaking the algae again (…
aidnem Apr 17, 2025
ac947f6
(#227) Add a ton of useful logging and make final drive to reef comma…
aidnem Apr 17, 2025
b63a05e
(#227) Only enter warmup when we have a gamepiece, fixes bug where el…
aidnem Apr 17, 2025
ffe182a
(#227) Cleanup conditional logic and claw debouncer to fix review com…
aidnem Apr 19, 2025
399533c
Merge remote-tracking branch 'origin/227-hardcode-barge-auto' into 22…
minhlpnguyen Apr 23, 2025
23c901e
saving wip not tested in sim (lineup stuck)
minhlpnguyen Apr 23, 2025
e28314b
working yay!! :D
minhlpnguyen Apr 23, 2025
7b44fc5
merging new updates will test later
minhlpnguyen Apr 23, 2025
9a5dd1c
Merge branch 'main' into 227-pick-an-algae-off-the-reef-in-auto (stru…
minhlpnguyen Apr 28, 2025
1ad7379
tested in sim, working!
minhlpnguyen Apr 28, 2025
cf95676
converted all autos
minhlpnguyen Apr 28, 2025
17e0264
Merge branch 'main' into 227-pick-an-algae-off-the-reef-in-auto
minhlpnguyen Apr 28, 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
16 changes: 8 additions & 8 deletions src/main/deploy/auto/1PieceBarge.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"scoringLocations": [
"Reef0"
],
"scoringLevels": [
"L4"
],
"intakeLocation": "CoralStationRight",
"intakeAfterLastScore": false
"actions": [
{
"type": "Score",
"piece": "Coral",
"location": "Reef0",
"scoringTarget": "L4"
}
]
}
53 changes: 44 additions & 9 deletions src/main/deploy/auto/1PieceBargeWithAlgae.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,46 @@
{
"scoringLocations": [
"Reef0"
],
"scoringLevels": [
"L4"
],
"intakeLocation": "CoralStationRight",
"intakeAfterLastScore": false,
"isBargeAuto": true
"actions": [
{
"type": "Score",
"piece": "Coral",
"location": "Reef0",
"scoringTarget": "L4"
},
{
"type": "DriveToLocation",
"piece": "Algae",
"location": "AutoLine",
"scoringTarget": "L2"
},
{
"type": "IntakeAlgae",
"piece": "Algae",
"location": "Algae0",
"scoringTarget": "L2"
},
{
"type": "DriveToLocation",
"piece": "Algae",
"location": "NetScore",
"scoringTarget": "L2"
},
{
"type": "NetScore",
"piece": "Algae",
"location": "Net",
"scoringTarget": "Net"
},
{
"type": "DriveToLocation",
"piece": "Algae",
"location": "NetScore",
"scoringTarget": "L2"
},
{
"type": "DriveToLocation",
"piece": "Algae",
"location": "Algae0",
"scoringTarget": "L2"
}
]
}
16 changes: 8 additions & 8 deletions src/main/deploy/auto/1PieceLeft.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"scoringLocations": [
"Reef10"
],
"scoringLevels": [
"L4"
],
"intakeLocation": "CoralStationLeft",
"intakeAfterLastScore": false
"actions": [
{
"type": "Score",
"piece": "Coral",
"location": "Reef10",
"scoringTarget": "L4"
}
]
}
29 changes: 20 additions & 9 deletions src/main/deploy/auto/2PieceLeft.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
{
"scoringLocations": [
"Reef10",
"Reef9"
],
"scoringLevels": [
"L4",
"L4"
],
"intakeLocation": "CoralStationLeft"
"actions": [
{
"type": "Score",
"piece": "Coral",
"location": "Reef10",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationLeft",
"scoringTarget": "L2"
},
{
"type": "Score",
"piece": "Coral",
"location": "Reef9",
"scoringTarget": "L4"
}
]
}
29 changes: 20 additions & 9 deletions src/main/deploy/auto/2PieceRight.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,22 @@
{
"scoringLocations": [
"Reef3",
"Reef5"
],
"scoringLevels": [
"L4",
"L4"
],
"intakeLocation": "CoralStationRight"
"actions": [
{
"type": "Score",
"piece": "Coral",
"location": "Reef3",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationRight",
"scoringTarget": "L2"
},
{
"type": "Score",
"piece": "Coral",
"location": "Reef5",
"scoringTarget": "L4"
}
]
}
49 changes: 38 additions & 11 deletions src/main/deploy/auto/3PieceLeft.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,40 @@
{
"scoringLocations": [
"Reef11",
"Reef8",
"Reef9"
],
"scoringLevels": [
"L4",
"L4",
"L4"
],
"intakeLocation": "CoralStationLeft"
"actions": [
{
"type": "Score",
"piece": "Coral",
"location": "Reef11",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationLeft",
"scoringTarget": "L2"
},
{
"type": "Score",
"piece": "Coral",
"location": "Reef8",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationLeft",
"scoringTarget": "L2"
},
{
"type": "Score",
"piece": "Coral",
"location": "Reef9",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationLeft",
"scoringTarget": "L2"
}
]
}
49 changes: 38 additions & 11 deletions src/main/deploy/auto/3PieceRight.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,40 @@
{
"scoringLocations": [
"Reef2",
"Reef5",
"Reef4"
],
"scoringLevels": [
"L4",
"L4",
"L4"
],
"intakeLocation": "CoralStationRight"
"actions": [
{
"type": "Score",
"piece": "Coral",
"location": "Reef2",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationRight",
"scoringTarget": "L2"
},
{
"type": "Score",
"piece": "Coral",
"location": "Reef5",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationRight",
"scoringTarget": "L2"
},
{
"type": "Score",
"piece": "Coral",
"location": "Reef4",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationRight",
"scoringTarget": "L2"
}
]
}
63 changes: 50 additions & 13 deletions src/main/deploy/auto/4PieceLeft.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,52 @@
{
"scoringLocations": [
"Reef11",
"Reef8",
"Reef9",
"Reef7"
],
"scoringLevels": [
"L4",
"L4",
"L4",
"L4"
],
"intakeLocation": "CoralStationLeft"
"actions": [
{
"type": "Score",
"piece": "Coral",
"location": "Reef11",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationLeft",
"scoringTarget": "L2"
},
{
"type": "Score",
"piece": "Coral",
"location": "Reef8",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationLeft",
"scoringTarget": "L2"
},
{
"type": "Score",
"piece": "Coral",
"location": "Reef9",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationLeft",
"scoringTarget": "L2"
},
{
"type": "Score",
"piece": "Coral",
"location": "Reef7",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationLeft",
"scoringTarget": "L2"
}
]
}
63 changes: 50 additions & 13 deletions src/main/deploy/auto/4PieceRight.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,52 @@
{
"scoringLocations": [
"Reef2",
"Reef5",
"Reef4",
"Reef6"
],
"scoringLevels": [
"L4",
"L4",
"L4",
"L4"
],
"intakeLocation": "CoralStationRight"
"actions": [
{
"type": "Score",
"piece": "Coral",
"location": "Reef2",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationRight",
"scoringTarget": "L2"
},
{
"type": "Score",
"piece": "Coral",
"location": "Reef5",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationRight",
"scoringTarget": "L2"
},
{
"type": "Score",
"piece": "Coral",
"location": "Reef4",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationRight",
"scoringTarget": "L2"
},
{
"type": "Score",
"piece": "Coral",
"location": "Reef6",
"scoringTarget": "L4"
},
{
"type": "Intake",
"piece": "Coral",
"location": "CoralStationRight",
"scoringTarget": "L2"
}
]
}
Loading
Loading