MarcoBuster/Gadgetbridge
1
0
Fork 0
mirror of https://codeberg.org/Freeyourgadget/Gadgetbridge synced 2024-11-30 05:52:57 +01:00
Code Releases Wiki Activity

Colmi R0x: Improve sleep handling around DST changes

Browse Source
This commit is contained in:
Arjan Schrijver 2024-10-28 11:41:31 +01:00
parent 35ca3f947e
commit d5c2207a48
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/src/main/java/nodomain/freeyourgadget/gadgetbridge/devices/colmi/ColmiR0xPacketHandler.java
View File

@ -338,11 +338,14 @@ public class ColmiR0xPacketHandler {
index++; index++;
int dayBytes = value[index]; int dayBytes = value[index];
index++; index++;
// sleepStart is received as "minutes after midnight"
int sleepStart = BLETypeConversions.toUint16(value[index], value[index + 1]); int sleepStart = BLETypeConversions.toUint16(value[index], value[index + 1]);
index += 2; index += 2;
// sleepEnd is received as "minutes after midnight"
int sleepEnd = BLETypeConversions.toUint16(value[index], value[index + 1]); int sleepEnd = BLETypeConversions.toUint16(value[index], value[index + 1]);
index += 2; index += 2;
// Calculate sleep start timestamp // Calculate sleep start timestamp
LOG.info("Sleep session daysAgo={}, dayBytes={}, sleepStart={}, sleepEnd={}", daysAgo, dayBytes, sleepStart, sleepEnd);
Calendar sessionStart = Calendar.getInstance(); Calendar sessionStart = Calendar.getInstance();
sessionStart.add(Calendar.DAY_OF_MONTH, 0 - daysAgo); sessionStart.add(Calendar.DAY_OF_MONTH, 0 - daysAgo);
sessionStart.set(Calendar.HOUR_OF_DAY, 0); sessionStart.set(Calendar.HOUR_OF_DAY, 0);
@ -351,8 +354,7 @@ public class ColmiR0xPacketHandler {
sessionStart.set(Calendar.MILLISECOND, 0); sessionStart.set(Calendar.MILLISECOND, 0);
if (sleepStart > sleepEnd) { if (sleepStart > sleepEnd) {
// Sleep started a day earlier, so before midnight // Sleep started a day earlier, so before midnight
sessionStart.add(Calendar.DAY_OF_MONTH, -1); sessionStart.add(Calendar.MINUTE, sleepStart - 1440);
sessionStart.add(Calendar.MINUTE, sleepStart);
} else { } else {
// Sleep started this day, so after midnight // Sleep started this day, so after midnight
sessionStart.add(Calendar.MINUTE, sleepStart); sessionStart.add(Calendar.MINUTE, sleepStart);
@ -374,15 +376,22 @@ public class ColmiR0xPacketHandler {
Calendar sleepStage = (Calendar) sessionStart.clone(); Calendar sleepStage = (Calendar) sessionStart.clone();
for (int j = 4; j < dayBytes; j += 2) { for (int j = 4; j < dayBytes; j += 2) {
int sleepMinutes = value[index + 1]; int sleepMinutes = value[index + 1];
LOG.info("Sleep stage type={} starts at {} and lasts for {} minutes", value[index], sleepStage.getTime(), sleepMinutes);
final ColmiSleepStageSample sample = new ColmiSleepStageSample(); final ColmiSleepStageSample sample = new ColmiSleepStageSample();
sample.setTimestamp(sleepStage.getTimeInMillis()); sample.setTimestamp(sleepStage.getTimeInMillis());
sample.setDuration(value[index + 1]); sample.setDuration(value[index + 1]);
sample.setStage(value[index]); sample.setStage(value[index]);
stageSamples.add(sample); if (sleepMinutes > 0) {
LOG.info("Sleep stage type={} starts at {} and lasts for {} minutes", value[index], sleepStage.getTime(), sleepMinutes);
if (sleepStage.getTimeInMillis() + sleepMinutes * 60 * 1000 > sessionEnd.getTimeInMillis()) {
LOG.warn("Warning: sleep stage exceeds end of sleep session, received data may be corrupt");
}
stageSamples.add(sample);
sleepStage.add(Calendar.MINUTE, sleepMinutes);
} else {
LOG.info("Ignoring sleep stage type={} starts at {} and lasts for {} minutes", value[index], sleepStage.getTime(), sleepMinutes);
}
// Prepare for next sample // Prepare for next sample
index += 2; index += 2;
sleepStage.add(Calendar.MINUTE, sleepMinutes);
} }
// Persist sleep session // Persist sleep session
try (DBHandler handler = GBApplication.acquireDB()) { try (DBHandler handler = GBApplication.acquireDB()) {