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: Use current day resting heart rate

Browse Source
This commit is contained in:
José Rebelo
2026-02-10 20:50:11 +00:00
parent 0032f0e887
commit 1a8736621f
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/FitImporter.java
+8 -3
View File
@@ -380,14 +380,19 @@ public class FitImporter {
trainingLoadChronicSamples.add(sample);
}
} else if (record instanceof FitMonitoringHrData monitoringHrData) {
if (monitoringHrData.getRestingHeartRate() == null) {
if (monitoringHrData.getRestingHeartRate() == null && monitoringHrData.getCurrentDayRestingHeartRate() == null) {
LOG.warn("Resting HR at {} is null", ts);
continue;
}
LOG.trace("Resting HR at {}: {}", ts, monitoringHrData.getRestingHeartRate());
LOG.trace("Resting HR at {}: {}, currentDay={}", ts, monitoringHrData.getRestingHeartRate(), monitoringHrData.getCurrentDayRestingHeartRate());
final GarminHeartRateRestingSample sample = new GarminHeartRateRestingSample();
sample.setTimestamp(ts * 1000L);
sample.setHeartRate(monitoringHrData.getRestingHeartRate());
if (monitoringHrData.getCurrentDayRestingHeartRate() != null) {
// Prioritize the current day value - that matches what the watch displays
sample.setHeartRate(monitoringHrData.getCurrentDayRestingHeartRate());
} else {
sample.setHeartRate(monitoringHrData.getRestingHeartRate());
}
restingHrSamples.add(sample);
} else if (record instanceof FitDeviceStatus deviceStatus) {
Integer level = deviceStatus.getBatteryLevel();
app/src/test/java/nodomain/freeyourgadget/gadgetbridge/service/devices/garmin/fit/FitImporterTest.java
+16
View File
@@ -1,5 +1,6 @@
package nodomain.freeyourgadget.gadgetbridge.service.devices.garmin.fit;
import org.junit.Assert;
import org.junit.Ignore;
import org.junit.Test;
@@ -14,4 +15,19 @@ public class FitImporterTest extends TestBase {
final FitImporter fitImporter = new FitImporter( null, null);
fitImporter.importFile(new File("/storage/SKIN_TEMP.fit"));
}
@Test
@Ignore("helper test for development, remove this while debugging")
public void localTestFolder() throws Exception {
final File dir = new File("/storage/MONITOR/2026/");
final File[] files = dir.listFiles();
Assert.assertNotNull(files);
for (File file : files) {
if (!file.getName().endsWith(".fit")) {
continue;
}
final FitImporter fitImporter = new FitImporter( null, null);
fitImporter.importFile(file);
}
}
}