Skip to content

Add support for disabling error flags #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
archie94 merged 1 commit into from
Jan 7, 2022
Merged

Add support for disabling error flags #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions app/src/main/java/com/camomile/openlibre/model/RawTagData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,19 @@ public class RawTagData extends RealmObject {
private int timezoneOffsetInMinutes;
private String tagId;
private byte[] data;
private boolean checkForErrorFlags = false;

public RawTagData() {}

public RawTagData(String tagId, byte[] data) {
this(tagId, System.currentTimeMillis(), data);
}

public RawTagData(String tagId, byte[] data, boolean checkForErrorFlags) {
this(tagId, System.currentTimeMillis(), data);
this.checkForErrorFlags = checkForErrorFlags;
}

public RawTagData(String tagId, long utc_date, byte[] data) {
date = utc_date;
timezoneOffsetInMinutes = TimeZone.getDefault().getOffset(date) / 1000 / 60;
Expand Down Expand Up @@ -139,4 +145,8 @@ private int readBits(byte []buffer, int byteOffset,int bitOffset, int bitCount
}
return res;
}

public boolean isCheckForErrorFlags() {
return checkForErrorFlags;
}
}
8 changes: 4 additions & 4 deletions app/src/main/java/com/camomile/openlibre/model/ReadingData.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,13 +99,13 @@ public ReadingData(RawTagData rawTagData) {
int glucoseLevelRaw = rawTagData.getTrendValue(index);
int flags = rawTagData.getTrendFlags(index);
// skip zero values if the sensor has not filled the ring buffer yet completely
if (glucoseLevelRaw > 0 && flags != errorFlags) {
if (glucoseLevelRaw > 0 && (!rawTagData.isCheckForErrorFlags() || flags != errorFlags)) {
int dataAgeInMinutes = numTrendValues - counter;
int ageInSensorMinutes = sensorAgeInMinutes - dataAgeInMinutes;
long dataDate = lastReadingDate + (long) (TimeUnit.MINUTES.toMillis(ageInSensorMinutes - lastSensorAgeInMinutes) * timeDriftFactor);

trend.add(new GlucoseData(sensor, ageInSensorMinutes, timezoneOffsetInMinutes, glucoseLevelRaw, true, dataDate));
} else if (flags == errorFlags) {
} else if (rawTagData.isCheckForErrorFlags() && flags == errorFlags) {
int dataAgeInMinutes = numTrendValues - counter;
int ageInSensorMinutes = sensorAgeInMinutes - dataAgeInMinutes;
long dataDate = lastReadingDate + (long) (TimeUnit.MINUTES.toMillis(ageInSensorMinutes - lastSensorAgeInMinutes) * timeDriftFactor);
Expand All @@ -126,7 +126,7 @@ public ReadingData(RawTagData rawTagData) {
int flags = rawTagData.getHistoryFlags(index);
// skip zero values if the sensor has not filled the ring buffer yet completely
// and skip if we have any error flags
if (glucoseLevelRaw > 0 && flags != errorFlags) {
if (glucoseLevelRaw > 0 && (!rawTagData.isCheckForErrorFlags() || flags != errorFlags)) {
int dataAgeInMinutes = mostRecentHistoryAgeInMinutes + (numHistoryValues - (counter + 1)) * historyIntervalInMinutes;
int ageInSensorMinutes = sensorAgeInMinutes - dataAgeInMinutes;

Expand All @@ -135,7 +135,7 @@ public ReadingData(RawTagData rawTagData) {
glucoseLevels.add(glucoseLevelRaw);
ageInSensorMinutesList.add(ageInSensorMinutes);
}
} else if (flags == errorFlags) {
} else if (rawTagData.isCheckForErrorFlags() && flags == errorFlags) {
int dataAgeInMinutes = mostRecentHistoryAgeInMinutes + (numHistoryValues - (counter + 1)) * historyIntervalInMinutes;
int ageInSensorMinutes = sensorAgeInMinutes - dataAgeInMinutes;
long dataDate = lastReadingDate + (long) (TimeUnit.MINUTES.toMillis(ageInSensorMinutes - lastSensorAgeInMinutes) * timeDriftFactor);
Expand Down