diff --git a/Main/src/main/java/com/chameleonvision/Main.java b/Main/src/main/java/com/chameleonvision/Main.java index 956633600..b35cf8eb5 100644 --- a/Main/src/main/java/com/chameleonvision/Main.java +++ b/Main/src/main/java/com/chameleonvision/Main.java @@ -4,6 +4,7 @@ import com.chameleonvision.settings.SettingsManager; import com.chameleonvision.vision.camera.CameraManager; import com.chameleonvision.vision.process.VisionProcess; import com.chameleonvision.web.Server; +import edu.wpi.first.networktables.NetworkTableInstance; public class Main { public static void main(String[] args) { @@ -12,6 +13,8 @@ public class Main { for (var camSet : CameraManager.getAllCamerasByName().entrySet()) { new Thread(new VisionProcess(camSet.getValue())).start(); } + NetworkTableInstance.getDefault().startClient("localhost"); + // NetworkTableInstance.getDefault().startClientTeam(SettingsManager.GeneralSettings.team_number); Server.main(8888); } else { diff --git a/Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java b/Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java index bf48abdcf..197f633f0 100644 --- a/Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java +++ b/Main/src/main/java/com/chameleonvision/vision/process/CVProcess.java @@ -58,8 +58,8 @@ public class CVProcess { try { double contourArea = Imgproc.contourArea(Contour); //TODO change scaling double targetArea = (contourArea / CamVals.ImageArea) * 100; - double minArea = Math.pow(area.get(0), 4); - double maxArea = Math.pow(area.get(1), 4); + double minArea = (double) area.get(0) / 100; + double maxArea = (double) area.get(1) / 100; if (targetArea < minArea || targetArea > maxArea) { continue; }