diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index bffe940..18f6065 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -46,7 +46,7 @@ public class RobotContainer { private ActiverBlockeur ActiverBlockeur = new ActiverBlockeur(poussoir); private Activershaker Activershaker = new Activershaker(pistonshaker); private DesactiverBlockeur DesactiverBlockeur = new DesactiverBlockeur(poussoir); - private ResetGyro resetGyro = new ResetGyro(basePilotable); + /** The container for the robot. Contains subsystems, OI devices, and commands. */ public RobotContainer() { // Configure the button bindings diff --git a/src/main/java/frc/robot/commands/ResetGyro.java b/src/main/java/frc/robot/commands/ResetGyro.java deleted file mode 100644 index f602f87..0000000 --- a/src/main/java/frc/robot/commands/ResetGyro.java +++ /dev/null @@ -1,38 +0,0 @@ -// Copyright (c) FIRST and other WPILib contributors. -// Open Source Software; you can modify and/or share it under the terms of -// the WPILib BSD license file in the root directory of this project. - -package frc.robot.commands; - -import edu.wpi.first.wpilibj2.command.CommandBase; -import frc.robot.subsystems.BasePilotable; - -public class ResetGyro extends CommandBase { - private BasePilotable basePilotable; - /** Creates a new ResetGero. */ - public ResetGyro(BasePilotable basePilotable) { - basePilotable = new BasePilotable(); - // Use addRequirements() here to declare subsystem dependencies. - addRequirements(basePilotable); - } - - // Called when the command is initially scheduled. - @Override - public void initialize() { - - } - - // Called every time the scheduler runs while the command is scheduled. - @Override - public void execute() {} - - // Called once the command ends or is interrupted. - @Override - public void end(boolean interrupted) {} - - // Returns true when the command should end. - @Override - public boolean isFinished() { - return true; - } -} diff --git a/src/main/java/frc/robot/subsystems/BasePilotable.java b/src/main/java/frc/robot/subsystems/BasePilotable.java index f10d034..9a85098 100644 --- a/src/main/java/frc/robot/subsystems/BasePilotable.java +++ b/src/main/java/frc/robot/subsystems/BasePilotable.java @@ -7,6 +7,7 @@ package frc.robot.subsystems; import com.ctre.phoenix.motorcontrol.can.WPI_TalonSRX; import com.kauailabs.navx.frc.AHRS; +import edu.wpi.first.wpilibj.DriverStation; import edu.wpi.first.wpilibj.drive.MecanumDrive; import edu.wpi.first.wpilibj2.command.SubsystemBase; import frc.robot.Constants; @@ -32,11 +33,7 @@ public void drive(double y, double x, double rot){ mecanum.driveCartesian(y, rot, x, -getangle()); } public void resetgyro(){ - try { - gyroscope.reset(); - } - - +try { gyroscope.reset(); } catch( Exception e) {DriverStation.reportError(e.getMessage(), true); } } /** Creates a new BasePilotable. */ public BasePilotable() {