From f86573e44b4c5b96a00b99e02c0a9e6db1d7289d Mon Sep 17 00:00:00 2001 From: Antoine PerreaultE Date: Thu, 30 Nov 2023 17:30:07 -0500 Subject: [PATCH] s --- src/main/deploy/swerve/modules/backleft.json | 2 +- src/main/deploy/swerve/modules/backright.json | 2 +- src/main/deploy/swerve/modules/frontleft.json | 2 +- src/main/deploy/swerve/modules/frontright.json | 2 +- src/main/java/frc/robot/RobotContainer.java | 1 + src/main/java/frc/robot/subsystems/Drive.java | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/main/deploy/swerve/modules/backleft.json b/src/main/deploy/swerve/modules/backleft.json index fbc7422..bf4c653 100644 --- a/src/main/deploy/swerve/modules/backleft.json +++ b/src/main/deploy/swerve/modules/backleft.json @@ -16,7 +16,7 @@ }, "encoder": { "type": "cancoder", - "id": 22, + "id": 7, "canbus": null }, "inverted": { diff --git a/src/main/deploy/swerve/modules/backright.json b/src/main/deploy/swerve/modules/backright.json index 0b155a0..04240b4 100644 --- a/src/main/deploy/swerve/modules/backright.json +++ b/src/main/deploy/swerve/modules/backright.json @@ -16,7 +16,7 @@ }, "encoder": { "type": "cancoder", - "id": 22, + "id": 6, "canbus": null }, "inverted": { diff --git a/src/main/deploy/swerve/modules/frontleft.json b/src/main/deploy/swerve/modules/frontleft.json index 943f3d0..2cc4e7a 100644 --- a/src/main/deploy/swerve/modules/frontleft.json +++ b/src/main/deploy/swerve/modules/frontleft.json @@ -16,7 +16,7 @@ }, "encoder": { "type": "cancoder", - "id": 22, + "id": 5, "canbus": null }, "inverted": { diff --git a/src/main/deploy/swerve/modules/frontright.json b/src/main/deploy/swerve/modules/frontright.json index 98d0c29..9694a22 100644 --- a/src/main/deploy/swerve/modules/frontright.json +++ b/src/main/deploy/swerve/modules/frontright.json @@ -16,7 +16,7 @@ }, "encoder": { "type": "cancoder", - "id": 22, + "id": 4, "canbus": null }, "inverted": { diff --git a/src/main/java/frc/robot/RobotContainer.java b/src/main/java/frc/robot/RobotContainer.java index 11eb794..d30e6db 100644 --- a/src/main/java/frc/robot/RobotContainer.java +++ b/src/main/java/frc/robot/RobotContainer.java @@ -43,6 +43,7 @@ public class RobotContainer { GenericEntry force5 = forces.add("Force5", 0).getEntry(); GenericEntry force6 = forces.add("Force6", 0).getEntry(); GenericEntry force7 = forces.add("Force7", 0).getEntry(); + CommandXboxController manette = new CommandXboxController(0); CommandJoystick joystick1 = new CommandJoystick(0); Drive drive = new Drive(); diff --git a/src/main/java/frc/robot/subsystems/Drive.java b/src/main/java/frc/robot/subsystems/Drive.java index d2391d1..c0aa314 100644 --- a/src/main/java/frc/robot/subsystems/Drive.java +++ b/src/main/java/frc/robot/subsystems/Drive.java @@ -19,7 +19,7 @@ public class Drive extends SubsystemBase { File swerveJsonDirectory = new File(Filesystem.getDeployDirectory(),"swerve"); public void drive(double x, double y, double zRotation){ - swerveDrive.drive(new Translation2d(x, y), zRotation, true, false); + swerveDrive.drive(new Translation2d(x, y), zRotation, false, false); }