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

Temp fix for port setting, add flush to NetworkTables, add --manage-network argument

Browse Source
This commit is contained in:
Banks Troutman
2019-10-01 03:00:42 -04:00
parent b87d31e465
commit 2097778461
3 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Main/src/main/java/com/chameleonvision/Main.java
View File

@@ -14,13 +14,15 @@ import java.io.IOException;
public class Main {
private static final String PORT_KEY = "--port"; // expects integer
private static final String NT_SERVERMODE_KEY = "--ntservermode"; // no args for this setting
private static final String NT_CLIENTMODESERVER_KEY = "--ntclientserver"; // expects String representing an IP address (hostnames will be rejected!)
private static final String NT_SERVERMODE_KEY = "--nt-servermode"; // no args for this setting
private static final String NT_CLIENTMODESERVER_KEY = "--nt-client-server"; // expects String representing an IP address (hostnames will be rejected!)
private static final String NETWORK_MANAGE_KEY = "--manage-network"; // no args for this setting
private static final int DEFAULT_PORT = 8888;
private static int webserverPort = DEFAULT_PORT;
private static boolean ntServerMode = false;
private static boolean manageNetwork = false;
private static String ntClientModeServer = null;
private static void handleArgs(String[] args) {
@@ -40,18 +42,20 @@ public class Main {
i++; // increment to skip an 'arg' next go-around of for loop, as that would be this value
break;
case NT_SERVERMODE_KEY:
case NETWORK_MANAGE_KEY:
// nothing
}
// this switch actually handles the arguments.
switch (key) {
case PORT_KEY:
try {
if (value == null) throw new Exception("Bad or No argument value");
webserverPort = Integer.parseInt(value);
} catch (Exception ex) {
System.err.printf("Argument for port was invalid, starting server at port %d\n", DEFAULT_PORT);
}
System.out.println("INFO - The \"--port\" argument is currently disabled.");
// try {
// if (value == null) throw new Exception("Bad or No argument value");
// webserverPort = Integer.parseInt(value);
// } catch (Exception ex) {
// System.err.printf("Argument for port was invalid, starting server at port %d\n", DEFAULT_PORT);
// }
break;
case NT_SERVERMODE_KEY:
ntServerMode = true;
@@ -70,6 +74,9 @@ public class Main {
}
System.err.println("Argument for NT Server Host was invalid, defaulting to team number host");
break;
case NETWORK_MANAGE_KEY:
manageNetwork = true;
break;
}
}
}

19
Main/src/main/java/com/chameleonvision/settings/SettingsManager.java
View File

@@ -19,16 +19,17 @@ public class SettingsManager {
private SettingsManager() {}
public static void initialize() {
public static void initialize(boolean manageNetwork) {
initGeneralSettings();
NetworkSettings netSettings = new NetworkSettings();
netSettings.hostname = GeneralSettings.hostname;
netSettings.gateway = GeneralSettings.gateway;
netSettings.netmask = GeneralSettings.netmask;
netSettings.connectionType = GeneralSettings.connection_type;
netSettings.ip = GeneralSettings.ip;
netSettings.run();
if (manageNetwork) {
NetworkSettings netSettings = new NetworkSettings();
netSettings.hostname = GeneralSettings.hostname;
netSettings.gateway = GeneralSettings.gateway;
netSettings.netmask = GeneralSettings.netmask;
netSettings.connectionType = GeneralSettings.connection_type;
netSettings.ip = GeneralSettings.ip;
netSettings.run();
}
var allCameras = CameraManager.getAllCamerasByName();
if (!allCameras.containsKey(GeneralSettings.curr_camera) && allCameras.size() > 0) {
var cam = allCameras.entrySet().stream().findFirst().get().getValue();

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

@@ -115,6 +115,7 @@ public class VisionProcess implements Runnable {
ntYawEntry.setNumber(pipelineResult.Yaw);
ntPitchEntry.setNumber(pipelineResult.Pitch);
ntDistanceEntry.setNumber(pipelineResult.Area);
NetworkTableInstance.getDefault().flush();
}
ntTimeStampEntry.setNumber(TimeStamp);
}