mirror of
https://github.com/SlimeVR/SlimeVR-Server.git
synced 2026-11-20 00:51:20 -08:00
Add support for smol receiver and tracker in serial console (#1868)
This commit is contained in:
1 parent
3a0dc4b922
commit
90956a6a02
12 files changed
+256
-141
No files matched your search
@@ -41,6 +41,7 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="303a", ATTRS{idProduct}=="0002", MODE="0660
|
||||
SUBSYSTEMS=="usb", ATTRS{idVendor}=="0403", ATTRS{idProduct}=="6001", MODE="0660", TAG+="uaccess"
|
||||
|
||||
## SlimeVR
|
||||
# smol slime dongle
|
||||
SUBSYSTEM=="usb", ATTR{idVendor}=="1209", ATTR{idProduct}=="7690", MODE="0660", TAG+="uaccess"
|
||||
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="7690", MODE="0660", TAG+="uaccess"
|
||||
# SlimeNRF Receiver & Tracker
|
||||
SUBSYSTEM=="usb|tty", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="7690|7692", MODE="0660", TAG+="uaccess"
|
||||
# same thing but hidraw
|
||||
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="1209", ATTRS{idProduct}=="7690|7692", MODE="0660", TAG+="uaccess"
|
||||
@@ -790,6 +790,12 @@ settings-serial-factory_reset-warning-cancel = Cancel
|
||||
settings-serial-serial_select = Select a serial port
|
||||
settings-serial-auto_dropdown_item = Auto
|
||||
settings-serial-get_wifi_scan = Get WiFi Scan
|
||||
settings-serial-enter_pairing = Enter Pairing
|
||||
settings-serial-exit_pairing = Exit Pairing
|
||||
settings-serial-calibrate = Calibrate
|
||||
settings-serial-six_side_calibrate = 6-Side Calibrate
|
||||
settings-serial-dfu = Enter DFU
|
||||
settings-serial-meow = Meow!
|
||||
settings-serial-file_type = Plain text
|
||||
settings-serial-save_logs = Save To File
|
||||
settings-serial-send_command = Send
|
||||
|
||||
@@ -5,6 +5,7 @@ import {
|
||||
NewSerialDeviceResponseT,
|
||||
RpcMessage,
|
||||
SerialDeviceT,
|
||||
SerialDeviceType,
|
||||
} from 'solarxr-protocol';
|
||||
import { useConfig } from '@/hooks/config';
|
||||
import { useWebsocketAPI } from '@/hooks/websocket-api';
|
||||
@@ -56,7 +57,8 @@ export function SerialDetectionModal() {
|
||||
'/settings/serial',
|
||||
'/onboarding/connect-trackers',
|
||||
'/settings/firmware-tool',
|
||||
].includes(pathname)
|
||||
].includes(pathname) &&
|
||||
device?.type !== SerialDeviceType.HID_RECEIVER
|
||||
) {
|
||||
setOpen(device);
|
||||
}
|
||||
|
||||
@@ -13,6 +13,7 @@ import {
|
||||
NewSerialDeviceResponseT,
|
||||
RpcMessage,
|
||||
SerialDeviceT,
|
||||
SerialDeviceType,
|
||||
SerialDevicesRequestT,
|
||||
SerialDevicesResponseT,
|
||||
TrackerStatus,
|
||||
@@ -77,13 +78,14 @@ function SerialDevicesList({
|
||||
RpcMessage.SerialDevicesResponse,
|
||||
(res: SerialDevicesResponseT) => {
|
||||
setDevices(
|
||||
res.devices.reduce(
|
||||
(curr, device) => ({
|
||||
res.devices.reduce((curr, device) => {
|
||||
if (device?.type != SerialDeviceType.ESP_TRACKER) return curr;
|
||||
|
||||
return {
|
||||
...curr,
|
||||
[device?.port?.toString() ?? 'unknown']: device,
|
||||
}),
|
||||
{}
|
||||
)
|
||||
};
|
||||
}, {})
|
||||
);
|
||||
setLoading(false);
|
||||
}
|
||||
@@ -92,7 +94,7 @@ function SerialDevicesList({
|
||||
useRPCPacket(
|
||||
RpcMessage.NewSerialDeviceResponse,
|
||||
({ device }: NewSerialDeviceResponseT) => {
|
||||
if (device?.port)
|
||||
if (device?.port && device?.type === SerialDeviceType.ESP_TRACKER)
|
||||
setDevices((old) => ({
|
||||
...old,
|
||||
[device?.port?.toString() ?? 'unknown']: device,
|
||||
|
||||
@@ -14,6 +14,7 @@ import {
|
||||
SerialUpdateResponseT,
|
||||
SerialTrackerGetWifiScanRequestT,
|
||||
SerialTrackerCustomCommandRequestT,
|
||||
SerialDeviceType,
|
||||
} from 'solarxr-protocol';
|
||||
import { useWebsocketAPI } from '@/hooks/websocket-api';
|
||||
import { Button } from '@/components/commons/Button';
|
||||
@@ -41,7 +42,10 @@ export function Serial() {
|
||||
const consoleRef = useRef<HTMLDivElement>(null);
|
||||
const [consoleContent, setConsole] = useState('');
|
||||
|
||||
const [isSerialOpen, setSerialOpen] = useState(false);
|
||||
const [openedSerialDevice, setOpenedSerialDevice] = useState<Omit<
|
||||
SerialDeviceT,
|
||||
'pack'
|
||||
> | null>(null);
|
||||
const [serialDevices, setSerialDevices] = useState<
|
||||
Omit<SerialDeviceT, 'pack'>[]
|
||||
>([]);
|
||||
@@ -87,11 +91,19 @@ export function Serial() {
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
sendRPCPacket(RpcMessage.SerialDevicesRequest, new SerialDevicesRequestT());
|
||||
const typedState: { serialPort: string } = state as any;
|
||||
if (typedState?.serialPort) {
|
||||
reset({ port: typedState.serialPort });
|
||||
}
|
||||
|
||||
sendRPCPacket(RpcMessage.SerialDevicesRequest, new SerialDevicesRequestT());
|
||||
const interval = setInterval(() => {
|
||||
sendRPCPacket(
|
||||
RpcMessage.SerialDevicesRequest,
|
||||
new SerialDevicesRequestT()
|
||||
);
|
||||
}, 3000);
|
||||
return () => clearInterval(interval);
|
||||
}, []);
|
||||
|
||||
useEffect(() => {
|
||||
@@ -103,11 +115,8 @@ export function Serial() {
|
||||
useRPCPacket(
|
||||
RpcMessage.SerialUpdateResponse,
|
||||
(data: SerialUpdateResponseT) => {
|
||||
if (data.closed) {
|
||||
setSerialOpen(false);
|
||||
} else {
|
||||
setSerialOpen(true);
|
||||
}
|
||||
if (data.device) setOpenedSerialDevice(data.device);
|
||||
else if (data.closed) setOpenedSerialDevice(null);
|
||||
|
||||
if (data.log) {
|
||||
setConsole((console) => console + data.log);
|
||||
@@ -122,6 +131,7 @@ export function Serial() {
|
||||
{
|
||||
name: l10n.getString('settings-serial-auto_dropdown_item'),
|
||||
port: 'Auto',
|
||||
type: SerialDeviceType.ESP_TRACKER,
|
||||
},
|
||||
...(res.devices || []),
|
||||
]);
|
||||
@@ -161,7 +171,7 @@ export function Serial() {
|
||||
|
||||
useEffect(() => {
|
||||
const id = setInterval(() => {
|
||||
if (!isSerialOpen) {
|
||||
if (openedSerialDevice === null) {
|
||||
openSerial(port ?? defaultValues.port);
|
||||
} else {
|
||||
clearInterval(id);
|
||||
@@ -171,7 +181,7 @@ export function Serial() {
|
||||
return () => {
|
||||
clearInterval(id);
|
||||
};
|
||||
}, [isSerialOpen]);
|
||||
}, [openedSerialDevice]);
|
||||
|
||||
const reboot = () => {
|
||||
sendRPCPacket(
|
||||
@@ -179,6 +189,8 @@ export function Serial() {
|
||||
new SerialTrackerRebootRequestT()
|
||||
);
|
||||
};
|
||||
|
||||
// ESP
|
||||
const factoryReset = () => {
|
||||
sendRPCPacket(
|
||||
RpcMessage.SerialTrackerFactoryResetRequest,
|
||||
@@ -209,6 +221,48 @@ export function Serial() {
|
||||
setValue('customCommand', '');
|
||||
};
|
||||
|
||||
// HID
|
||||
const enterPairing = () => {
|
||||
sendRPCPacket(
|
||||
RpcMessage.SerialTrackerCustomCommandRequest,
|
||||
new SerialTrackerCustomCommandRequestT('pair')
|
||||
);
|
||||
};
|
||||
const dfu = () => {
|
||||
sendRPCPacket(
|
||||
RpcMessage.SerialTrackerCustomCommandRequest,
|
||||
new SerialTrackerCustomCommandRequestT('dfu')
|
||||
);
|
||||
};
|
||||
const meow = () => {
|
||||
sendRPCPacket(
|
||||
RpcMessage.SerialTrackerCustomCommandRequest,
|
||||
new SerialTrackerCustomCommandRequestT('meow')
|
||||
);
|
||||
};
|
||||
|
||||
// HID receiver
|
||||
const exitPairing = () => {
|
||||
sendRPCPacket(
|
||||
RpcMessage.SerialTrackerCustomCommandRequest,
|
||||
new SerialTrackerCustomCommandRequestT('exit')
|
||||
);
|
||||
};
|
||||
|
||||
// HID tracker
|
||||
const calibrate = () => {
|
||||
sendRPCPacket(
|
||||
RpcMessage.SerialTrackerCustomCommandRequest,
|
||||
new SerialTrackerCustomCommandRequestT('calibrate')
|
||||
);
|
||||
};
|
||||
const sixSideCalibrate = () => {
|
||||
sendRPCPacket(
|
||||
RpcMessage.SerialTrackerCustomCommandRequest,
|
||||
new SerialTrackerCustomCommandRequestT('6-side')
|
||||
);
|
||||
};
|
||||
|
||||
const consoleContentRef = useRef(consoleContent);
|
||||
useLayoutEffect(() => {
|
||||
consoleContentRef.current = consoleContent;
|
||||
@@ -318,7 +372,7 @@ export function Serial() {
|
||||
>
|
||||
<div className="flex select-text">
|
||||
<pre>
|
||||
{isSerialOpen
|
||||
{openedSerialDevice !== null
|
||||
? consoleContent
|
||||
: l10n.getString('settings-serial-connection_lost')}
|
||||
</pre>
|
||||
@@ -326,70 +380,115 @@ export function Serial() {
|
||||
</div>
|
||||
<div className="border-t-2 pt-2 border-background-60 border-solid gap-2 flex flex-row">
|
||||
<div className="xs:flex flex-grow xs:flex-wrap gap-2 grid grid-cols-2">
|
||||
<Button variant="quaternary" onClick={reboot}>
|
||||
{l10n.getString('settings-serial-reboot')}
|
||||
</Button>
|
||||
<Button
|
||||
variant="quaternary"
|
||||
onClick={() => setTryFactoryReset(true)}
|
||||
>
|
||||
{l10n.getString('settings-serial-factory_reset')}
|
||||
</Button>
|
||||
<Button variant="quaternary" onClick={getWifiScan}>
|
||||
{l10n.getString('settings-serial-get_wifi_scan')}
|
||||
</Button>
|
||||
<Button
|
||||
variant="quaternary"
|
||||
onClick={saveLogToFile}
|
||||
disabled={!isSerialOpen || !consoleContent.trim()}
|
||||
>
|
||||
{l10n.getString('settings-serial-save_logs')}
|
||||
</Button>
|
||||
<div className="ml-auto">
|
||||
<Button
|
||||
variant="quaternary"
|
||||
onClick={pauseScroll}
|
||||
icon={
|
||||
isPaused ? (
|
||||
<PlayIcon width={16} />
|
||||
) : (
|
||||
<PauseIcon width={16} />
|
||||
)
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
<form
|
||||
className="w-full flex flex-row gap-2 mobile:col-span-2"
|
||||
onSubmit={(e) => {
|
||||
if (!isSerialOpen) {
|
||||
return;
|
||||
}
|
||||
e.preventDefault();
|
||||
if (!acceptedCustomCommandWarning) {
|
||||
setTrySendCustomCommand(true);
|
||||
} else {
|
||||
sendCustomSerialCommand();
|
||||
}
|
||||
}}
|
||||
>
|
||||
<div className="flex-grow">
|
||||
<Input
|
||||
control={control}
|
||||
name="customCommand"
|
||||
className="flex-grow"
|
||||
placeholder={l10n.getString(
|
||||
'settings-serial-send_command-placeholder'
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
<Button
|
||||
variant="quaternary"
|
||||
disabled={!isSerialOpen}
|
||||
type="submit"
|
||||
>
|
||||
{l10n.getString('settings-serial-send_command')}
|
||||
</Button>
|
||||
</form>
|
||||
{openedSerialDevice !== null && (
|
||||
<>
|
||||
<Button variant="quaternary" onClick={reboot}>
|
||||
{l10n.getString('settings-serial-reboot')}
|
||||
</Button>
|
||||
{openedSerialDevice?.type ===
|
||||
SerialDeviceType.ESP_TRACKER && (
|
||||
<>
|
||||
<Button
|
||||
variant="quaternary"
|
||||
onClick={() => setTryFactoryReset(true)}
|
||||
>
|
||||
{l10n.getString('settings-serial-factory_reset')}
|
||||
</Button>
|
||||
<Button variant="quaternary" onClick={getWifiScan}>
|
||||
{l10n.getString('settings-serial-get_wifi_scan')}
|
||||
</Button>
|
||||
</>
|
||||
)}
|
||||
{openedSerialDevice?.type !==
|
||||
SerialDeviceType.ESP_TRACKER && (
|
||||
<Button variant="quaternary" onClick={enterPairing}>
|
||||
{l10n.getString('settings-serial-enter_pairing')}
|
||||
</Button>
|
||||
)}
|
||||
{openedSerialDevice?.type ===
|
||||
SerialDeviceType.HID_RECEIVER && (
|
||||
<Button variant="quaternary" onClick={exitPairing}>
|
||||
{l10n.getString('settings-serial-exit_pairing')}
|
||||
</Button>
|
||||
)}
|
||||
{openedSerialDevice?.type ===
|
||||
SerialDeviceType.HID_TRACKER && (
|
||||
<>
|
||||
<Button variant="quaternary" onClick={calibrate}>
|
||||
{l10n.getString('settings-serial-calibrate')}
|
||||
</Button>
|
||||
<Button variant="quaternary" onClick={sixSideCalibrate}>
|
||||
{l10n.getString('settings-serial-six_side_calibrate')}
|
||||
</Button>
|
||||
</>
|
||||
)}
|
||||
{openedSerialDevice?.type !==
|
||||
SerialDeviceType.ESP_TRACKER && (
|
||||
<>
|
||||
<Button variant="quaternary" onClick={dfu}>
|
||||
{l10n.getString('settings-serial-dfu')}
|
||||
</Button>
|
||||
<Button variant="quaternary" onClick={meow}>
|
||||
{l10n.getString('settings-serial-meow')}
|
||||
</Button>
|
||||
</>
|
||||
)}
|
||||
<Button
|
||||
variant="quaternary"
|
||||
onClick={saveLogToFile}
|
||||
disabled={
|
||||
openedSerialDevice === null || !consoleContent.trim()
|
||||
}
|
||||
>
|
||||
{l10n.getString('settings-serial-save_logs')}
|
||||
</Button>
|
||||
<div className="ml-auto">
|
||||
<Button
|
||||
variant="quaternary"
|
||||
onClick={pauseScroll}
|
||||
icon={
|
||||
isPaused ? (
|
||||
<PlayIcon width={16} />
|
||||
) : (
|
||||
<PauseIcon width={16} />
|
||||
)
|
||||
}
|
||||
/>
|
||||
</div>
|
||||
<form
|
||||
className="w-full flex flex-row gap-2 mobile:col-span-2"
|
||||
onSubmit={(e) => {
|
||||
if (openedSerialDevice === null) {
|
||||
return;
|
||||
}
|
||||
e.preventDefault();
|
||||
if (!acceptedCustomCommandWarning) {
|
||||
setTrySendCustomCommand(true);
|
||||
} else {
|
||||
sendCustomSerialCommand();
|
||||
}
|
||||
}}
|
||||
>
|
||||
<div className="flex-grow">
|
||||
<Input
|
||||
control={control}
|
||||
name="customCommand"
|
||||
className="flex-grow"
|
||||
placeholder={l10n.getString(
|
||||
'settings-serial-send_command-placeholder'
|
||||
)}
|
||||
/>
|
||||
</div>
|
||||
<Button
|
||||
variant="quaternary"
|
||||
disabled={openedSerialDevice === null}
|
||||
type="submit"
|
||||
>
|
||||
{l10n.getString('settings-serial-send_command')}
|
||||
</Button>
|
||||
</form>
|
||||
</>
|
||||
)}
|
||||
|
||||
<div className="w-full mobile:col-span-2">
|
||||
<Dropdown
|
||||
|
||||
@@ -14,6 +14,7 @@ import com.hoho.android.usbserial.driver.UsbSerialProber
|
||||
import com.hoho.android.usbserial.util.SerialInputOutputManager
|
||||
import dev.slimevr.serial.SerialHandler
|
||||
import dev.slimevr.serial.SerialListener
|
||||
import dev.slimevr.tracking.trackers.hid.HIDCommon
|
||||
import io.eiren.util.logging.LogManager
|
||||
import java.io.IOException
|
||||
import java.nio.ByteBuffer
|
||||
@@ -57,7 +58,7 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
|
||||
get() = getPorts()
|
||||
.asSequence()
|
||||
.map { SerialPortWrapper(it.ports[0]) }
|
||||
.filter { isKnownBoard(it) }
|
||||
.filter { isKnownBoard(it) || HIDCommon.matchesAny(it.vendorId, it.productId) }
|
||||
.asStream()
|
||||
|
||||
val usbReceiver: BroadcastReceiver = object : BroadcastReceiver() {
|
||||
@@ -144,11 +145,11 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
|
||||
}
|
||||
|
||||
@Synchronized
|
||||
override fun openSerial(portLocation: String?, auto: Boolean): Boolean {
|
||||
override fun openSerial(portLocation: String?, auto: Boolean, autoIncludeHid: Boolean): Boolean {
|
||||
LogManager.info("[SerialHandler] Trying to open: $portLocation, auto: $auto")
|
||||
lastKnownPorts = knownPorts.asSequence().toSet()
|
||||
val newPort = lastKnownPorts.find {
|
||||
(!auto && it.portLocation == portLocation) || (auto && isKnownBoard(it))
|
||||
(!auto && it.portLocation == portLocation) || (auto && isKnownBoard(it)) || (auto && autoIncludeHid && HIDCommon.matchesAny(it.vendorId, it.productId))
|
||||
}
|
||||
|
||||
if (newPort == null) {
|
||||
|
||||
@@ -7,10 +7,24 @@ import dev.slimevr.protocol.ProtocolAPIServer
|
||||
import dev.slimevr.protocol.rpc.RPCHandler
|
||||
import dev.slimevr.serial.SerialListener
|
||||
import dev.slimevr.serial.SerialPort
|
||||
import dev.slimevr.tracking.trackers.hid.HIDCommon
|
||||
import io.eiren.util.logging.LogManager
|
||||
import solarxr_protocol.rpc.*
|
||||
import java.util.*
|
||||
import java.util.function.Consumer
|
||||
import kotlin.collections.emptyList
|
||||
|
||||
fun createSerialDevice(fbb: FlatBufferBuilder, port: SerialPort): Int {
|
||||
val portOffset = fbb.createString(port.portLocation)
|
||||
val nameOffset = fbb.createString(port.descriptivePortName)
|
||||
val portType = when {
|
||||
HIDCommon.matchesReceiver(port.vendorId, port.productId) -> SerialDeviceType.HID_RECEIVER
|
||||
HIDCommon.matchesTracker(port.vendorId, port.productId) -> SerialDeviceType.HID_TRACKER
|
||||
else -> SerialDeviceType.ESP_TRACKER
|
||||
}
|
||||
|
||||
return SerialDevice.createSerialDevice(fbb, portOffset, nameOffset, portType)
|
||||
}
|
||||
|
||||
class RPCSerialHandler(var rpcHandler: RPCHandler, var api: ProtocolAPI) : SerialListener {
|
||||
init {
|
||||
@@ -35,38 +49,36 @@ class RPCSerialHandler(var rpcHandler: RPCHandler, var api: ProtocolAPI) : Seria
|
||||
val outbound = rpcHandler.createRPCMessage(fbb, RpcMessage.SerialUpdateResponse, update)
|
||||
fbb.finish(outbound)
|
||||
|
||||
this.forAllListeners(
|
||||
Consumer { conn: GenericConnection ->
|
||||
conn.send(fbb.dataBuffer())
|
||||
conn.context.useSerial = false
|
||||
},
|
||||
)
|
||||
this.forAllListeners { conn: GenericConnection ->
|
||||
conn.send(fbb.dataBuffer())
|
||||
conn.context.useSerial = false
|
||||
}
|
||||
}
|
||||
|
||||
override fun onSerialLog(str: String, server: Boolean) {
|
||||
val fbb = FlatBufferBuilder(32)
|
||||
|
||||
val logOffset = fbb.createString(str)
|
||||
val portOffset = api.server.serialHandler.getCurrentPort()?.let { port ->
|
||||
createSerialDevice(fbb, port)
|
||||
} ?: 0
|
||||
|
||||
SerialUpdateResponse.startSerialUpdateResponse(fbb)
|
||||
SerialUpdateResponse.addLog(fbb, logOffset)
|
||||
SerialUpdateResponse.addDevice(fbb, portOffset)
|
||||
val update = SerialUpdateResponse.endSerialUpdateResponse(fbb)
|
||||
val outbound = rpcHandler.createRPCMessage(fbb, RpcMessage.SerialUpdateResponse, update)
|
||||
fbb.finish(outbound)
|
||||
|
||||
this.forAllListeners(
|
||||
Consumer { conn: GenericConnection ->
|
||||
conn.send(fbb.dataBuffer())
|
||||
},
|
||||
)
|
||||
this.forAllListeners { conn ->
|
||||
conn.send(fbb.dataBuffer())
|
||||
}
|
||||
}
|
||||
|
||||
override fun onNewSerialDevice(port: SerialPort) {
|
||||
val fbb = FlatBufferBuilder(32)
|
||||
|
||||
val portOffset = fbb.createString(port.portLocation)
|
||||
val nameOffset = fbb.createString(port.descriptivePortName)
|
||||
val deviceOffset = SerialDevice.createSerialDevice(fbb, portOffset, nameOffset)
|
||||
val deviceOffset = createSerialDevice(fbb, port)
|
||||
val newSerialOffset = NewSerialDeviceResponse
|
||||
.createNewSerialDeviceResponse(fbb, deviceOffset)
|
||||
val outbound = rpcHandler
|
||||
@@ -89,17 +101,17 @@ class RPCSerialHandler(var rpcHandler: RPCHandler, var api: ProtocolAPI) : Seria
|
||||
override fun onSerialConnected(port: SerialPort) {
|
||||
val fbb = FlatBufferBuilder(32)
|
||||
|
||||
val deviceOffset = createSerialDevice(fbb, port)
|
||||
SerialUpdateResponse.startSerialUpdateResponse(fbb)
|
||||
SerialUpdateResponse.addClosed(fbb, false)
|
||||
SerialUpdateResponse.addDevice(fbb, deviceOffset)
|
||||
val update = SerialUpdateResponse.endSerialUpdateResponse(fbb)
|
||||
val outbound = rpcHandler.createRPCMessage(fbb, RpcMessage.SerialUpdateResponse, update)
|
||||
fbb.finish(outbound)
|
||||
|
||||
this.forAllListeners(
|
||||
Consumer { conn: GenericConnection ->
|
||||
conn.send(fbb.dataBuffer())
|
||||
},
|
||||
)
|
||||
this.forAllListeners { conn ->
|
||||
conn.send(fbb.dataBuffer())
|
||||
}
|
||||
}
|
||||
|
||||
fun onSerialTrackerRebootRequest(
|
||||
@@ -165,20 +177,17 @@ class RPCSerialHandler(var rpcHandler: RPCHandler, var api: ProtocolAPI) : Seria
|
||||
|
||||
val fbb = FlatBufferBuilder(32)
|
||||
|
||||
val devicesOffsets: MutableList<Int> = ArrayList()
|
||||
|
||||
try {
|
||||
this.api.server.serialHandler.knownPorts.forEach { port: SerialPort ->
|
||||
val portOffset = fbb.createString(port.portLocation)
|
||||
val nameOffset = fbb.createString(port.descriptivePortName)
|
||||
devicesOffsets.add(SerialDevice.createSerialDevice(fbb, portOffset, nameOffset))
|
||||
}
|
||||
val devicesOffsets = try {
|
||||
api.server.serialHandler.knownPorts.map { port ->
|
||||
createSerialDevice(fbb, port)
|
||||
}.toList()
|
||||
} catch (e: Throwable) {
|
||||
LogManager.severe("Using serial ports is not supported on this platform", e)
|
||||
emptyList()
|
||||
}
|
||||
|
||||
SerialDevicesResponse.startDevicesVector(fbb, devicesOffsets.size)
|
||||
devicesOffsets.forEach(Consumer { offset: Int -> SerialDevicesResponse.addDevices(fbb, offset) })
|
||||
devicesOffsets.forEach { offset: Int -> SerialDevicesResponse.addDevices(fbb, offset) }
|
||||
val devices = fbb.endVector()
|
||||
val serialDeviceOffsets = SerialDevicesResponse.createSerialDevicesResponse(fbb, devices)
|
||||
val outbound = rpcHandler
|
||||
@@ -188,7 +197,7 @@ class RPCSerialHandler(var rpcHandler: RPCHandler, var api: ProtocolAPI) : Seria
|
||||
}
|
||||
|
||||
fun onSetWifiRequest(conn: GenericConnection, messageHeader: RpcMessageHeader) {
|
||||
val req = messageHeader.message(SetWifiRequest()) as SetWifiRequest? ?: return
|
||||
val req = messageHeader.message(SetWifiRequest()) as? SetWifiRequest? ?: return
|
||||
|
||||
if (req.password() == null || req.ssid() == null || !this.api.server.serialHandler.isConnected) {
|
||||
return
|
||||
@@ -198,13 +207,13 @@ class RPCSerialHandler(var rpcHandler: RPCHandler, var api: ProtocolAPI) : Seria
|
||||
|
||||
fun onOpenSerialRequest(conn: GenericConnection, messageHeader: RpcMessageHeader) {
|
||||
val req =
|
||||
messageHeader.message(OpenSerialRequest()) as OpenSerialRequest? ?: return
|
||||
messageHeader.message(OpenSerialRequest()) as? OpenSerialRequest? ?: return
|
||||
|
||||
conn.context.useSerial = true
|
||||
|
||||
this.api.server.queueTask {
|
||||
try {
|
||||
this.api.server.serialHandler.openSerial(req.port(), req.auto())
|
||||
this.api.server.serialHandler.openSerial(req.port(), req.auto(), true)
|
||||
} catch (e: Exception) {
|
||||
LogManager.severe("Unable to open serial port", e)
|
||||
} catch (e: Throwable) {
|
||||
@@ -245,17 +254,10 @@ class RPCSerialHandler(var rpcHandler: RPCHandler, var api: ProtocolAPI) : Seria
|
||||
conn.send(fbb.dataBuffer())
|
||||
}
|
||||
|
||||
fun forAllListeners(action: Consumer<in GenericConnection?>?) {
|
||||
this.api
|
||||
.apiServers
|
||||
.forEach(
|
||||
Consumer { server: ProtocolAPIServer ->
|
||||
server
|
||||
.apiConnections
|
||||
.filter { conn: GenericConnection -> conn.context.useSerial }
|
||||
.forEach(action)
|
||||
},
|
||||
)
|
||||
fun forAllListeners(action: (GenericConnection) -> Unit) {
|
||||
this.api.apiServers.forEach { server ->
|
||||
server.apiConnections.filter { it.context.useSerial }.forEach(action)
|
||||
}
|
||||
}
|
||||
|
||||
override fun onSerialDeviceDeleted(port: SerialPort) {
|
||||
|
||||
@@ -71,9 +71,9 @@ public class ProvisioningHandler implements SerialListener {
|
||||
try {
|
||||
boolean openResult = false;
|
||||
if (port != null)
|
||||
openResult = vrServer.serialHandler.openSerial(port, false);
|
||||
openResult = vrServer.serialHandler.openSerial(port, false, false);
|
||||
else
|
||||
openResult = vrServer.serialHandler.openSerial(null, true);
|
||||
openResult = vrServer.serialHandler.openSerial(null, true, false);
|
||||
if (!openResult)
|
||||
LogManager.info("[SerialHandler] Serial port wasn't open...");
|
||||
} catch (Exception e) {
|
||||
|
||||
@@ -9,7 +9,7 @@ abstract class SerialHandler {
|
||||
abstract fun addListener(channel: SerialListener)
|
||||
abstract fun removeListener(channel: SerialListener)
|
||||
|
||||
abstract fun openSerial(portLocation: String?, auto: Boolean): Boolean
|
||||
abstract fun openSerial(portLocation: String?, auto: Boolean, autoIncludeHid: Boolean = false): Boolean
|
||||
abstract fun rebootRequest()
|
||||
abstract fun factoryResetRequest()
|
||||
abstract fun infoRequest()
|
||||
@@ -22,7 +22,7 @@ abstract class SerialHandler {
|
||||
|
||||
companion object {
|
||||
// Please also update the udev rules when updating these in:
|
||||
// gui/src-tauri/69-slimevr-devices.rules
|
||||
// gui/electron/resources/69-slimevr-devices.rules
|
||||
val supportedSerial: Set<Pair<Int, Int>> = setOf(
|
||||
// / QinHeng
|
||||
// CH340
|
||||
@@ -61,7 +61,7 @@ class SerialHandlerStub : SerialHandler() {
|
||||
|
||||
override fun removeListener(channel: SerialListener) {}
|
||||
|
||||
override fun openSerial(portLocation: String?, auto: Boolean): Boolean = false
|
||||
override fun openSerial(portLocation: String?, auto: Boolean, autoIncludeHid: Boolean): Boolean = false
|
||||
|
||||
override fun rebootRequest() {}
|
||||
|
||||
|
||||
@@ -5,8 +5,8 @@ import java.util.*
|
||||
abstract class SerialPort {
|
||||
abstract val portLocation: String
|
||||
abstract val descriptivePortName: String
|
||||
abstract val vendorId: Int?
|
||||
abstract val productId: Int?
|
||||
abstract val vendorId: Int
|
||||
abstract val productId: Int
|
||||
|
||||
override fun equals(other: Any?): Boolean {
|
||||
val other: SerialPort = other as? SerialPort ?: return super.equals(other)
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.fazecast.jSerialComm.SerialPortEvent
|
||||
import com.fazecast.jSerialComm.SerialPortMessageListener
|
||||
import dev.slimevr.serial.SerialHandler
|
||||
import dev.slimevr.serial.SerialListener
|
||||
import dev.slimevr.tracking.trackers.hid.HIDCommon
|
||||
import io.eiren.util.logging.LogManager
|
||||
import java.io.IOException
|
||||
import java.io.OutputStreamWriter
|
||||
@@ -88,13 +89,14 @@ class DesktopSerialHandler :
|
||||
}
|
||||
|
||||
@Synchronized
|
||||
override fun openSerial(portLocation: String?, auto: Boolean): Boolean {
|
||||
override fun openSerial(portLocation: String?, auto: Boolean, autoIncludeHid: Boolean): Boolean {
|
||||
LogManager.info("[SerialHandler] Trying to open: $portLocation, auto: $auto")
|
||||
val ports = SerialPort.getCommPorts()
|
||||
lastKnownPorts = ports.map { SerialPortWrapper(it) }.toSet()
|
||||
val newPort: SerialPort? = ports.find {
|
||||
(!auto && it.portLocation == portLocation) ||
|
||||
(auto && isKnownBoard(SerialPortWrapper(it)))
|
||||
(auto && isKnownBoard(SerialPortWrapper(it))) ||
|
||||
(auto && autoIncludeHid && HIDCommon.matchesAny(it.vendorID, it.productID))
|
||||
}
|
||||
if (newPort == null) {
|
||||
LogManager.info(
|
||||
@@ -244,7 +246,7 @@ class DesktopSerialHandler :
|
||||
get() = SerialPort.getCommPorts()
|
||||
.asSequence()
|
||||
.map { SerialPortWrapper(it) }
|
||||
.filter { isKnownBoard(it) }
|
||||
.filter { isKnownBoard(it) || HIDCommon.matchesAny(it.vendorId, it.productId) }
|
||||
.asStream()
|
||||
|
||||
private fun detectNewPorts() {
|
||||
@@ -261,7 +263,7 @@ class DesktopSerialHandler :
|
||||
}
|
||||
}
|
||||
|
||||
override fun getCurrentPort(): dev.slimevr.serial.SerialPort? {
|
||||
override fun getCurrentPort(): SlimeSerialPort? {
|
||||
val port = this.currentPort ?: return null
|
||||
return SerialPortWrapper(port)
|
||||
}
|
||||
|
||||
+1
-1
Submodule solarxr-protocol updated: 3ffd218a83...00c38a6dc2.
Reference in new issue
Block a user