caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge pull request #7 from MilosKozak/master

Browse source 
Update to Milos master
This commit is contained in:
AdrianLxM 2016-11-08 06:01:58 +01:00 committed by GitHub
commit 69355c5609
2 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/info/nightscout/androidaps/db/TempBasal.java
View file

@ -97,6 +97,7 @@ public class TempBasal {
Iob aIOB = tempBolusPart.iobCalc(time, profile.getDia()); Iob aIOB = tempBolusPart.iobCalc(time, profile.getDia());
result.basaliob += aIOB.iobContrib; result.basaliob += aIOB.iobContrib;
result.activity += aIOB.activityContrib;
Double dia_ago = time.getTime() - profile.getDia() * 60 * 60 * 1000; Double dia_ago = time.getTime() - profile.getDia() * 60 * 60 * 1000;
if (date > dia_ago && date <= time.getTime()) { if (date > dia_ago && date <= time.getTime()) {
result.netbasalinsulin += tempBolusPart.insulin; result.netbasalinsulin += tempBolusPart.insulin;

2
app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/IobTotal.java
View file

@ -43,7 +43,7 @@ public class IobTotal {
public static IobTotal combine(IobTotal bolusIOB, IobTotal basalIob) { public static IobTotal combine(IobTotal bolusIOB, IobTotal basalIob) {
IobTotal result = new IobTotal(); IobTotal result = new IobTotal();
result.iob = bolusIOB.iob + basalIob.basaliob; result.iob = bolusIOB.iob + basalIob.basaliob;
result.activity = bolusIOB.activity; result.activity = bolusIOB.activity + basalIob.activity;
result.bolussnooze = bolusIOB.bolussnooze; result.bolussnooze = bolusIOB.bolussnooze;
result.basaliob = basalIob.basaliob; result.basaliob = basalIob.basaliob;
result.netbasalinsulin = basalIob.netbasalinsulin; result.netbasalinsulin = basalIob.netbasalinsulin;