mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-11-22 01:51:20 -08:00
Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5e89e64e27 | ||
|
|
bd6d9b693a | ||
|
|
57d74747c2 |
No files matched your search
+1
-2
@@ -13,5 +13,4 @@ rust-version = "1.82" # Tauri's MSRV
|
||||
repository = "https://github.com/SlimeVR/SlimeVR-Server"
|
||||
|
||||
[profile.release]
|
||||
lto = true
|
||||
strip = true
|
||||
lto = "thin"
|
||||
@@ -18,8 +18,6 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="1A86", ATTRS{idProduct}=="7522", MODE="0660
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1A86", ATTRS{idProduct}=="7523", MODE="0660", TAG+="uaccess"
|
||||
# CH341
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1A86", ATTRS{idProduct}=="5523", MODE="0660", TAG+="uaccess"
|
||||
# CH343
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1A86", ATTRS{idProduct}=="55D3", MODE="0660", TAG+="uaccess"
|
||||
# CH9102x
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="1A86", ATTRS{idProduct}=="55D4", MODE="0660", TAG+="uaccess"
|
||||
|
||||
@@ -28,10 +26,8 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="1A86", ATTRS{idProduct}=="55D4", MODE="0660
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="10C4", ATTRS{idProduct}=="EA60", MODE="0660", TAG+="uaccess"
|
||||
|
||||
## Espressif
|
||||
# ESP32-S3 / ESP32-C3 / ESP32-C5 / ESP32-C6 / ESP32-C61 / ESP32-H2 / ESP32-P4
|
||||
# ESP32-C3
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="303A", ATTRS{idProduct}=="1001", MODE="0660", TAG+="uaccess"
|
||||
# ESP32-S2
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="303A", ATTRS{idProduct}=="0002", MODE="0660", TAG+="uaccess"
|
||||
|
||||
## FTDI
|
||||
# FT232BM/L/Q, FT245BM/L/Q
|
||||
|
||||
@@ -38,7 +38,7 @@ export function TrackerBattery({
|
||||
|
||||
return (
|
||||
<Tooltip
|
||||
disabled={charging || !runtime || debug}
|
||||
disabled={!charging && (!runtime || debug)}
|
||||
preferedDirection="left"
|
||||
content=<Typography>{percentFormatter.format(value)}</Typography>
|
||||
>
|
||||
|
||||
@@ -199,7 +199,7 @@ export function TrackerSettingsPage() {
|
||||
shakeHighlight={false}
|
||||
/>
|
||||
)}
|
||||
{tracker?.device?.hardwareInfo?.hardwareIdentifier != 'Unknown' && (
|
||||
{
|
||||
<div className="flex flex-col bg-background-70 p-3 rounded-lg gap-2">
|
||||
<Typography
|
||||
variant="section-title"
|
||||
@@ -223,38 +223,34 @@ export function TrackerSettingsPage() {
|
||||
whitespace="whitespace-pre-wrap"
|
||||
textAlign="text-end"
|
||||
>
|
||||
{tracker?.device?.hardwareInfo?.firmwareVersion
|
||||
? `v${tracker?.device?.hardwareInfo?.firmwareVersion}`
|
||||
: '--'}
|
||||
v{tracker?.device?.hardwareInfo?.firmwareVersion}
|
||||
</Typography>
|
||||
</div>
|
||||
{!!tracker?.device?.hardwareInfo?.officialBoardType && (
|
||||
<div className="flex justify-between gap-2">
|
||||
<Typography id="tracker-settings-latest-version" />
|
||||
{!updateUnavailable && (
|
||||
<>
|
||||
{currentFirmwareRelease && (
|
||||
<Typography
|
||||
color={
|
||||
needUpdate === 'updated'
|
||||
? undefined
|
||||
: 'text-accent-background-10'
|
||||
}
|
||||
textAlign="text-end"
|
||||
whitespace="whitespace-pre-wrap"
|
||||
>
|
||||
{currentFirmwareRelease.name}
|
||||
</Typography>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
{updateUnavailable && (
|
||||
<Typography id="tracker-settings-update-unavailable-v2">
|
||||
No releases found
|
||||
</Typography>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
<div className="flex justify-between gap-2">
|
||||
<Typography id="tracker-settings-latest-version" />
|
||||
{!updateUnavailable && (
|
||||
<>
|
||||
{currentFirmwareRelease && (
|
||||
<Typography
|
||||
color={
|
||||
needUpdate === 'updated'
|
||||
? undefined
|
||||
: 'text-accent-background-10'
|
||||
}
|
||||
textAlign="text-end"
|
||||
whitespace="whitespace-pre-wrap"
|
||||
>
|
||||
{currentFirmwareRelease.name}
|
||||
</Typography>
|
||||
)}
|
||||
</>
|
||||
)}
|
||||
{updateUnavailable && (
|
||||
<Typography id="tracker-settings-update-unavailable-v2">
|
||||
No releases found
|
||||
</Typography>
|
||||
)}
|
||||
</div>
|
||||
</div>
|
||||
{!updateUnavailable && (
|
||||
<Tooltip
|
||||
@@ -293,7 +289,7 @@ export function TrackerSettingsPage() {
|
||||
</Tooltip>
|
||||
)}
|
||||
</div>
|
||||
)}
|
||||
}
|
||||
|
||||
<div className="flex flex-col bg-background-70 p-3 rounded-lg gap-2 overflow-x-auto">
|
||||
<div className="flex justify-between">
|
||||
@@ -321,11 +317,10 @@ export function TrackerSettingsPage() {
|
||||
<div className="flex justify-between">
|
||||
<Typography>{l10n.getString('tracker-infos-url')}</Typography>
|
||||
<Typography>
|
||||
{tracker?.device?.hardwareInfo?.ipAddress?.addr
|
||||
? `udp://${IPv4.fromNumber(
|
||||
tracker?.device?.hardwareInfo?.ipAddress?.addr || 0
|
||||
).toString()}`
|
||||
: '--'}
|
||||
udp://
|
||||
{IPv4.fromNumber(
|
||||
tracker?.device?.hardwareInfo?.ipAddress?.addr || 0
|
||||
).toString()}
|
||||
</Typography>
|
||||
</div>
|
||||
<div className="flex justify-between">
|
||||
|
||||
@@ -11,6 +11,7 @@ import dev.slimevr.serial.SerialPort
|
||||
import dev.slimevr.tracking.trackers.Tracker
|
||||
import dev.slimevr.tracking.trackers.TrackerStatus
|
||||
import dev.slimevr.tracking.trackers.TrackerStatusListener
|
||||
import dev.slimevr.tracking.trackers.udp.MCUType
|
||||
import dev.slimevr.tracking.trackers.udp.UDPDevice
|
||||
import io.eiren.util.logging.LogManager
|
||||
import kotlinx.coroutines.*
|
||||
@@ -101,11 +102,27 @@ class FirmwareUpdateHandler(private val server: VRServer) :
|
||||
)
|
||||
return@suspendCancellableCoroutine
|
||||
}
|
||||
|
||||
// TODO:
|
||||
// - Use the Firmware Builder to get the expected MCU
|
||||
// It would be wrong to assume that the Target MCU is the correct one,
|
||||
// just because the device is listening on the correct port.
|
||||
// The Upload protocol does not verify the compatibility of the firmware with the MCU.
|
||||
|
||||
val port = when (udpDevice.mcuType) {
|
||||
MCUType.ESP8266 -> 8266
|
||||
MCUType.ESP32, MCUType.ESP32_C3 -> 3232
|
||||
else -> error("MCU-Typ: ${udpDevice.mcuType} not supported for OTA updates")
|
||||
}
|
||||
|
||||
LogManager.info("[FirmwareUpdateHandler] Starting OTA update for device ${deviceId.id} at ${udpDevice.ipAddress.hostAddress}:$port and MCU ${udpDevice.mcuType}")
|
||||
|
||||
val task = OTAUpdateTask(
|
||||
part.firmware,
|
||||
deviceId,
|
||||
udpDevice.ipAddress,
|
||||
::onStatusChange,
|
||||
port,
|
||||
)
|
||||
c.invokeOnCancellation {
|
||||
task.cancel()
|
||||
@@ -156,6 +173,15 @@ class FirmwareUpdateHandler(private val server: VRServer) :
|
||||
flasher.addBin(part.firmware, part.offset.toInt())
|
||||
}
|
||||
|
||||
// TODO:
|
||||
// - Check if FW is able to use flashmode
|
||||
// - Add check if the flashmode was successfully set to surpress the request
|
||||
// for manual flashmode setting prompt in gui
|
||||
|
||||
server.serialHandler.openSerial(deviceId.id, false)
|
||||
server.serialHandler.write("SET FLASHMODE\r\n".toByteArray())
|
||||
server.serialHandler.closeSerial()
|
||||
|
||||
flasher.addProgressListener(object : FlashingProgressListener {
|
||||
override fun progress(progress: Float) {
|
||||
onStatusChange(
|
||||
|
||||
@@ -14,6 +14,8 @@ import java.security.MessageDigest
|
||||
import java.security.NoSuchAlgorithmException
|
||||
import java.util.*
|
||||
import java.util.function.Consumer
|
||||
import javax.crypto.SecretKeyFactory
|
||||
import javax.crypto.spec.PBEKeySpec
|
||||
import kotlin.math.min
|
||||
|
||||
class OTAUpdateTask(
|
||||
@@ -21,8 +23,9 @@ class OTAUpdateTask(
|
||||
private val deviceId: UpdateDeviceId<Int>,
|
||||
private val deviceIp: InetAddress,
|
||||
private val statusCallback: Consumer<UpdateStatusEvent<Int>>,
|
||||
private val port: Int = 8266,
|
||||
) {
|
||||
private val receiveBuffer: ByteArray = ByteArray(38)
|
||||
private val receiveBuffer: ByteArray = ByteArray(69)
|
||||
var socketServer: ServerSocket? = null
|
||||
var uploadSocket: Socket? = null
|
||||
var authSocket: DatagramSocket? = null
|
||||
@@ -40,17 +43,35 @@ class OTAUpdateTask(
|
||||
return md5str.toString()
|
||||
}
|
||||
|
||||
@Throws(NoSuchAlgorithmException::class)
|
||||
private fun bytesToSha256(bytes: ByteArray): String {
|
||||
val sha256 = MessageDigest.getInstance("SHA-256")
|
||||
sha256.update(bytes)
|
||||
val digest = sha256.digest()
|
||||
val sha256str = StringBuilder()
|
||||
for (b in digest) {
|
||||
sha256str.append(String.format("%02x", b))
|
||||
}
|
||||
return sha256str.toString()
|
||||
}
|
||||
|
||||
fun pbkdf2Hmac(password: String, salt: ByteArray, iterations: Int, keyLength: Int): ByteArray {
|
||||
val spec = PBEKeySpec(password.toCharArray(), salt, iterations, keyLength * 8)
|
||||
val factory = SecretKeyFactory.getInstance("PBKDF2WithHmacSHA256")
|
||||
return factory.generateSecret(spec).encoded
|
||||
}
|
||||
|
||||
private fun authenticate(localPort: Int): Boolean {
|
||||
try {
|
||||
DatagramSocket().use { socket ->
|
||||
authSocket = socket
|
||||
statusCallback.accept(UpdateStatusEvent(deviceId, FirmwareUpdateStatus.AUTHENTICATING))
|
||||
LogManager.info("[OTAUpdate] Sending OTA invitation to: $deviceIp")
|
||||
LogManager.info("[OTAUpdate] Sending OTA invitation to: $deviceIp:$port")
|
||||
|
||||
val fileMd5 = bytesToMd5(firmware)
|
||||
val message = "$FLASH $localPort ${firmware.size} $fileMd5\n"
|
||||
|
||||
socket.send(DatagramPacket(message.toByteArray(), message.length, deviceIp, PORT))
|
||||
socket.send(DatagramPacket(message.toByteArray(), message.length, deviceIp, port))
|
||||
socket.soTimeout = 10000
|
||||
|
||||
val authPacket = DatagramPacket(receiveBuffer, receiveBuffer.size)
|
||||
@@ -68,13 +89,26 @@ class OTAUpdateTask(
|
||||
if (args.size != 2 || args[0] != "AUTH") return false
|
||||
|
||||
LogManager.info("[OTAUpdate] Authenticating...")
|
||||
var payload = ""
|
||||
var signature = ""
|
||||
|
||||
val authToken = args[1]
|
||||
val signature = bytesToMd5(UUID.randomUUID().toString().toByteArray())
|
||||
val hashedPassword = bytesToMd5(PASSWORD.toByteArray())
|
||||
val resultText = "$hashedPassword:$authToken:$signature"
|
||||
val payload = bytesToMd5(resultText.toByteArray())
|
||||
|
||||
if (authToken.length == 32) {
|
||||
signature =
|
||||
bytesToMd5(UUID.randomUUID().toString().toByteArray())
|
||||
val hashedPassword = bytesToMd5(PASSWORD.toByteArray())
|
||||
val resultText = "$hashedPassword:$authToken:$signature"
|
||||
payload = bytesToMd5(resultText.toByteArray())
|
||||
} else if (authToken.length == 64) {
|
||||
signature =
|
||||
bytesToSha256(UUID.randomUUID().toString().toByteArray())
|
||||
val salt = "$authToken:$signature"
|
||||
val hashedPassword = bytesToSha256(PASSWORD.toByteArray())
|
||||
val derivedkey = pbkdf2Hmac(hashedPassword, salt.toByteArray(), 10000, 32)
|
||||
val derivedkeyHex = derivedkey.joinToString("") { "%02x".format(it) }
|
||||
val challenge = "$derivedkeyHex:$authToken:$signature"
|
||||
payload = bytesToSha256(challenge.toByteArray())
|
||||
}
|
||||
val authMessage = "$AUTH $signature $payload\n"
|
||||
|
||||
socket.soTimeout = 10000
|
||||
@@ -83,7 +117,7 @@ class OTAUpdateTask(
|
||||
authMessage.toByteArray(),
|
||||
authMessage.length,
|
||||
deviceIp,
|
||||
PORT,
|
||||
port,
|
||||
),
|
||||
)
|
||||
|
||||
@@ -198,7 +232,6 @@ class OTAUpdateTask(
|
||||
|
||||
companion object {
|
||||
private const val FLASH = 0
|
||||
private const val PORT = 8266
|
||||
private const val PASSWORD = "SlimeVR-OTA"
|
||||
private const val AUTH = 200
|
||||
}
|
||||
|
||||
@@ -349,9 +349,6 @@ fun createDeviceData(
|
||||
if (tracker.packetsReceived != null) {
|
||||
HardwareStatus.addPacketsReceived(fbb, tracker.packetsReceived!!)
|
||||
}
|
||||
if (tracker.batteryRemainingRuntime != null) {
|
||||
HardwareStatus.addBatteryRuntimeEstimate(fbb, tracker.batteryRemainingRuntime!!)
|
||||
}
|
||||
|
||||
val hardwareDataOffset = HardwareStatus.endHardwareStatus(fbb)
|
||||
val hardwareInfoOffset = createHardwareInfo(fbb, device)
|
||||
|
||||
@@ -36,7 +36,7 @@ public class ProvisioningHandler implements SerialListener {
|
||||
this.provisioningTickTimer.scheduleAtFixedRate(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (!isRunning || provisioningStatus == ProvisioningStatus.DONE)
|
||||
if (!isRunning)
|
||||
return;
|
||||
provisioningTick();
|
||||
}
|
||||
|
||||
@@ -30,18 +30,14 @@ abstract class SerialHandler {
|
||||
Pair(0x1A86, 0x7523),
|
||||
// CH341
|
||||
Pair(0x1A86, 0x5523),
|
||||
// CH343
|
||||
Pair(0x1A86, 0x55D3),
|
||||
// CH9102x
|
||||
Pair(0x1A86, 0x55D4),
|
||||
// / Silabs
|
||||
// CP210x
|
||||
Pair(0x10C4, 0xEA60),
|
||||
// / Espressif
|
||||
// ESP32-S3 / ESP32-C3 / ESP32-C5 / ESP32-C6 / ESP32-C61 / ESP32-H2 / ESP32-P4
|
||||
// ESP32-C3
|
||||
Pair(0x303A, 0x1001),
|
||||
// ESP32-S2
|
||||
Pair(0x303A, 0x0002),
|
||||
// / FTDI
|
||||
// FT232BM/L/Q, FT245BM/L/Q
|
||||
// FT232RL/Q, FT245RL/Q
|
||||
|
||||
@@ -11,7 +11,6 @@ import dev.slimevr.tracking.trackers.Tracker
|
||||
import dev.slimevr.tracking.trackers.TrackerStatus
|
||||
import dev.slimevr.tracking.trackers.TrackerUtils
|
||||
import dev.slimevr.tracking.trackers.udp.TrackerDataType
|
||||
import io.github.axisangles.ktmath.Quaternion
|
||||
import solarxr_protocol.datatypes.DeviceIdT
|
||||
import solarxr_protocol.datatypes.TrackerIdT
|
||||
import solarxr_protocol.rpc.*
|
||||
@@ -200,8 +199,7 @@ class TrackingChecklistManager(private val vrServer: VRServer) : VRCConfigListen
|
||||
}
|
||||
// We ask for a full reset if you need to do mounting calibration but cant because you haven't done full reset in a while
|
||||
// or if you have trackers that need reset after re-assigning
|
||||
val usingSavedCalibration = vrServer.configManager.vrConfig.resetsConfig.saveMountingReset && imuTrackers.all { it.resetsHandler.mountRotFix != Quaternion.IDENTITY }
|
||||
val needFullReset = (vrServer.configManager.vrConfig.resetsConfig.lastMountingMethod == MountingMethods.AUTOMATIC && !usingSavedCalibration && !resetMountingCompleted && !vrServer.serverGuards.canDoMounting) || trackerRequireReset.isNotEmpty()
|
||||
val needFullReset = (!resetMountingCompleted && !vrServer.serverGuards.canDoMounting) || trackerRequireReset.isNotEmpty()
|
||||
updateValidity(TrackingChecklistStepId.FULL_RESET, !needFullReset) {
|
||||
it.enabled = imuTrackers.isNotEmpty()
|
||||
if (trackerRequireReset.isNotEmpty()) {
|
||||
|
||||
@@ -7,7 +7,6 @@ import dev.slimevr.desktop.platform.ProtobufMessages.*
|
||||
import dev.slimevr.tracking.trackers.Tracker
|
||||
import dev.slimevr.tracking.trackers.TrackerStatus
|
||||
import dev.slimevr.tracking.trackers.TrackerStatus.Companion.getById
|
||||
import dev.slimevr.tracking.trackers.TrackerUtils
|
||||
import dev.slimevr.util.ann.VRServerThread
|
||||
import io.eiren.util.ann.Synchronize
|
||||
import io.eiren.util.ann.ThreadSafe
|
||||
@@ -219,11 +218,6 @@ abstract class ProtobufBridge(@JvmField protected val bridgeName: String) : ISte
|
||||
|
||||
"mounting_reset" -> instance.resetTrackersMounting(resetSourceName)
|
||||
|
||||
"feet_mounting_reset" -> instance.resetTrackersMounting(
|
||||
resetSourceName,
|
||||
TrackerUtils.feetsBodyParts,
|
||||
)
|
||||
|
||||
"pause_tracking" ->
|
||||
instance
|
||||
.togglePauseTracking(resetSourceName)
|
||||
|
||||
@@ -3558,20 +3558,6 @@ public final class ProtobufMessages {
|
||||
* @return The trackerRole.
|
||||
*/
|
||||
int getTrackerRole();
|
||||
|
||||
/**
|
||||
* <code>string manufacturer = 5;</code>
|
||||
*
|
||||
* @return The manufacturer.
|
||||
*/
|
||||
java.lang.String getManufacturer();
|
||||
|
||||
/**
|
||||
* <code>string manufacturer = 5;</code>
|
||||
*
|
||||
* @return The bytes for manufacturer.
|
||||
*/
|
||||
com.google.protobuf.ByteString getManufacturerBytes();
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -3602,7 +3588,6 @@ public final class ProtobufMessages {
|
||||
private TrackerAdded() {
|
||||
trackerSerial_ = "";
|
||||
trackerName_ = "";
|
||||
manufacturer_ = "";
|
||||
}
|
||||
|
||||
public static final com.google.protobuf.Descriptors.Descriptor getDescriptor() {
|
||||
@@ -3728,48 +3713,6 @@ public final class ProtobufMessages {
|
||||
return trackerRole_;
|
||||
}
|
||||
|
||||
public static final int MANUFACTURER_FIELD_NUMBER = 5;
|
||||
@SuppressWarnings("serial")
|
||||
private volatile java.lang.Object manufacturer_ = "";
|
||||
|
||||
/**
|
||||
* <code>string manufacturer = 5;</code>
|
||||
*
|
||||
* @return The manufacturer.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public java.lang.String getManufacturer() {
|
||||
java.lang.Object ref = manufacturer_;
|
||||
if (ref instanceof java.lang.String) {
|
||||
return (java.lang.String) ref;
|
||||
} else {
|
||||
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
|
||||
java.lang.String s = bs.toStringUtf8();
|
||||
manufacturer_ = s;
|
||||
return s;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* <code>string manufacturer = 5;</code>
|
||||
*
|
||||
* @return The bytes for manufacturer.
|
||||
*/
|
||||
@java.lang.Override
|
||||
public com.google.protobuf.ByteString getManufacturerBytes() {
|
||||
java.lang.Object ref = manufacturer_;
|
||||
if (ref instanceof java.lang.String) {
|
||||
com.google.protobuf.ByteString b = com.google.protobuf.ByteString
|
||||
.copyFromUtf8(
|
||||
(java.lang.String) ref
|
||||
);
|
||||
manufacturer_ = b;
|
||||
return b;
|
||||
} else {
|
||||
return (com.google.protobuf.ByteString) ref;
|
||||
}
|
||||
}
|
||||
|
||||
private byte memoizedIsInitialized = -1;
|
||||
|
||||
@java.lang.Override
|
||||
@@ -3799,9 +3742,6 @@ public final class ProtobufMessages {
|
||||
if (trackerRole_ != 0) {
|
||||
output.writeInt32(4, trackerRole_);
|
||||
}
|
||||
if (!com.google.protobuf.GeneratedMessage.isStringEmpty(manufacturer_)) {
|
||||
com.google.protobuf.GeneratedMessage.writeString(output, 5, manufacturer_);
|
||||
}
|
||||
getUnknownFields().writeTo(output);
|
||||
}
|
||||
|
||||
@@ -3826,9 +3766,6 @@ public final class ProtobufMessages {
|
||||
size += com.google.protobuf.CodedOutputStream
|
||||
.computeInt32Size(4, trackerRole_);
|
||||
}
|
||||
if (!com.google.protobuf.GeneratedMessage.isStringEmpty(manufacturer_)) {
|
||||
size += com.google.protobuf.GeneratedMessage.computeStringSize(5, manufacturer_);
|
||||
}
|
||||
size += getUnknownFields().getSerializedSize();
|
||||
memoizedSize = size;
|
||||
return size;
|
||||
@@ -3864,11 +3801,6 @@ public final class ProtobufMessages {
|
||||
!= other.getTrackerRole()
|
||||
)
|
||||
return false;
|
||||
if (
|
||||
!getManufacturer()
|
||||
.equals(other.getManufacturer())
|
||||
)
|
||||
return false;
|
||||
if (!getUnknownFields().equals(other.getUnknownFields()))
|
||||
return false;
|
||||
return true;
|
||||
@@ -3889,8 +3821,6 @@ public final class ProtobufMessages {
|
||||
hash = (53 * hash) + getTrackerName().hashCode();
|
||||
hash = (37 * hash) + TRACKER_ROLE_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getTrackerRole();
|
||||
hash = (37 * hash) + MANUFACTURER_FIELD_NUMBER;
|
||||
hash = (53 * hash) + getManufacturer().hashCode();
|
||||
hash = (29 * hash) + getUnknownFields().hashCode();
|
||||
memoizedHashCode = hash;
|
||||
return hash;
|
||||
@@ -4063,7 +3993,6 @@ public final class ProtobufMessages {
|
||||
trackerSerial_ = "";
|
||||
trackerName_ = "";
|
||||
trackerRole_ = 0;
|
||||
manufacturer_ = "";
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -4115,9 +4044,6 @@ public final class ProtobufMessages {
|
||||
if (((from_bitField0_ & 0x00000008) != 0)) {
|
||||
result.trackerRole_ = trackerRole_;
|
||||
}
|
||||
if (((from_bitField0_ & 0x00000010) != 0)) {
|
||||
result.manufacturer_ = manufacturer_;
|
||||
}
|
||||
}
|
||||
|
||||
@java.lang.Override
|
||||
@@ -4157,11 +4083,6 @@ public final class ProtobufMessages {
|
||||
if (other.getTrackerRole() != 0) {
|
||||
setTrackerRole(other.getTrackerRole());
|
||||
}
|
||||
if (!other.getManufacturer().isEmpty()) {
|
||||
manufacturer_ = other.manufacturer_;
|
||||
bitField0_ |= 0x00000010;
|
||||
onChanged();
|
||||
}
|
||||
this.mergeUnknownFields(other.getUnknownFields());
|
||||
onChanged();
|
||||
return this;
|
||||
@@ -4209,11 +4130,6 @@ public final class ProtobufMessages {
|
||||
bitField0_ |= 0x00000008;
|
||||
break;
|
||||
} // case 32
|
||||
case 42: {
|
||||
manufacturer_ = input.readStringRequireUtf8();
|
||||
bitField0_ |= 0x00000010;
|
||||
break;
|
||||
} // case 42
|
||||
default: {
|
||||
if (!super.parseUnknownField(input, extensionRegistry, tag)) {
|
||||
done = true; // was an endgroup tag
|
||||
@@ -4482,93 +4398,6 @@ public final class ProtobufMessages {
|
||||
return this;
|
||||
}
|
||||
|
||||
private java.lang.Object manufacturer_ = "";
|
||||
|
||||
/**
|
||||
* <code>string manufacturer = 5;</code>
|
||||
*
|
||||
* @return The manufacturer.
|
||||
*/
|
||||
public java.lang.String getManufacturer() {
|
||||
java.lang.Object ref = manufacturer_;
|
||||
if (!(ref instanceof java.lang.String)) {
|
||||
com.google.protobuf.ByteString bs = (com.google.protobuf.ByteString) ref;
|
||||
java.lang.String s = bs.toStringUtf8();
|
||||
manufacturer_ = s;
|
||||
return s;
|
||||
} else {
|
||||
return (java.lang.String) ref;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* <code>string manufacturer = 5;</code>
|
||||
*
|
||||
* @return The bytes for manufacturer.
|
||||
*/
|
||||
public com.google.protobuf.ByteString getManufacturerBytes() {
|
||||
java.lang.Object ref = manufacturer_;
|
||||
if (ref instanceof String) {
|
||||
com.google.protobuf.ByteString b = com.google.protobuf.ByteString
|
||||
.copyFromUtf8(
|
||||
(java.lang.String) ref
|
||||
);
|
||||
manufacturer_ = b;
|
||||
return b;
|
||||
} else {
|
||||
return (com.google.protobuf.ByteString) ref;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* <code>string manufacturer = 5;</code>
|
||||
*
|
||||
* @param value The manufacturer to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setManufacturer(
|
||||
java.lang.String value
|
||||
) {
|
||||
if (value == null) {
|
||||
throw new NullPointerException();
|
||||
}
|
||||
manufacturer_ = value;
|
||||
bitField0_ |= 0x00000010;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* <code>string manufacturer = 5;</code>
|
||||
*
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder clearManufacturer() {
|
||||
manufacturer_ = getDefaultInstance().getManufacturer();
|
||||
bitField0_ = (bitField0_ & ~0x00000010);
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
/**
|
||||
* <code>string manufacturer = 5;</code>
|
||||
*
|
||||
* @param value The bytes for manufacturer to set.
|
||||
* @return This builder for chaining.
|
||||
*/
|
||||
public Builder setManufacturerBytes(
|
||||
com.google.protobuf.ByteString value
|
||||
) {
|
||||
if (value == null) {
|
||||
throw new NullPointerException();
|
||||
}
|
||||
checkByteStringIsUtf8(value);
|
||||
manufacturer_ = value;
|
||||
bitField0_ |= 0x00000010;
|
||||
onChanged();
|
||||
return this;
|
||||
}
|
||||
|
||||
// @@protoc_insertion_point(builder_scope:messages.TrackerAdded)
|
||||
}
|
||||
|
||||
@@ -9043,55 +8872,53 @@ public final class ProtobufMessages {
|
||||
+
|
||||
"ctionArgumentsEntry\0326\n\024ActionArgumentsEn"
|
||||
+
|
||||
"try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"|\n\014T"
|
||||
"try\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"f\n\014T"
|
||||
+
|
||||
"rackerAdded\022\022\n\ntracker_id\030\001 \001(\005\022\026\n\016track"
|
||||
+
|
||||
"er_serial\030\002 \001(\t\022\024\n\014tracker_name\030\003 \001(\t\022\024\n"
|
||||
+
|
||||
"\014tracker_role\030\004 \001(\005\022\024\n\014manufacturer\030\005 \001("
|
||||
"\014tracker_role\030\004 \001(\005\"\374\002\n\rTrackerStatus\022\022\n"
|
||||
+
|
||||
"\t\"\374\002\n\rTrackerStatus\022\022\n\ntracker_id\030\001 \001(\005\022"
|
||||
"\ntracker_id\030\001 \001(\005\022.\n\006status\030\002 \001(\0162\036.mess"
|
||||
+
|
||||
".\n\006status\030\002 \001(\0162\036.messages.TrackerStatus"
|
||||
"ages.TrackerStatus.Status\0221\n\005extra\030\003 \003(\013"
|
||||
+
|
||||
".Status\0221\n\005extra\030\003 \003(\0132\".messages.Tracke"
|
||||
"2\".messages.TrackerStatus.ExtraEntry\022;\n\n"
|
||||
+
|
||||
"rStatus.ExtraEntry\022;\n\nconfidence\030\004 \001(\0162\""
|
||||
"confidence\030\004 \001(\0162\".messages.TrackerStatu"
|
||||
+
|
||||
".messages.TrackerStatus.ConfidenceH\000\210\001\001\032"
|
||||
"s.ConfidenceH\000\210\001\001\032,\n\nExtraEntry\022\013\n\003key\030\001"
|
||||
+
|
||||
",\n\nExtraEntry\022\013\n\003key\030\001 \001(\t\022\r\n\005value\030\002 \001("
|
||||
" \001(\t\022\r\n\005value\030\002 \001(\t:\0028\001\"E\n\006Status\022\020\n\014DIS"
|
||||
+
|
||||
"\t:\0028\001\"E\n\006Status\022\020\n\014DISCONNECTED\020\000\022\006\n\002OK\020"
|
||||
"CONNECTED\020\000\022\006\n\002OK\020\001\022\010\n\004BUSY\020\002\022\t\n\005ERROR\020\003"
|
||||
+
|
||||
"\001\022\010\n\004BUSY\020\002\022\t\n\005ERROR\020\003\022\014\n\010OCCLUDED\020\004\"3\n\n"
|
||||
"\022\014\n\010OCCLUDED\020\004\"3\n\nConfidence\022\006\n\002NO\020\000\022\007\n\003"
|
||||
+
|
||||
"Confidence\022\006\n\002NO\020\000\022\007\n\003LOW\020\001\022\n\n\006MEDIUM\020\005\022"
|
||||
"LOW\020\001\022\n\n\006MEDIUM\020\005\022\010\n\004HIGH\020\nB\r\n\013_confiden"
|
||||
+
|
||||
"\010\n\004HIGH\020\nB\r\n\013_confidence\"I\n\007Battery\022\022\n\nt"
|
||||
"ce\"I\n\007Battery\022\022\n\ntracker_id\030\001 \001(\005\022\025\n\rbat"
|
||||
+
|
||||
"racker_id\030\001 \001(\005\022\025\n\rbattery_level\030\002 \001(\002\022\023"
|
||||
"tery_level\030\002 \001(\002\022\023\n\013is_charging\030\003 \001(\010\"\241\002"
|
||||
+
|
||||
"\n\013is_charging\030\003 \001(\010\"\241\002\n\017ProtobufMessage\022"
|
||||
"\n\017ProtobufMessage\022&\n\010position\030\001 \001(\0132\022.me"
|
||||
+
|
||||
"&\n\010position\030\001 \001(\0132\022.messages.PositionH\000\022"
|
||||
"ssages.PositionH\000\022+\n\013user_action\030\002 \001(\0132\024"
|
||||
+
|
||||
"+\n\013user_action\030\002 \001(\0132\024.messages.UserActi"
|
||||
".messages.UserActionH\000\022/\n\rtracker_added\030"
|
||||
+
|
||||
"onH\000\022/\n\rtracker_added\030\003 \001(\0132\026.messages.T"
|
||||
"\003 \001(\0132\026.messages.TrackerAddedH\000\0221\n\016track"
|
||||
+
|
||||
"rackerAddedH\000\0221\n\016tracker_status\030\004 \001(\0132\027."
|
||||
"er_status\030\004 \001(\0132\027.messages.TrackerStatus"
|
||||
+
|
||||
"messages.TrackerStatusH\000\022$\n\007battery\030\005 \001("
|
||||
"H\000\022$\n\007battery\030\005 \001(\0132\021.messages.BatteryH\000"
|
||||
+
|
||||
"\0132\021.messages.BatteryH\000\022$\n\007version\030\006 \001(\0132"
|
||||
"\022$\n\007version\030\006 \001(\0132\021.messages.VersionH\000B\t"
|
||||
+
|
||||
"\021.messages.VersionH\000B\t\n\007messageB2\n\034dev.s"
|
||||
"\n\007messageB2\n\034dev.slimevr.desktop.platfor"
|
||||
+
|
||||
"limevr.desktop.platformB\020ProtobufMessage"
|
||||
+
|
||||
"sH\003b\006proto3"
|
||||
"mB\020ProtobufMessagesH\003b\006proto3"
|
||||
};
|
||||
descriptor = com.google.protobuf.Descriptors.FileDescriptor
|
||||
.internalBuildGeneratedFileFrom(
|
||||
@@ -9130,8 +8957,7 @@ public final class ProtobufMessages {
|
||||
internal_static_messages_TrackerAdded_descriptor = getDescriptor().getMessageTypes().get(4);
|
||||
internal_static_messages_TrackerAdded_fieldAccessorTable = new com.google.protobuf.GeneratedMessage.FieldAccessorTable(
|
||||
internal_static_messages_TrackerAdded_descriptor,
|
||||
new java.lang.String[] { "TrackerId", "TrackerSerial", "TrackerName", "TrackerRole",
|
||||
"Manufacturer", }
|
||||
new java.lang.String[] { "TrackerId", "TrackerSerial", "TrackerName", "TrackerRole", }
|
||||
);
|
||||
internal_static_messages_TrackerStatus_descriptor = getDescriptor()
|
||||
.getMessageTypes()
|
||||
|
||||
@@ -147,13 +147,23 @@ abstract class SteamVRBridge(
|
||||
val device = instance.deviceManager
|
||||
.createDevice(
|
||||
trackerAdded.trackerName,
|
||||
null,
|
||||
trackerAdded.manufacturer.ifEmpty { "OpenVR" },
|
||||
trackerAdded.trackerSerial,
|
||||
"OpenVR", // TODO : We need the manufacturer
|
||||
)
|
||||
|
||||
// Display name, needsReset and isHmd
|
||||
val displayName: String = trackerAdded.trackerName
|
||||
val isHmd = trackerAdded.trackerId == 0
|
||||
val displayName: String
|
||||
val isHmd = if (trackerAdded.trackerId == 0) {
|
||||
displayName = if (trackerAdded.trackerName == "HMD") {
|
||||
"SteamVR Driver HMD"
|
||||
} else {
|
||||
"Feeder App HMD"
|
||||
}
|
||||
true
|
||||
} else {
|
||||
displayName = trackerAdded.trackerName
|
||||
false
|
||||
}
|
||||
|
||||
// trackerPosition
|
||||
val role = getById(trackerAdded.trackerRole)
|
||||
|
||||
@@ -190,7 +190,7 @@ class DesktopSerialHandler :
|
||||
}
|
||||
|
||||
override fun write(buff: ByteArray) {
|
||||
LogManager.info("[SerialHandler] WRITING $buff")
|
||||
LogManager.info("[SerialHandler] WRITING ${buff.toString(Charsets.UTF_8)}")
|
||||
currentPort?.outputStream?.write(buff)
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user