From eb65156548d7ecdaddbd739adee269b6b032e087 Mon Sep 17 00:00:00 2001
From: ori agranat <oriagranat9@gmail.com>
Date: Mon, 7 Oct 2019 21:15:17 +0300
Subject: [PATCH] merge bugfix

---
 Main/src/main/java/com/chameleonvision/util/MathHandler.java  | 1 +
 .../com/chameleonvision/vision/process/VisionProcess.java     | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Main/src/main/java/com/chameleonvision/util/MathHandler.java b/Main/src/main/java/com/chameleonvision/util/MathHandler.java
index 35c634c26..76a1a762d 100644
--- a/Main/src/main/java/com/chameleonvision/util/MathHandler.java
+++ b/Main/src/main/java/com/chameleonvision/util/MathHandler.java
@@ -1,6 +1,7 @@
 package com.chameleonvision.util;
 
 import java.lang.Math;
+import org.apache.commons.math3.util.FastMath;
 
 public class MathHandler {
     MathHandler() {}
diff --git a/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java b/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
index 9a7fff80b..66c3208aa 100644
--- a/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
+++ b/Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
@@ -118,13 +118,13 @@ public class VisionProcess implements Runnable {
 			ntYawEntry.setNumber(pipelineResult.Yaw);
 			ntPitchEntry.setNumber(pipelineResult.Pitch);
 			ntDistanceEntry.setNumber(pipelineResult.Area);
-			ntTimeStampEntry.setNumber(TimeStamp);
+			ntTimeStampEntry.setNumber(timeStamp);
 			NetworkTableInstance.getDefault().flush();
 		} else {
 			ntYawEntry.setNumber(0.0);
 			ntPitchEntry.setNumber(0.0);
 			ntDistanceEntry.setNumber(0.0);
-			ntTimeStampEntry.setNumber(TimeStamp);
+			ntTimeStampEntry.setNumber(timeStamp);
 			ntValidEntry.setBoolean(false);
 		}
 	}