competition fixes

[3501/2017steamworks] / src / org / usfirst / frc / team3501 / robot / MathLib.java

diff --git a/src/org/usfirst/frc/team3501/robot/MathLib.java b/src/org/usfirst/frc/team3501/robot/MathLib.java
index a57b5ce7efa4aa3f8d02f040652dd450485f3d4a..50cdd91d8376d6f905d4cf3b7be0368ae000d56f 100644 (file)
--- a/src/org/usfirst/frc/team3501/robot/MathLib.java
+++ b/src/org/usfirst/frc/team3501/robot/MathLib.java
@@ -38,8 +38,8 @@ public class MathLib {
    */
   public static double getSpeedForConstantAccel(double minSpeed,
       double maxSpeed, double percentComplete) {
-    return maxSpeed + 2 * (minSpeed - maxSpeed)
-        * Math.abs(percentComplete - 0.5);
+    return maxSpeed
+        + 2 * (minSpeed - maxSpeed) * Math.abs(percentComplete - 0.5);
   }
 
   /***
@@ -65,7 +65,7 @@ public class MathLib {
 
   /***
    * Returns true if val is in the range [low, high]
-   * 
+   *
    * @param val
    *          value to test
    * @param low
@@ -77,4 +77,36 @@ public class MathLib {
   public static boolean inRange(double val, double low, double high) {
     return (val <= high) && (val >= low);
   }
+
+  public static double limitValue(double val) {
+    return limitValue(val, 1.0);
+  }
+
+  public static double limitValue(double val, double max) {
+    if (val > max) {
+      return max;
+    } else if (val < -max) {
+      return -max;
+    } else {
+      return val;
+    }
+  }
+
+  public static double limitValue(double val, double min, double max) {
+    if (val > max) {
+      return max;
+    } else if (val < min) {
+      return min;
+    } else {
+      return val;
+    }
+  }
+
+  public static double calcLeftTankDrive(double x, double y) {
+    return limitValue(y + x);
+  }
+
+  public static double calcRightTankDrive(double x, double y) {
+    return limitValue(y - x);
+  }
 }