Add Serial Console Wifi Scan (#930)

SlimeVR · Feb 16, 2024 · a74d5aa · a74d5aa
1 parent 21576af
commit a74d5aa
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 1 deletion.
diff --git a/gui/public/i18n/en/translation.ftl b/gui/public/i18n/en/translation.ftl
@@ -446,6 +446,7 @@ settings-serial-factory_reset-warning-cancel = Cancel
 settings-serial-get_infos = Get Infos
 settings-serial-serial_select = Select a serial port
 settings-serial-auto_dropdown_item = Auto
+settings-serial-get_wifi_scan = Get WiFi Scan
 
 ## OSC router settings
 settings-osc-router = OSC router

diff --git a/gui/src/components/settings/pages/Serial.tsx b/gui/src/components/settings/pages/Serial.tsx
@@ -12,6 +12,7 @@ import {
   SerialTrackerGetInfoRequestT,
   SerialTrackerRebootRequestT,
   SerialUpdateResponseT,
+  SerialTrackerGetWifiScanRequestT,
 } from 'solarxr-protocol';
 import { useElemSize, useLayout } from '@/hooks/layout';
 import { useWebsocketAPI } from '@/hooks/websocket-api';
@@ -158,6 +159,12 @@ export function Serial() {
       new SerialTrackerGetInfoRequestT()
     );
   };
+  const getWifiScan = () => {
+    sendRPCPacket(
+      RpcMessage.SerialTrackerGetWifiScanRequest,
+      new SerialTrackerGetWifiScanRequestT()
+    );
+  };
 
   return (
     <>
@@ -231,6 +238,9 @@ export function Serial() {
                 <Button variant="quaternary" onClick={getInfos}>
                   {l10n.getString('settings-serial-get_infos')}
                 </Button>
+                <Button variant="quaternary" onClick={getWifiScan}>
+                  {l10n.getString('settings-serial-get_wifi_scan')}
+                </Button>
                 {isMobile && (
                   <Dropdown
                     control={control}

diff --git a/server/android/src/main/java/dev/slimevr/android/serial/AndroidSerialHandler.kt b/server/android/src/main/java/dev/slimevr/android/serial/AndroidSerialHandler.kt
@@ -204,6 +204,10 @@ class AndroidSerialHandler(val activity: AppCompatActivity) :
 		writeSerial("GET INFO")
 	}
 
+	override fun wifiScanRequest() {
+		writeSerial("GET WIFISCAN")
+	}
+
 	override fun closeSerial() {
 		try {
 			if (isConnected) {

diff --git a/server/core/src/main/java/dev/slimevr/protocol/rpc/serial/RPCSerialHandler.java b/server/core/src/main/java/dev/slimevr/protocol/rpc/serial/RPCSerialHandler.java
@@ -38,6 +38,11 @@ public RPCSerialHandler(RPCHandler rpcHandler, ProtocolAPI api) {
 				RpcMessage.SerialTrackerFactoryResetRequest,
 				this::onSerialTrackerFactoryResetRequest
 			);
+		rpcHandler
+			.registerPacketListener(
+				RpcMessage.SerialTrackerGetWifiScanRequest,
+				this::onSerialTrackerGetWifiScanRequest
+			);
 		rpcHandler.registerPacketListener(RpcMessage.SetWifiRequest, this::onSetWifiRequest);
 		rpcHandler.registerPacketListener(RpcMessage.OpenSerialRequest, this::onOpenSerialRequest);
 		rpcHandler
@@ -158,6 +163,17 @@ public void onSerialTrackerFactoryResetRequest(
 		this.api.server.serialHandler.factoryResetRequest();
 	}
 
+	public void onSerialTrackerGetWifiScanRequest(
+		GenericConnection conn,
+		RpcMessageHeader messageHeader
+	) {
+		SerialTrackerGetWifiScanRequest req = (SerialTrackerGetWifiScanRequest) messageHeader
+			.message(new SerialTrackerGetWifiScanRequest());
+		if (req == null)
+			return;
+
+		this.api.server.serialHandler.wifiScanRequest();
+	}
 
 	private void onRequestSerialDevices(GenericConnection conn, RpcMessageHeader messageHeader) {
 		SerialDevicesRequest req = (SerialDevicesRequest) messageHeader

diff --git a/server/core/src/main/java/dev/slimevr/serial/SerialHandler.kt b/server/core/src/main/java/dev/slimevr/serial/SerialHandler.kt
@@ -13,6 +13,7 @@ abstract class SerialHandler {
 	abstract fun rebootRequest()
 	abstract fun factoryResetRequest()
 	abstract fun infoRequest()
+	abstract fun wifiScanRequest()
 	abstract fun closeSerial()
 	abstract fun setWifi(ssid: String, passwd: String)
 
@@ -62,6 +63,8 @@ class SerialHandlerStub() : SerialHandler() {
 
 	override fun infoRequest() {}
 
+	override fun wifiScanRequest() {}
+
 	override fun closeSerial() {}
 
 	override fun setWifi(ssid: String, passwd: String) {}

diff --git a/server/desktop/src/main/java/dev/slimevr/desktop/serial/DesktopSerialHandler.kt b/server/desktop/src/main/java/dev/slimevr/desktop/serial/DesktopSerialHandler.kt
@@ -144,6 +144,10 @@ class DesktopSerialHandler : SerialHandler(), SerialPortMessageListener {
 		writeSerial("GET INFO")
 	}
 
+	override fun wifiScanRequest() {
+		writeSerial("GET WIFISCAN")
+	}
+
 	@Synchronized
 	override fun closeSerial() {
 		try {

diff --git a/solarxr-protocol b/solarxr-protocol
+56 −5		protocol/cpp/include/solarxr_protocol/generated/all_generated.h
+2 −1		protocol/java/src/solarxr_protocol/rpc/RpcMessage.java
+4 −0		protocol/java/src/solarxr_protocol/rpc/RpcMessageHeader.java
+2 −0		protocol/java/src/solarxr_protocol/rpc/RpcMessageUnion.java
+47 −0		protocol/java/src/solarxr_protocol/rpc/SerialTrackerGetWifiScanRequest.java
+16 −0		protocol/java/src/solarxr_protocol/rpc/SerialTrackerGetWifiScanRequestT.java
+2 −1		protocol/kotlin/src/solarxr_protocol/rpc/RpcMessage.kt
+40 −0		protocol/kotlin/src/solarxr_protocol/rpc/SerialTrackerGetWifiScanRequest.kt
+2 −0		protocol/rust/src/generated/mod.rs
+7 −3		protocol/rust/src/generated/solarxr_protocol/rpc/rpc_message_generated.rs
+23 −0		protocol/rust/src/generated/solarxr_protocol/rpc/rpc_message_header_generated.rs
+91 −0		protocol/rust/src/generated/solarxr_protocol/rpc/serial_tracker_get_wifi_scan_request_generated.rs
+1 −0		protocol/typescript/src/all_generated.ts
+2 −1		protocol/typescript/src/solarxr-protocol/rpc/rpc-message-header.ts
+9 −5		protocol/typescript/src/solarxr-protocol/rpc/rpc-message.ts
+57 −0		protocol/typescript/src/solarxr-protocol/rpc/serial-tracker-get-wifi-scan-request.ts
+4 −0		schema/rpc.fbs