diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystems/Turret.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystems/Turret.java index 550bb30..48fd4dc 100755 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystems/Turret.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/subsystems/Turret.java @@ -481,7 +481,7 @@ public class Turret { } if (dist > 145.0) { - return 2400.0; + return 2300.0; } double x = dist; @@ -489,11 +489,11 @@ public class Turret { double x3 = x2 * x; double x4 = x3 * x; - double velocity = (-0.00000898301 * x4) - + (0.00302546 * x3) - + (-0.300962 * x2) - + (16.04247 * x) - + 1327.9972; + double velocity = (-0.0000218345 * x4) + + (0.00636447 * x3) + + (-0.593959 * x2) + + (26.08276 * x) + + 1218.12895; return Range.clip(velocity, 1300.0, 2450.0); } diff --git a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tuning/flywheelTuning.java b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tuning/flywheelTuning.java index 82c685a..10bdf3e 100755 --- a/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tuning/flywheelTuning.java +++ b/TeamCode/src/main/java/org/firstinspires/ftc/teamcode/tuning/flywheelTuning.java @@ -257,7 +257,7 @@ public class flywheelTuning extends OpMode { } if (dist > 145.0) { - return 2400.0; + return 2300.0; } double x = dist; @@ -265,13 +265,13 @@ public class flywheelTuning extends OpMode { double x3 = x2 * x; double x4 = x3 * x; - double velocity = (-0.00000898301 * x4) - + (0.00302546 * x3) - + (-0.300962 * x2) - + (16.04247 * x) - + 1327.9972; + double velocity = (-0.0000218345 * x4) + + (0.00636447 * x3) + + (-0.593959 * x2) + + (26.08276 * x) + + 1218.12895; - return Range.clip(velocity, 1300.0, 2450.0); + return Range.clip(velocity, 1300.0, 2350.0); } private double getHoodPOS(double dist) { if (dist < 20.0) {