caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Verify all actions that send NonceResyncableMessageBlock

Browse source
This commit is contained in:
Bart Sopers 2019-12-07 15:01:07 +01:00
parent dfb15e0f82
commit 3bbf3a1104
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodManager.java
View file

@ -133,28 +133,28 @@ public class OmnipodManager {
public synchronized void acknowledgeAlerts() { public synchronized void acknowledgeAlerts() {
assertReadyForDelivery(); assertReadyForDelivery();
communicationService.executeAction(new AcknowledgeAlertsAction(podState, podState.getActiveAlerts())); executeAndVerify(() -> communicationService.executeAction(new AcknowledgeAlertsAction(podState, podState.getActiveAlerts())));
} }
public synchronized void setBasalSchedule(BasalSchedule schedule) { public synchronized void setBasalSchedule(BasalSchedule schedule) {
assertReadyForDelivery(); assertReadyForDelivery();
communicationService.executeAction(new SetBasalScheduleAction(podState, schedule, executeAndVerify(() -> communicationService.executeAction(new SetBasalScheduleAction(podState, schedule,
false, podState.getScheduleOffset(), true)); false, podState.getScheduleOffset(), true)));
} }
public synchronized void setTemporaryBasal(TempBasalPair tempBasalPair) { public synchronized void setTemporaryBasal(TempBasalPair tempBasalPair) {
assertReadyForDelivery(); assertReadyForDelivery();
communicationService.executeAction(new SetTempBasalAction(new SetTempBasalService(), executeAndVerify(() -> communicationService.executeAction(new SetTempBasalAction(new SetTempBasalService(),
podState, tempBasalPair.getInsulinRate(), Duration.standardMinutes(tempBasalPair.getDurationMinutes()), podState, tempBasalPair.getInsulinRate(), Duration.standardMinutes(tempBasalPair.getDurationMinutes()),
true, true)); true, true)));
} }
public synchronized void cancelTemporaryBasal() { public synchronized void cancelTemporaryBasal() {
assertReadyForDelivery(); assertReadyForDelivery();
communicationService.executeAction(new CancelDeliveryAction(podState, DeliveryType.TEMP_BASAL, true)); executeAndVerify(() -> communicationService.executeAction(new CancelDeliveryAction(podState, DeliveryType.TEMP_BASAL, true)));
} }
// Returns a SingleSubject that returns when the bolus has finished. // Returns a SingleSubject that returns when the bolus has finished.
@ -252,33 +252,33 @@ public class OmnipodManager {
} }
} }
// CAUTION: cancels TBR and bolus
public synchronized void suspendDelivery() { public synchronized void suspendDelivery() {
assertReadyForDelivery(); assertReadyForDelivery();
communicationService.executeAction(new CancelDeliveryAction(podState, EnumSet.allOf(DeliveryType.class), true)); executeAndVerify(() -> communicationService.executeAction(new CancelDeliveryAction(podState, EnumSet.allOf(DeliveryType.class), true)));
} }
public synchronized void resumeDelivery() { public synchronized void resumeDelivery() {
assertReadyForDelivery(); assertReadyForDelivery();
communicationService.executeAction(new SetBasalScheduleAction(podState, podState.getBasalSchedule(), executeAndVerify(() -> communicationService.executeAction(new SetBasalScheduleAction(podState, podState.getBasalSchedule(),
true, podState.getScheduleOffset(), true)); true, podState.getScheduleOffset(), true)));
} }
// If this command fails, it it possible that delivery has been suspended // CAUTION: cancels TBR and bolus
// CAUTION: suspends and then resumes delivery.
// If any error occurs during the command sequence, delivery could be suspended
public synchronized void setTime() { public synchronized void setTime() {
assertReadyForDelivery(); assertReadyForDelivery();
// Suspend delivery suspendDelivery();
communicationService.executeAction(new CancelDeliveryAction(podState, EnumSet.allOf(DeliveryType.class), false));
// Joda seems to cache the default time zone, so we use the JVM's // Joda seems to cache the default time zone, so we use the JVM's
DateTimeZone.setDefault(DateTimeZone.forTimeZone(TimeZone.getDefault())); DateTimeZone.setDefault(DateTimeZone.forTimeZone(TimeZone.getDefault()));
podState.setTimeZone(DateTimeZone.getDefault()); podState.setTimeZone(DateTimeZone.getDefault());
// Resume delivery resumeDelivery();
StatusResponse statusResponse = communicationService.executeAction(new SetBasalScheduleAction(podState, podState.getBasalSchedule(),
true, podState.getScheduleOffset(), true));
} }
public synchronized void deactivatePod() { public synchronized void deactivatePod() {
@ -286,7 +286,8 @@ public class OmnipodManager {
throw new IllegalSetupProgressException(SetupProgress.ADDRESS_ASSIGNED, null); throw new IllegalSetupProgressException(SetupProgress.ADDRESS_ASSIGNED, null);
} }
communicationService.executeAction(new DeactivatePodAction(podState, true)); executeAndVerify(() -> communicationService.executeAction(new DeactivatePodAction(podState, true)));
resetPodState(); resetPodState();
} }
@ -383,12 +384,12 @@ public class OmnipodManager {
new CancelDeliveryCommand(podState.getCurrentNonce(), BeepType.NO_BEEP, DeliveryType.NONE), false); new CancelDeliveryCommand(podState.getCurrentNonce(), BeepType.NO_BEEP, DeliveryType.NONE), false);
} catch (NonceOutOfSyncException ex) { } catch (NonceOutOfSyncException ex) {
if (isLoggingEnabled()) { if (isLoggingEnabled()) {
LOG.info("Command resolved to FAILURE (CERTAIN_FAILURE)"); LOG.info("Command resolved to FAILURE (CERTAIN_FAILURE)", ex);
} }
return CommandDeliveryStatus.CERTAIN_FAILURE; return CommandDeliveryStatus.CERTAIN_FAILURE;
} catch (Exception ex) { } catch (Exception ex) {
if (isLoggingEnabled()) { if (isLoggingEnabled()) {
LOG.error("Command unresolved (UNCERTAIN_FAILURE)"); LOG.error("Command unresolved (UNCERTAIN_FAILURE)", ex);
} }
return CommandDeliveryStatus.UNCERTAIN_FAILURE; return CommandDeliveryStatus.UNCERTAIN_FAILURE;
} }