Skip to content

Commit e2de2d7

Browse files
2 parents 7e75b71 + c9cfc4b commit e2de2d7

File tree

6 files changed

+21
-1
lines changed

6 files changed

+21
-1
lines changed

PathWeaver/PathWeaver/Groups/Main

Whitespace-only changes.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
X,Y,Tangent X,Tangent Y,Fixed Theta,Name
2+
0.785134818779641,-2.4491953082746205,3.048,0.0,true,
3+
3.9256439357052786,-0.9691852646659866,3.012461901832824,0.9257114703175879,false,
4+
10.0502383438093,-0.7285332250548269,5.871909766512307,0.012032601980558,true,
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"lengthUnit": "Meter",
3+
"maxVelocity": 3.0,
4+
"maxAcceleration": 3.0,
5+
"wheelBase": 0.558,
6+
"gameName": "Infinite Recharge",
7+
"outputDir": ""
8+
}

src/main/kotlin/frc/robot/Constants.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class Constants {
3636
val kShooterSpeed = 1.0 * kShooterDir
3737
val kShooterReverseSpeed = -0.3 * kShooterDir
3838
val kGateSpeed = 1.0 * kGateDir
39+
val kGateRSpeed = -0.5 * kGateDir
3940
val kGateLoadSpeed = 0.5 * kGateDir
4041
val kIntakeSpeed = 1.0 * kIntakeDir
4142
val kIntake2Speed = 0.85

src/main/kotlin/frc/robot/RobotContainer.kt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -254,6 +254,13 @@ class RobotContainer {
254254
}
255255

256256
fun getAutonomousCommand(): Command {
257+
if (gate.isBallTriggered()) {
258+
return pathPlanningCommand("paths/") // update
259+
} else{
260+
return pathPlanningCommand("paths/")
261+
}
262+
263+
257264
// Return the selected command
258265
return m_autoCommandChooser.selected
259266
}

src/main/kotlin/frc/robot/commands/CompositeShoot.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ class CompositeShoot(val intakeSubsystem: IntakeSubsystem, val indexerSubsystem:
4949
gateSubsystem.setSpeed(0.0)
5050
}
5151
} else {
52-
gateSubsystem.setSpeed(0.0)
52+
gateSubsystem.setSpeed(Constants.kGateRSpeed)
5353
}
5454
}
5555

0 commit comments

Comments
 (0)