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: Fix sleep stages if no MONITOR files are received

Browse Source 
Sometimes MONITOR files might fail to be fetched, and Gb would fail to
display sleep stages altogether.
This commit is contained in:
José Rebelo
2025-07-23 21:51:50 +01:00
parent 8015f92f28
commit b8eb3c2db5
3 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/AbstractSampleProvider.java
+1 -1
View File
@@ -384,7 +384,7 @@ public abstract class AbstractSampleProvider<T extends AbstractActivitySample> i
return ret;
}
private T createDummySample(final int ts) {
protected T createDummySample(final int ts) {
final T dummySample = createActivitySample();
dummySample.setTimestamp(ts);
dummySample.setRawKind(ActivityKind.UNKNOWN.getCode());
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/garmin/GarminActivitySampleProvider.java
+25 -17
View File
@@ -201,12 +201,24 @@ public class GarminActivitySampleProvider extends AbstractSampleProvider<GarminA
}
if (!stagesMap.isEmpty()) {
for (final GarminActivitySample sample : samples) {
final long ts = sample.getTimestamp() * 1000L;
final ActivityKind sleepType = stagesMap.get(ts);
if (sleepType != null && !sleepType.equals(ActivityKind.UNKNOWN)) {
sample.setRawKind(sleepType.getCode());
sample.setRawIntensity(ActivitySample.NOT_MEASURED);
if (!samples.isEmpty()) {
for (final GarminActivitySample sample : samples) {
final long ts = sample.getTimestamp() * 1000L;
final ActivityKind sleepType = stagesMap.get(ts);
if (sleepType != null && !sleepType.equals(ActivityKind.UNKNOWN)) {
sample.setRawKind(sleepType.getCode());
sample.setRawIntensity(ActivitySample.NOT_MEASURED);
}
}
} else {
for (int ts = timestamp_from; ts <= timestamp_to; ts += 60) {
final GarminActivitySample sample = createDummySample(ts);
final ActivityKind sleepType = stagesMap.get(ts * 1000L);
if (sleepType != null && !sleepType.equals(ActivityKind.UNKNOWN)) {
sample.setRawKind(sleepType.getCode());
sample.setRawIntensity(ActivitySample.NOT_MEASURED);
}
samples.add(sample);
}
}
}
@@ -219,17 +231,13 @@ public class GarminActivitySampleProvider extends AbstractSampleProvider<GarminA
return ActivityKind.UNKNOWN;
}
switch (sleepStage) {
case AWAKE:
return ActivityKind.AWAKE_SLEEP;
case LIGHT:
return ActivityKind.LIGHT_SLEEP;
case DEEP:
return ActivityKind.DEEP_SLEEP;
case REM:
return ActivityKind.REM_SLEEP;
}
return switch (sleepStage) {
case AWAKE -> ActivityKind.AWAKE_SLEEP;
case LIGHT -> ActivityKind.LIGHT_SLEEP;
case DEEP -> ActivityKind.DEEP_SLEEP;
case REM -> ActivityKind.REM_SLEEP;
default -> ActivityKind.UNKNOWN;
};
return ActivityKind.UNKNOWN;
}
}
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/huawei/HuaweiSampleProvider.java
+2 -1
View File
@@ -325,7 +325,8 @@ public class HuaweiSampleProvider extends AbstractSampleProvider<HuaweiActivityS
return true;
}
private HuaweiActivitySample createDummySample(int timestamp) {
@Override
protected HuaweiActivitySample createDummySample(int timestamp) {
HuaweiActivitySample activitySample = new HuaweiActivitySample(
timestamp,
-1,