mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Don't rely on android filtering for BLE scan, because NRF52

pull/104/head
geeksville 2020-07-15 17:19:36 -07:00
rodzic a527852f55
commit 87c272f784
1 zmienionych plików z 48 dodań i 41 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

89
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
Wyświetl plik

@ -183,54 +183,59 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging {
// if that device later disconnects remove it as a candidate // if that device later disconnects remove it as a candidate
override fun onScanResult(callbackType: Int, result: ScanResult) { override fun onScanResult(callbackType: Int, result: ScanResult) {
val addr = result.device.address if ((result.device.name?.startsWith("Mesh") ?: false)) {
val fullAddr = "x$addr" // full address with the bluetooh prefix val addr = result.device.address
// prevent logspam because weill get get lots of redundant scan results val fullAddr = "x$addr" // full address with the bluetooh prefix
val isBonded = result.device.bondState == BluetoothDevice.BOND_BONDED // prevent logspam because weill get get lots of redundant scan results
val oldDevs = devices.value!! val isBonded = result.device.bondState == BluetoothDevice.BOND_BONDED
val oldEntry = oldDevs[fullAddr] val oldDevs = devices.value!!
if (oldEntry == null || oldEntry.bonded != isBonded) { // Don't spam the GUI with endless updates for non changing nodes val oldEntry = oldDevs[fullAddr]
if (oldEntry == null || oldEntry.bonded != isBonded) { // Don't spam the GUI with endless updates for non changing nodes
val skipBogus = try { val skipBogus = try {
// Note Soyes XS has a buggy BLE scan implementation and returns devices we didn't ask for. So we check to see if the // Note Soyes XS has a buggy BLE scan implementation and returns devices we didn't ask for. So we check to see if the
// last two chars of the name matches the last two of the address - if not we skip it // last two chars of the name matches the last two of the address - if not we skip it
// Note: the address is always two more than the hex string we show in the name // Note: the address is always two more than the hex string we show in the name
// nasty parsing of a string that ends with ab:45 as four hex digits // nasty parsing of a string that ends with ab:45 as four hex digits
val lastAddr = (addr.substring( val lastAddr = (addr.substring(
addr.length - 5, addr.length - 5,
addr.length - 3 addr.length - 3
) + addr.substring(addr.length - 2)).toInt(16) ) + addr.substring(addr.length - 2)).toInt(16)
val lastName = val lastName =
result.device.name.substring(result.device.name.length - 4).toInt(16) result.device.name.substring(result.device.name.length - 4).toInt(16)
(lastAddr - 2) != lastName // ESP32 macaddr are two higher than the reported device name
} catch (ex: Throwable) { // NRF52 macaddrs match the portion used in the string
false // If we fail parsing anything, don't do this nasty hack // either would be acceptable
} (lastAddr - 2) != lastName && lastAddr != lastName
} catch (ex: Throwable) {
false // If we fail parsing anything, don't do this nasty hack
}
if (skipBogus) if (skipBogus)
errormsg("Skipping bogus BLE entry $result") errormsg("Skipping bogus BLE entry $result")
else { else {
val entry = DeviceListEntry( val entry = DeviceListEntry(
result.device.name result.device.name
?: "unnamed-$addr", // autobug: some devices might not have a name, if someone is running really old device code? ?: "unnamed-$addr", // autobug: some devices might not have a name, if someone is running really old device code?
fullAddr, fullAddr,
isBonded isBonded
)
debug("onScanResult ${entry}")
// If nothing was selected, by default select the first valid thing we see
val activity =
GeeksvilleApplication.currentActivity as MainActivity? // Can be null if app is shutting down
if (selectedAddress == null && entry.bonded && activity != null)
changeScanSelection(
activity,
fullAddr
) )
addDevice(entry) // Add/replace entry debug("onScanResult ${entry}")
// If nothing was selected, by default select the first valid thing we see
val activity =
GeeksvilleApplication.currentActivity as MainActivity? // Can be null if app is shutting down
if (selectedAddress == null && entry.bonded && activity != null)
changeScanSelection(
activity,
fullAddr
)
addDevice(entry) // Add/replace entry
}
} }
} }
} }
@ -313,6 +318,8 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging {
// filter and only accept devices that have our service // filter and only accept devices that have our service
val filter = val filter =
ScanFilter.Builder() ScanFilter.Builder()
// Note: NRF52 doesn't put the service in the avertizement, so we can't filter by service here
// Instead we check in the callback
.setServiceUuid(ParcelUuid(BluetoothInterface.BTM_SERVICE_UUID)) .setServiceUuid(ParcelUuid(BluetoothInterface.BTM_SERVICE_UUID))
.build() .build()