caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'master' of https://github.com/MilosKozak/AndroidAPS

Browse source
This commit is contained in:
Milos Kozak 2017-01-26 18:23:47 +01:00
parent 87ba28136a 750cea7bcf
commit 0c289bfb6e
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/info/nightscout/androidaps/plugins/DanaR/DanaRPlugin.java
View file

@ -713,7 +713,7 @@ public class DanaRPlugin implements PluginBase, PumpInterface, ConstraintsInterf
} }
@Override @Override
public PumpDescription getPumpDescription() { public static PumpDescription getPumpDescription() {
return pumpDescription; return pumpDescription;
} }

2
app/src/main/java/info/nightscout/androidaps/plugins/DanaR/comm/MsgSettingBasal.java
View file

@ -23,7 +23,7 @@ public class MsgSettingBasal extends MessageBase {
pump.pumpProfiles[pump.activeProfile] = new double[24]; pump.pumpProfiles[pump.activeProfile] = new double[24];
for (int index = 0; index < 24; index++) { for (int index = 0; index < 24; index++) {
int basal = intFromBuff(bytes, 2 * index, 2); int basal = intFromBuff(bytes, 2 * index, 2);
if (basal < 10) basal = 0; if (basal < DanaRPlugin.getPumpDescription().basalMinimumRate) basal = 0;
pump.pumpProfiles[pump.activeProfile][index] = basal / 100d; pump.pumpProfiles[pump.activeProfile][index] = basal / 100d;
} }

2
app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/DanaRKoreanPlugin.java
View file

@ -713,7 +713,7 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, Constraints
} }
@Override @Override
public PumpDescription getPumpDescription() { public static PumpDescription getPumpDescription() {
return pumpDescription; return pumpDescription;
} }

2
app/src/main/java/info/nightscout/androidaps/plugins/DanaRKorean/comm/MsgSettingBasal.java
View file

@ -24,7 +24,7 @@ public class MsgSettingBasal extends MessageBase {
pump.pumpProfiles[pump.activeProfile] = new double[24]; pump.pumpProfiles[pump.activeProfile] = new double[24];
for (int index = 0; index < 24; index++) { for (int index = 0; index < 24; index++) {
int basal = intFromBuff(bytes, 2 * index, 2); int basal = intFromBuff(bytes, 2 * index, 2);
if (basal < 10) basal = 0; if (basal < DanaRKoreanPlugin.getPumpDescription().basalMinimumRate) basal = 0;
pump.pumpProfiles[pump.activeProfile][index] = basal / 100d; pump.pumpProfiles[pump.activeProfile][index] = basal / 100d;
} }