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

fix: update `MockInterface` with 2.0 changes

pull/779/head
andrekir 2023-11-03 19:17:28 -03:00
rodzic a5822bb532
commit f25b752fd7
3 zmienionych plików z 77 dodań i 32 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

13
app/src/main/java/com/geeksville/mesh/android/BuildUtils.kt
Wyświetl plik

@ -19,6 +19,15 @@ object BuildUtils : Logging {
return Build.DEVICE == "osprey_u2" // Moto G
}
/// Are we running on the emulator?
val isEmulator get() = Build.MODEL == "Android SDK built for x86" || Build.MODEL == "sdk_gphone_x86" || Build.MODEL == "sdk_gphone64_arm64" || Build.MODEL == "Android SDK built for x86_64"
// Are we running on the emulator?
val isEmulator
get() = Build.FINGERPRINT.startsWith("generic") ||
Build.FINGERPRINT.startsWith("unknown") ||
Build.FINGERPRINT.contains("emulator") ||
setOf(Build.MODEL, Build.PRODUCT).contains("google_sdk") ||
Build.MODEL.contains("sdk_gphone64") ||
Build.MODEL.contains("Emulator") ||
Build.MODEL.contains("Android SDK built for") ||
Build.MANUFACTURER.contains("Genymotion") ||
Build.BRAND.startsWith("generic") && Build.DEVICE.startsWith("generic")
}

9
app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt
Wyświetl plik

@ -187,18 +187,15 @@ class BTScanModel @Inject constructor(
return if (isMockInterfaceAddressValid) {
warn("Running under emulator/test lab")
val testnodes = listOf(
listOf(
DeviceListEntry(context.getString(R.string.none), "n", true),
DeviceListEntry("Included simulator", "m", true),
DeviceListEntry("Complete simulator", "t10.0.2.2", true),
DeviceListEntry(context.getString(R.string.none), "n", true)
/* Don't populate fake bluetooth devices, because we don't want testlab inside of google
to try and use them.
DeviceListEntry("Meshtastic_ab12", "xaa", false),
DeviceListEntry("Meshtastic_32ac", "xbb", true) */
)
devices.value = (testnodes.map { it.fullAddress to it }).toMap().toMutableMap()
).forEach(::addDevice)
true
} else {
if (scanner == null) {

85
app/src/main/java/com/geeksville/mesh/repository/radio/MockInterface.kt
Wyświetl plik

@ -1,21 +1,41 @@
package com.geeksville.mesh.repository.radio
import android.app.Application
import com.geeksville.mesh.*
import com.geeksville.mesh.android.Logging
import com.geeksville.mesh.concurrent.handledLaunch
import com.geeksville.mesh.model.Channel
import com.geeksville.mesh.model.getInitials
import com.google.protobuf.ByteString
import dagger.assisted.Assisted
import dagger.assisted.AssistedInject
import kotlinx.coroutines.delay
private val defaultLoRaConfig = ConfigKt.loRaConfig {
usePreset = true
region = ConfigProtos.Config.LoRaConfig.RegionCode.TW
}
private val defaultChannel = channel {
settings = Channel.default.settings
role = ChannelProtos.Channel.Role.PRIMARY
}
/** A simulated interface that is used for testing in the simulator */
class MockInterface @AssistedInject constructor(
private val context: Application,
private val service: RadioInterfaceService,
@Assisted val address: String
) : Logging, IRadioInterface {
private var messageCount = 50
@Assisted val address: String,
) : IRadioInterface, Logging {
companion object {
private const val MY_NODE = 0x42424242
}
private var currentPacketId = 50
// an infinite sequence of ints
private val messageNumSequence = generateSequence { messageCount++ }.iterator()
private val packetIdSequence = generateSequence { currentPacketId++ }.iterator()
init {
info("Starting the mock interface")
@ -24,6 +44,7 @@ class MockInterface @AssistedInject constructor(
override fun handleSendToRadio(p: ByteArray) {
val pr = MeshProtos.ToRadio.parseFrom(p)
sendQueueStatus(pr.packet.id)
val data = if (pr.hasPacket()) pr.packet.decoded else null
@ -42,27 +63,21 @@ class MockInterface @AssistedInject constructor(
when {
d.getConfigRequest == AdminProtos.AdminMessage.ConfigType.LORA_CONFIG ->
sendAdmin(pr.packet.to, pr.packet.from, pr.packet.id) {
getConfigResponse = ConfigProtos.Config.newBuilder().apply {
lora =
ConfigProtos.Config.LoRaConfig.newBuilder().apply {
region = ConfigProtos.Config.LoRaConfig.RegionCode.TW
// FIXME set critical times?
}.build()
}.build()
getConfigResponse = config { lora = defaultLoRaConfig }
}
d.getChannelRequest != 0 ->
sendAdmin(pr.packet.to, pr.packet.from, pr.packet.id) {
getChannelResponse = ChannelProtos.Channel.newBuilder().apply {
getChannelResponse = channel {
index = d.getChannelRequest - 1 // 0 based on the response
role =
if (d.getChannelRequest == 1) ChannelProtos.Channel.Role.PRIMARY else ChannelProtos.Channel.Role.DISABLED
}.build()
if (d.getChannelRequest == 1) {
settings = Channel.default.settings
role = ChannelProtos.Channel.Role.PRIMARY
}
}
}
else ->
info("Ignoring admin sent to mock interface $d")
else -> info("Ignoring admin sent to mock interface $d")
}
}
@ -74,7 +89,7 @@ class MockInterface @AssistedInject constructor(
private fun makeTextMessage(numIn: Int) =
MeshProtos.FromRadio.newBuilder().apply {
packet = MeshProtos.MeshPacket.newBuilder().apply {
id = messageNumSequence.next()
id = packetIdSequence.next()
from = numIn
to = 0xffffffff.toInt() // ugly way of saying broadcast
rxTime = (System.currentTimeMillis() / 1000).toInt()
@ -89,7 +104,7 @@ class MockInterface @AssistedInject constructor(
private fun makeDataPacket(fromIn: Int, toIn: Int, data: MeshProtos.Data.Builder) =
MeshProtos.FromRadio.newBuilder().apply {
packet = MeshProtos.MeshPacket.newBuilder().apply {
id = messageNumSequence.next()
id = packetIdSequence.next()
from = fromIn
to = toIn
rxTime = (System.currentTimeMillis() / 1000).toInt()
@ -106,6 +121,16 @@ class MockInterface @AssistedInject constructor(
requestId = msgId
})
private fun sendQueueStatus(msgId: Int) = service.handleFromRadio(
fromRadio {
queueStatus = queueStatus {
res = 0
free = 16
meshPacketId = msgId
}
}.toByteArray()
)
private fun sendAdmin(
fromIn: Int,
toIn: Int,
@ -123,9 +148,10 @@ class MockInterface @AssistedInject constructor(
}
/// Send a fake ack packet back if the sender asked for want_ack
private fun sendFakeAck(pr: MeshProtos.ToRadio) {
private fun sendFakeAck(pr: MeshProtos.ToRadio) = service.serviceScope.handledLaunch {
delay(2000)
service.handleFromRadio(
makeAck(pr.packet.to, pr.packet.from, pr.packet.id).build().toByteArray()
makeAck(MY_NODE + 1, pr.packet.from, pr.packet.id).build().toByteArray()
)
}
@ -153,7 +179,6 @@ class MockInterface @AssistedInject constructor(
}
// Simulated network data to feed to our app
val MY_NODE = 0x42424242
val packets = arrayOf(
// MyNodeInfo
MeshProtos.FromRadio.newBuilder().apply {
@ -162,10 +187,24 @@ class MockInterface @AssistedInject constructor(
}.build()
},
MeshProtos.FromRadio.newBuilder().apply {
metadata = deviceMetadata {
firmwareVersion = context.getString(R.string.cur_firmware_version)
}
},
// Fake NodeDB
makeNodeInfo(MY_NODE, 32.776665, -96.796989), // dallas
makeNodeInfo(MY_NODE + 1, 32.960758, -96.733521), // richardson
MeshProtos.FromRadio.newBuilder().apply {
config = config { lora = defaultLoRaConfig }
},
MeshProtos.FromRadio.newBuilder().apply {
channel = defaultChannel
},
MeshProtos.FromRadio.newBuilder().apply {
configCompleteId = configId
},