Merge remote-tracking branch 'origin/dev' into dev

thenetworkgrinch · thenetworkgrinch · commit 07d7995e014c · 2024-02-12T18:56:11.000-06:00
diff --git a/src/main/java/swervelib/encoders/SparkMaxEncoderSwerve.java b/src/main/java/swervelib/encoders/SparkMaxEncoderSwerve.java
@@ -35,6 +35,14 @@ public class SparkMaxEncoderSwerve extends SwerveAbsoluteEncoder
    */
   public SparkMaxEncoderSwerve(SwerveMotor motor, int conversionFactor)
   {
+    failureConfiguring = new Alert(
+        "Encoders",
+        "Failure configuring SparkMax Analog Encoder",
+        Alert.AlertType.WARNING_TRACE);
+    offsetFailure = new Alert(
+        "Encoders",
+        "Failure to set Absolute Encoder Offset",
+        Alert.AlertType.WARNING_TRACE);
     if (motor.getMotor() instanceof CANSparkMax)
     {
       encoder = ((CANSparkMax) motor.getMotor()).getAbsoluteEncoder(Type.kDutyCycle);
@@ -44,14 +52,6 @@ public SparkMaxEncoderSwerve(SwerveMotor motor, int conversionFactor)
     {
       throw new RuntimeException("Motor given to instantiate SparkMaxEncoder is not a CANSparkMax");
     }
-    failureConfiguring = new Alert(
-        "Encoders",
-        "Failure configuring SparkMax Analog Encoder",
-        Alert.AlertType.WARNING_TRACE);
-    offsetFailure = new Alert(
-        "Encoders",
-        "Failure to set Absolute Encoder Offset",
-        Alert.AlertType.WARNING_TRACE);
   }
 
   /**

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,14 @@ public class SparkMaxEncoderSwerve extends SwerveAbsoluteEncoder`
`35`	`35`	`*/`
`36`	`36`	`public SparkMaxEncoderSwerve(SwerveMotor motor, int conversionFactor)`
`37`	`37`	`{`
	`38`	`+ failureConfiguring = new Alert(`
	`39`	`+ "Encoders",`
	`40`	`+ "Failure configuring SparkMax Analog Encoder",`
	`41`	`+ Alert.AlertType.WARNING_TRACE);`
	`42`	`+ offsetFailure = new Alert(`
	`43`	`+ "Encoders",`
	`44`	`+ "Failure to set Absolute Encoder Offset",`
	`45`	`+ Alert.AlertType.WARNING_TRACE);`
`38`	`46`	`if (motor.getMotor() instanceof CANSparkMax)`
`39`	`47`	`{`
`40`	`48`	`encoder = ((CANSparkMax) motor.getMotor()).getAbsoluteEncoder(Type.kDutyCycle);`
`@@ -44,14 +52,6 @@ public SparkMaxEncoderSwerve(SwerveMotor motor, int conversionFactor)`
`44`	`52`	`{`
`45`	`53`	`throw new RuntimeException("Motor given to instantiate SparkMaxEncoder is not a CANSparkMax");`
`46`	`54`	`}`
`47`		`- failureConfiguring = new Alert(`
`48`		`- "Encoders",`
`49`		`- "Failure configuring SparkMax Analog Encoder",`
`50`		`- Alert.AlertType.WARNING_TRACE);`
`51`		`- offsetFailure = new Alert(`
`52`		`- "Encoders",`
`53`		`- "Failure to set Absolute Encoder Offset",`
`54`		`- Alert.AlertType.WARNING_TRACE);`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`/**`