From 7c1324bec9d5720a5a06acf1bc445615cc948430 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Sun, 22 Mar 2026 19:21:46 +0000 Subject: [PATCH] Zepp OS: Add Floorball activity --- .../devices/huami/zeppos/ZeppOsActivitySummaryParser.java | 5 +++-- .../freeyourgadget/gadgetbridge/model/ActivityKind.java | 1 + .../service/devices/huami/zeppos/ZeppOsActivityType.java | 1 + app/src/main/res/values/strings.xml | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsActivitySummaryParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsActivitySummaryParser.java index 294b3cde9c..282e212bce 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsActivitySummaryParser.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huami/zeppos/ZeppOsActivitySummaryParser.java @@ -90,9 +90,10 @@ public class ZeppOsActivitySummaryParser extends HuamiActivitySummaryParser { if (activityType != null) { activityKind = activityType.toActivityKind(); } else { - LOG.warn("Unknown workout activity type code {}", String.format("0x%X", summaryProto.getType().getType())); + final String typeCodeHex = String.format("0x%X", summaryProto.getType().getType()); + LOG.warn("Unknown workout activity type code {}", typeCodeHex); activityKind = ActivityKind.UNKNOWN; - summaryData.add(ACTIVITY_TYPE_CODE, typeCode, UNIT_NONE); + summaryData.add(ACTIVITY_TYPE_CODE, typeCodeHex, UNIT_NONE); } summary.setActivityKind(activityKind.getCode()); } else { diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java index 2a5b021347..0e494cc9d5 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivityKind.java @@ -340,6 +340,7 @@ public enum ActivityKind { STREET_RUNNING(0x04000135, R.string.activity_type_street_running, R.drawable.ic_activity_road), STOP_WATCH(0x04000136, R.string.activity_type_stop_watch, R.drawable.ic_timer), CCR_DIVING(0x04000137, R.string.activity_type_ccr_diving, R.drawable.ic_activity_diving), + FLOORBALL(0x04000138, R.string.activity_type_floorball, R.drawable.ic_activity_hockey), ; private final int code; diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsActivityType.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsActivityType.java index e6ab96437e..9dda2f840e 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsActivityType.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/huami/zeppos/ZeppOsActivityType.java @@ -77,6 +77,7 @@ public enum ZeppOsActivityType { HipHop(0xa5, ActivityKind.HIP_HOP), HorizontalBar(0x95, ActivityKind.HORIZONTAL_BAR), HulaHoop(0x73, ActivityKind.HULA_HOOP), + Floorball(0xbc, ActivityKind.FLOORBALL), IceHockey(0x9e, ActivityKind.ICE_HOCKEY), IceSkating(0x2c, ActivityKind.ICE_SKATING), IndoorCycling(0x08, ActivityKind.INDOOR_CYCLING), diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c7653b29ca..b6c505b84b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1572,6 +1572,7 @@ Jet skiing Skating Ice hockey + Floorball Curling Cross country skiing Snow sports