pull/265/head
Vadim Furman 2021-03-22 21:21:58 -07:00
rodzic 0d9f31f7fb
commit 13d63ee52b
1 zmienionych plików z 3 dodań i 4 usunięć

Wyświetl plik

@ -1090,7 +1090,7 @@ class MainActivity : AppCompatActivity(), Logging,
applicationContext.contentResolver.openFileDescriptor(file_uri, "w")?.use { applicationContext.contentResolver.openFileDescriptor(file_uri, "w")?.use {
FileOutputStream(it.fileDescriptor).use { fs -> FileOutputStream(it.fileDescriptor).use { fs ->
// Write header // Write header
fs.write(("from,snr,time,dist\n").toByteArray()); fs.write(("from,rssi,snr,time,dist\n").toByteArray());
// Packets are ordered by time, we keep most recent position of // Packets are ordered by time, we keep most recent position of
// our device in my_position. // our device in my_position.
var my_position: MeshProtos.Position? = null var my_position: MeshProtos.Position? = null
@ -1100,9 +1100,8 @@ class MainActivity : AppCompatActivity(), Logging,
if (packet_proto.from == myNodeNum) { if (packet_proto.from == myNodeNum) {
my_position = position my_position = position
} else if (my_position != null) { } else if (my_position != null) {
val dist: Int = val dist = positionToMeter(my_position!!, position).roundToInt()
positionToMeter(my_position!!, position).roundToInt() fs.write("%x,%d,%f,%d,%d\n".format(packet_proto.from,packet_proto.rxRssi,
fs.write("%x,%f,%d,%d\n".format( packet_proto.from,
packet_proto.rxSnr, packet_proto.rxTime, dist).toByteArray()) packet_proto.rxSnr, packet_proto.rxTime, dist).toByteArray())
} }
} }