diff --git a/swervelib/parser/json/DeviceJson.java b/swervelib/parser/json/DeviceJson.java
index 776cc6e..5a99b46 100644
--- a/swervelib/parser/json/DeviceJson.java
+++ b/swervelib/parser/json/DeviceJson.java
@@ -69,11 +69,10 @@ public class DeviceJson
         return null;
       case "integrated":
       case "attached":
-        return new SparkMaxEncoderSwerve(motor, 1);
-      case "sparkmax_analog":
-        return new SparkMaxAnalogEncoderSwerve(motor, 3.3);
       case "canandcoder":
         return new SparkMaxEncoderSwerve(motor, 360);
+      case "sparkmax_analog":
+        return new SparkMaxAnalogEncoderSwerve(motor, 3.3);
       case "canandcoder_can":
         return new CanAndCoderSwerve(id);
       case "ctre_mag":