caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

- reverted some of my changes

Browse source 
- fixed problem that service doesn't start with AAPS, but with Tab click
This commit is contained in:
Andy Rozman 2020-07-31 19:00:00 +01:00
parent 19675b1951
commit 54d30cd8c4
8 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/build.gradle
View file

@ -37,6 +37,7 @@ repositories {
maven { url 'https://maven.fabric.io/public' }
jcenter { url "https://jcenter.bintray.com/" }
mavenCentral()
google()
}
def generateGitBuild = { ->

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

@ -430,7 +430,8 @@ public class RileyLinkBLE {
// Catch if the service is not supported by the BLE device
rval.resultCode = BLECommOperationResult.RESULT_NONE;
aapsLogger.error(LTag.PUMPBTCOMM, "BT Device not supported");
rileyLinkServiceData.setServiceState(RileyLinkServiceState.BluetoothError, RileyLinkError.NoBluetoothAdapter);
// TODO: 11/07/2016 UI update for user
// xyz rileyLinkServiceData.setServiceState(RileyLinkServiceState.BluetoothError, RileyLinkError.NoBluetoothAdapter);
} else {
BluetoothGattCharacteristic chara = bluetoothConnectionGatt.getService(serviceUUID)
.getCharacteristic(charaUUID);
@ -489,7 +490,8 @@ public class RileyLinkBLE {
// e.g. when the user switches from portrait to landscape.
rval.resultCode = BLECommOperationResult.RESULT_NONE;
aapsLogger.error(LTag.PUMPBTCOMM, "BT Device not supported");
rileyLinkServiceData.setServiceState(RileyLinkServiceState.BluetoothError, RileyLinkError.NoBluetoothAdapter);
// TODO: 11/07/2016 UI update for user
// xyz rileyLinkServiceData.setServiceState(RileyLinkServiceState.BluetoothError, RileyLinkError.NoBluetoothAdapter);
} else {
BluetoothGattCharacteristic chara = bluetoothConnectionGatt.getService(serviceUUID)
.getCharacteristic(charaUUID);
@ -531,7 +533,8 @@ public class RileyLinkBLE {
// Catch if the service is not supported by the BLE device
rval.resultCode = BLECommOperationResult.RESULT_NONE;
aapsLogger.error(LTag.PUMPBTCOMM, "BT Device not supported");
rileyLinkServiceData.setServiceState(RileyLinkServiceState.BluetoothError, RileyLinkError.NoBluetoothAdapter);
// TODO: 11/07/2016 UI update for user
// xyz rileyLinkServiceData.setServiceState(RileyLinkServiceState.BluetoothError, RileyLinkError.NoBluetoothAdapter);
} else {
BluetoothGattCharacteristic chara = bluetoothConnectionGatt.getService(serviceUUID).getCharacteristic(
charaUUID);

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

@ -101,7 +101,7 @@ public abstract class RileyLinkService extends DaggerService {
super.onDestroy();
//LOG.error("I die! I die!");
rfspy.stopReader();
// xyz rfspy.stopReader();
rileyLinkBLE.disconnect(); // dispose of Gatt (disconnect and close)
if (mBroadcastReceiver != null) {

3
app/src/main/java/info/nightscout/androidaps/plugins/pump/medtronic/comm/MedtronicCommunicationManager.java
View file

@ -61,14 +61,11 @@ import info.nightscout.androidaps.plugins.pump.medtronic.util.MedtronicUtil;
*/
public class MedtronicCommunicationManager extends RileyLinkCommunicationManager {
@Inject AAPSLogger aapsLogger;
@Inject MedtronicPumpStatus medtronicPumpStatus;
@Inject MedtronicPumpPlugin medtronicPumpPlugin;
@Inject MedtronicConverter medtronicConverter;
@Inject MedtronicUtil medtronicUtil;
@Inject MedtronicPumpHistoryDecoder medtronicPumpHistoryDecoder;
@Inject RileyLinkServiceData rileyLinkServiceData;
@Inject ServiceTaskExecutor serviceTaskExecutor;
private final int MAX_COMMAND_TRIES = 3;
private final int DEFAULT_TIMEOUT = 2000;

1
app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/OmnipodPumpPlugin.java
View file

@ -213,6 +213,7 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
aapsLogger.debug(LTag.PUMP, "RileyLinkOmnipodService is connected");
RileyLinkOmnipodService.LocalBinder mLocalBinder = (RileyLinkOmnipodService.LocalBinder) service;
rileyLinkOmnipodService = mLocalBinder.getServiceInstance();
rileyLinkOmnipodService.verifyConfiguration();
new Thread(() -> {

1
app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/ui/OmnipodUITask.java
View file

@ -220,6 +220,7 @@ public class OmnipodUITask {
}
omnipodUtil.setPodDeviceState(PodDeviceState.Sleeping);
omnipodUtil.setCurrentCommand(null);
}

6
app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/events/EventOmnipodDeviceStatusChange.kt
View file

@ -4,6 +4,7 @@ import info.nightscout.androidaps.events.Event
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError
import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState
import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState
import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommandType
import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodDeviceState
import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodSessionState
@ -26,6 +27,11 @@ class EventOmnipodDeviceStatusChange : Event {
this.rileyLinkError = rileyLinkError
}
constructor(commandType: OmnipodCommandType?) {
}
constructor(podSessionState: PodSessionState?) {
this.podSessionState = podSessionState
}

2
app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodUtil.java
View file

@ -100,6 +100,8 @@ public class OmnipodUtil {
if (currentCommand != null)
rileyLinkUtil.getRileyLinkHistory().add(new RLHistoryItem(currentCommand));
rxBus.send(new EventOmnipodDeviceStatusChange((OmnipodCommandType)null));
}
public static void displayNotConfiguredDialog(Context context) {