mirror of
https://github.com/meshtastic/Meshtastic-Android.git
synced 2026-04-20 22:23:37 +00:00
Add hopLimit to the DataPacket class, update MeshService to use hopLimit when building its MeshPackets
This commit is contained in:
parent
1c7d1c7ea9
commit
a6c80cc203
2 changed files with 14 additions and 4 deletions
|
|
@ -26,7 +26,8 @@ data class DataPacket(
|
|||
var from: String? = ID_LOCAL, // a nodeID string, or ID_LOCAL for localhost
|
||||
var time: Long = System.currentTimeMillis(), // msecs since 1970
|
||||
var id: Int = 0, // 0 means unassigned
|
||||
var status: MessageStatus? = MessageStatus.UNKNOWN
|
||||
var status: MessageStatus? = MessageStatus.UNKNOWN,
|
||||
var hopLimit: Int = 0
|
||||
) : Parcelable {
|
||||
|
||||
/**
|
||||
|
|
@ -60,7 +61,8 @@ data class DataPacket(
|
|||
parcel.readString(),
|
||||
parcel.readLong(),
|
||||
parcel.readInt(),
|
||||
parcel.readParcelable(MessageStatus::class.java.classLoader)
|
||||
parcel.readParcelable(MessageStatus::class.java.classLoader),
|
||||
parcel.readInt()
|
||||
) {
|
||||
}
|
||||
|
||||
|
|
@ -77,6 +79,7 @@ data class DataPacket(
|
|||
if (dataType != other.dataType) return false
|
||||
if (!bytes!!.contentEquals(other.bytes!!)) return false
|
||||
if (status != other.status) return false
|
||||
if (hopLimit != other.hopLimit) return false
|
||||
|
||||
return true
|
||||
}
|
||||
|
|
@ -89,6 +92,7 @@ data class DataPacket(
|
|||
result = 31 * result + dataType
|
||||
result = 31 * result + bytes!!.contentHashCode()
|
||||
result = 31 * result + status.hashCode()
|
||||
result = 31 * result + hopLimit
|
||||
return result
|
||||
}
|
||||
|
||||
|
|
@ -100,6 +104,7 @@ data class DataPacket(
|
|||
parcel.writeLong(time)
|
||||
parcel.writeInt(id)
|
||||
parcel.writeParcelable(status, flags)
|
||||
parcel.writeInt(hopLimit)
|
||||
}
|
||||
|
||||
override fun describeContents(): Int {
|
||||
|
|
@ -115,6 +120,7 @@ data class DataPacket(
|
|||
time = parcel.readLong()
|
||||
id = parcel.readInt()
|
||||
status = parcel.readParcelable(MessageStatus::class.java.classLoader)
|
||||
hopLimit = parcel.readInt()
|
||||
}
|
||||
|
||||
companion object CREATOR : Parcelable.Creator<DataPacket> {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue