demus/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge.git synced 2026-07-31 07:44:24 +02:00
Code Issues 1 Packages Projects Releases Wiki Activity

Garmin: Make calories consistent with other devices

Browse Source
This commit is contained in:
José Rebelo
2026-01-15 19:36:35 +00:00
parent 617ef396a5
commit b6c125a3a6
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/activities/workouts/entries/ActivitySummaryGroup.kt
+1 -1
View File
@@ -57,7 +57,7 @@ object ActivitySummaryGroup {
ActivitySummaryEntries.GROUP_ACTIVITY, listOf<String>(
ActivitySummaryEntries.ACTIVE_SECONDS,
ActivitySummaryEntries.DISTANCE_METERS,
ActivitySummaryEntries.CALORIES_ACTIVE,
ActivitySummaryEntries.CALORIES_BURNT,
ActivitySummaryEntries.HR_AVG,
ActivitySummaryEntries.STEPS,
ActivitySummaryEntries.STRIDE_TOTAL,
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminWorkoutParser.java
+2 -2
View File
@@ -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);
}
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/model/ActivitySummaryEntries.java
+2 -2
View File
@@ -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";