Merge branch 'llelievr/firmware-tool' of github.com:SlimeVR/SlimeVR-S…

…erver into llelievr/firmware-tool

gui/public/i18n/en/translation.ftl

@@ -1068,8 +1068,8 @@ firmware-tool_loading = Loading...
 ## Firmware tool Steps
 firmware-tool = DIY Firmware tool
 firmware-tool_description =
-    Allows to configure and flash your DIY trackers
-firmware-tool_not-available = Oops the firmware tool is not available at the moment. Come back later!
+    Allows you to configure and flash your DIY trackers
+firmware-tool_not-available = Oops, the firmware tool is not available at the moment. Come back later!
 firmware-tool_not-compatible = The firmware tool is not compatible with this version of the server. Please update your server!
 
 firmware-tool_board-step = Select your Board
@@ -1149,7 +1149,7 @@ firmware-tool_flashbtn-step_description = Before going into the next step there
 
 firmware-tool_flashbtn-step_board_SLIMEVR = Press the flash button on the pcb before inserting turning on the tracker.
     If the tracker was already on, simply turn it off and back on while pressing the button or shorting the flash pads.
-    Here are a few pictures on how to do it according to the different revisions of the slimevr tracker
+    Here are a few pictures on how to do it according to the different revisions of the SlimeVR tracker
 firmware-tool_flashbtn-step_board_SLIMEVR-r11 = Turn on the tracker while shorting the second rectangular FLASH pad from the edge on the top side of the board, and the metal shield of the microcontroller
 firmware-tool_flashbtn-step_board_SLIMEVR-r12 = Turn on the tracker while shorting the circular FLASH pad on the top side of the board, and the metal shield of the microcontroller
 firmware-tool_flashbtn-step_board_SLIMEVR-r14 = Turn on the tracker while pushing in the FLASH button on the top side of the board

server/core/build.gradle.kts

@@ -76,9 +76,8 @@ dependencies {
 	implementation("org.java-websocket:Java-WebSocket:1.+")
 	implementation("com.melloware:jintellitype:1.+")
 	implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.7.3")
-	implementation("it.unimi.dsi:fastutil:8.5.12")
 	implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.1")
-	implementation("com.mayakapps.kache:kache:2.0.0-rc02")
+	implementation("com.mayakapps.kache:kache:2.1.0")
 
 	api("com.github.loucass003:EspflashKotlin:v0.10.0")
 

server/core/src/main/java/dev/slimevr/firmware/FirmwareUpdateHandler.kt

@@ -175,7 +175,7 @@ class FirmwareUpdateHandler(private val server: VRServer) :
 			flasher.flash(serialPort)
 			if (needManualReboot) {
 				if (watchRestartQueue.find { it.first == deviceId } != null) {
-					LogManager.info("[FirmwareUpdateHandler] Device is already updating, Skipping")
+					LogManager.info("[FirmwareUpdateHandler] Device is already updating, skipping")
 				}
 
 				onStatusChange(UpdateStatusEvent(deviceId, FirmwareUpdateStatus.NEED_MANUAL_REBOOT))
@@ -219,7 +219,7 @@ class FirmwareUpdateHandler(private val server: VRServer) :
 		clearJob?.await()
 		if (method == FirmwareUpdateMethod.OTA) {
 			if (watchRestartQueue.find { it.first == deviceId } != null) {
-				LogManager.info("[FirmwareUpdateHandler] Device is already updating, Skipping")
+				LogManager.info("[FirmwareUpdateHandler] Device is already updating, skipping")
 			}
 
 			onStatusChange(
@@ -240,7 +240,7 @@ class FirmwareUpdateHandler(private val server: VRServer) :
 			)
 		} else {
 			if (updatingDevicesStatus[deviceId] != null) {
-				LogManager.info("[FirmwareUpdateHandler] Device is already updating, Skipping")
+				LogManager.info("[FirmwareUpdateHandler] Device is already updating, skipping")
 				return@launch
 			}
 

server/core/src/main/java/dev/slimevr/firmware/SerialRebootHandler.kt

@@ -58,7 +58,7 @@ class SerialRebootHandler(
 	}
 
 	override fun onSerialDeviceDeleted(port: SerialPort) {
-		val foundPort = watchRestartQueue.find { it.first.id === port.portLocation }
+		val foundPort = watchRestartQueue.find { it.first.id == port.portLocation }
 		if (foundPort != null) {
 			disconnectedDevices.add(port)
 		}