caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

lint & deprecation

Browse source
This commit is contained in:
Milos Kozak 2020-05-12 12:33:23 +02:00
parent e1df6c8145
commit 66c567f0e7
4 changed files with 13 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -113,6 +113,7 @@ public class MainApp extends DaggerApplication {
.build(); .build();
} }
@SuppressWarnings("deprecation")
private void registerLocalBroadcastReceiver() { private void registerLocalBroadcastReceiver() {
IntentFilter filter = new IntentFilter(); IntentFilter filter = new IntentFilter();
filter.addAction(Intents.ACTION_NEW_TREATMENT); filter.addAction(Intents.ACTION_NEW_TREATMENT);

4
app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/BasalProfile.java
View file

@ -363,10 +363,6 @@ public class BasalProfile {
} }
private boolean isLogEnabled() {
return L.isEnabled(LTag.PUMPCOMM);
}
public boolean verify(PumpType pumpType) { public boolean verify(PumpType pumpType) {
try { try {

3
app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/data/dto/TempBasalPair.java
View file

@ -42,8 +42,7 @@ public class TempBasalPair extends info.nightscout.androidaps.plugins.pump.commo
public TempBasalPair(AAPSLogger aapsLogger, byte[] response) { public TempBasalPair(AAPSLogger aapsLogger, byte[] response) {
super(); super();
if (L.isEnabled(LTag.PUMPCOMM)) aapsLogger.debug(LTag.PUMPBTCOMM, "Received TempBasal response: " + ByteUtil.getHex(response));
aapsLogger.debug(LTag.PUMPBTCOMM, "Received TempBasal response: " + ByteUtil.getHex(response));
isPercent = response[0] == 1; isPercent = response[0] == 1;

26
app/src/main/java/info/nightscout/androidaps/plugins/sensitivity/SensitivityOref1Plugin.java
View file

@ -2,6 +2,8 @@ package info.nightscout.androidaps.plugins.sensitivity;
import androidx.collection.LongSparseArray; import androidx.collection.LongSparseArray;
import org.jetbrains.annotations.NotNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List; import java.util.List;
@ -61,7 +63,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
this.dateUtil = dateUtil; this.dateUtil = dateUtil;
} }
@Override @NotNull @Override
public AutosensResult detectSensitivity(IobCobCalculatorInterface iobCobCalculatorPlugin, long fromTime, long toTime) { public AutosensResult detectSensitivity(IobCobCalculatorInterface iobCobCalculatorPlugin, long fromTime, long toTime) {
// todo this method is called from the IobCobCalculatorPlugin, which leads to a circular // todo this method is called from the IobCobCalculatorPlugin, which leads to a circular
// dependency, this should be avoided // dependency, this should be avoided
@ -92,7 +94,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
//[0] = 8 hour //[0] = 8 hour
//[1] = 24 hour //[1] = 24 hour
//Deviationshour has DeviationsArray //Deviationshour has DeviationsArray
List<ArrayList> deviationsHour = Arrays.asList(new ArrayList(), new ArrayList()); List<ArrayList<Double>> deviationsHour = Arrays.asList(new ArrayList<>(), new ArrayList<>());
List<String> pastSensitivityArray = Arrays.asList("", ""); List<String> pastSensitivityArray = Arrays.asList("", "");
List<String> sensResultArray = Arrays.asList("", ""); List<String> sensResultArray = Arrays.asList("", "");
List<Double> ratioArray = Arrays.asList(0d, 0d); List<Double> ratioArray = Arrays.asList(0d, 0d);
@ -118,7 +120,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
//hoursegment = 0 = 8 hour //hoursegment = 0 = 8 hour
//hoursegment = 1 = 24 hour //hoursegment = 1 = 24 hour
while (hoursegment < deviationsHour.size()) { while (hoursegment < deviationsHour.size()) {
ArrayList deviationsArray = deviationsHour.get(hoursegment); ArrayList<Double> deviationsArray = deviationsHour.get(hoursegment);
String pastSensitivity = pastSensitivityArray.get(hoursegment); String pastSensitivity = pastSensitivityArray.get(hoursegment);
// reset deviations after site change // reset deviations after site change
@ -144,8 +146,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
deviationsArray.add(deviation); deviationsArray.add(deviation);
for (int i = 0; i < autosensData.extraDeviation.size(); i++) deviationsArray.addAll(autosensData.extraDeviation);
deviationsArray.add(autosensData.extraDeviation.get(i));
if (deviationsArray.size() > deviationCategory.get(hoursegment)) { if (deviationsArray.size() > deviationCategory.get(hoursegment)) {
deviationsArray.remove(0); deviationsArray.remove(0);
@ -170,13 +171,12 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
// this dampens any large sensitivity changes detected based on too little data, without ignoring them completely // this dampens any large sensitivity changes detected based on too little data, without ignoring them completely
for (int i = 0; i < deviationsHour.size(); i++) { for (int i = 0; i < deviationsHour.size(); i++) {
ArrayList deviations = deviationsHour.get(i); ArrayList<Double> deviations = deviationsHour.get(i);
getAapsLogger().debug(LTag.AUTOSENS, "Using most recent " + deviations.size() + " deviations"); getAapsLogger().debug(LTag.AUTOSENS, "Using most recent " + deviations.size() + " deviations");
if (deviations.size() < deviationCategory.get(i)) { if (deviations.size() < deviationCategory.get(i)) {
int pad = (int) Math.round((1 - (double) deviations.size() / deviationCategory.get(i)) * 18); int pad = (int) Math.round((1 - (double) deviations.size() / deviationCategory.get(i)) * 18);
getAapsLogger().debug(LTag.AUTOSENS, "Adding " + pad + " more zero deviations"); getAapsLogger().debug(LTag.AUTOSENS, "Adding " + pad + " more zero deviations");
for (int d = 0; d < pad; d++) { for (int d = 0; d < pad; d++) {
;
deviations.add(0d); deviations.add(0d);
} }
} }
@ -190,11 +190,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
ArrayList deviationsArray = deviationsHour.get(hourused); ArrayList deviationsArray = deviationsHour.get(hourused);
String pastSensitivity = pastSensitivityArray.get(hourused); String pastSensitivity = pastSensitivityArray.get(hourused);
String sensResult = "(8 hours) "; String sensResult = "(8 hours) ";
String senstime = sensResult; if (hourused == 1) sensResult = "(24 hours) ";
if (hourused == 1) {
senstime = "(24 hours) ";
sensResult = senstime;
}
String ratioLimit = ""; String ratioLimit = "";
Double[] deviations = new Double[deviationsArray.size()]; Double[] deviations = new Double[deviationsArray.size()];
@ -212,10 +208,10 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
double basalOff = 0; double basalOff = 0;
if (pSensitive < 0) { // sensitive if (pSensitive < 0) { // sensitive
basalOff = pSensitive * (60 / 5) / Profile.toMgdl(sens, profile.getUnits()); basalOff = pSensitive * (60.0 / 5) / Profile.toMgdl(sens, profile.getUnits());
sensResult += "Excess insulin sensitivity detected"; sensResult += "Excess insulin sensitivity detected";
} else if (pResistant > 0) { // resistant } else if (pResistant > 0) { // resistant
basalOff = pResistant * (60 / 5) / Profile.toMgdl(sens, profile.getUnits()); basalOff = pResistant * (60.0 / 5) / Profile.toMgdl(sens, profile.getUnits());
sensResult += "Excess insulin resistance detected"; sensResult += "Excess insulin resistance detected";
} else { } else {
sensResult += "Sensitivity normal"; sensResult += "Sensitivity normal";
@ -239,7 +235,7 @@ public class SensitivityOref1Plugin extends AbstractSensitivityPlugin {
if (ratioArray.get(0) < ratioArray.get(1)) { if (ratioArray.get(0) < ratioArray.get(1)) {
key = 0; key = 0;
} }
String message = hoursDetection.get(key) + " of sensitivity used"; //String message = hoursDetection.get(key) + " of sensitivity used";
AutosensResult output = fillResult(ratioArray.get(key), current.cob, pastSensitivityArray.get(key), ratioLimitArray.get(key), AutosensResult output = fillResult(ratioArray.get(key), current.cob, pastSensitivityArray.get(key), ratioLimitArray.get(key),
sensResultArray.get(key) + comparison, deviationsHour.get(key).size()); sensResultArray.get(key) + comparison, deviationsHour.get(key).size());