From b6c125a3a68070a7464fa2301e4981afb9c6718a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Rebelo?= Date: Thu, 15 Jan 2026 19:36:35 +0000 Subject: [PATCH] Garmin: Make calories consistent with other devices --- .../activities/workouts/entries/ActivitySummaryGroup.kt | 2 +- .../gadgetbridge/devices/garmin/GarminWorkoutParser.java | 4 ++-- .../gadgetbridge/model/ActivitySummaryEntries.java | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/entries/ActivitySummaryGroup.kt b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/entries/ActivitySummaryGroup.kt index f1ee00e754..d1f06f7193 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/entries/ActivitySummaryGroup.kt +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/entries/ActivitySummaryGroup.kt @@ -57,7 +57,7 @@ object ActivitySummaryGroup { ActivitySummaryEntries.GROUP_ACTIVITY, listOf( ActivitySummaryEntries.ACTIVE_SECONDS, ActivitySummaryEntries.DISTANCE_METERS, - ActivitySummaryEntries.CALORIES_ACTIVE, + ActivitySummaryEntries.CALORIES_BURNT, ActivitySummaryEntries.HR_AVG, ActivitySummaryEntries.STEPS, ActivitySummaryEntries.STRIDE_TOTAL, diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminWorkoutParser.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminWorkoutParser.java index f34bb850f3..b66942c334 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminWorkoutParser.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminWorkoutParser.java @@ -256,9 +256,9 @@ public class GarminWorkoutParser implements ActivitySummaryParser { summaryData.add(STEP_LENGTH_AVG, session.getAvgStepLength(), UNIT_MM); if (session.getTotalCalories() != null) { summaryData.add(CALORIES_CONSUMED, session.getCaloriesConsumed(), UNIT_KCAL); - summaryData.add(CALORIES_BURNT, session.getTotalCalories(), UNIT_KCAL); + summaryData.add(CALORIES_TOTAL, session.getTotalCalories(), UNIT_KCAL); if (session.getRestingCalories() != null) { - summaryData.add(CALORIES_ACTIVE, session.getTotalCalories() - session.getRestingCalories(), UNIT_KCAL); + summaryData.add(CALORIES_BURNT, session.getTotalCalories() - session.getRestingCalories(), UNIT_KCAL); summaryData.add(CALORIES_RESTING, session.getRestingCalories(), UNIT_KCAL); } } diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryEntries.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryEntries.java index abf3a47c5f..71cef00455 100644 --- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryEntries.java +++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryEntries.java @@ -173,8 +173,8 @@ public class ActivitySummaryEntries { public static final String SWIM_AVG_CADENCE = "swim_avg_cadence"; public static final String CALORIES_CONSUMED = "calories_consumed"; - public static final String CALORIES_BURNT = "caloriesBurnt"; - public static final String CALORIES_ACTIVE = "active_calories"; + public static final String CALORIES_BURNT = "active_calories"; + public static final String CALORIES_TOTAL = "caloriesBurnt"; public static final String CALORIES_RESTING = "restingCalories"; public static final String TRAINING_EFFECT_AEROBIC = "aerobicTrainingEffect"; public static final String TRAINING_EFFECT_ANAEROBIC = "anaerobicTrainingEffect";