Merge branch 'main' of https://demerso.net/pls5618/2023/robot
This commit is contained in:
commit
f1d0e3b352
Binary file not shown.
@ -4,11 +4,16 @@
|
|||||||
|
|
||||||
package frc.robot;
|
package frc.robot;
|
||||||
|
|
||||||
|
import edu.wpi.first.wpilibj.Joystick;
|
||||||
import edu.wpi.first.wpilibj.XboxController;
|
import edu.wpi.first.wpilibj.XboxController;
|
||||||
import edu.wpi.first.wpilibj2.command.Command;
|
import edu.wpi.first.wpilibj2.command.Command;
|
||||||
import edu.wpi.first.wpilibj2.command.Commands;
|
import edu.wpi.first.wpilibj2.command.Commands;
|
||||||
import edu.wpi.first.wpilibj2.command.RunCommand;
|
import edu.wpi.first.wpilibj2.command.RunCommand;
|
||||||
|
<<<<<<< HEAD
|
||||||
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
|
import edu.wpi.first.wpilibj2.command.SequentialCommandGroup;
|
||||||
|
=======
|
||||||
|
import edu.wpi.first.wpilibj2.command.button.JoystickButton;
|
||||||
|
>>>>>>> ded3f6018fe8a2c8b719139889c406330ff44003
|
||||||
//subsystems
|
//subsystems
|
||||||
import frc.robot.subsystems.BasePilotable;
|
import frc.robot.subsystems.BasePilotable;
|
||||||
import frc.robot.subsystems.Gratte;
|
import frc.robot.subsystems.Gratte;
|
||||||
@ -60,7 +65,11 @@ public RobotContainer() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
private void configureBindings() {}
|
private void configureBindings() {
|
||||||
|
|
||||||
|
JoystickButton buttonA = new JoystickButton(manette1, XboxController.Button.kA.value);
|
||||||
|
buttonA.whenPressed()
|
||||||
|
}
|
||||||
|
|
||||||
public Command getAutonomousCommand() {
|
public Command getAutonomousCommand() {
|
||||||
return Commands.print("No autonomous command configured");
|
return Commands.print("No autonomous command configured");
|
||||||
|
@ -32,7 +32,7 @@ public class BasePilotable extends SubsystemBase {
|
|||||||
return gyroscope.getPitch();
|
return gyroscope.getPitch();
|
||||||
}
|
}
|
||||||
|
|
||||||
public void drive(double xSpeed, double zRotation, double d, BasePilotable basePilotable){
|
public void drive(double xSpeed, double zRotation, double d){
|
||||||
drive.arcadeDrive(xSpeed, zRotation);
|
drive.arcadeDrive(xSpeed, zRotation);
|
||||||
}
|
}
|
||||||
public double distance(){
|
public double distance(){
|
||||||
|
Loading…
x
Reference in New Issue
Block a user