caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'master' into dev

Browse source
This commit is contained in:
Milos Kozak 2017-01-26 18:31:31 +01:00
parent 72fc4ec096 e78de8b622
commit 08880b8032
5 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,7 +66,7 @@ public class DanaRPlugin implements PluginBase, PumpInterface, ConstraintsInterf
private static DanaRPump sDanaRPump = new DanaRPump(); private static DanaRPump sDanaRPump = new DanaRPump();
private static boolean useExtendedBoluses = false; private static boolean useExtendedBoluses = false;
private static PumpDescription pumpDescription = new PumpDescription(); public static PumpDescription pumpDescription = new PumpDescription();
public static DanaRPump getDanaRPump() { public static DanaRPump getDanaRPump() {
return sDanaRPump; return sDanaRPump;
@ -724,7 +724,7 @@ public class DanaRPlugin implements PluginBase, PumpInterface, ConstraintsInterf
} }
@Override @Override
public static PumpDescription getPumpDescription() { public 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 < DanaRPlugin.getPumpDescription().basalMinimumRate) basal = 0; if (basal < DanaRPlugin.pumpDescription.basalMinimumRate) basal = 0;
pump.pumpProfiles[pump.activeProfile][index] = basal / 100d; pump.pumpProfiles[pump.activeProfile][index] = basal / 100d;
} }

1
app/src/main/java/info/nightscout/androidaps/plugins/DanaR/comm/MsgSettingShippingInfo.java
View file

@ -32,6 +32,7 @@ public class MsgSettingShippingInfo extends MessageBase {
log.debug("Serial number: " + pump.serialNumber); log.debug("Serial number: " + pump.serialNumber);
log.debug("Shipping date: " + pump.shippingDate); log.debug("Shipping date: " + pump.shippingDate);
log.debug("Shipping country: " + pump.shippingCountry); log.debug("Shipping country: " + pump.shippingCountry);
log.debug("Is new pump: " + pump.isNewPump);
} }
} }
} }

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

@ -66,7 +66,7 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, Constraints
private static DanaRKoreanPump sDanaRKoreanPump = new DanaRKoreanPump(); private static DanaRKoreanPump sDanaRKoreanPump = new DanaRKoreanPump();
private static boolean useExtendedBoluses = false; private static boolean useExtendedBoluses = false;
private PumpDescription pumpDescription = new PumpDescription(); public static PumpDescription pumpDescription = new PumpDescription();
public static DanaRKoreanPump getDanaRPump() { public static DanaRKoreanPump getDanaRPump() {
return sDanaRKoreanPump; return sDanaRKoreanPump;
@ -724,7 +724,7 @@ public class DanaRKoreanPlugin implements PluginBase, PumpInterface, Constraints
} }
@Override @Override
public static PumpDescription getPumpDescription() { public 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 < DanaRKoreanPlugin.getPumpDescription().basalMinimumRate) basal = 0; if (basal < DanaRKoreanPlugin.pumpDescription.basalMinimumRate) basal = 0;
pump.pumpProfiles[pump.activeProfile][index] = basal / 100d; pump.pumpProfiles[pump.activeProfile][index] = basal / 100d;
} }