Merge branch 'sofie-arm' of https://github.com/deepbluerobotics/Robot…

…Code2024 into sofie-arm
DeepBlueRobotics · Mar 2, 2024 · 8a91064 · 8a91064
2 parents 23581c6 + 26f86ef
commit 8a91064
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/main/java/org/carlmontrobotics/subsystems/Arm.java b/src/main/java/org/carlmontrobotics/subsystems/Arm.java
@@ -44,7 +44,7 @@ public class Arm extends SubsystemBase {
     // a boolean meant to tell if the arm is in a forbidden posistion AKA FORBIDDEN FLAG
 
     private final CANSparkMax armMotor1 = MotorControllerFactory.createSparkMax(ARM_MOTOR_PORT_1, MotorConfig.NEO);
-    private final CANSparkMax armMotor2 = MotorControllerFactory.createSparkMax(ARM_MOTOR_PORT_2, MotorConfig.NEO)
+    private final CANSparkMax armMotor2 = MotorControllerFactory.createSparkMax(ARM_MOTOR_PORT_2, MotorConfig.NEO);
     private final RelativeEncoder armEncoder = armMotor1.getEncoder();
 
 
@@ -71,6 +71,9 @@ public Arm() {
         armEncoder.setVelocityConversionFactor(rotationToRad);
         armEncoder.setInverted(encoderInverted);
 
+        armMotor2.follow(armMotor1);
+
+        //armEncoder1.setZeroOffset(offsetRad);
 
         //armPID.setTolerance(posToleranceRad, velToleranceRadPSec);