File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -5,12 +5,21 @@ public final class BuildConstants {
55 public static final String MAVEN_GROUP = "" ;
66 public static final String MAVEN_NAME = "2024RobotCode" ;
77 public static final String VERSION = "unspecified" ;
8+ <<<<<<< Updated upstream
89 public static final int GIT_REVISION = 357 ;
910 public static final String GIT_SHA = "3ef842811300f6ae93f92b9acc1813edc4af7f2f" ;
1011 public static final String GIT_DATE = "2024-10-19 17:38:18 EDT" ;
1112 public static final String GIT_BRANCH = "bloomfield" ;
1213 public static final String BUILD_DATE = "2024-10-19 18:17:32 EDT" ;
1314 public static final long BUILD_UNIX_TIME = 1729376252676L ;
15+ =======
16+ public static final int GIT_REVISION = 359 ;
17+ public static final String GIT_SHA = "34f1402c7f7ff5c12d12c6dcd907953b5f3c70ea" ;
18+ public static final String GIT_DATE = "2025-05-15 18:52:07 EDT" ;
19+ public static final String GIT_BRANCH = "outreach" ;
20+ public static final String BUILD_DATE = "2025-05-15 19:14:04 EDT" ;
21+ public static final long BUILD_UNIX_TIME = 1747350844263L ;
22+ >>>>>>> Stashed changes
1423 public static final int DIRTY = 1 ;
1524
1625 private BuildConstants () {}
Original file line number Diff line number Diff line change 5353import frc .robot .commands .SetShooterTargetRPM ;
5454import frc .robot .commands .ShootNoteAmp ;
5555import frc .robot .commands .ShootNoteCenter ;
56+ import frc .robot .commands .ShootNoteFAR ;
5657import frc .robot .commands .ShootNoteSource ;
5758import frc .robot .commands .StopIntakeFeed ;
5859import frc .robot .commands .TurnToAmpCorner ;
@@ -138,6 +139,7 @@ public class RobotContainer {
138139 private Trigger driveAButton ;
139140 private Trigger driveXButton ;
140141 private Trigger driveBButton ;
142+ private Trigger driveBothSticks ;
141143
142144 private final LoggedDashboardNumber flywheelSpeed = new LoggedDashboardNumber ("fly speed" , 5400 );
143145
@@ -672,6 +674,10 @@ private void driverControls() {
672674 driveAButton .onTrue (climbCommands );
673675
674676 driveXButton .onTrue (trapCommands );
677+
678+ driveController
679+ .rightStick ()
680+ .onTrue (new ShootNoteFAR (shooter ));
675681 }
676682
677683 private void manipControls () {
Original file line number Diff line number Diff line change 1+ // Copyright (c) FIRST and other WPILib contributors.
2+ // Open Source Software; you can modify and/or share it under the terms of
3+ // the WPILib BSD license file in the root directory of this project.
4+
5+ package frc .robot .commands ;
6+
7+ import edu .wpi .first .wpilibj2 .command .InstantCommand ;
8+ import edu .wpi .first .wpilibj2 .command .SequentialCommandGroup ;
9+ import edu .wpi .first .wpilibj2 .command .WaitCommand ;
10+ import frc .robot .subsystems .shooter .Shooter ;
11+
12+ // NOTE: Consider using this command inline, rather than writing a subclass. For more
13+ // information, see:
14+ // https://docs.wpilib.org/en/stable/docs/software/commandbased/convenience-features.html
15+ public class ShootNoteFAR extends SequentialCommandGroup {
16+ /** Creates a new ShootNote. */
17+ public ShootNoteFAR (Shooter shooter ) {
18+ // Add your commands in the addCommands() call, e.g.
19+ // addCommands(new FooCommand(), new BarCommand());
20+ addCommands (
21+ new InstantCommand (() -> shooter .setFlywheelRPMs (6000 , 6000 )),
22+ new WaitCommand (1 ),
23+ new InstantCommand (() -> shooter .setFeedersRPM (4000 )),
24+ new WaitCommand (0.5 ),
25+ new InstantCommand (shooter ::stopFeeders , shooter ),
26+ new InstantCommand (shooter ::stopFlywheels , shooter ));
27+ }
28+ }
You can’t perform that action at this time.
0 commit comments