From 0b0aedfb5271013d688e03da3daf0f06b9cf85d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Sun, 25 Feb 2024 21:08:07 +0000 Subject: [PATCH] Revert Xiaomi steps and stress parsing fixes - This reverts commit 789292d31862716992efaacad89dbe40c610b696. - This reverts commit 641eb1bee7923a8378299fd1a2202981b4169e32. Further changes are required --- .../xiaomi/activity/impl/DailyDetailsParser.java | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java index 4c16ac49c..624368676 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/xiaomi/activity/impl/DailyDetailsParser.java @@ -88,12 +88,7 @@ public class DailyDetailsParser extends XiaomiActivityParser { final XiaomiActivitySample sample = new XiaomiActivitySample(); sample.setTimestamp((int) (timestamp.getTimeInMillis() / 1000)); - // we only need the first 14 bits of the 2 bytes - // FIXME we should parse the header - final byte[] steps = new byte[2]; - buf.get(steps); - final int stepsNum = (steps[0] & 0xff) | (((steps[1] >> 2) & 0xff) << 8); - sample.setSteps(stepsNum); + sample.setSteps(buf.getShort()); final int calories = buf.get() & 0xff; final int unk2 = buf.get() & 0xff; @@ -110,10 +105,7 @@ public class DailyDetailsParser extends XiaomiActivityParser { if (version == 3) { // TODO gadgets with versions 2 also should have stress, but the values don't make sense sample.setSpo2(buf.get() & 0xff); - int stress = buf.get() & 0xff; - if (stress != 0xff) { - sample.setStress(stress); - } + sample.setStress(buf.get() & 0xff); } }