Merge branch 'networkmanager' into dev

# Conflicts:
#	Main/src/main/java/com/chameleonvision/util/MathHandler.java
#	Main/src/main/java/com/chameleonvision/vision/camera/Camera.java
#	Main/src/main/java/com/chameleonvision/vision/camera/CameraManager.java
#	Main/src/main/java/com/chameleonvision/vision/process/VisionProcess.java
This commit is contained in:
Banks Troutman
2019-10-07 14:08:01 -04:00
24 changed files with 746 additions and 123 deletions

View File

@@ -113,14 +113,20 @@ public class VisionProcess implements Runnable {
}
private void updateNetworkTables(PipelineResult pipelineResult) {
ntValidEntry.setBoolean(pipelineResult.IsValid);
if (pipelineResult.IsValid) {
ntValidEntry.setBoolean(true);
ntYawEntry.setNumber(pipelineResult.Yaw);
ntPitchEntry.setNumber(pipelineResult.Pitch);
ntDistanceEntry.setNumber(pipelineResult.Area);
ntTimeStampEntry.setNumber(TimeStamp);
NetworkTableInstance.getDefault().flush();
} else {
ntYawEntry.setNumber(0.0);
ntPitchEntry.setNumber(0.0);
ntDistanceEntry.setNumber(0.0);
ntTimeStampEntry.setNumber(TimeStamp);
ntValidEntry.setBoolean(false);
}
ntTimeStampEntry.setNumber(timeStamp);
}
private PipelineResult runVisionProcess(Mat inputImage, Mat outputImage) {