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

Merge remote-tracking branch 'root/master' into dev

pull/226/head
Kevin Hester 2021-02-01 22:54:18 +08:00
rodzic 719bef7889 57b04518de
commit e710b67131
1 zmienionych plików z 25 dodań i 24 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

3
app/src/main/java/com/geeksville/mesh/MainActivity.kt
Wyświetl plik

@ -793,6 +793,7 @@ class MainActivity : AppCompatActivity(), Logging,
connectionJob = mainScope.handledLaunch { connectionJob = mainScope.handledLaunch {
model.meshService = service model.meshService = service
try {
usbDevice?.let { usb -> usbDevice?.let { usb ->
debug("Switching to USB radio ${usb.deviceName}") debug("Switching to USB radio ${usb.deviceName}")
service.setDeviceAddress(SerialInterface.toInterfaceName(usb.deviceName)) service.setDeviceAddress(SerialInterface.toInterfaceName(usb.deviceName))
@ -817,7 +818,7 @@ class MainActivity : AppCompatActivity(), Logging,
if (connectionState != MeshService.ConnectionState.CONNECTED) if (connectionState != MeshService.ConnectionState.CONNECTED)
updateNodesFromDevice() updateNodesFromDevice()
try {
// We won't receive a notify for the initial state of connection, so we force an update here // We won't receive a notify for the initial state of connection, so we force an update here
onMeshConnectionChanged(connectionState) onMeshConnectionChanged(connectionState)
} catch (ex: RemoteException) { } catch (ex: RemoteException) {