caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #15 from MilosKozak/master

Browse source 
update Milos master
This commit is contained in:
AdrianLxM 2016-11-12 20:38:19 +01:00 committed by GitHub
commit fd3e32ddfa
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/src/main/java/info/nightscout/androidaps/db/DatabaseHelper.java
View file

@ -291,7 +291,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
return null;
}
int minutes = 5;
double minutes = 5;
double change;
double avg;
@ -301,13 +301,13 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
BgReading last1 = bgReadings.get(sizeRecords - 2);
BgReading last2 = bgReadings.get(sizeRecords - 1);
if (last2.value > 30) {
minutes = 3 * 5;
minutes = (now.timeIndex - last2.timeIndex)/(60d*1000);
change = now.value - last2.value;
} else if (last1.value > 30) {
minutes = 2 * 5;
minutes = (now.timeIndex - last1.timeIndex)/(60d*1000);;
change = now.value - last1.value;
} else if (last.value > 30) {
minutes = 5;
minutes = (now.timeIndex - last.timeIndex)/(60d*1000);
change = now.value - last.value;
} else {
change = 0;
@ -316,7 +316,7 @@ public class DatabaseHelper extends OrmLiteSqliteOpenHelper {
avg = change / minutes * 5;
result.glucose = now.value;
result.delta = now.value - last.value;
result.delta = (now.value - last.value)*5*60*1000/(now.getTimeIndex() - last.getTimeIndex());
result.avgdelta = avg;
}
} catch (SQLException e) {