Skip to content

Commit 4a90a97

Browse files
committed
day 1 changes
1 parent 4d372b0 commit 4a90a97

File tree

7 files changed

+1234
-1254
lines changed

7 files changed

+1234
-1254
lines changed

config.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,7 @@
148148
horizontal_intake_speed = 0.5
149149
l1_eject_speed = 0.25
150150
intake_algae_speed = 1
151+
extake_algae_speed = 0.3
151152

152153
# elevator
153154
elevator_lead_id = 9
@@ -183,7 +184,7 @@
183184
intake_algae_ground_angle = math.radians(58)
184185
intake_algae_score_angle = math.radians(32)
185186
intake_climb_angle = math.radians(20)
186-
intake_coral_station_angle = 0
187+
intake_coral_station_angle = math.radians(-0.095)
187188
intake_l1_angle = math.radians(37)
188189

189190
wrist_intake_angle = math.radians(-114.5)

deploy/choreo/4_piece.chor

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,16 +57,16 @@
5757
},
5858
"bumper":{
5959
"front":{
60-
"exp":"16.25 in",
61-
"val":0.41275
60+
"exp":"18 in",
61+
"val":0.4572
6262
},
6363
"side":{
64-
"exp":"16.25 in",
65-
"val":0.41275
64+
"exp":"18 in",
65+
"val":0.4572
6666
},
6767
"back":{
68-
"exp":"16.25 in",
69-
"val":0.41275
68+
"exp":"18 in",
69+
"val":0.4572
7070
}
7171
},
7272
"differentialTrackWidth":{

deploy/choreo/Four L4 Left.traj

Lines changed: 403 additions & 411 deletions
Large diffs are not rendered by default.

deploy/choreo/Four L4 Right.traj

Lines changed: 404 additions & 412 deletions
Large diffs are not rendered by default.

deploy/choreo/Three L4 Left Bump.traj

Lines changed: 414 additions & 422 deletions
Large diffs are not rendered by default.

oi/OI.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,10 @@ def map_controls():
9292

9393
Keymap.Intake.INTAKE_L1.whileTrue(
9494
commands2.SequentialCommandGroup(
95-
command.Target(config.target_positions["INTAKE_L1"], Robot.wrist, Robot.elevator),
95+
commands2.ParallelCommandGroup(
96+
command.Target(config.target_positions["INTAKE_L1"], Robot.wrist, Robot.elevator),
97+
command.SetPivot(Robot.intake, config.intake_coral_station_angle)
98+
),
9699
command.RunIntake(Robot.intake)
97100
)
98101
)

subsystem/intake.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ def roll_out(self, speed: float = config.horizontal_intake_speed) -> None:
7979
def extake_algae(self) -> None:
8080

8181
self.horizontal_motor.set_raw_output(
82-
config.horizontal_intake_speed
82+
config.extake_algae_speed
8383
)
8484

8585
self.intake_running = True

0 commit comments

Comments
 (0)