zjs81/meshcore-open
1
0
Fork 0
mirror of https://github.com/zjs81/meshcore-open.git synced 2026-04-20 22:13:48 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix USB device name matching and correct localization strings

Browse source
This commit is contained in:
just_stuff_tm 2026-03-03 15:38:10 -05:00 • committed by just-stuff-tm
parent 21ff765e41
commit 367e47bb1e
4 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

9
android/app/src/main/kotlin/com/meshcore/meshcore_open/MeshcoreUsbFunctions.kt
View file

@ -235,7 +235,14 @@ class MeshcoreUsbFunctions(
}
private fun findUsbDevice(portName: String): UsbDevice? {
return usbManager.deviceList.values.firstOrNull { it.deviceName == portName }
val devices = usbManager.deviceList.values
val exactMatch = devices.firstOrNull { it.deviceName == portName }
if (exactMatch != null) {
return exactMatch
}
val normalizedName = portName.substringBefore(" - ").trim()
return devices.firstOrNull { it.deviceName == normalizedName }
}
private fun openUsbDevice(