Skip to content
This repository has been archived by the owner on Jan 10, 2025. It is now read-only.

Event/unh #32

Merged
merged 8 commits into from
Jun 6, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion dashboard
7 changes: 4 additions & 3 deletions rio/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,8 @@ class SuperStrucConstants:
# angles for shooter
ShootPos = 321
LoadPos = 204
ClimbPos = 277
ClimbPos = 285
HarmonyPos = 316

# CANSpark IDS
rotateID = 11
Expand Down Expand Up @@ -200,8 +201,8 @@ class IntakeConstants:

# conversion factor
kLiftConversion = 1 # Configured feb 12 by joe
SuckPos = 0.541
BlowPos = 0.005
SuckPos = 0.645
BlowPos = 0.1
# lift pid
kLiftP = 3.3
kLiftI = 0.0000001
Expand Down
21 changes: 4 additions & 17 deletions rio/robotcontainer.py
Original file line number Diff line number Diff line change
Expand Up @@ -180,11 +180,6 @@ def configureButtonBindings(self) -> None:
)
)

# set Shooter to climb position
self.driverController.y().onTrue(
ShooterROT(SuperStrucConstants.ClimbPos, self.shooter)
)

# Deliver to amp (button a), part a
self.driverController.a().onTrue(
commands2.SequentialCommandGroup(
Expand Down Expand Up @@ -220,18 +215,10 @@ def configureButtonBindings(self) -> None:

# Climbing
self.driverController.pov(0).whileTrue(
Climb(
1,
self.climber,
self.shooter,
)
ShooterROT(SuperStrucConstants.HarmonyPos, self.shooter)
)
self.driverController.pov(180).whileTrue(
Climb(
-1,
self.climber,
self.shooter,
)
ShooterROT(SuperStrucConstants.ClimbPos, self.shooter)
)

self.driverController.leftBumper().whileTrue(
Expand Down Expand Up @@ -279,8 +266,8 @@ def configureButtonBindings(self) -> None:

# shooter keybinds
# shooter movement
self.opController.button(3).whileTrue(manualROT(0.5, self.shooter))
self.opController.button(4).whileTrue(manualROT(-0.5, self.shooter))
self.opController.button(3).whileTrue(manualROT(0.2, self.shooter))
self.opController.button(4).whileTrue(manualROT(-0.2, self.shooter))

# climber
self.opController.button(5).whileTrue(Climb(0.4, self.climber, self.shooter))
Expand Down
2 changes: 1 addition & 1 deletion rio/simgui-window.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
"###FMS": {
"Collapsed": "0",
"Pos": "5,540",
"Size": "169,184"
"Size": "283,140"
},
"###Joysticks": {
"Collapsed": "0",
Expand Down
2 changes: 1 addition & 1 deletion rio/subsystems/intake.py
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ def periodic(self) -> None:
self.sd.putNumber(
"Thermals/Intake/Rotate", self.liftMotor.getMotorTemperature()
)
# print(self.liftEncoder.getPosition())
logging.debug(f" Lift encoder is {self.liftEncoder.getPosition()}")

def intake(self, speed):
self.intakeMotor.set(speed)
Expand Down
Loading