Merge branch 'master' of https://git.demerso.net/pls5618/2024/betabot-2024
This commit is contained in:
@@ -7,6 +7,8 @@ package frc.robot.subsystems;
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
|
||||
import com.kauailabs.navx.frc.AHRS;
|
||||
|
||||
import edu.wpi.first.math.geometry.Translation2d;
|
||||
import edu.wpi.first.math.kinematics.SwerveModulePosition;
|
||||
import edu.wpi.first.wpilibj.Filesystem;
|
||||
@@ -38,11 +40,18 @@ public class Drive extends SubsystemBase {
|
||||
final CanAndCoderSwerve avantgaucheangle = new CanAndCoderSwerve(Constants.avantgaucheAngle);
|
||||
final CanAndCoderSwerve arrieregaucheangle = new CanAndCoderSwerve(Constants.arrieregaucheAngle);
|
||||
final CanAndCoderSwerve arrieredroitangle = new CanAndCoderSwerve(Constants.arrieredroitAngle); */
|
||||
<<<<<<< HEAD
|
||||
public void drive(double x, double y, double zRotation){
|
||||
swerveDrive.drive(new Translation2d(x*5, y*5), zRotation, true, false);
|
||||
}
|
||||
|
||||
|
||||
=======
|
||||
public void drive(double x, double y, double zRotation){
|
||||
swerveDrive.drive(new Translation2d(x*2, y*2), zRotation, true, false);}
|
||||
|
||||
|
||||
>>>>>>> 05182be6b406e77cf3fc555805b04dba72ec611b
|
||||
|
||||
/** Creates a new Drive. */
|
||||
public Drive() {
|
||||
|
||||
Reference in New Issue
Block a user