caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

- clean up after merge prepare

Browse source
This commit is contained in:
Andy Rozman 2020-05-02 21:42:49 +01:00
parent 037d9e88df
commit 0149378b13
11 changed files with 6 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/java/info/nightscout/androidaps/plugins/pump/common/PumpPluginAbstract.java
View file

@ -44,7 +44,6 @@ import info.nightscout.androidaps.utils.DateUtil;
import info.nightscout.androidaps.utils.DecimalFormatter;
import info.nightscout.androidaps.utils.FabricPrivacy;
import info.nightscout.androidaps.utils.resources.ResourceHelper;
import info.nightscout.androidaps.utils.sharedPreferences.SP;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.schedulers.Schedulers;

7
app/src/main/java/info/nightscout/androidaps/plugins/pump/common/data/PumpStatus.java
View file

@ -3,14 +3,9 @@ package info.nightscout.androidaps.plugins.pump.common.data;
import java.util.Date;
import info.nightscout.androidaps.data.ProfileStore;
import info.nightscout.androidaps.interfaces.PumpDescription;
import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
import info.nightscout.androidaps.plugins.pump.common.defs.PumpStatusType;
import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
import info.nightscout.androidaps.utils.DateUtil;
import info.nightscout.androidaps.utils.resources.ResourceHelper;
import info.nightscout.androidaps.utils.sharedPreferences.SP;
/**
* Created by andy on 4/28/18.
@ -18,8 +13,6 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
public abstract class PumpStatus {
// connection
public long lastDataTime;
public long lastConnection = 0L;

8
app/src/main/java/info/nightscout/androidaps/plugins/pump/common/dialog/RileyLinkBLEScanActivity.java
View file

@ -54,9 +54,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLin
import info.nightscout.androidaps.plugins.pump.common.utils.LocationHelper;
import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
import info.nightscout.androidaps.plugins.pump.medtronic.events.EventMedtronicPumpConfigurationChanged;
import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodPumpValuesChanged;
import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodUtil;
import info.nightscout.androidaps.utils.resources.ResourceHelper;
import info.nightscout.androidaps.utils.sharedPreferences.SP;
@ -68,8 +66,6 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
@Inject RxBusWrapper rxBus;
@Inject ResourceHelper resourceHelper;
@Inject RileyLinkUtil rileyLinkUtil;
// TODO change this. Currently verifyConfiguration uses MDT data not only RL
// @Inject MedtronicPumpPlugin medtronicPumpPlugin;
@Inject ActivePluginProvider activePlugin;
private static final int PERMISSION_REQUEST_COARSE_LOCATION = 30241; // arbitrary.
@ -119,10 +115,6 @@ public class RileyLinkBLEScanActivity extends NoSplashAppCompatActivity {
sp.putString(RileyLinkConst.Prefs.RileyLinkAddress, bleAddress);
//RileyLinkUtil.getRileyLinkSelectPreference().setSummary(bleAddress);
// TODO refactor this
PumpInterface activePump = activePlugin.getActivePump();
if (activePump.manufacturer()== ManufacturerType.Medtronic) {

2
app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RFSpy.java
View file

@ -362,8 +362,6 @@ public class RFSpy {
break;
}
//this.selectedTargetFrequency = frequency;
}

2
app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/ble/RileyLinkCommunicationException.java
View file

@ -7,9 +7,11 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.Rile
*/
public class RileyLinkCommunicationException extends Exception {
String extendedErrorText;
private RileyLinkBLEError errorCode;
public RileyLinkCommunicationException(RileyLinkBLEError errorCode, String extendedErrorText) {
super(errorCode.getDescription());

17
app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/dialog/RileyLinkStatusGeneralFragment.java
View file

@ -44,13 +44,6 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
@Inject ResourceHelper resourceHelper;
@Inject MedtronicUtil medtronicUtil;
@Inject AAPSLogger aapsLogger;
// TODO fix this is not correct
//@Inject RileyLinkUtil rileyLinkUtil;
//@Inject MedtronicUtil medtronicUtil;
//@Inject MedtronicPumpStatus medtronicPumpStatus;
//@Inject MedtronicPumpPlugin medtronicPumpPlugin;
@Inject RileyLinkServiceData rileyLinkServiceData;
TextView connectionStatus;
@ -65,10 +58,6 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
TextView lastDeviceContact;
TextView firmwareVersion;
//RileyLinkServiceData rileyLinkServiceData;
//MedtronicPumpStatus medtronicPumpStatus;
//OmnipodPumpStatus omnipodPumpStatus;
boolean first = false;
@ -139,14 +128,8 @@ public class RileyLinkStatusGeneralFragment extends DaggerFragment implements Re
}
// TODO add handling for Omnipod pump status
// TODO refactor this Omnipod
PumpPluginAbstract pumpPlugin = (PumpPluginAbstract)activePlugin.getActivePump();
//if (activePlugin)
if (pumpPlugin.manufacturer()== ManufacturerType.Medtronic) {
MedtronicPumpStatus medtronicPumpStatus = (MedtronicPumpStatus)pumpPlugin.getPumpStatusData();

2
app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/ResetRileyLinkConfigurationTask.java
View file

@ -19,7 +19,6 @@ import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtro
*/
public class ResetRileyLinkConfigurationTask extends PumpTask {
private static final String TAG = "ResetRileyLinkTask";
@Inject ActivePluginProvider activePlugin;
@Inject RxBusWrapper rxBus;
@ -35,7 +34,6 @@ public class ResetRileyLinkConfigurationTask extends PumpTask {
@Override
public void run() {
// this is intended only for RL supported pump, so we can cast to PumpPluginAbstract
RileyLinkPumpDevice pumpAbstract = (RileyLinkPumpDevice)activePlugin.getActivePump();
rxBus.send(new EventRefreshButtonState(false));

7
app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/WakeAndTuneTask.java
View file

@ -34,12 +34,11 @@ public class WakeAndTuneTask extends PumpTask {
@Override
public void run() {
PumpPluginAbstract pump = (PumpPluginAbstract) activePlugin.getActivePump();
RileyLinkPumpDevice pumpDevice = (RileyLinkPumpDevice)pump;
RileyLinkPumpDevice pumpDevice = (RileyLinkPumpDevice)activePlugin.getActivePump();
rxBus.send(new EventRefreshButtonState(false));
MedtronicPumpPlugin.isBusy = true;
pumpDevice.setIsBusy(true);
pumpDevice.doTuneUpDevice();
MedtronicPumpPlugin.isBusy = false;
pumpDevice.setIsBusy(false);
rxBus.send(new EventRefreshButtonState(true));
}
}

1
app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/driver/MedtronicPumpStatus.java
View file

@ -121,6 +121,7 @@ public class MedtronicPumpStatus extends PumpStatus {
medtronicPumpMap.put("723", PumpType.Medtronic_523_723_Revel);
medtronicPumpMap.put("554", PumpType.Medtronic_554_754_Veo);
medtronicPumpMap.put("754", PumpType.Medtronic_554_754_Veo);
}
public Map<String, PumpType> getMedtronicPumpMap() {

1
app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/service/RileyLinkMedtronicService.java
View file

@ -240,7 +240,6 @@ public class RileyLinkMedtronicService extends RileyLinkService {
} else {
PumpType pumpType = medtronicPumpStatus.getMedtronicPumpMap().get(pumpTypePart);
medtronicPumpStatus.medtronicDeviceType = medtronicPumpStatus.getMedtronicDeviceTypeMap().get(pumpTypePart);
//medtronicPumpPlugin.getPumpDescription().setPumpDescription(pumpType);
medtronicPumpPlugin.setPumpType(pumpType);
if (pumpTypePart.startsWith("7"))

1
app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/util/MedtronicUtil.java
View file

@ -68,7 +68,6 @@ public class MedtronicUtil {
this.medtronicPumpStatus = medtronicPumpStatus;
}
public LocalTime getTimeFrom30MinInterval(int interval) {
if (interval % 2 == 0) {
return new LocalTime(interval / 2, 0);