diff --git a/src/main/java/dev/slimevr/Main.java b/src/main/java/dev/slimevr/Main.java index 9ba409b70..a68c13d5e 100644 --- a/src/main/java/dev/slimevr/Main.java +++ b/src/main/java/dev/slimevr/Main.java @@ -15,7 +15,7 @@ import io.eiren.util.logging.LogManager; public class Main { - public static String VERSION = "0.1.3"; + public static String VERSION = "0.2.0"; public static VRServer vrServer; diff --git a/src/main/java/dev/slimevr/NetworkProtocol.java b/src/main/java/dev/slimevr/NetworkProtocol.java new file mode 100644 index 000000000..1300da175 --- /dev/null +++ b/src/main/java/dev/slimevr/NetworkProtocol.java @@ -0,0 +1,9 @@ +package dev.slimevr; + +public enum NetworkProtocol { + + OWO_LEGACY, + SLIMEVR_RAW, + SLIMEVR_FLATBUFFER, + SLIMEVR_WEBSOCKET; +} diff --git a/src/main/java/dev/slimevr/gui/TrackersList.java b/src/main/java/dev/slimevr/gui/TrackersList.java index 9487ad57a..264022e2a 100644 --- a/src/main/java/dev/slimevr/gui/TrackersList.java +++ b/src/main/java/dev/slimevr/gui/TrackersList.java @@ -48,6 +48,7 @@ public class TrackersList extends EJBoxNoStretch { private final VRServer server; private final VRServerGUI gui; private long lastUpdate = 0; + private boolean debug = false; public TrackersList(VRServer server, VRServerGUI gui) { super(BoxLayout.PAGE_AXIS, false, true); @@ -59,6 +60,12 @@ public class TrackersList extends EJBoxNoStretch { server.addNewTrackerConsumer(this::newTrackerAdded); } + @AWTThread + public void setDebug(boolean debug) { + this.debug = debug; + build(); + } + @AWTThread private void build() { removeAll(); @@ -142,6 +149,7 @@ public class TrackersList extends EJBoxNoStretch { JLabel magAccuracy; JLabel adj; JLabel adjYaw; + JLabel adjGyro; JLabel correction; JLabel signalStrength; JLabel rotQuat; @@ -245,18 +253,17 @@ public class TrackersList extends EJBoxNoStretch { row++; add(new JLabel("Raw:"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); add(raw = new JLabel("0 0 0"), s(c(1, row, 2, GridBagConstraints.FIRST_LINE_START), 3, 1)); - /* - if(realTracker instanceof IMUTracker) { + + if(debug && realTracker instanceof IMUTracker) { add(new JLabel("Quat:"), c(2, row, 2, GridBagConstraints.FIRST_LINE_START)); add(rotQuat = new JLabel("0"), c(3, row, 2, GridBagConstraints.FIRST_LINE_START)); } - //*/ row++; - /* - if(realTracker instanceof IMUTracker) { + + if(debug && realTracker instanceof IMUTracker) { add(new JLabel("Raw mag:"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); add(rawMag = new JLabel("0 0 0"), s(c(1, row, 2, GridBagConstraints.FIRST_LINE_START), 3, 1)); - add(new JLabel("Hash:"), c(2, row, 2, GridBagConstraints.FIRST_LINE_START)); + add(new JLabel("Gyro fix:"), c(2, row, 2, GridBagConstraints.FIRST_LINE_START)); add(new JLabel(String.format("0x%8x", realTracker.hashCode())), s(c(3, row, 2, GridBagConstraints.FIRST_LINE_START), 3, 1)); row++; add(new JLabel("Cal:"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); @@ -270,16 +277,16 @@ public class TrackersList extends EJBoxNoStretch { add(rotAdj = new JLabel("0"), c(3, row, 2, GridBagConstraints.FIRST_LINE_START)); row++; } - //*/ - /* - if(t instanceof ReferenceAdjustedTracker) { - add(new JLabel("Adj:"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); + if(debug && t instanceof ReferenceAdjustedTracker) { + add(new JLabel("Att fix:"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); add(adj = new JLabel("0 0 0 0"), c(1, row, 2, GridBagConstraints.FIRST_LINE_START)); - add(new JLabel("AdjY:"), c(2, row, 2, GridBagConstraints.FIRST_LINE_START)); + add(new JLabel("Yaw Fix:"), c(2, row, 2, GridBagConstraints.FIRST_LINE_START)); add(adjYaw = new JLabel("0 0 0 0"), c(3, row, 2, GridBagConstraints.FIRST_LINE_START)); + row++; + add(new JLabel("Gyro Fix:"), c(0, row, 2, GridBagConstraints.FIRST_LINE_START)); + add(adjGyro = new JLabel("0 0 0 0"), c(1, row, 2, GridBagConstraints.FIRST_LINE_START)); } - //*/ setBorder(BorderFactory.createLineBorder(new Color(0x663399), 2, false)); TrackersList.this.add(this); @@ -314,21 +321,30 @@ public class TrackersList extends EJBoxNoStretch { if(realTracker instanceof TrackerWithBattery) bat.setText(String.format("%d%% (%sV)", Math.round(((TrackerWithBattery) realTracker).getBatteryLevel()), StringUtils.prettyNumber(((TrackerWithBattery) realTracker).getBatteryVoltage(), 2))); if(t instanceof ReferenceAdjustedTracker) { - ((ReferenceAdjustedTracker) t).attachmentFix.toAngles(angles); - if(adj != null) + ReferenceAdjustedTracker rat = (ReferenceAdjustedTracker) t; + if(adj != null) { + rat.attachmentFix.toAngles(angles); adj.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) + " " + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); - ((ReferenceAdjustedTracker) t).yawFix.toAngles(angles); - if(adjYaw != null) + } + if(adjYaw != null) { + rat.yawFix.toAngles(angles); adjYaw.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) + " " + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); + } + if(adjGyro != null) { + rat.gyroFix.toAngles(angles); + adjGyro.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) + + " " + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) + + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); + } } if(realTracker instanceof IMUTracker) { if(ping != null) ping.setText(String.valueOf(((IMUTracker) realTracker).ping)); - if (signalStrength != null) { + if(signalStrength != null) { int signal = ((IMUTracker) realTracker).signalStrength; if (signal == -1) { signalStrength.setText("N/A"); @@ -347,21 +363,23 @@ public class TrackersList extends EJBoxNoStretch { + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); if(realTracker instanceof IMUTracker) { IMUTracker imu = (IMUTracker) realTracker; - imu.rotMagQuaternion.toAngles(angles); - if(rawMag != null) + if(rawMag != null) { + imu.rotMagQuaternion.toAngles(angles); rawMag.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) + " " + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); + } if(calibration != null) calibration.setText(imu.calibrationStatus + " / " + imu.magCalibrationStatus); if(magAccuracy != null) magAccuracy.setText(StringUtils.prettyNumber(imu.magnetometerAccuracy * FastMath.RAD_TO_DEG, 1) + "°"); - imu.getCorrection(q); - q.toAngles(angles); - if(correction != null) + if(correction != null) { + imu.getCorrection(q); + q.toAngles(angles); correction.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) + " " + StringUtils.prettyNumber(angles[1] * FastMath.RAD_TO_DEG, 0) + " " + StringUtils.prettyNumber(angles[2] * FastMath.RAD_TO_DEG, 0)); + } if(rotQuat != null) { imu.rotQuaternion.toAngles(angles); rotQuat.setText(StringUtils.prettyNumber(angles[0] * FastMath.RAD_TO_DEG, 0) diff --git a/src/main/java/dev/slimevr/gui/VRServerGUI.java b/src/main/java/dev/slimevr/gui/VRServerGUI.java index e43b90e0d..01d639c96 100644 --- a/src/main/java/dev/slimevr/gui/VRServerGUI.java +++ b/src/main/java/dev/slimevr/gui/VRServerGUI.java @@ -198,6 +198,17 @@ public class VRServerGUI extends JFrame { add(new EJBoxNoStretch(PAGE_AXIS, false, true) {{ setAlignmentY(TOP_ALIGNMENT); + + JCheckBox debugCb; + add(debugCb = new JCheckBox("Show debug information")); + debugCb.setSelected(false); + debugCb.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + trackersList.setDebug(debugCb.isSelected()); + } + }); + JLabel l; add(l = new JLabel("Body proportions")); l.setFont(l.getFont().deriveFont(Font.BOLD)); diff --git a/src/main/java/dev/slimevr/vr/trackers/BnoTap.java b/src/main/java/dev/slimevr/vr/trackers/SensorTap.java similarity index 81% rename from src/main/java/dev/slimevr/vr/trackers/BnoTap.java rename to src/main/java/dev/slimevr/vr/trackers/SensorTap.java index 4a37f6922..12ae3413d 100644 --- a/src/main/java/dev/slimevr/vr/trackers/BnoTap.java +++ b/src/main/java/dev/slimevr/vr/trackers/SensorTap.java @@ -1,10 +1,10 @@ package dev.slimevr.vr.trackers; -public class BnoTap { +public class SensorTap { public final boolean doubleTap; - public BnoTap(int tapBits) { + public SensorTap(int tapBits) { doubleTap = (tapBits & 0x40) > 0; } diff --git a/src/main/java/dev/slimevr/vr/trackers/TrackersUDPServer.java b/src/main/java/dev/slimevr/vr/trackers/TrackersUDPServer.java index 34582b6f5..236ee81d9 100644 --- a/src/main/java/dev/slimevr/vr/trackers/TrackersUDPServer.java +++ b/src/main/java/dev/slimevr/vr/trackers/TrackersUDPServer.java @@ -22,6 +22,8 @@ import java.util.Map; import java.util.Random; import java.util.function.Consumer; +import org.apache.commons.lang3.ArrayUtils; + import com.jme3.math.FastMath; import com.jme3.math.Quaternion; import com.jme3.math.Vector3f; @@ -44,6 +46,7 @@ public class TrackersUDPServer extends Thread { private static final byte[] KEEPUP_BUFFER = new byte[64]; private static final byte[] CALIBRATION_BUFFER = new byte[64]; private static final byte[] CALIBRATION_REQUEST_BUFFER = new byte[64]; + private static final byte[] dummyPacket = new byte[12]; private final Quaternion buf = new Quaternion(); private final Random random = new Random(); @@ -52,6 +55,7 @@ public class TrackersUDPServer extends Thread { private final Map connectionsByMAC = new HashMap<>(); private final Consumer trackersConsumer; private final int port; + private final ArrayList broadcastAddresses = new ArrayList<>(); protected DatagramSocket socket = null; protected long lastKeepup = System.currentTimeMillis(); @@ -60,6 +64,28 @@ public class TrackersUDPServer extends Thread { super(name); this.port = port; this.trackersConsumer = trackersConsumer; + try { + Enumeration ifaces = NetworkInterface.getNetworkInterfaces(); + while(ifaces.hasMoreElements()) { + NetworkInterface iface = ifaces.nextElement(); + // Ignore loopback, PPP, virtual and disabled devices + if(iface.isLoopback() || !iface.isUp() || iface.isPointToPoint() || iface.isVirtual()) { + continue; + } + Enumeration iaddrs = iface.getInetAddresses(); + while(iaddrs.hasMoreElements()) { + InetAddress iaddr = iaddrs.nextElement(); + // Ignore IPv6 addresses + if(iaddr instanceof Inet6Address) { + continue; + } + String[] iaddrParts = iaddr.getHostAddress().split("\\."); + broadcastAddresses.add(new InetSocketAddress(String.format("%s.%s.%s.255", iaddrParts[0], iaddrParts[1], iaddrParts[2]), port)); + } + } + } catch(Exception e) { + LogManager.log.severe("[TrackerServer] Can't enumerate network interfaces", e); + } } private void setUpNewConnection(DatagramPacket handshakePacket, ByteBuffer data) throws IOException { @@ -169,32 +195,10 @@ public class TrackersUDPServer extends Thread { try { socket = new DatagramSocket(port); - // Why not just 255.255.255.255? Because Windows. - // https://social.technet.microsoft.com/Forums/windows/en-US/72e7387a-9f2c-4bf4-a004-c89ddde1c8aa/how-to-fix-the-global-broadcast-address-255255255255-behavior-on-windows - ArrayList addresses = new ArrayList(); - Enumeration ifaces = NetworkInterface.getNetworkInterfaces(); - while(ifaces.hasMoreElements()) { - NetworkInterface iface = ifaces.nextElement(); - // Ignore loopback, PPP, virtual and disabled devices - if(iface.isLoopback() || !iface.isUp() || iface.isPointToPoint() || iface.isVirtual()) { - continue; - } - Enumeration iaddrs = iface.getInetAddresses(); - while(iaddrs.hasMoreElements()) { - InetAddress iaddr = iaddrs.nextElement(); - // Ignore IPv6 addresses - if(iaddr instanceof Inet6Address) { - continue; - } - String[] iaddrParts = iaddr.getHostAddress().split("\\."); - addresses.add(new InetSocketAddress(String.format("%s.%s.%s.255", iaddrParts[0], iaddrParts[1], iaddrParts[2]), port)); - } - } - byte[] dummyPacket = new byte[]{0x0}; - long prevPacketTime = System.currentTimeMillis(); socket.setSoTimeout(250); while(true) { + DatagramPacket received = null; try { boolean hasActiveTrackers = false; for(TrackerConnection tracker : connections) { @@ -206,21 +210,22 @@ public class TrackersUDPServer extends Thread { if(!hasActiveTrackers) { long discoveryPacketTime = System.currentTimeMillis(); if((discoveryPacketTime - prevPacketTime) >= 2000) { - for(SocketAddress addr : addresses) { + for(SocketAddress addr : broadcastAddresses) { socket.send(new DatagramPacket(dummyPacket, dummyPacket.length, addr)); } prevPacketTime = discoveryPacketTime; } } - DatagramPacket recieve = new DatagramPacket(rcvBuffer, rcvBuffer.length); - socket.receive(recieve); + received = new DatagramPacket(rcvBuffer, rcvBuffer.length); + socket.receive(received); + bb.limit(received.getLength()); bb.rewind(); TrackerConnection connection; IMUTracker tracker = null; synchronized(connections) { - connection = connectionsByAddress.get(recieve.getAddress()); + connection = connectionsByAddress.get(received.getAddress()); } int packetId = bb.getInt(); long packetNumber = bb.getLong(); @@ -228,7 +233,7 @@ public class TrackersUDPServer extends Thread { if(connection != null) { if(!connection.isNextPacket(packetNumber)) { // Skip packet because it's not next - LogManager.log.warning("[TrackerServer] Out of order packet received: id " + packetId + ", number " + packetNumber + ", last " + connection.lastPacketNumber + ", from " + recieve.getSocketAddress()); + LogManager.log.warning("[TrackerServer] Out of order packet received: id " + packetId + ", number " + packetNumber + ", last " + connection.lastPacketNumber + ", from " + received.getSocketAddress()); continue; } connection.lastPacket = System.currentTimeMillis(); @@ -237,7 +242,7 @@ public class TrackersUDPServer extends Thread { case 0: break; case 3: - setUpNewConnection(recieve, bb); + setUpNewConnection(received, bb); break; case 1: // PACKET_ROTATION case 16: // PACKET_ROTATION_2 @@ -352,12 +357,12 @@ public class TrackersUDPServer extends Thread { if(tracker == null) break; int tap = bb.get() & 0xFF; - BnoTap tapObj = new BnoTap(tap); + SensorTap tapObj = new SensorTap(tap); LogManager.log.info("[TrackerServer] Tap packet received from " + tracker.getName() + "/" + sensorId + ": " + tapObj + " (b" + Integer.toBinaryString(tap) + ")"); break; case 14: // PACKET_ERROR byte reason = bb.get(); - LogManager.log.severe("[TrackerServer] Error recieved from " + recieve.getSocketAddress() + ": " + reason); + LogManager.log.severe("[TrackerServer] Error recieved from " + received.getSocketAddress() + ": " + reason); if(connection == null) break; sensorId = bb.get() & 0xFF; @@ -396,11 +401,12 @@ public class TrackersUDPServer extends Thread { } break; default: - LogManager.log.warning("[TrackerServer] Unknown data received: " + packetId + " from " + recieve.getSocketAddress()); + LogManager.log.warning("[TrackerServer] Unknown data received: " + packetId + " from " + received.getSocketAddress() + ": " + packetToString(received)); break; } - } catch(SocketTimeoutException e) {} catch(Exception e) { - e.printStackTrace(); + } catch(SocketTimeoutException e) { + } catch(Exception e) { + LogManager.log.warning("Error parsing packet " + packetToString(received), e); } if(lastKeepup + 500 < System.currentTimeMillis()) { lastKeepup = System.currentTimeMillis(); @@ -435,6 +441,7 @@ public class TrackersUDPServer extends Thread { conn.lastPingPacketId = random.nextInt(); conn.lastPingPacketTime = System.currentTimeMillis(); bb.rewind(); + bb.limit(bb.capacity()); bb.putInt(10); bb.putLong(0); bb.putInt(conn.lastPingPacketId); @@ -451,6 +458,19 @@ public class TrackersUDPServer extends Thread { } } + private static String packetToString(DatagramPacket packet) { + StringBuilder sb = new StringBuilder(); + sb.append("DatagramPacket{"); + sb.append(packet.getAddress().toString()); + sb.append(packet.getPort()); + sb.append(','); + sb.append(packet.getLength()); + sb.append(','); + sb.append(ArrayUtils.toString(packet.getData())); + sb.append('}'); + return sb.toString(); + } + private class TrackerConnection { Map sensors = new HashMap<>();