From f3d32da4cd0b5221f0fb25176bf7fe10029faec4 Mon Sep 17 00:00:00 2001 From: lucas lelievre Date: Thu, 20 Oct 2022 17:10:31 +0200 Subject: [PATCH] Bring back device ip (#256) --- solarxr-protocol | 2 +- src/main/java/dev/slimevr/gui/TrackersList.java | 13 +++++++++++++ .../java/dev/slimevr/protocol/DataFeedBuilder.java | 13 ++++++++++++- src/main/java/dev/slimevr/vr/Device.java | 5 +++++ .../java/dev/slimevr/vr/trackers/udp/UDPDevice.java | 5 +++++ 5 files changed, 36 insertions(+), 2 deletions(-) diff --git a/solarxr-protocol b/solarxr-protocol index 116580c34..f588c2e4a 160000 --- a/solarxr-protocol +++ b/solarxr-protocol @@ -1 +1 @@ -Subproject commit 116580c3443829bf07b5a0790f52d49a939850f9 +Subproject commit f588c2e4adc70480d7dfe23f77621d1f2183ed47 diff --git a/src/main/java/dev/slimevr/gui/TrackersList.java b/src/main/java/dev/slimevr/gui/TrackersList.java index f351df6c0..34911aa5b 100644 --- a/src/main/java/dev/slimevr/gui/TrackersList.java +++ b/src/main/java/dev/slimevr/gui/TrackersList.java @@ -132,6 +132,7 @@ public class TrackersList extends EJBoxNoStretch { JLabel position; JLabel rotation; JLabel status; + JLabel url; JLabel tps; JLabel bat; JLabel ping; @@ -236,6 +237,16 @@ public class TrackersList extends EJBoxNoStretch { } row++; } + + if (t.getDevice() != null && t.getDevice().getIpAddress() != null) { + add(new JLabel("URL:"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); + add( + url = new JLabel(""), + c(1, row, 2, GridBagConstraints.FIRST_LINE_START) + ); + row++; + } + if (t.hasRotation()) add(new JLabel("Rotation"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); if (t.hasPosition()) @@ -383,6 +394,8 @@ public class TrackersList extends EJBoxNoStretch { + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0) ); status.setText(t.getStatus().toString().toLowerCase()); + if (t.getDevice() != null && t.getDevice().getIpAddress() != null) + url.setText("udp:/" + t.getDevice().getIpAddress()); if (tracker instanceof TrackerWithTPS) { tps.setText(StringUtils.prettyNumber(((TrackerWithTPS) tracker).getTPS(), 1)); diff --git a/src/main/java/dev/slimevr/protocol/DataFeedBuilder.java b/src/main/java/dev/slimevr/protocol/DataFeedBuilder.java index 654465c0f..d6aab6c2b 100644 --- a/src/main/java/dev/slimevr/protocol/DataFeedBuilder.java +++ b/src/main/java/dev/slimevr/protocol/DataFeedBuilder.java @@ -14,6 +14,7 @@ import solarxr_protocol.data_feed.tracker.TrackerData; import solarxr_protocol.data_feed.tracker.TrackerDataMaskT; import solarxr_protocol.data_feed.tracker.TrackerInfo; import solarxr_protocol.datatypes.DeviceId; +import solarxr_protocol.datatypes.Ipv4Address; import solarxr_protocol.datatypes.Temperature; import solarxr_protocol.datatypes.TrackerId; import solarxr_protocol.datatypes.hardware_info.HardwareInfo; @@ -21,6 +22,7 @@ import solarxr_protocol.datatypes.hardware_info.HardwareStatus; import solarxr_protocol.datatypes.math.Quat; import solarxr_protocol.datatypes.math.Vec3f; +import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; @@ -41,11 +43,20 @@ public class DataFeedBuilder { HardwareInfo.startHardwareInfo(fbb); HardwareInfo.addFirmwareVersion(fbb, nameOffset); HardwareInfo.addManufacturer(fbb, manufacturerOffset); + HardwareInfo + .addIpAddress( + fbb, + Ipv4Address + .createIpv4Address( + fbb, + ByteBuffer.wrap(device.getIpAddress().getAddress()).getInt() + ) + ); // BRUH MOMENT // TODO need support: HardwareInfo.addHardwareRevision(fbb, // hardwareRevisionOffset); // TODO need support: HardwareInfo.addDisplayName(fbb, de); - // TODO need support: HardwareInfo.addHardwareAddress(fbb, tracker.); + // TODO need support: HardwareInfo.addMcuId(device); return HardwareInfo.endHardwareInfo(fbb); } diff --git a/src/main/java/dev/slimevr/vr/Device.java b/src/main/java/dev/slimevr/vr/Device.java index d6d64948d..a1734f21f 100644 --- a/src/main/java/dev/slimevr/vr/Device.java +++ b/src/main/java/dev/slimevr/vr/Device.java @@ -3,6 +3,7 @@ package dev.slimevr.vr; import dev.slimevr.vr.trackers.Tracker; import io.eiren.util.collections.FastList; +import java.net.InetAddress; import java.util.concurrent.atomic.AtomicInteger; @@ -53,6 +54,10 @@ public class Device { return this.customName; } + public InetAddress getIpAddress() { + return null; + } + public FastList getTrackers() { return trackers; } diff --git a/src/main/java/dev/slimevr/vr/trackers/udp/UDPDevice.java b/src/main/java/dev/slimevr/vr/trackers/udp/UDPDevice.java index 58d9ca273..64779fba5 100644 --- a/src/main/java/dev/slimevr/vr/trackers/udp/UDPDevice.java +++ b/src/main/java/dev/slimevr/vr/trackers/udp/UDPDevice.java @@ -71,6 +71,11 @@ public class UDPDevice extends Device { return name; } + @Override + public InetAddress getIpAddress() { + return this.ipAddress; + } + @Override public FastList getTrackers() { return this.trackers;