Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-20 00:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some compilation errors

Browse Source
This commit is contained in:
Matt
2019-11-23 09:11:38 -08:00
parent dbe22417ae
commit faf03e7ba2
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Main/src/main/java/com/chameleonvision/network/NetworkManager.java
View File

@@ -1,8 +1,8 @@
package com.chameleonvision.network;
import com.chameleonvision.config.ConfigManager;
import com.chameleonvision.util.Platform;
import com.chameleonvision.settings.SettingsManager;
import java.net.SocketException;
import java.util.ArrayList;
@@ -43,7 +43,7 @@ public class NetworkManager {
e.printStackTrace();
}
var teamBytes = NetworkManager.GetTeamNumberIPBytes(SettingsManager.generalSettings.teamNumber);
var teamBytes = NetworkManager.GetTeamNumberIPBytes(ConfigManager.settings.teamNumber);
if (interfaces.size() > 0) {
for (var inetface : interfaces) {
@@ -85,7 +85,7 @@ public class NetworkManager {
return true;
}
var genSettings = SettingsManager.generalSettings;
var genSettings = ConfigManager.settings;
boolean isStatic = genSettings.connectionType.equals(NetworkIPMode.STATIC);
if (isStatic) {

2
Main/src/main/java/com/chameleonvision/vision/VisionProcess.java
View File

@@ -61,7 +61,7 @@ public class VisionProcess {
// Thread to grab frames from the camera
// TODO: (HIGH) fix video modes!!!
this.cameraRunnable = new CameraFrameRunnable(cameraProcess.getProperties().videoModes.get(0).f ps);
this.cameraRunnable = new CameraFrameRunnable(cameraProcess.getProperties().videoModes.get(0).fps);
lastPipelineResult = new DriverVisionPipeline.DriverPipelineResult(
null, cameraRunnable.getFrame(new Mat()), 0