From 10886a9c9884a9820a0431c76695798852dcd575 Mon Sep 17 00:00:00 2001 From: andrekir Date: Wed, 26 Jan 2022 22:26:35 -0300 Subject: [PATCH] add MyNodeInfo channelUtilization & airUtilTx --- app/src/main/java/com/geeksville/mesh/MyNodeInfo.kt | 12 +++++++++--- .../java/com/geeksville/mesh/service/MeshService.kt | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/MyNodeInfo.kt b/app/src/main/java/com/geeksville/mesh/MyNodeInfo.kt index a650dfe06..bbb70db81 100644 --- a/app/src/main/java/com/geeksville/mesh/MyNodeInfo.kt +++ b/app/src/main/java/com/geeksville/mesh/MyNodeInfo.kt @@ -16,7 +16,9 @@ data class MyNodeInfo( val currentPacketId: Long, val messageTimeoutMsec: Int, val minAppVersion: Int, - val maxChannels: Int + val maxChannels: Int, + val channelUtilization: Float, + val airUtilTx: Float ) : Parcelable { /** A human readable description of the software/hardware version */ val firmwareString: String get() = "$model $firmwareVersion" @@ -31,8 +33,10 @@ data class MyNodeInfo( parcel.readLong(), parcel.readInt(), parcel.readInt(), - parcel.readInt() - ) + parcel.readInt(), + parcel.readFloat(), + parcel.readFloat() + ) override fun writeToParcel(parcel: Parcel, flags: Int) { parcel.writeInt(myNodeNum) @@ -45,6 +49,8 @@ data class MyNodeInfo( parcel.writeInt(messageTimeoutMsec) parcel.writeInt(minAppVersion) parcel.writeInt(maxChannels) + parcel.writeFloat(channelUtilization) + parcel.writeFloat(airUtilTx) } override fun describeContents(): Int { diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index b2db3268d..b0ac61244 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -1333,7 +1333,9 @@ class MeshService : Service(), Logging { currentPacketId.toLong() and 0xffffffffL, if (messageTimeoutMsec == 0) 5 * 60 * 1000 else messageTimeoutMsec, // constants from current device code minAppVersion, - maxChannels + maxChannels, + channelUtilization, + airUtilTx ) }