From 5c8e526930c6e4e587ebdef2031bfaeec1761a91 Mon Sep 17 00:00:00 2001 From: Azalea Gui Date: Mon, 23 Jan 2023 22:17:18 -0500 Subject: [PATCH] [O] Make measurement for battery --- .../hydev/wearsync/bles/decoders/BatteryDecoder.kt | 11 ++++++----- .../org/hydev/wearsync/bles/decoders/ModelDecoder.kt | 5 +---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/org/hydev/wearsync/bles/decoders/BatteryDecoder.kt b/app/src/main/java/org/hydev/wearsync/bles/decoders/BatteryDecoder.kt index ba93845..79340b2 100644 --- a/app/src/main/java/org/hydev/wearsync/bles/decoders/BatteryDecoder.kt +++ b/app/src/main/java/org/hydev/wearsync/bles/decoders/BatteryDecoder.kt @@ -1,15 +1,16 @@ package org.hydev.wearsync.bles.decoders +import com.influxdb.annotations.Measurement import com.welie.blessed.asUInt8 import java.util.* -class BatteryDecoder : IDecoder +@Measurement(name = "wear-battery") +data class BatteryMeasurement(val percent: UInt) + +class BatteryDecoder : IDecoder { override val sid = UUID.fromString("0000180F-0000-1000-8000-00805f9b34fb") override val cid = UUID.fromString("00002A19-0000-1000-8000-00805f9b34fb") - override fun decode(value: ByteArray): UInt - { - return value.asUInt8()!! - } + override fun decode(value: ByteArray) = BatteryMeasurement(value.asUInt8()!!) } \ No newline at end of file diff --git a/app/src/main/java/org/hydev/wearsync/bles/decoders/ModelDecoder.kt b/app/src/main/java/org/hydev/wearsync/bles/decoders/ModelDecoder.kt index 3390128..bd69104 100644 --- a/app/src/main/java/org/hydev/wearsync/bles/decoders/ModelDecoder.kt +++ b/app/src/main/java/org/hydev/wearsync/bles/decoders/ModelDecoder.kt @@ -8,8 +8,5 @@ class ModelDecoder : IDecoder override val sid = UUID.fromString("0000180A-0000-1000-8000-00805f9b34fb") override val cid = UUID.fromString("00002A24-0000-1000-8000-00805f9b34fb") - override fun decode(value: ByteArray): String - { - return value.asString() - } + override fun decode(value: ByteArray) = value.asString() } \ No newline at end of file