From b3878866cf78ed972495cb4a2e35c882ec4cea44 Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Tue, 7 Mar 2023 19:11:10 -0500 Subject: [PATCH 1/2] hdtgb --- src/main/java/frc/robot/RobotContainer.java | 3 ++- src/main/java/frc/robot/commands/Gyro.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 20a459a..37187a6 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -3,7 +3,7 @@ // the WPILib BSD license file in the root directory of this project. package frc.robot; - +import edu.wpi.first.cameraserver.CameraServer; import edu.wpi.first.wpilibj2.command.Command; import edu.wpi.first.wpilibj2.command.Commands; import edu.wpi.first.wpilibj2.command.SequentialCommandGroup; @@ -34,6 +34,7 @@ import frc.robot.commands.bras.PivoteBrasHaut; import frc.robot.commands.bras.PivoteBrasMilieux; public class RobotContainer { + CameraServer.startAutomaticCapture(); CommandXboxController manette1 = new CommandXboxController(0); CommandXboxController manette2 = new CommandXboxController(1); // subsystems diff --git a/src/main/java/frc/robot/commands/Gyro.java b/src/main/java/frc/robot/commands/Gyro.java index dcb7893..330e6b3 100644 --- a/src/main/java/frc/robot/commands/Gyro.java +++ b/src/main/java/frc/robot/commands/Gyro.java @@ -25,11 +25,11 @@ public class Gyro extends CommandBase { public void execute() { if(basePilotable.getpitch()<10) { - basePilotable.drive(0.4, 0); + basePilotable.drive(0.3*basePilotable.getpitch()/15, 0); } else if(basePilotable.getpitch()>-10) { - basePilotable.drive(-0.4, 0); + basePilotable.drive(-0.3*basePilotable.getpitch()/15, 0); } else { From 4a648fff253273e6370e24fca5c7299ba0c628ae Mon Sep 17 00:00:00 2001 From: samuel desharnais Date: Tue, 7 Mar 2023 19:12:38 -0500 Subject: [PATCH 2/2] jyrhn --- src/main/java/frc/robot/commands/Gyro.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/frc/robot/commands/Gyro.java b/src/main/java/frc/robot/commands/Gyro.java index 330e6b3..88aec83 100644 --- a/src/main/java/frc/robot/commands/Gyro.java +++ b/src/main/java/frc/robot/commands/Gyro.java @@ -23,13 +23,13 @@ public class Gyro extends CommandBase { // Called every time the scheduler runs while the command is scheduled. @Override public void execute() { - if(basePilotable.getpitch()<10) + if(basePilotable.getpitch()>4) { basePilotable.drive(0.3*basePilotable.getpitch()/15, 0); } - else if(basePilotable.getpitch()>-10) + else if(basePilotable.getpitch()<-4) { - basePilotable.drive(-0.3*basePilotable.getpitch()/15, 0); + basePilotable.drive(0.3*basePilotable.getpitch()/15, 0); } else {