diff --git a/src/main/java/io/eiren/vr/Main.java b/src/main/java/io/eiren/vr/Main.java index 42c6ce336..33a7bc92a 100644 --- a/src/main/java/io/eiren/vr/Main.java +++ b/src/main/java/io/eiren/vr/Main.java @@ -7,7 +7,7 @@ import io.eiren.util.logging.LogManager; public class Main { - public static String VERSION = "0.0.19"; + public static String VERSION = "0.0.19 Test 1"; public static VRServer vrServer; diff --git a/src/main/java/io/eiren/vr/VRServer.java b/src/main/java/io/eiren/vr/VRServer.java index e09aaa3d4..956cef250 100644 --- a/src/main/java/io/eiren/vr/VRServer.java +++ b/src/main/java/io/eiren/vr/VRServer.java @@ -94,7 +94,7 @@ public class VRServer extends Thread { synchronized(configuration) { TrackerConfig config = configuration.get(tracker.getName()); if(config == null) { - config = new TrackerConfig(tracker.getName()); + config = new TrackerConfig(tracker); configuration.put(tracker.getName(), config); } return config; diff --git a/src/main/java/io/eiren/vr/trackers/Tracker.java b/src/main/java/io/eiren/vr/trackers/Tracker.java index 7e87308c8..34f576ab2 100644 --- a/src/main/java/io/eiren/vr/trackers/Tracker.java +++ b/src/main/java/io/eiren/vr/trackers/Tracker.java @@ -38,4 +38,8 @@ public interface Tracker { public boolean hasPosition(); public boolean isComputed(); + + public default String getDescriptiveName() { + return getName(); + } } diff --git a/src/main/java/io/eiren/vr/trackers/TrackerConfig.java b/src/main/java/io/eiren/vr/trackers/TrackerConfig.java index 2415b47c4..b1e28f93f 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackerConfig.java +++ b/src/main/java/io/eiren/vr/trackers/TrackerConfig.java @@ -8,16 +8,20 @@ public class TrackerConfig { public final String trackerName; public String designation; + public String description; public boolean hide; public Quaternion adjustment; public String mountingRotation; - public TrackerConfig(String trackerName) { - this.trackerName = trackerName; + public TrackerConfig(Tracker tracker) { + this.trackerName = tracker.getName(); + this.description = tracker.getDescriptiveName(); + this.designation = tracker.getBodyPosition() != null ? tracker.getBodyPosition().designation : null; } public TrackerConfig(YamlNode node) { this.trackerName = node.getString("name"); + this.description = node.getString("description"); this.designation = node.getString("designation"); this.hide = node.getBoolean("hide", false); this.mountingRotation = node.getString("rotation"); @@ -54,5 +58,10 @@ public class TrackerConfig { } else { configNode.removeProperty("rotation"); } + if(description != null) { + configNode.setProperty("description", description); + } else { + configNode.removeProperty("description"); + } } } diff --git a/src/main/java/io/eiren/vr/trackers/TrackersUDPServer.java b/src/main/java/io/eiren/vr/trackers/TrackersUDPServer.java index 8ee1efcaf..2ec2a5d59 100644 --- a/src/main/java/io/eiren/vr/trackers/TrackersUDPServer.java +++ b/src/main/java/io/eiren/vr/trackers/TrackersUDPServer.java @@ -103,7 +103,8 @@ public class TrackersUDPServer extends Thread { firmware.append("owoTrack"); isOwo = true; } - IMUTracker imu = new IMUTracker("udp:/" + handshakePacket.getAddress().toString(), this); + String trackerName = macString != null ? "upd://" + macString : "udp:/" + handshakePacket.getAddress().toString(); + IMUTracker imu = new IMUTracker(trackerName, this); ReferenceAdjustedTracker adjustedTracker = new ReferenceAdjustedTracker<>(imu); trackersConsumer.accept(adjustedTracker); sensor = new TrackerConnection(imu, handshakePacket.getSocketAddress()); @@ -114,7 +115,7 @@ public class TrackersUDPServer extends Thread { trackers.add(sensor); trackersMap.put(addr, sensor); } - System.out.println("[TrackerServer] Sensor " + i + " added with address " + handshakePacket.getSocketAddress() + ". Board type: " + boardType + ", imu type: " + imuType + ", firmware: " + firmware + " (" + firmwareBuild + "), mac: " + macString); + System.out.println("[TrackerServer] Sensor " + i + " added with address " + handshakePacket.getSocketAddress() + ". Board type: " + boardType + ", imu type: " + imuType + ", firmware: " + firmware + " (" + firmwareBuild + "), mac: " + macString + ", name: " + trackerName); } sensor.tracker.setStatus(TrackerStatus.OK); socket.send(new DatagramPacket(HANDSHAKE_BUFFER, HANDSHAKE_BUFFER.length, handshakePacket.getAddress(), handshakePacket.getPort()));