mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-11-20 17:11:20 -08:00
Bring back device ip (#256)
This commit is contained in:
1 parent
d5059ed48c
commit
f3d32da4cd
5 files changed
+36
-2
No files matched your search
@@ -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));
|
||||
|
||||
@@ -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);
|
||||
}
|
||||
|
||||
@@ -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<Tracker> getTrackers() {
|
||||
return trackers;
|
||||
}
|
||||
|
||||
@@ -71,6 +71,11 @@ public class UDPDevice extends Device {
|
||||
return name;
|
||||
}
|
||||
|
||||
@Override
|
||||
public InetAddress getIpAddress() {
|
||||
return this.ipAddress;
|
||||
}
|
||||
|
||||
@Override
|
||||
public FastList<Tracker> getTrackers() {
|
||||
return this.trackers;
|
||||
|
||||
Reference in new issue
Block a user