From 8f7634f980886318bd4a9954311c4645b81a5ea3 Mon Sep 17 00:00:00 2001
From: unlogisch04 <98281608+unlogisch04@users.noreply.github.com>
Date: Thu, 1 Feb 2024 02:16:59 +0100
Subject: [PATCH 1/3] Add Serial Console Wifi Scan

Adding the WiFi Scan feature that was added in the Firmware Version 0.4.0
---
 gui/public/i18n/en/translation.ftl               |  1 +
 gui/src/components/settings/pages/Serial.tsx     | 10 ++++++++++
 .../android/serial/AndroidSerialHandler.kt       |  4 ++++
 .../protocol/rpc/serial/RPCSerialHandler.java    | 16 ++++++++++++++++
 .../java/dev/slimevr/serial/SerialHandler.kt     |  3 +++
 .../desktop/serial/DesktopSerialHandler.kt       |  4 ++++
 solarxr-protocol                                 |  2 +-
 7 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/gui/public/i18n/en/translation.ftl b/gui/public/i18n/en/translation.ftl
index b4c2eae8b4..5f38fba1d1 100644
--- a/gui/public/i18n/en/translation.ftl
+++ b/gui/public/i18n/en/translation.ftl
@@ -442,6 +442,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
index f267a02974..961fe4b70a 100644
--- 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
index a26c560f6c..8e131619ee 100644
--- 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
index 08c57361ca..2e1a42ff0f 100644
--- 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
index 64ff91e43f..104f429411 100644
--- 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
index 2d8750e8bd..4747a1bb50 100644
--- 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
index 2aa159288c..fe78b76f7b 160000
--- a/solarxr-protocol
+++ b/solarxr-protocol
@@ -1 +1 @@
-Subproject commit 2aa159288c3049ccafeaf779f7d9b53b5a8caed9
+Subproject commit fe78b76f7b67931d3997b19a1d87ee9cb2b20c72

From 86324629a5441b133a0785490e8fd53477e270b7 Mon Sep 17 00:00:00 2001
From: unlogisch04 <98281608+unlogisch04@users.noreply.github.com>
Date: Thu, 1 Feb 2024 21:08:40 +0100
Subject: [PATCH 2/3] lint

---
 gui/src/components/settings/pages/Serial.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/src/components/settings/pages/Serial.tsx b/gui/src/components/settings/pages/Serial.tsx
index 961fe4b70a..e4be27bfd9 100644
--- a/gui/src/components/settings/pages/Serial.tsx
+++ b/gui/src/components/settings/pages/Serial.tsx
@@ -159,7 +159,7 @@ export function Serial() {
       new SerialTrackerGetInfoRequestT()
     );
   };
-  const getWifiScan = () =>{
+  const getWifiScan = () => {
     sendRPCPacket(
       RpcMessage.SerialTrackerGetWifiScanRequest,
       new SerialTrackerGetWifiScanRequestT()

From ce845c2a4c67cca1641bc5e0e22d630c2bca96c1 Mon Sep 17 00:00:00 2001
From: unlogisch04 <98281608+unlogisch04@users.noreply.github.com>
Date: Fri, 16 Feb 2024 23:03:11 +0100
Subject: [PATCH 3/3] Update solarxr-protocol

---
 solarxr-protocol | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/solarxr-protocol b/solarxr-protocol
index fe78b76f7b..42017052a7 160000
--- a/solarxr-protocol
+++ b/solarxr-protocol
@@ -1 +1 @@
-Subproject commit fe78b76f7b67931d3997b19a1d87ee9cb2b20c72
+Subproject commit 42017052a74fe01e52c7f303767ad8a2055d171d