Merge pull request #2628 from AAPS-Omnipod/omnipod_eros_dev_upstream_merge

Updates from Omnipod repo

app/src/main/AndroidManifest.xml

@@ -300,6 +300,17 @@
 
         <uses-library android:name="org.apache.http.legacy" android:required="false"/>
 
+        <!-- Omnipod service and activities -->
+        <service
+            android:name=".plugins.pump.omnipod.service.RileyLinkOmnipodService"
+            android:enabled="true"
+            android:exported="true" />
+
+        <activity android:name=".plugins.pump.omnipod.dialogs.PodManagementActivity" />
+        <activity android:name=".plugins.pump.omnipod.dialogs.PodHistoryActivity" />
+        <activity android:name="com.atech.android.library.wizardpager.WizardPagerActivity"
+                  android:theme="@style/AppTheme.NoActionBar"/>
+
     </application>
 
 </manifest>

app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt

@@ -41,6 +41,7 @@ import info.nightscout.androidaps.plugins.pump.danaRS.DanaRSPlugin
 import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
+import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin

app/src/main/java/info/nightscout/androidaps/dependencyInjection/FragmentsModule.kt

@@ -38,6 +38,7 @@ import info.nightscout.androidaps.plugins.pump.danaR.DanaRFragment
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicFragment
 import info.nightscout.androidaps.plugins.pump.medtronic.dialog.RileyLinkStatusDeviceMedtronic
+import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodFragment
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpFragment
 import info.nightscout.androidaps.plugins.source.BGSourceFragment
 import info.nightscout.androidaps.plugins.treatments.TreatmentsFragment
@@ -71,6 +72,7 @@ abstract class FragmentsModule {
     @ContributesAndroidInjector abstract fun contributesLoopFragment(): LoopFragment
     @ContributesAndroidInjector abstract fun contributesMaintenanceFragment(): MaintenanceFragment
     @ContributesAndroidInjector abstract fun contributesMedtronicFragment(): MedtronicFragment
+    @ContributesAndroidInjector abstract fun contributesOmnipodFragment(): OmnipodFragment
     @ContributesAndroidInjector abstract fun contributesNSProfileFragment(): NSProfileFragment
     @ContributesAndroidInjector abstract fun contributesNSClientFragment(): NSClientFragment
     @ContributesAndroidInjector abstract fun contributesSmsCommunicatorFragment(): SmsCommunicatorFragment

app/src/main/java/info/nightscout/androidaps/dependencyInjection/OmnipodModule.kt

@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.dependencyInjection
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.OmnipodCommunicationManager
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodSessionState
+import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.PodHistoryActivity
+import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.PodManagementActivity
+import info.nightscout.androidaps.plugins.pump.omnipod.dialogs.wizard.pages.InitPodRefreshAction
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.comm.AapsOmnipodManager
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.ui.OmnipodUITask
+
+@Module
+@Suppress("unused")
+abstract class OmnipodModule {
+
+    // Activities
+    @ContributesAndroidInjector abstract fun contributesPodManagementActivity(): PodManagementActivity
+    @ContributesAndroidInjector abstract fun contributesPodHistoryActivity(): PodHistoryActivity
+
+    @ContributesAndroidInjector abstract fun omnipodCommunicationManagerProvider(): OmnipodCommunicationManager
+    @ContributesAndroidInjector abstract fun omnipodUITaskProvider(): OmnipodUITask
+    @ContributesAndroidInjector abstract fun aapsOmnipodManagerProvider(): AapsOmnipodManager
+    @ContributesAndroidInjector abstract fun initPodRefreshAction(): InitPodRefreshAction
+    @ContributesAndroidInjector abstract fun podSessionState(): PodSessionState
+
+
+}

app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt

@@ -45,6 +45,7 @@ import info.nightscout.androidaps.plugins.pump.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.plugins.pump.insight.LocalInsightPlugin
 import info.nightscout.androidaps.plugins.pump.mdi.MDIPlugin
 import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin
+import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityAAPSPlugin
 import info.nightscout.androidaps.plugins.sensitivity.SensitivityOref1Plugin

app/src/main/java/info/nightscout/androidaps/dependencyInjection/ServicesModule.kt

@@ -15,6 +15,7 @@ import info.nightscout.androidaps.plugins.pump.danaRv2.services.DanaRv2Execution
 import info.nightscout.androidaps.plugins.pump.insight.InsightAlertService
 import info.nightscout.androidaps.plugins.pump.insight.connection_service.InsightConnectionService
 import info.nightscout.androidaps.plugins.pump.medtronic.service.RileyLinkMedtronicService
+import info.nightscout.androidaps.plugins.pump.omnipod.service.RileyLinkOmnipodService
 import info.nightscout.androidaps.services.AlarmSoundService
 import info.nightscout.androidaps.services.DataService
 import info.nightscout.androidaps.services.LocationService
@@ -39,4 +40,5 @@ abstract class ServicesModule {
     @ContributesAndroidInjector abstract fun contributesInsightConnectionService(): InsightConnectionService
     @ContributesAndroidInjector abstract fun contributesRileyLinkService(): RileyLinkService
     @ContributesAndroidInjector abstract fun contributesRileyLinkMedtronicService(): RileyLinkMedtronicService
+    @ContributesAndroidInjector abstract fun contributesRileyLinkOmnipodService(): RileyLinkOmnipodService
 }

app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/RileyLinkBroadcastReceiver.java

@@ -20,11 +20,13 @@ import javax.inject.Inject;
 
 import dagger.android.DaggerBroadcastReceiver;
 import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkConst;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkFirmwareVersion;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkError;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.DiscoverGattServicesTask;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.tasks.InitializePumpManagerTask;
@@ -45,10 +47,11 @@ public class RileyLinkBroadcastReceiver extends DaggerBroadcastReceiver {
     @Inject AAPSLogger aapsLogger;
     @Inject RileyLinkServiceData rileyLinkServiceData;
     @Inject ServiceTaskExecutor serviceTaskExecutor;
+    @Inject ActivePluginProvider activePlugin;
 
     RileyLinkService serviceInstance;
     protected Map<String, List<String>> broadcastIdentifiers = null;
-    String deviceSpecificPrefix;
+    //String deviceSpecificPrefix;
 
     public RileyLinkBroadcastReceiver(RileyLinkService serviceInstance) {
         this.serviceInstance = serviceInstance;
@@ -80,12 +83,18 @@ public class RileyLinkBroadcastReceiver extends DaggerBroadcastReceiver {
                 RileyLinkConst.Intents.RileyLinkDisconnect));
 
         // Device Specific
-        deviceSpecificPrefix = serviceInstance.getDeviceSpecificBroadcastsIdentifierPrefix();
+        // TODO remove from service instance
+        //deviceSpecificPrefix = serviceInstance.getDeviceSpecificBroadcastsIdentifierPrefix();
 
         // Application specific
 
     }
 
+    private RileyLinkService getServiceInstance() {
+        RileyLinkPumpDevice pumpDevice = (RileyLinkPumpDevice)activePlugin.getActivePump();
+        return pumpDevice.getRileyLinkService();
+    }
+
 
     @Override
     public void onReceive(Context context, Intent intent) {
@@ -103,7 +112,6 @@ public class RileyLinkBroadcastReceiver extends DaggerBroadcastReceiver {
                 if (!processBluetoothBroadcasts(action) && //
                         !processRileyLinkBroadcasts(action, context) && //
                         !processTuneUpBroadcasts(action) && //
-                        !processDeviceSpecificBroadcasts(action, intent) && //
                         !processApplicationSpecificBroadcasts(action, intent) //
                 ) {
                     aapsLogger.error(LTag.PUMPCOMM, "Unhandled broadcast: action=" + action);
@@ -124,16 +132,14 @@ public class RileyLinkBroadcastReceiver extends DaggerBroadcastReceiver {
             }
         }
 
-        if (deviceSpecificPrefix != null) {
-            serviceInstance.registerDeviceSpecificBroadcasts(intentFilter);
-        }
-
         LocalBroadcastManager.getInstance(context).registerReceiver(this, intentFilter);
     }
 
 
     private boolean processRileyLinkBroadcasts(String action, Context context) {
 
+        RileyLinkService rileyLinkService = getServiceInstance();
+
         if (action.equals(RileyLinkConst.Intents.RileyLinkDisconnected)) {
             if (BluetoothAdapter.getDefaultAdapter().isEnabled()) {
                 rileyLinkServiceData.setServiceState(RileyLinkServiceState.BluetoothError, RileyLinkError.RileyLinkUnreachable);
@@ -147,20 +153,20 @@ public class RileyLinkBroadcastReceiver extends DaggerBroadcastReceiver {
             aapsLogger.warn(LTag.PUMPCOMM, "MedtronicConst.Intents.RileyLinkReady");
             // sendIPCNotification(RT2Const.IPC.MSG_note_WakingPump);
 
-            serviceInstance.rileyLinkBLE.enableNotifications();
+            rileyLinkService.rileyLinkBLE.enableNotifications();
-            serviceInstance.rfspy.startReader(); // call startReader from outside?
+            rileyLinkService.rfspy.startReader(); // call startReader from outside?
 
-            serviceInstance.rfspy.initializeRileyLink();
+            rileyLinkService.rfspy.initializeRileyLink();
-            String bleVersion = serviceInstance.rfspy.getBLEVersionCached();
+            String bleVersion = rileyLinkService.rfspy.getBLEVersionCached();
             RileyLinkFirmwareVersion rlVersion = rileyLinkServiceData.firmwareVersion;
 
 //            if (isLoggingEnabled())
             aapsLogger.debug(LTag.PUMPCOMM, "RfSpy version (BLE113): " + bleVersion);
-            serviceInstance.rileyLinkServiceData.versionBLE113 = bleVersion;
+            rileyLinkService.rileyLinkServiceData.versionBLE113 = bleVersion;
 
 //            if (isLoggingEnabled())
             aapsLogger.debug(LTag.PUMPCOMM, "RfSpy Radio version (CC110): " + rlVersion.name());
-            serviceInstance.rileyLinkServiceData.versionCC110 = rlVersion;
+            this.rileyLinkServiceData.versionCC110 = rlVersion;
 
             ServiceTask task = new InitializePumpManagerTask(injector, context);
             serviceTaskExecutor.startTask(task);
@@ -174,13 +180,13 @@ public class RileyLinkBroadcastReceiver extends DaggerBroadcastReceiver {
             } else {
                 // showBusy("Configuring Service", 50);
                 // rileyLinkBLE.findRileyLink(RileylinkBLEAddress);
-                serviceInstance.reconfigureRileyLink(RileylinkBLEAddress);
+                rileyLinkService.reconfigureRileyLink(RileylinkBLEAddress);
                 // MainApp.getServiceClientConnection().setThisRileylink(RileylinkBLEAddress);
             }
 
             return true;
         } else if (action.equals(RileyLinkConst.Intents.RileyLinkDisconnect)) {
-            serviceInstance.disconnectRileyLink();
+            rileyLinkService.disconnectRileyLink();
 
             return true;
         } else {
@@ -201,7 +207,7 @@ public class RileyLinkBroadcastReceiver extends DaggerBroadcastReceiver {
         } else if (action.equals(RileyLinkConst.Intents.BluetoothReconnected)) {
             aapsLogger.debug(LTag.PUMPCOMM, "Bluetooth - Reconnecting");
 
-            serviceInstance.bluetoothInit();
+            getServiceInstance().bluetoothInit();
             serviceTaskExecutor.startTask(new DiscoverGattServicesTask(injector, true));
 
             return true;
@@ -209,7 +215,6 @@ public class RileyLinkBroadcastReceiver extends DaggerBroadcastReceiver {
 
             return false;
         }
-
     }
 
 
@@ -226,19 +231,6 @@ public class RileyLinkBroadcastReceiver extends DaggerBroadcastReceiver {
     }
 
 
-    public boolean processDeviceSpecificBroadcasts(String action, Intent intent) {
-
-        if (this.deviceSpecificPrefix == null) {
-            return false;
-        }
-
-        if (action.startsWith(this.deviceSpecificPrefix)) {
-            return serviceInstance.handleDeviceSpecificBroadcasts(intent);
-        } else
-            return false;
-    }
-
-
     public boolean processApplicationSpecificBroadcasts(String action, Intent intent) {
         return false;
     }

app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/DiscoverGattServicesTask.java

@@ -3,15 +3,19 @@ package info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.task
 import javax.inject.Inject;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
-import info.nightscout.androidaps.plugins.pump.medtronic.MedtronicPumpPlugin;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkPumpDevice;
 
 /**
  * Created by geoff on 7/9/16.
  */
 public class DiscoverGattServicesTask extends ServiceTask {
 
-    @Inject MedtronicPumpPlugin medtronicPumpPlugin;
+    @Inject ActivePluginProvider activePlugin;
+    @Inject AAPSLogger aapsLogger;
 
     public boolean needToConnect = false;
 
@@ -30,9 +34,18 @@ public class DiscoverGattServicesTask extends ServiceTask {
     @Override
     public void run() {
 
-        if (needToConnect)
+        if (activePlugin.getActivePump().model() == PumpType.Insulet_Omnipod_Dash) {
-            medtronicPumpPlugin.getRileyLinkService().getRileyLinkBLE().connectGatt();
+            // TODO different init classes, this can be probably removed later
+            aapsLogger.warn(LTag.PUMPCOMM, "Discovery Gatt Services not implemeneted for Dash.");
+            return;
+        }
 
-        medtronicPumpPlugin.getRileyLinkService().getRileyLinkBLE().discoverServices();
+        RileyLinkPumpDevice pumpDevice = (RileyLinkPumpDevice) activePlugin.getActivePump();
+
+        if (needToConnect) {
+            pumpDevice.getRileyLinkService().getRileyLinkBLE().connectGatt();
+        }
+
+        pumpDevice.getRileyLinkService().getRileyLinkBLE().discoverServices();
     }
 }

app/src/main/java/info/nightscout/androidaps/plugins/pump/common/hw/rileylink/service/tasks/InitializePumpManagerTask.java

@@ -66,7 +66,6 @@ public class InitializePumpManagerTask extends ServiceTask {
             lastGoodFrequency = rileyLinkServiceData.lastGoodFrequency;
         }
 
-        // TODO Omnipod/Dagger needs refactoring
         RileyLinkCommunicationManager rileyLinkCommunicationManager = ((RileyLinkPumpDevice) activePlugin.getActivePump()).getRileyLinkService().getDeviceCommunicationManager();
 
         if (activePlugin.getActivePump().manufacturer() == ManufacturerType.Medtronic) {
@@ -102,9 +101,8 @@ public class InitializePumpManagerTask extends ServiceTask {
                 rileyLinkServiceData.lastGoodFrequency = lastGoodFrequency;
             }
 
-
             rileyLinkServiceData.setRileyLinkServiceState(RileyLinkServiceState.RileyLinkReady);
-            rileyLinkUtil.setRileyLinkTargetFrequency(RileyLinkTargetFrequency.Omnipod);
+            rileyLinkServiceData.rileyLinkTargetFrequency = RileyLinkTargetFrequency.Omnipod; // TODO shouldn't be needed
 
             aapsLogger.info(LTag.PUMPCOMM, "Setting radio frequency to {} MHz", lastGoodFrequency);
 

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

@@ -619,15 +619,7 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
         if (omnipodUtil.getPodSessionState() != null) {
             podSessionState = omnipodUtil.getPodSessionState();
         } else {
-            String podState = sp.getString(OmnipodConst.Prefs.PodState, null);
+            podSessionState = omnipodUtil.loadSessionState();
-
-            aapsLogger.info(LTag.PUMP, "PodSessionState-SP: loaded from SharedPreferences: " + podState);
-
-            if (podState != null) {
-                podSessionState = omnipodUtil.getGsonInstance().fromJson(podState, PodSessionState.class);
-                podSessionState.injectDaggerClass(injector);
-                omnipodUtil.setPodSessionState(podSessionState);
-            }
         }
 
 
@@ -1017,7 +1009,6 @@ public class OmnipodPumpPlugin extends PumpPluginAbstract implements OmnipodPump
 
                 // Don't trigger an alert when we exceeded the thresholds, but the last communication was successful
                 // This happens when we simply didn't need to send any commands to the pump
-                return false;
             }
         }
 

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/OmnipodCommunicationManager.java

@@ -23,6 +23,8 @@ import info.nightscout.androidaps.plugins.pump.medtronic.defs.PumpDeviceState;
 import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.OmnipodAction;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CommunicationException;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalMessageAddressException;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalMessageSequenceNumberException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalPacketTypeException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalResponseException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.NonceOutOfSyncException;
@@ -38,13 +40,13 @@ import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.Err
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.StatusResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.podinfo.PodInfoFaultEvent;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.podinfo.PodInfoResponse;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.ErrorResponseType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.MessageBlockType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PacketType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInfoType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodState;
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
 import info.nightscout.androidaps.plugins.pump.omnipod.exception.OmnipodException;
+import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodConst;
 
 /**
  * Created by andy on 6/29/18.
@@ -53,9 +55,9 @@ public class OmnipodCommunicationManager extends RileyLinkCommunicationManager {
 
     @Inject public AAPSLogger aapsLogger;
     @Inject OmnipodPumpStatus omnipodPumpStatus;
-    @Inject OmnipodPumpPlugin omnipodPumpPlugin;
+    //@Inject OmnipodPumpPlugin omnipodPumpPlugin;
-    @Inject RileyLinkServiceData rileyLinkServiceData;
+    //@Inject RileyLinkServiceData rileyLinkServiceData;
-    @Inject ServiceTaskExecutor serviceTaskExecutor;
+    //@Inject ServiceTaskExecutor serviceTaskExecutor;
 
     public OmnipodCommunicationManager(HasAndroidInjector injector, RFSpy rfspy) {
         super(injector, rfspy);
@@ -149,7 +151,7 @@ public class OmnipodCommunicationManager extends RileyLinkCommunicationManager {
             } else {
                 if (responseMessageBlock.getType() == MessageBlockType.ERROR_RESPONSE) {
                     ErrorResponse error = (ErrorResponse) responseMessageBlock;
-                    if (error.getErrorResponseType() == ErrorResponseType.BAD_NONCE) {
+                    if (error.getErrorResponseCode() == ErrorResponse.ERROR_RESPONSE_CODE_BAD_NONCE) {
                         podState.resyncNonce(error.getNonceSearchKey(), message.getSentNonce(), message.getSequenceNumber());
                         if (automaticallyResyncNonce) {
                             message.resyncNonce(podState.getCurrentNonce());
@@ -157,7 +159,7 @@ public class OmnipodCommunicationManager extends RileyLinkCommunicationManager {
                             throw new NonceOutOfSyncException();
                         }
                     } else {
-                        throw new PodReturnedErrorResponseException((ErrorResponse) responseMessageBlock);
+                        throw new PodReturnedErrorResponseException(error);
                     }
                 } else if (responseMessageBlock.getType() == MessageBlockType.POD_INFO_RESPONSE && ((PodInfoResponse) responseMessageBlock).getSubType() == PodInfoType.FAULT_EVENT) {
                     PodInfoFaultEvent faultEvent = ((PodInfoResponse) responseMessageBlock).getPodInfo();
@@ -178,6 +180,8 @@ public class OmnipodCommunicationManager extends RileyLinkCommunicationManager {
             packetAddress = addressOverride;
         }
 
+        podState.increaseMessageNumber();
+
         boolean firstPacket = true;
         byte[] encodedMessage;
         // this does not work well with the deactivate pod command, we somehow either
@@ -230,7 +234,6 @@ public class OmnipodCommunicationManager extends RileyLinkCommunicationManager {
         }
 
         if (response.getPacketType() == PacketType.ACK) {
-            podState.increasePacketNumber(1);
             throw new IllegalPacketTypeException(null, PacketType.ACK);
         }
 
@@ -239,6 +242,12 @@ public class OmnipodCommunicationManager extends RileyLinkCommunicationManager {
         while (receivedMessage == null) {
             try {
                 receivedMessage = OmnipodMessage.decodeMessage(receivedMessageData);
+                if (receivedMessage.getAddress() != message.getAddress()) {
+                    throw new IllegalMessageAddressException(message.getAddress(), receivedMessage.getAddress());
+                }
+                if (receivedMessage.getSequenceNumber() != podState.getMessageNumber()) {
+                    throw new IllegalMessageSequenceNumberException(podState.getMessageNumber(), receivedMessage.getSequenceNumber());
+                }
             } catch (NotEnoughDataException ex) {
                 // Message is (probably) not complete yet
                 OmnipodPacket ackForCon = createAckPacket(podState, packetAddress, ackAddressOverride);
@@ -258,8 +267,6 @@ public class OmnipodCommunicationManager extends RileyLinkCommunicationManager {
             }
         }
 
-        podState.increaseMessageNumber(2);
-
         ackUntilQuiet(podState, packetAddress, ackAddressOverride);
 
         List<MessageBlock> messageBlocks = receivedMessage.getMessageBlocks();
@@ -271,19 +278,23 @@ public class OmnipodCommunicationManager extends RileyLinkCommunicationManager {
             aapsLogger.error(LTag.PUMPBTCOMM, "Received more than one message block: {}", messageBlocks.toString());
         }
 
-        return messageBlocks.get(0);
+        MessageBlock messageBlock = messageBlocks.get(0);
+
+        if (messageBlock.getType() != MessageBlockType.ERROR_RESPONSE) {
+            podState.increaseMessageNumber();
+        }
+
+        return messageBlock;
     }
 
     private OmnipodPacket createAckPacket(PodState podState, Integer packetAddress, Integer messageAddress) {
-        int pktAddress = podState.getAddress();
+        if (packetAddress == null) {
-        int msgAddress = podState.getAddress();
+            packetAddress = podState.getAddress();
-        if (packetAddress != null) {
-            pktAddress = packetAddress;
         }
-        if (messageAddress != null) {
+        if (messageAddress == null) {
-            msgAddress = messageAddress;
+            messageAddress = podState.getAddress();
         }
-        return new OmnipodPacket(pktAddress, PacketType.ACK, podState.getPacketNumber(), ByteUtil.getBytesFromInt(msgAddress));
+        return new OmnipodPacket(packetAddress, PacketType.ACK, podState.getPacketNumber(), ByteUtil.getBytesFromInt(messageAddress));
     }
 
     private void ackUntilQuiet(PodState podState, Integer packetAddress, Integer messageAddress) {
@@ -303,7 +314,7 @@ public class OmnipodCommunicationManager extends RileyLinkCommunicationManager {
             throw new CommunicationException(CommunicationException.Type.UNEXPECTED_EXCEPTION, ex);
         }
 
-        podState.increasePacketNumber(1);
+        podState.increasePacketNumber();
     }
 
     private OmnipodPacket exchangePackets(PodState podState, OmnipodPacket packet) {
@@ -317,26 +328,39 @@ public class OmnipodCommunicationManager extends RileyLinkCommunicationManager {
     private OmnipodPacket exchangePackets(PodState podState, OmnipodPacket packet, int repeatCount, int responseTimeoutMilliseconds, int exchangeTimeoutMilliseconds, int preambleExtensionMilliseconds) {
         long timeoutTime = System.currentTimeMillis() + exchangeTimeoutMilliseconds;
 
+        podState.increasePacketNumber();
+
         while (System.currentTimeMillis() < timeoutTime) {
             OmnipodPacket response = null;
             try {
                 response = sendAndListen(packet, responseTimeoutMilliseconds, repeatCount, 9, preambleExtensionMilliseconds, OmnipodPacket.class);
             } catch (RileyLinkCommunicationException | OmnipodException ex) {
-                aapsLogger.debug(LTag.PUMPBTCOMM, "Ignoring exception in exchangePackets", ex);
+                aapsLogger.debug(LTag.PUMPBTCOMM, "Ignoring exception in exchangePackets: " + ex.getClass().getSimpleName() + ": " + ex.getMessage());
+                continue;
             } catch (Exception ex) {
                 throw new CommunicationException(CommunicationException.Type.UNEXPECTED_EXCEPTION, ex);
             }
-            if (response == null || !response.isValid()) {
+            if (response == null) {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "exchangePackets response is null");
+                continue;
+            } else if (!response.isValid()) {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "exchangePackets response is invalid: " + response);
                 continue;
             }
-            if (response.getAddress() != packet.getAddress()) {
+            if (response.getAddress() != packet.getAddress() &&
-                continue;
+                    response.getAddress() != OmnipodConst.DEFAULT_ADDRESS) { // In some (strange) cases, the Pod remains a packet address of 0xffffffff during it's lifetime
-            }
+                aapsLogger.debug(LTag.PUMPBTCOMM, "Packet address " + response.getAddress() + " doesn't match " + packet.getAddress());
-            if (response.getSequenceNumber() != ((podState.getPacketNumber() + 1) & 0b11111)) {
                 continue;
             }
 
-            podState.increasePacketNumber(2);
+            if (response.getSequenceNumber() != podState.getPacketNumber()) {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "Packet sequence number " + response.getSequenceNumber() + " does not match " + podState.getPacketNumber());
+                continue;
+            }
+
+            // Once we have verification that the POD heard us, we can increment our counters
+            podState.increasePacketNumber();
+
             return response;
         }
         throw new CommunicationException(CommunicationException.Type.TIMEOUT);

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

@@ -5,6 +5,7 @@ import org.joda.time.DateTimeZone;
 import org.joda.time.Duration;
 
 import java.util.EnumSet;
+import java.util.Random;
 import java.util.TimeZone;
 import java.util.concurrent.TimeUnit;
 
@@ -14,7 +15,6 @@ import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.AcknowledgeAl
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.AssignAddressAction;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.BolusAction;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.CancelDeliveryAction;
-import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.ConfigurePodAction;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.DeactivatePodAction;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.GetPodInfoAction;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.GetStatusAction;
@@ -22,6 +22,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.InsertCannula
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.PrimeAction;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.SetBasalScheduleAction;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.SetTempBasalAction;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.SetupPodAction;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.service.InsertCannulaService;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.action.service.PrimeService;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CommunicationException;
@@ -61,18 +62,14 @@ public class OmnipodManager {
     private ActiveBolusData activeBolusData;
     private final Object bolusDataMutex = new Object();
 
-    //private HasAndroidInjector injector;
+    private AAPSLogger aapsLogger;
-    AAPSLogger aapsLogger;
+    private SP sp;
-    SP sp;
 
-    public OmnipodManager(//HasAndroidInjector injector,
+    public OmnipodManager(AAPSLogger aapsLogger,
-                          AAPSLogger aapsLogger,
                           SP sp,
                           OmnipodCommunicationManager communicationService,
                           PodSessionState podState,
                           PodStateChangedHandler podStateChangedHandler) {
-//        this.injector = injector;
-//        this.injector.androidInjector().inject(this);
         if (communicationService == null) {
             throw new IllegalArgumentException("Communication service cannot be null");
         }
@@ -86,25 +83,18 @@ public class OmnipodManager {
         this.podStateChangedHandler = podStateChangedHandler;
     }
 
-//    public OmnipodManager(HasAndroidInjector injector,
+    public synchronized Single<SetupActionResult> pairAndPrime(int address) {
-//                          OmnipodCommunicationManager communicationService,
-//                          PodSessionState podState) {
-//        this(injector, communicationService, podState, null);
-//    }
-
-    public synchronized Single<SetupActionResult> pairAndPrime() {
         logStartingCommandExecution("pairAndPrime");
 
         try {
-            if (podState == null) {
+            if (podState == null || podState.getSetupProgress().isBefore(SetupProgress.POD_CONFIGURED)) {
+                // Always send both 0x07 and 0x03 on retries
                 podState = communicationService.executeAction(
-                        new AssignAddressAction(podStateChangedHandler));
+                        new AssignAddressAction(podStateChangedHandler, address));
-            } else if (SetupProgress.PRIMING.isBefore(podState.getSetupProgress())) {
-                throw new IllegalSetupProgressException(SetupProgress.ADDRESS_ASSIGNED, podState.getSetupProgress());
-            }
 
-            if (SetupProgress.ADDRESS_ASSIGNED.equals(podState.getSetupProgress())) {
+                communicationService.executeAction(new SetupPodAction(podState));
-                communicationService.executeAction(new ConfigurePodAction(podState));
+            } else if (SetupProgress.PRIMING.isBefore(podState.getSetupProgress())) {
+                throw new IllegalSetupProgressException(SetupProgress.POD_CONFIGURED, podState.getSetupProgress());
             }
 
             communicationService.executeAction(new PrimeAction(new PrimeService(), podState));
@@ -574,6 +564,15 @@ public class OmnipodManager {
         return ex instanceof OmnipodException && ((OmnipodException) ex).isCertainFailure();
     }
 
+    public static int generateRandomAddress() {
+        // Create random address with 20 bits to match PDM, could easily use 24 bits instead
+        return 0x1f000000 | (new Random().nextInt() & 0x000fffff);
+    }
+
+    public static boolean isValidAddress(int address) {
+        return (0x1f000000 | (address & 0x000fffff)) == address;
+    }
+
     public static class BolusCommandResult {
         private final CommandDeliveryStatus commandDeliveryStatus;
         private final SingleSubject<BolusDeliveryResult> deliveryResultSubject;

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/AssignAddressAction.java

@@ -3,9 +3,10 @@ package info.nightscout.androidaps.plugins.pump.omnipod.comm.action;
 import org.joda.time.DateTimeZone;
 
 import java.util.Collections;
-import java.util.Random;
 
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.OmnipodCommunicationManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalMessageAddressException;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalVersionResponseTypeException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.OmnipodMessage;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.command.AssignAddressCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.VersionResponse;
@@ -18,15 +19,11 @@ public class AssignAddressAction implements OmnipodAction<PodSessionState> {
     private final int address;
     private final PodStateChangedHandler podStateChangedHandler;
 
-    public AssignAddressAction(PodStateChangedHandler podStateChangedHandler) {
+    public AssignAddressAction(PodStateChangedHandler podStateChangedHandler, int address) {
-        this.address = generateRandomAddress();
+        this.address = address;
         this.podStateChangedHandler = podStateChangedHandler;
     }
 
-    private static int generateRandomAddress() {
-        return 0x1f000000 | (new Random().nextInt() & 0x000fffff);
-    }
-
     @Override
     public PodSessionState execute(OmnipodCommunicationManager communicationService) {
         PodSetupState setupState = new PodSetupState(address, 0x00, 0x00);
@@ -38,6 +35,13 @@ public class AssignAddressAction implements OmnipodAction<PodSessionState> {
         VersionResponse assignAddressResponse = communicationService.exchangeMessages(VersionResponse.class, setupState, assignAddressMessage,
                 OmnipodConst.DEFAULT_ADDRESS, setupState.getAddress());
 
+        if (!assignAddressResponse.isAssignAddressVersionResponse()) {
+            throw new IllegalVersionResponseTypeException("assignAddress", "setupPod");
+        }
+        if (assignAddressResponse.getAddress() != address) {
+            throw new IllegalMessageAddressException(address, assignAddressResponse.getAddress());
+        }
+
         DateTimeZone timeZone = DateTimeZone.getDefault();
 
         PodSessionState podState = new PodSessionState(timeZone, address, assignAddressResponse.getPiVersion(),

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/PrimeAction.java

@@ -28,7 +28,7 @@ public class PrimeAction implements OmnipodAction<StatusResponse> {
     }
 
     public static void updatePrimingStatus(PodSessionState podState, StatusResponse statusResponse, AAPSLogger aapsLogger) {
-        if (podState.getSetupProgress().equals(SetupProgress.PRIMING) && statusResponse.getPodProgressStatus().equals(PodProgressStatus.READY_FOR_BASAL_SCHEDULE)) {
+        if (podState.getSetupProgress().equals(SetupProgress.PRIMING) && statusResponse.getPodProgressStatus().equals(PodProgressStatus.PRIMING_COMPLETED)) {
             aapsLogger.debug(LTag.PUMPBTCOMM, "Updating SetupProgress from PRIMING to PRIMING_FINISHED");
             podState.setSetupProgress(SetupProgress.PRIMING_FINISHED);
         }

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/action/SetupPodAction.java

@@ -5,22 +5,24 @@ import org.joda.time.DateTime;
 import java.util.Collections;
 
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.OmnipodCommunicationManager;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalMessageAddressException;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalPacketTypeException;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalPodProgressException;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalSetupProgressException;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalVersionResponseTypeException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.OmnipodMessage;
-import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.command.ConfigurePodCommand;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.command.SetupPodCommand;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.VersionResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PacketType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodProgressStatus;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.SetupProgress;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodSessionState;
-import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalPacketTypeException;
-import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalPodProgressException;
-import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalSetupProgressException;
 import info.nightscout.androidaps.plugins.pump.omnipod.util.OmnipodConst;
 
-public class ConfigurePodAction implements OmnipodAction<VersionResponse> {
+public class SetupPodAction implements OmnipodAction<VersionResponse> {
     private final PodSessionState podState;
 
-    public ConfigurePodAction(PodSessionState podState) {
+    public SetupPodAction(PodSessionState podState) {
         this.podState = podState;
     }
 
@@ -31,13 +33,13 @@ public class ConfigurePodAction implements OmnipodAction<VersionResponse> {
         }
         DateTime activationDate = DateTime.now(podState.getTimeZone());
 
-        ConfigurePodCommand configurePodCommand = new ConfigurePodCommand(podState.getAddress(), activationDate,
+        SetupPodCommand setupPodCommand = new SetupPodCommand(podState.getAddress(), activationDate,
                 podState.getLot(), podState.getTid());
         OmnipodMessage message = new OmnipodMessage(OmnipodConst.DEFAULT_ADDRESS,
-                Collections.singletonList(configurePodCommand), podState.getMessageNumber());
+                Collections.singletonList(setupPodCommand), podState.getMessageNumber());
-        VersionResponse configurePodResponse;
+        VersionResponse setupPodResponse;
         try {
-            configurePodResponse = communicationService.exchangeMessages(VersionResponse.class, podState,
+            setupPodResponse = communicationService.exchangeMessages(VersionResponse.class, podState,
                     message, OmnipodConst.DEFAULT_ADDRESS, podState.getAddress());
         } catch (IllegalPacketTypeException ex) {
             if (PacketType.ACK.equals(ex.getActual())) {
@@ -48,12 +50,18 @@ public class ConfigurePodAction implements OmnipodAction<VersionResponse> {
             throw ex;
         }
 
-        if (configurePodResponse.getPodProgressStatus() != PodProgressStatus.PAIRING_SUCCESS) {
+        if (!setupPodResponse.isSetupPodVersionResponse()) {
-            throw new IllegalPodProgressException(PodProgressStatus.PAIRING_SUCCESS, configurePodResponse.getPodProgressStatus());
+            throw new IllegalVersionResponseTypeException("setupPod", "assignAddress");
+        }
+        if (setupPodResponse.getAddress() != podState.getAddress()) {
+            throw new IllegalMessageAddressException(podState.getAddress(), setupPodResponse.getAddress());
+        }
+        if (setupPodResponse.getPodProgressStatus() != PodProgressStatus.PAIRING_COMPLETED) {
+            throw new IllegalPodProgressException(PodProgressStatus.PAIRING_COMPLETED, setupPodResponse.getPodProgressStatus());
         }
 
         podState.setSetupProgress(SetupProgress.POD_CONFIGURED);
 
-        return configurePodResponse;
+        return setupPodResponse;
     }
 }

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalMessageAddressException.java

@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.comm.exception;
+
+import info.nightscout.androidaps.plugins.pump.omnipod.exception.OmnipodException;
+
+public class IllegalMessageAddressException extends OmnipodException {
+    private final int expected;
+    private final int actual;
+
+    public IllegalMessageAddressException(int expected, int actual) {
+        super("Invalid message address. Expected="+ expected +", actual="+ actual, false);
+        this.expected = expected;
+        this.actual = actual;
+    }
+
+    public int getExpected() {
+        return expected;
+    }
+
+    public int getActual() {
+        return actual;
+    }
+}

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalMessageSequenceNumberException.java

@@ -0,0 +1,22 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.comm.exception;
+
+import info.nightscout.androidaps.plugins.pump.omnipod.exception.OmnipodException;
+
+public class IllegalMessageSequenceNumberException extends OmnipodException {
+    private final int expected;
+    private final int actual;
+
+    public IllegalMessageSequenceNumberException(int expected, int actual) {
+        super("Invalid message sequence number. Expected="+ expected +", actual="+ actual, false);
+        this.expected = expected;
+        this.actual = actual;
+    }
+
+    public int getExpected() {
+        return expected;
+    }
+
+    public int getActual() {
+        return actual;
+    }
+}

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/IllegalVersionResponseTypeException.java

@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.plugins.pump.omnipod.comm.exception;
+
+import info.nightscout.androidaps.plugins.pump.omnipod.exception.OmnipodException;
+
+public class IllegalVersionResponseTypeException extends OmnipodException {
+    public IllegalVersionResponseTypeException(String expected, String actual) {
+        super("Invalid Version Response type. Expected="+ expected +", actual="+ actual, false);
+    }
+}

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/PodFaultException.java

@@ -7,7 +7,7 @@ public class PodFaultException extends OmnipodException {
     private final PodInfoFaultEvent faultEvent;
 
     public PodFaultException(PodInfoFaultEvent faultEvent) {
-        super(faultEvent.getFaultEventType().toString(), true);
+        super(faultEvent.getFaultEventCode().toString(), true);
         this.faultEvent = faultEvent;
     }
 

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/exception/PodReturnedErrorResponseException.java

@@ -7,7 +7,7 @@ public class PodReturnedErrorResponseException extends OmnipodException {
     private final ErrorResponse errorResponse;
 
     public PodReturnedErrorResponseException(ErrorResponse errorResponse) {
-        super("Pod returned error response: " + errorResponse.getErrorResponseType(), true);
+        super("Pod returned error response: " + errorResponse, true);
         this.errorResponse = errorResponse;
     }
 

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodMessage.java

@@ -97,6 +97,10 @@ public class OmnipodMessage {
         }
     }
 
+    public int getAddress() {
+        return address;
+    }
+
     public List<MessageBlock> getMessageBlocks() {
         return messageBlocks;
     }
@@ -135,7 +139,6 @@ public class OmnipodMessage {
         return false;
     }
 
-
     @Override
     public String toString() {
         return "OmnipodMessage{" +

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/OmnipodPacket.java

@@ -1,5 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.comm.message;
 
+import java.util.Arrays;
+
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.data.RLMessage;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PacketType;
@@ -79,4 +81,14 @@ public class OmnipodPacket implements RLMessage {
         return valid;
     }
 
+    @Override
+    public String toString() {
+        return "OmnipodPacket{" +
+                "packetAddress=" + packetAddress +
+                ", packetType=" + packetType +
+                ", sequenceNumber=" + sequenceNumber +
+                ", encodedMessage=" + ByteUtil.shortHexStringWithoutSpaces(encodedMessage) +
+                ", valid=" + valid +
+                '}';
+    }
 }

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetupPodCommand.java

@@ -6,7 +6,7 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.MessageBlock;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.MessageBlockType;
 
-public class ConfigurePodCommand extends MessageBlock {
+public class SetupPodCommand extends MessageBlock {
 
     private static final byte PACKET_TIMEOUT_LIMIT = 0x04;
 
@@ -15,7 +15,7 @@ public class ConfigurePodCommand extends MessageBlock {
     private final DateTime date;
     private final int address;
 
-    public ConfigurePodCommand(int address, DateTime date, int lot, int tid) {
+    public SetupPodCommand(int address, DateTime date, int lot, int tid) {
         this.address = address;
         this.lot = lot;
         this.tid = tid;
@@ -46,7 +46,7 @@ public class ConfigurePodCommand extends MessageBlock {
 
     @Override
     public String toString() {
-        return "ConfigurePodCommand{" +
+        return "SetupPodCommand{" +
                 "lot=" + lot +
                 ", tid=" + tid +
                 ", date=" + date +

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/ErrorResponse.java

@@ -2,14 +2,19 @@ package info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response;
 
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.MessageBlock;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.ErrorResponseType;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventCode;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.MessageBlockType;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodProgressStatus;
 
 public class ErrorResponse extends MessageBlock {
+    public static final byte ERROR_RESPONSE_CODE_BAD_NONCE = (byte) 0x14;
+
     private static final int MESSAGE_LENGTH = 5;
 
-    private final ErrorResponseType errorResponseType;
+    private final byte errorResponseCode;
-    private final int nonceSearchKey;
+    private Integer nonceSearchKey; // only valid for BAD_NONCE
+    private FaultEventCode faultEventCode; // valid for all but BAD_NONCE
+    private PodProgressStatus podProgressStatus; // valid for all but BAD_NONCE
 
     public ErrorResponse(byte[] encodedData) {
         if (encodedData.length < MESSAGE_LENGTH) {
@@ -17,14 +22,14 @@ public class ErrorResponse extends MessageBlock {
         }
         this.encodedData = ByteUtil.substring(encodedData, 2, MESSAGE_LENGTH - 2);
 
-        ErrorResponseType errorResponseType = null;
+        errorResponseCode = encodedData[2];
-        try {
-            errorResponseType = ErrorResponseType.fromByte(encodedData[2]);
-        } catch (IllegalArgumentException ex) {
-        }
 
-        this.errorResponseType = errorResponseType;
+        if (this.errorResponseCode == ERROR_RESPONSE_CODE_BAD_NONCE) {
-        this.nonceSearchKey = ByteUtil.makeUnsignedShort((int) encodedData[3], (int) encodedData[4]);
+            nonceSearchKey = ByteUtil.makeUnsignedShort(encodedData[3], encodedData[4]);
+        } else {
+            faultEventCode = FaultEventCode.fromByte(encodedData[3]);
+            podProgressStatus = PodProgressStatus.fromByte(encodedData[4]);
+        }
     }
 
     @Override
@@ -32,19 +37,29 @@ public class ErrorResponse extends MessageBlock {
         return MessageBlockType.ERROR_RESPONSE;
     }
 
-    public ErrorResponseType getErrorResponseType() {
+    public byte getErrorResponseCode() {
-        return errorResponseType;
+        return errorResponseCode;
     }
 
-    public int getNonceSearchKey() {
+    public FaultEventCode getFaultEventCode() {
+        return faultEventCode;
+    }
+
+    public PodProgressStatus getPodProgressStatus() {
+        return podProgressStatus;
+    }
+
+    public Integer getNonceSearchKey() {
         return nonceSearchKey;
     }
 
     @Override
     public String toString() {
         return "ErrorResponse{" +
-                "errorResponseType=" + errorResponseType +
+                "errorResponseCode=" + errorResponseCode +
                 ", nonceSearchKey=" + nonceSearchKey +
+                ", faultEventCode=" + faultEventCode +
+                ", podProgressStatus=" + podProgressStatus +
                 '}';
     }
 }

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/StatusResponse.java

@@ -31,20 +31,20 @@ public class StatusResponse extends MessageBlock {
         }
         this.encodedData = ByteUtil.substring(encodedData, 1, MESSAGE_LENGTH - 1);
 
-        this.deliveryStatus = DeliveryStatus.fromByte((byte) (ByteUtil.convertUnsignedByteToInt(encodedData[1]) >>> 4));
+        deliveryStatus = DeliveryStatus.fromByte((byte) (ByteUtil.convertUnsignedByteToInt(encodedData[1]) >>> 4));
-        this.podProgressStatus = PodProgressStatus.fromByte((byte) (encodedData[1] & 0x0F));
+        podProgressStatus = PodProgressStatus.fromByte((byte) (encodedData[1] & 0x0F));
 
         int minutes = ((encodedData[7] & 0x7F) << 6) | ((encodedData[8] & 0xFC) >>> 2);
-        this.timeActive = Duration.standardMinutes(minutes);
+        timeActive = Duration.standardMinutes(minutes);
 
         int highInsulinBits = (encodedData[2] & 0xF) << 9;
         int middleInsulinBits = ByteUtil.convertUnsignedByteToInt(encodedData[3]) << 1;
         int lowInsulinBits = ByteUtil.convertUnsignedByteToInt(encodedData[4]) >>> 7;
-        this.insulinDelivered = OmnipodConst.POD_PULSE_SIZE * (highInsulinBits | middleInsulinBits | lowInsulinBits);
+        insulinDelivered = OmnipodConst.POD_PULSE_SIZE * (highInsulinBits | middleInsulinBits | lowInsulinBits);
-        this.podMessageCounter = (byte) ((encodedData[4] >>> 3) & 0xf);
+        podMessageCounter = (byte) ((encodedData[4] >>> 3) & 0xf);
 
-        this.insulinNotDelivered = OmnipodConst.POD_PULSE_SIZE * (((encodedData[4] & 0x03) << 8) | ByteUtil.convertUnsignedByteToInt(encodedData[5]));
+        insulinNotDelivered = OmnipodConst.POD_PULSE_SIZE * (((encodedData[4] & 0x03) << 8) | ByteUtil.convertUnsignedByteToInt(encodedData[5]));
-        this.alerts = new AlertSet((byte) (((encodedData[6] & 0x7f) << 1) | (ByteUtil.convertUnsignedByteToInt(encodedData[7]) >>> 7)));
+        alerts = new AlertSet((byte) (((encodedData[6] & 0x7f) << 1) | (ByteUtil.convertUnsignedByteToInt(encodedData[7]) >>> 7)));
 
         double reservoirValue = (((encodedData[8] & 0x3) << 8) + ByteUtil.convertUnsignedByteToInt(encodedData[9])) * OmnipodConst.POD_PULSE_SIZE;
         if (reservoirValue > OmnipodConst.MAX_RESERVOIR_READING) {
@@ -94,7 +94,7 @@ public class StatusResponse extends MessageBlock {
     public byte[] getRawData() {
         ByteArrayOutputStream stream = new ByteArrayOutputStream();
         try {
-            stream.write(this.getType().getValue());
+            stream.write(getType().getValue());
             stream.write(encodedData);
         } catch (IOException e) {
             e.printStackTrace();

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/VersionResponse.java

@@ -7,45 +7,51 @@ import info.nightscout.androidaps.plugins.pump.omnipod.defs.MessageBlockType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodProgressStatus;
 
 public class VersionResponse extends MessageBlock {
+    private static final int ASSIGN_ADDRESS_VERSION_RESPONSE_LENGTH = 0x15;
+    private static final int SETUP_POD_VERSION_RESPONSE_LENGTH = 0x1b;
+
     private final PodProgressStatus podProgressStatus;
     private final FirmwareVersion pmVersion;
     private final FirmwareVersion piVersion;
     private final int lot;
     private final int tid;
+    private Byte gain; // Only in the assign address version response
+    private Byte rssi; // Only in the assign address version response
     private final int address;
 
-    public VersionResponse(byte[] encodedData) {
+    public VersionResponse(byte[] data) {
-        int length = ByteUtil.convertUnsignedByteToInt(encodedData[1]) + 2;
+        int length = ByteUtil.convertUnsignedByteToInt(data[1]);
-        this.encodedData = ByteUtil.substring(encodedData, 2, length - 2);
+        this.encodedData = ByteUtil.substring(data, 2, length);
-
-        boolean extraByte;
-        byte[] truncatedData;
 
         switch (length) {
-            case 0x17:
+            case ASSIGN_ADDRESS_VERSION_RESPONSE_LENGTH:
-                truncatedData = ByteUtil.substring(encodedData, 2);
+                podProgressStatus = PodProgressStatus.fromByte(data[9]);
-                extraByte = true;
+                pmVersion = new FirmwareVersion(data[2], data[3], data[4]);
+                piVersion = new FirmwareVersion(data[5], data[6], data[7]);
+                lot = ByteUtil.toInt((int) data[10], (int) data[11],
+                        (int) data[12], (int) data[13], ByteUtil.BitConversion.BIG_ENDIAN);
+                tid = ByteUtil.toInt((int) data[14], (int) data[15],
+                        (int) data[16], (int) data[17], ByteUtil.BitConversion.BIG_ENDIAN);
+                gain = (byte) ((data[18] & 0xc0) >>> 6);
+                rssi = (byte) (data[18] & 0x3f);
+                address = ByteUtil.toInt((int) data[19], (int) data[20],
+                        (int) data[21], (int) data[22], ByteUtil.BitConversion.BIG_ENDIAN);
                 break;
-            case 0x1D:
+            case SETUP_POD_VERSION_RESPONSE_LENGTH:
-                truncatedData = ByteUtil.substring(encodedData, 9);
+                podProgressStatus = PodProgressStatus.fromByte(data[16]);
-                extraByte = false;
+                pmVersion = new FirmwareVersion(data[9], data[10], data[11]);
+                piVersion = new FirmwareVersion(data[12], data[13], data[14]);
+                lot = ByteUtil.toInt((int) data[17], (int) data[18],
+                        (int) data[19], (int) data[20], ByteUtil.BitConversion.BIG_ENDIAN);
+                tid = ByteUtil.toInt((int) data[21], (int) data[22],
+                        (int) data[23], (int) data[24], ByteUtil.BitConversion.BIG_ENDIAN);
+
+                address = ByteUtil.toInt((int) data[25], (int) data[26],
+                        (int) data[27], (int) data[28], ByteUtil.BitConversion.BIG_ENDIAN);
                 break;
             default:
                 throw new IllegalArgumentException("Unrecognized VersionResponse message length: " + length);
         }
-
-        this.podProgressStatus = PodProgressStatus.fromByte(truncatedData[7]);
-        this.pmVersion = new FirmwareVersion(truncatedData[0], truncatedData[1], truncatedData[2]);
-        this.piVersion = new FirmwareVersion(truncatedData[3], truncatedData[4], truncatedData[5]);
-        this.lot = ByteUtil.toInt((int) truncatedData[8], (int) truncatedData[9],
-                (int) truncatedData[10], (int) truncatedData[11], ByteUtil.BitConversion.BIG_ENDIAN);
-        this.tid = ByteUtil.toInt((int) truncatedData[12], (int) truncatedData[13],
-                (int) truncatedData[14], (int) truncatedData[15], ByteUtil.BitConversion.BIG_ENDIAN);
-
-        int indexIncrementor = extraByte ? 1 : 0;
-
-        this.address = ByteUtil.toInt((int) truncatedData[16 + indexIncrementor], (int) truncatedData[17 + indexIncrementor],
-                (int) truncatedData[18 + indexIncrementor], (int) truncatedData[19 + indexIncrementor], ByteUtil.BitConversion.BIG_ENDIAN);
     }
 
     @Override
@@ -73,6 +79,22 @@ public class VersionResponse extends MessageBlock {
         return tid;
     }
 
+    public Byte getGain() {
+        return gain;
+    }
+
+    public Byte getRssi() {
+        return rssi;
+    }
+
+    public boolean isAssignAddressVersionResponse() {
+        return encodedData.length == ASSIGN_ADDRESS_VERSION_RESPONSE_LENGTH;
+    }
+
+    public boolean isSetupPodVersionResponse() {
+        return encodedData.length == SETUP_POD_VERSION_RESPONSE_LENGTH;
+    }
+
     public int getAddress() {
         return address;
     }

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoDataLog.java

@@ -7,12 +7,12 @@ import java.util.Collections;
 import java.util.List;
 
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventType;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventCode;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInfoType;
 
 public class PodInfoDataLog extends PodInfo {
     private static final int MINIMUM_MESSAGE_LENGTH = 8;
-    private final FaultEventType faultEventType;
+    private final FaultEventCode faultEventCode;
     private final Duration timeFaultEvent;
     private final Duration timeSinceActivation;
     private final byte dataChunkSize;
@@ -26,7 +26,7 @@ public class PodInfoDataLog extends PodInfo {
             throw new IllegalArgumentException("Not enough data");
         }
 
-        faultEventType = FaultEventType.fromByte(encodedData[1]);
+        faultEventCode = FaultEventCode.fromByte(encodedData[1]);
         timeFaultEvent = Duration.standardMinutes(ByteUtil.toInt(encodedData[2], encodedData[3]));
         timeSinceActivation = Duration.standardMinutes(ByteUtil.toInt(encodedData[4], encodedData[5]));
         dataChunkSize = encodedData[6];
@@ -45,8 +45,8 @@ public class PodInfoDataLog extends PodInfo {
         return PodInfoType.DATA_LOG;
     }
 
-    public FaultEventType getFaultEventType() {
+    public FaultEventCode getFaultEventCode() {
-        return faultEventType;
+        return faultEventCode;
     }
 
     public Duration getTimeFaultEvent() {
@@ -72,7 +72,7 @@ public class PodInfoDataLog extends PodInfo {
     @Override
     public String toString() {
         return "PodInfoDataLog{" +
-                "faultEventType=" + faultEventType +
+                "faultEventCode=" + faultEventCode +
                 ", timeFaultEvent=" + timeFaultEvent +
                 ", timeSinceActivation=" + timeSinceActivation +
                 ", dataChunkSize=" + dataChunkSize +

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultAndInitializationTime.java

@@ -3,12 +3,12 @@ package info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.po
 import org.joda.time.DateTime;
 import org.joda.time.Duration;
 
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventType;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventCode;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInfoType;
 
 public class PodInfoFaultAndInitializationTime extends PodInfo {
     private static final int MINIMUM_MESSAGE_LENGTH = 17;
-    private final FaultEventType faultEventType;
+    private final FaultEventCode faultEventCode;
     private final Duration timeFaultEvent;
     private final DateTime initializationTime;
 
@@ -19,7 +19,7 @@ public class PodInfoFaultAndInitializationTime extends PodInfo {
             throw new IllegalArgumentException("Not enough data");
         }
 
-        faultEventType = FaultEventType.fromByte(encodedData[1]);
+        faultEventCode = FaultEventCode.fromByte(encodedData[1]);
         timeFaultEvent = Duration.standardMinutes(((encodedData[2] & 0b1) << 8) + encodedData[3]);
         // We ignore time zones here because we don't keep the time zone in which the pod was initially set up
         // Which is fine because we don't use the initialization time for anything important anyway
@@ -31,8 +31,8 @@ public class PodInfoFaultAndInitializationTime extends PodInfo {
         return PodInfoType.FAULT_AND_INITIALIZATION_TIME;
     }
 
-    public FaultEventType getFaultEventType() {
+    public FaultEventCode getFaultEventCode() {
-        return faultEventType;
+        return faultEventCode;
     }
 
     public Duration getTimeFaultEvent() {
@@ -46,7 +46,7 @@ public class PodInfoFaultAndInitializationTime extends PodInfo {
     @Override
     public String toString() {
         return "PodInfoFaultAndInitializationTime{" +
-                "faultEventType=" + faultEventType +
+                "faultEventCode=" + faultEventCode +
                 ", timeFaultEvent=" + timeFaultEvent +
                 ", initializationTime=" + initializationTime +
                 '}';

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultEvent.java

@@ -5,7 +5,7 @@ import org.joda.time.Duration;
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.AlertSet;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.DeliveryStatus;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventType;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventCode;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.LogEventErrorCode;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInfoType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodProgressStatus;
@@ -19,7 +19,7 @@ public class PodInfoFaultEvent extends PodInfo {
     private final double insulinNotDelivered;
     private final byte podMessageCounter;
     private final double totalInsulinDelivered;
-    private final FaultEventType faultEventType;
+    private final FaultEventCode faultEventCode;
     private final Duration faultEventTime;
     private final Double reservoirLevel;
     private final Duration timeSinceActivation;
@@ -44,7 +44,7 @@ public class PodInfoFaultEvent extends PodInfo {
         insulinNotDelivered = OmnipodConst.POD_PULSE_SIZE * ByteUtil.toInt(encodedData[3], encodedData[4]);
         podMessageCounter = encodedData[5];
         totalInsulinDelivered = OmnipodConst.POD_PULSE_SIZE * ByteUtil.toInt(encodedData[6], encodedData[7]);
-        faultEventType = FaultEventType.fromByte(encodedData[8]);
+        faultEventCode = FaultEventCode.fromByte(encodedData[8]);
 
         int minutesSinceActivation = ByteUtil.toInt(encodedData[9], encodedData[10]);
         if (minutesSinceActivation == 0xffff) {
@@ -99,8 +99,8 @@ public class PodInfoFaultEvent extends PodInfo {
         return totalInsulinDelivered;
     }
 
-    public FaultEventType getFaultEventType() {
+    public FaultEventCode getFaultEventCode() {
-        return faultEventType;
+        return faultEventCode;
     }
 
     public Duration getFaultEventTime() {
@@ -155,7 +155,7 @@ public class PodInfoFaultEvent extends PodInfo {
                 ", insulinNotDelivered=" + insulinNotDelivered +
                 ", podMessageCounter=" + podMessageCounter +
                 ", totalInsulinDelivered=" + totalInsulinDelivered +
-                ", faultEventType=" + faultEventType +
+                ", faultEventCode=" + faultEventCode +
                 ", faultEventTime=" + faultEventTime +
                 ", reservoirLevel=" + reservoirLevel +
                 ", timeSinceActivation=" + timeSinceActivation +

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/ErrorResponseType.java

@@ -1,24 +0,0 @@
-package info.nightscout.androidaps.plugins.pump.omnipod.defs;
-
-public enum ErrorResponseType {
-    BAD_NONCE((byte) 0x14);
-
-    private byte value;
-
-    ErrorResponseType(byte value) {
-        this.value = value;
-    }
-
-    public static ErrorResponseType fromByte(byte value) {
-        for (ErrorResponseType type : values()) {
-            if (type.value == value) {
-                return type;
-            }
-        }
-        throw new IllegalArgumentException("Unknown ErrorResponseType: " + value);
-    }
-
-    public byte getValue() {
-        return value;
-    }
-}

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/FaultEventCode.java

@@ -2,7 +2,7 @@ package info.nightscout.androidaps.plugins.pump.omnipod.defs;
 
 import java.util.Locale;
 
-public enum FaultEventType {
+public enum FaultEventCode {
     NO_FAULTS((byte) 0x00),
     FAILED_FLASH_ERASE((byte) 0x01),
     FAILED_FLASH_STORE((byte) 0x02),
@@ -124,17 +124,17 @@ public enum FaultEventType {
 
     private byte value;
 
-    FaultEventType(byte value) {
+    FaultEventCode(byte value) {
         this.value = value;
     }
 
-    public static FaultEventType fromByte(byte value) {
+    public static FaultEventCode fromByte(byte value) {
-        for (FaultEventType type : values()) {
+        for (FaultEventCode type : values()) {
             if (type.value == value) {
                 return type;
             }
         }
-        throw new IllegalArgumentException("Unknown FaultEventType: " + value);
+        throw new IllegalArgumentException("Unknown FaultEventCode: " + value);
     }
 
     public byte getValue() {

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/PodProgressStatus.java

@@ -1,22 +1,22 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.defs;
 
 public enum PodProgressStatus {
-    INITIAL_VALUE((byte) 0x00),
+    INITIALIZED((byte) 0x00),
-    TANK_POWER_ACTIVATED((byte) 0x01),
+    MEMORY_INITIALIZED((byte) 0x01),
-    TANK_FILL_COMPLETED((byte) 0x02),
+    REMINDER_INITIALIZED((byte) 0x02),
-    PAIRING_SUCCESS((byte) 0x03),
+    PAIRING_COMPLETED((byte) 0x03),
     PRIMING((byte) 0x04),
-    READY_FOR_BASAL_SCHEDULE((byte) 0x05),
+    PRIMING_COMPLETED((byte) 0x05),
-    READY_FOR_CANNULA_INSERTION((byte) 0x06),
+    BASAL_INITIALIZED((byte) 0x06),
-    CANNULA_INSERTING((byte) 0x07),
+    INSERTING_CANNULA((byte) 0x07),
-    RUNNING_ABOVE_FIFTY_UNITS((byte) 0x08),
+    ABOVE_FIFTY_UNITS((byte) 0x08),
-    RUNNING_BELOW_FIFTY_UNITS((byte) 0x09),
+    FIFTY_OR_LESS_UNITS((byte) 0x09),
-    ONE_NOT_USED_BUT_IN_33((byte) 0x0a),
+    ONE_NOT_USED((byte) 0x0a),
-    TWO_NOT_USED_BUT_IN_33((byte) 0x0b),
+    TWO_NOT_USED((byte) 0x0b),
-    THREE_NOT_USED_BUT_IN_33((byte) 0x0c),
+    THREE_NOT_USED((byte) 0x0c),
-    FAULT_EVENT_OCCURRED((byte) 0x0d),
+    FAULT_EVENT_OCCURRED((byte) 0x0d), // Fault event occurred (a "screamer")
-    FAILED_TO_INITIALIZE_IN_TIME((byte) 0x0e),
+    ACTIVATION_TIME_EXCEEDED((byte) 0x0e), // Took > 2 hours from progress 2 to 3 or > 1 hour from 3 to 8
-    INACTIVE((byte) 0x0f);
+    INACTIVE((byte) 0x0f); // Pod deactivated or a fatal packet state error
 
     private byte value;
 
@@ -38,6 +38,6 @@ public enum PodProgressStatus {
     }
 
     public boolean isReadyForDelivery() {
-        return this == RUNNING_ABOVE_FIFTY_UNITS || this == RUNNING_BELOW_FIFTY_UNITS;
+        return this == ABOVE_FIFTY_UNITS || this == FIFTY_OR_LESS_UNITS;
     }
 }

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodSessionState.java

@@ -33,12 +33,14 @@ import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 public class PodSessionState extends PodState {
 
-    @Inject AAPSLogger aapsLogger;
+    @Inject transient AAPSLogger aapsLogger;
-    @Inject SP sp;
+    @Inject transient SP sp;
-    @Inject OmnipodUtil omnipodUtil;
+    @Inject transient OmnipodUtil omnipodUtil;
+
+    private transient PodStateChangedHandler stateChangedHandler;
 
     private final Map<AlertSlot, AlertType> configuredAlerts;
-    private transient PodStateChangedHandler stateChangedHandler;
+    private DateTimeZone timeZone;
     private DateTime activatedAt;
     private DateTime expiresAt;
     private final FirmwareVersion piVersion;
@@ -47,8 +49,6 @@ public class PodSessionState extends PodState {
     private final int tid;
     private Double reservoirLevel;
     private boolean suspended;
-
-    private DateTimeZone timeZone;
     private NonceState nonceState;
     private SetupProgress setupProgress;
     private AlertSet activeAlerts;

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodState.java

@@ -46,12 +46,12 @@ public abstract class PodState {
         this.packetNumber = packetNumber;
     }
 
-    public void increaseMessageNumber(int increment) {
+    public void increaseMessageNumber() {
-        setMessageNumber((messageNumber + increment) & 0b1111);
+        setMessageNumber((messageNumber + 1) & 0b1111);
     }
 
-    public void increasePacketNumber(int increment) {
+    public void increasePacketNumber() {
-        setPacketNumber((packetNumber + increment) & 0b11111);
+        setPacketNumber((packetNumber + 1) & 0b11111);
     }
 
     public boolean hasFaultEvent() {

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/dialogs/PodManagementActivity.kt

@@ -157,7 +157,7 @@ class PodManagementActivity : NoSplashAppCompatActivity() {
         val isPodSessionActive = (omnipodUtil.getPodSessionState() != null)
 
         initpod_remove_pod.isEnabled = isPodSessionActive
-        initpod_reset_pod.isEnabled = isPodSessionActive
+        initpod_reset_pod.isEnabled = isPodSessionActive || omnipodUtil.hasNextPodAddress()
 
         if (omnipodUtil.getDriverState() == OmnipodDriverState.NotInitalized) {
             // if rileylink is not running we disable all operations

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManager.java

@@ -44,10 +44,13 @@ import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CommandIni
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CommunicationException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.CrcMismatchException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalDeliveryStatusException;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalMessageAddressException;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalMessageSequenceNumberException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalPacketTypeException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalPodProgressException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalResponseException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalSetupProgressException;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.IllegalVersionResponseTypeException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.MessageDecodingException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.NonceOutOfSyncException;
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.exception.NonceResyncException;
@@ -59,7 +62,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.pod
 import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.podinfo.PodInfoResponse;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.AlertSlot;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.AlertType;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventType;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventCode;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommunicationManagerInterface;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInfoType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInitActionType;
@@ -194,8 +197,13 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
         long time = System.currentTimeMillis();
         if (PodInitActionType.PairAndPrimeWizardStep.equals(podInitActionType)) {
             try {
-                Disposable disposable = delegate.pairAndPrime().subscribe(res -> //
+                int address = obtainNextPodAddress();
+
+                Disposable disposable = delegate.pairAndPrime(address).subscribe(res -> //
                         handleSetupActionResult(podInitActionType, podInitReceiver, res, time, null));
+
+                removeNextPodAddress();
+
                 return new PumpEnactResult(injector).success(true).enacted(true);
             } catch (Exception ex) {
                 String comment = handleAndTranslateException(ex);
@@ -299,6 +307,7 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
         reportImplicitlyCanceledTbr();
 
         this.omnipodUtil.setPodSessionState(null);
+        this.omnipodUtil.removeNextPodAddress();
 
         addSuccessToHistory(System.currentTimeMillis(), PodHistoryEntryType.ResetPodState, null);
 
@@ -355,7 +364,7 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
         activePlugin.getActiveTreatments().addToHistoryTreatment(detailedBolusInfo, false);
 
         if (delegate.getPodState().hasFaultEvent()) {
-            showPodFaultErrorDialog(delegate.getPodState().getFaultEvent().getFaultEventType(), R.raw.urgentalarm);
+            showPodFaultErrorDialog(delegate.getPodState().getFaultEvent().getFaultEventCode(), R.raw.urgentalarm);
         }
 
         return new PumpEnactResult(injector).success(true).enacted(true).bolusDelivered(unitsDelivered);
@@ -371,7 +380,7 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
                 addSuccessToHistory(time, PodHistoryEntryType.CancelBolus, null);
                 return new PumpEnactResult(injector).success(true).enacted(true);
             } catch (PodFaultException ex) {
-                showPodFaultErrorDialog(ex.getFaultEvent().getFaultEventType(), null);
+                showPodFaultErrorDialog(ex.getFaultEvent().getFaultEventCode(), null);
                 addSuccessToHistory(time, PodHistoryEntryType.CancelBolus, null);
                 return new PumpEnactResult(injector).success(true).enacted(true);
             } catch (Exception ex) {
@@ -562,18 +571,15 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
         }
     }
 
-
+    private long addSuccessToHistory(long requestTime, PodHistoryEntryType entryType, Object data) {
-    public long addSuccessToHistory(long requestTime, PodHistoryEntryType entryType, Object data) {
         return addToHistory(requestTime, entryType, data, true);
     }
 
-    public long addFailureToHistory(long requestTime, PodHistoryEntryType entryType, Object data) {
+    private long addFailureToHistory(long requestTime, PodHistoryEntryType entryType, Object data) {
         return addToHistory(requestTime, entryType, data, false);
     }
 
-
+    private long addToHistory(long requestTime, PodHistoryEntryType entryType, Object data, boolean success) {
-    public long addToHistory(long requestTime, PodHistoryEntryType entryType, Object data, boolean success) {
-
         PodHistory podHistory = new PodHistory(requestTime, entryType);
 
         if (data != null) {
@@ -590,7 +596,20 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
         MainApp.getDbHelper().createOrUpdate(podHistory);
 
         return podHistory.getPumpId();
+    }
 
+    private int obtainNextPodAddress() {
+        Integer nextPodAddress = this.omnipodUtil.getNextPodAddress();
+        if (nextPodAddress == null) {
+            nextPodAddress = OmnipodManager.generateRandomAddress();
+            this.omnipodUtil.setNextPodAddress(nextPodAddress);
+        }
+
+        return nextPodAddress;
+    }
+
+    private void removeNextPodAddress() {
+        this.omnipodUtil.removeNextPodAddress();
     }
 
     private void handleSetupActionResult(PodInitActionType podInitActionType, PodInitReceiver podInitReceiver, SetupActionResult res, long time, Profile profile) {
@@ -624,7 +643,11 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
             if (ex instanceof ActionInitializationException || ex instanceof CommandInitializationException) {
                 comment = getStringResource(R.string.omnipod_driver_error_invalid_parameters);
             } else if (ex instanceof CommunicationException) {
-                comment = getStringResource(R.string.omnipod_driver_error_communication_failed);
+                if (((CommunicationException) ex).getType() == CommunicationException.Type.TIMEOUT) {
+                    comment = getStringResource(R.string.omnipod_driver_error_communication_failed_timeout);
+                } else {
+                    comment = getStringResource(R.string.omnipod_driver_error_communication_failed_unexpected_exception);
+                }
             } else if (ex instanceof CrcMismatchException) {
                 comment = getStringResource(R.string.omnipod_driver_error_crc_mismatch);
             } else if (ex instanceof IllegalPacketTypeException) {
@@ -632,8 +655,14 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
             } else if (ex instanceof IllegalPodProgressException || ex instanceof IllegalSetupProgressException
                     || ex instanceof IllegalDeliveryStatusException) {
                 comment = getStringResource(R.string.omnipod_driver_error_invalid_progress_state);
+            } else if (ex instanceof IllegalVersionResponseTypeException) {
+                comment = getStringResource(R.string.omnipod_driver_error_invalid_response);
             } else if (ex instanceof IllegalResponseException) {
                 comment = getStringResource(R.string.omnipod_driver_error_invalid_response);
+            } else if (ex instanceof IllegalMessageSequenceNumberException) {
+                comment = getStringResource(R.string.omnipod_driver_error_invalid_message_sequence_number);
+            } else if (ex instanceof IllegalMessageAddressException) {
+                comment = getStringResource(R.string.omnipod_driver_error_invalid_message_address);
             } else if (ex instanceof MessageDecodingException) {
                 comment = getStringResource(R.string.omnipod_driver_error_message_decoding_failed);
             } else if (ex instanceof NonceOutOfSyncException) {
@@ -643,9 +672,9 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
             } else if (ex instanceof NotEnoughDataException) {
                 comment = getStringResource(R.string.omnipod_driver_error_not_enough_data);
             } else if (ex instanceof PodFaultException) {
-                FaultEventType faultEventType = ((PodFaultException) ex).getFaultEvent().getFaultEventType();
+                FaultEventCode faultEventCode = ((PodFaultException) ex).getFaultEvent().getFaultEventCode();
-                showPodFaultErrorDialog(faultEventType, R.raw.urgentalarm);
+                showPodFaultErrorDialog(faultEventCode, R.raw.urgentalarm);
-                comment = createPodFaultErrorMessage(faultEventType);
+                comment = createPodFaultErrorMessage(faultEventCode);
             } else if (ex instanceof PodReturnedErrorResponseException) {
                 comment = getStringResource(R.string.omnipod_driver_error_pod_returned_error_response);
             } else {
@@ -661,10 +690,10 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
         return comment;
     }
 
-    private String createPodFaultErrorMessage(FaultEventType faultEventType) {
+    private String createPodFaultErrorMessage(FaultEventCode faultEventCode) {
         String comment;
         comment = getStringResource(R.string.omnipod_driver_error_pod_fault,
-                ByteUtil.convertUnsignedByteToInt(faultEventType.getValue()), faultEventType.name());
+                ByteUtil.convertUnsignedByteToInt(faultEventCode.getValue()), faultEventCode.name());
         return comment;
     }
 
@@ -672,8 +701,8 @@ public class AapsOmnipodManager implements OmnipodCommunicationManagerInterface
         rxBus.send(event);
     }
 
-    private void showPodFaultErrorDialog(FaultEventType faultEventType, Integer sound) {
+    private void showPodFaultErrorDialog(FaultEventCode faultEventCode, Integer sound) {
-        showErrorDialog(createPodFaultErrorMessage(faultEventType), sound);
+        showErrorDialog(createPodFaultErrorMessage(faultEventCode), sound);
     }
 
     private void showErrorDialog(String message, Integer sound) {

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/service/RileyLinkOmnipodService.java

@@ -8,6 +8,8 @@ import android.os.IBinder;
 
 import com.google.gson.Gson;
 
+import org.apache.commons.lang3.StringUtils;
+
 import javax.inject.Inject;
 
 import info.nightscout.androidaps.R;
@@ -17,6 +19,7 @@ import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkCons
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RileyLinkBLE;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkEncodingType;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.defs.RileyLinkTargetFrequency;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkServiceState;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.defs.RileyLinkTargetDevice;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.service.RileyLinkService;
@@ -86,6 +89,7 @@ public class RileyLinkOmnipodService extends RileyLinkService {
     public void initRileyLinkServiceData() {
 
         rileyLinkServiceData.targetDevice = RileyLinkTargetDevice.Omnipod;
+        rileyLinkServiceData.rileyLinkTargetFrequency = RileyLinkTargetFrequency.Omnipod;
 
         // get most recently used RileyLink address
         rileyLinkServiceData.rileylinkAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
@@ -106,7 +110,7 @@ public class RileyLinkOmnipodService extends RileyLinkService {
             if (sp.contains(OmnipodConst.Prefs.PodState) && omnipodUtil.getPodSessionState() == null) {
                 try {
                     Gson gson = omnipodUtil.getGsonInstance();
-                    String storedPodState = sp.getString(OmnipodConst.Prefs.PodState, null);
+                    String storedPodState = sp.getString(OmnipodConst.Prefs.PodState, "");
                     aapsLogger.info(LTag.PUMPCOMM, "PodSessionState-SP: loaded from SharedPreferences: " + storedPodState);
                     podState = gson.fromJson(storedPodState, PodSessionState.class);
                     podState.injectDaggerClass(injector);
@@ -180,10 +184,10 @@ public class RileyLinkOmnipodService extends RileyLinkService {
         try {
             omnipodPumpStatus.errorDescription = "-";
 
-            String rileyLinkAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, null);
+            String rileyLinkAddress = sp.getString(RileyLinkConst.Prefs.RileyLinkAddress, "");
 
-            if (rileyLinkAddress == null) {
+            if (StringUtils.isEmpty(rileyLinkAddress)) {
-                aapsLogger.debug(LTag.PUMPCOMM, "RileyLink address invalid: null");
+                aapsLogger.debug(LTag.PUMPCOMM, "RileyLink address invalid: no address");
                 omnipodPumpStatus.errorDescription = resourceHelper.gs(R.string.medtronic_error_rileylink_address_invalid);
                 return false;
             } else {
@@ -204,6 +208,7 @@ public class RileyLinkOmnipodService extends RileyLinkService {
             this.omnipodPumpStatus.beepTBREnabled = sp.getBoolean(OmnipodConst.Prefs.BeepTBREnabled, true);
             this.omnipodPumpStatus.podDebuggingOptionsEnabled = sp.getBoolean(OmnipodConst.Prefs.PodDebuggingOptionsEnabled, false);
             this.omnipodPumpStatus.timeChangeEventEnabled = sp.getBoolean(OmnipodConst.Prefs.TimeChangeEventEnabled, true);
+            rileyLinkServiceData.rileyLinkTargetFrequency = RileyLinkTargetFrequency.Omnipod;
 
             aapsLogger.debug(LTag.PUMPCOMM, "Beeps [basal={}, bolus={}, SMB={}, TBR={}]", this.omnipodPumpStatus.beepBasalEnabled, this.omnipodPumpStatus.beepBolusEnabled, this.omnipodPumpStatus.beepSMBEnabled, this.omnipodPumpStatus.beepTBREnabled);
 

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod/util/OmnipodConst.java

@@ -14,6 +14,7 @@ public class OmnipodConst {
 
     public class Prefs {
         public static final String PodState = Prefix + "pod_state";
+        public static final String NextPodAddress = Prefix + "next_pod_address";
         public static final int BeepBasalEnabled = R.string.key_omnipod_beep_basal_enabled;
         public static final int BeepBolusEnabled = R.string.key_omnipod_beep_bolus_enabled;
         public static final int BeepSMBEnabled = R.string.key_omnipod_beep_smb_enabled;

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

@@ -8,6 +8,7 @@ import com.google.gson.JsonDeserializer;
 import com.google.gson.JsonPrimitive;
 import com.google.gson.JsonSerializer;
 
+import org.apache.commons.lang3.StringUtils;
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.joda.time.format.ISODateTimeFormat;
@@ -15,14 +16,17 @@ import org.joda.time.format.ISODateTimeFormat;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 
+import dagger.android.HasAndroidInjector;
 import info.nightscout.androidaps.MainApp;
 import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.interfaces.ActivePluginProvider;
 import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
 import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.data.RLHistoryItem;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.OmnipodManager;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommandType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodPodType;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodDeviceState;
@@ -31,6 +35,7 @@ import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodDriverState
 import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
 import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodDeviceStatusChange;
 import info.nightscout.androidaps.utils.alertDialogs.OKDialog;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
 /**
  * Created by andy on 4/8/19.
@@ -43,7 +48,8 @@ public class OmnipodUtil {
     private final RileyLinkUtil rileyLinkUtil;
     private final OmnipodPumpStatus omnipodPumpStatus;
     private final ActivePluginProvider activePlugins;
-
+    private final SP sp;
+    private final HasAndroidInjector injector;
 
     private boolean lowLevelDebug = true;
     private OmnipodCommandType currentCommand;
@@ -60,13 +66,17 @@ public class OmnipodUtil {
             RxBusWrapper rxBus,
             RileyLinkUtil rileyLinkUtil,
             OmnipodPumpStatus omnipodPumpStatus,
-            ActivePluginProvider activePlugins
+            SP sp,
+            ActivePluginProvider activePlugins,
+            HasAndroidInjector injector
     ) {
         this.aapsLogger = aapsLogger;
         this.rxBus = rxBus;
         this.rileyLinkUtil = rileyLinkUtil;
         this.omnipodPumpStatus = omnipodPumpStatus;
+        this.sp = sp;
         this.activePlugins = activePlugins;
+        this.injector = injector;
     }
 
 
@@ -92,7 +102,6 @@ public class OmnipodUtil {
             rileyLinkUtil.getRileyLinkHistory().add(new RLHistoryItem(currentCommand));
     }
 
-
     public static void displayNotConfiguredDialog(Context context) {
         OKDialog.showConfirmation(context, MainApp.gs(R.string.combo_warning),
                 MainApp.gs(R.string.omnipod_error_operation_not_possible_no_configuration), (Runnable) null);
@@ -182,7 +191,6 @@ public class OmnipodUtil {
         omnipodPumpStatus.pumpType = pumpType_;
     }
 
-
     public PumpType getPumpType() {
         return omnipodPumpStatus.pumpType;
     }
@@ -192,4 +200,49 @@ public class OmnipodUtil {
         return this.gsonInstance;
     }
 
+    public Integer getNextPodAddress() {
+        if (sp.contains(OmnipodConst.Prefs.NextPodAddress)) {
+            int nextPodAddress = sp.getInt(OmnipodConst.Prefs.NextPodAddress, 0);
+            if (OmnipodManager.isValidAddress(nextPodAddress)) {
+                return nextPodAddress;
+            }
+        }
+        return null;
+    }
+
+    public boolean hasNextPodAddress() {
+        return getNextPodAddress() != null;
+    }
+
+    public void setNextPodAddress(int address) {
+        sp.putInt(OmnipodConst.Prefs.NextPodAddress, address);
+    }
+
+    public void removeNextPodAddress() {
+        sp.remove(OmnipodConst.Prefs.NextPodAddress);
+    }
+
+    public AAPSLogger getAapsLogger() {
+        return this.aapsLogger;
+    }
+
+    public SP getSp() {
+        return this.sp;
+    }
+
+    public PodSessionState loadSessionState() {
+        String podState = sp.getString(OmnipodConst.Prefs.PodState, "");
+
+        aapsLogger.info(LTag.PUMP, "PodSessionState-SP: loaded from SharedPreferences: " + podState);
+
+        if (StringUtils.isNotEmpty(podState)) {
+            PodSessionState podSessionState = gsonInstance.fromJson(podState, PodSessionState.class);
+            podSessionState.injectDaggerClass(injector);
+            setPodSessionState(podSessionState);
+
+            return podSessionState;
+        }
+
+        return null;
+    }
 }

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/OmnipodDashPumpPlugin.java

@@ -0,0 +1,314 @@
+package info.nightscout.androidaps.plugins.pump.omnipod_dash;
+
+import android.content.Context;
+import android.os.Bundle;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Arrays;
+import java.util.List;
+
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.BuildConfig;
+import info.nightscout.androidaps.R;
+import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.PluginDescription;
+import info.nightscout.androidaps.interfaces.PluginType;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.L;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpDriverState;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodFragment;
+import info.nightscout.androidaps.plugins.pump.omnipod.OmnipodPumpPlugin;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodPumpPluginInterface;
+import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodPumpValuesChanged;
+import info.nightscout.androidaps.plugins.pump.omnipod.events.EventOmnipodRefreshButtonState;
+import info.nightscout.androidaps.plugins.pump.omnipod.service.RileyLinkOmnipodService;
+import info.nightscout.androidaps.plugins.pump.omnipod_dash.comm.OmnipodDashCommunicationManager;
+import info.nightscout.androidaps.utils.FabricPrivacy;
+import info.nightscout.androidaps.utils.TimeChangeType;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
+
+/**
+ * Created by andy on 23.04.18.
+ *
+ * @author Andy Rozman (andy.rozman@gmail.com)
+ */
+// FIXME this is just placeholder for now, but this should use most of OmnipodPumpPlugin implementation
+public class OmnipodDashPumpPlugin extends OmnipodPumpPlugin implements OmnipodPumpPluginInterface {
+
+    // TODO Dagger
+    //private static final Logger LOG = LoggerFactory.getLogger(L.PUMP);
+
+    protected static OmnipodDashPumpPlugin plugin = null;
+    //private RileyLinkOmnipodService omnipodService;
+    //private OmnipodPumpStatus pumpStatusLocal = null;
+
+    // variables for handling statuses and history
+    private boolean firstRun = true;
+    private boolean isRefresh = false;
+    private boolean isBasalProfileInvalid = false;
+    private boolean basalProfileChanged = false;
+    private boolean isInitialized = false;
+
+    public static boolean isBusy = false;
+    //private List<Long> busyTimestamps = new ArrayList<>();
+    //private boolean sentIdToFirebase = false;
+    //private boolean hasTimeDateOrTimeZoneChanged = false;
+
+    private Profile currentProfile;
+
+    //@Inject
+    public OmnipodDashPumpPlugin(HasAndroidInjector injector,
+                                 AAPSLogger aapsLogger,
+                                 RxBusWrapper rxBus,
+                                 Context context,
+                                 ResourceHelper resourceHelper,
+                                 ActivePluginProvider activePlugin,
+                                 SP sp,
+                                 CommandQueueProvider commandQueue,
+                                 FabricPrivacy fabricPrivacy) {
+        super(new PluginDescription() //
+                        .mainType(PluginType.PUMP) //
+                        .fragmentClass(OmnipodFragment.class.getName()) //
+                        .pluginName(R.string.omnipod_dash_name) //
+                        .shortName(R.string.omnipod_dash_name_short) //
+                        .preferencesId(R.xml.pref_omnipod) //
+                        .description(R.string.description_pump_omnipod_dash), //
+                PumpType.Insulet_Omnipod_Dash,
+                injector, aapsLogger, rxBus, context, resourceHelper, activePlugin, sp, commandQueue, fabricPrivacy
+        );
+
+        displayConnectionMessages = false;
+
+        //OmnipodUtil.setOmnipodPodType(OmnipodPodType.Dash);
+
+        if (omnipodCommunicationManager == null) {
+            omnipodCommunicationManager = OmnipodDashCommunicationManager.getInstance();
+        }
+
+        // DG omnipodUIComm = new OmnipodUIComm(omnipodCommunicationManager, this, this.omnipodPumpStatus);
+
+        //OmnipodUtil.setPlugin(this);
+
+        // FIXME
+//        serviceConnection = new ServiceConnection() {
+//
+//            public void onServiceDisconnected(ComponentName name) {
+//                if (isLoggingEnabled())
+//                    aapsLogger.debug(LTag.PUMP, "RileyLinkOmnipodService is disconnected");
+//                omnipodService = null;
+//            }
+//
+//            public void onServiceConnected(ComponentName name, IBinder service) {
+//                if (isLoggingEnabled())
+//                    aapsLogger.debug(LTag.PUMP, "RileyLinkOmnipodService is connected");
+//                RileyLinkOmnipodService.LocalBinder mLocalBinder = (RileyLinkOmnipodService.LocalBinder) service;
+//                omnipodService = mLocalBinder.getServiceInstance();
+//
+//                new Thread(() -> {
+//
+//                    for (int i = 0; i < 20; i++) {
+//                        SystemClock.sleep(5000);
+//
+//                        if (OmnipodUtil.getPumpStatus() != null) {
+//                            if (isLoggingEnabled())
+//                                aapsLogger.debug(LTag.PUMP, "Starting OmniPod-RileyLink service");
+//                            if (OmnipodUtil.getPumpStatus().setNotInPreInit()) {
+//                                break;
+//                            }
+//                        }
+//                    }
+//                }).start();
+//            }
+//        };
+    }
+
+    @Deprecated
+    public static OmnipodDashPumpPlugin getPlugin() {
+        if (plugin == null)
+            throw new IllegalStateException("Plugin not injected jet");
+        return plugin;
+    }
+
+
+    private String getLogPrefix() {
+        return "OmnipodPlugin::";
+    }
+
+
+    // FIXME
+    public Class getServiceClass() {
+        return RileyLinkOmnipodService.class;
+    }
+
+
+    @Override
+    public String deviceID() {
+        return "Omnipod Dash";
+    }
+
+
+    // Pump Plugin
+
+    private boolean isServiceSet() {
+        return true; //omnipodService != null;
+    }
+
+    private boolean isServiceInitialized() {
+        return true;
+    }
+
+
+    @Override
+    public boolean isInitialized() {
+        if (displayConnectionMessages)
+            aapsLogger.debug(LTag.PUMP, getLogPrefix() + "isInitialized");
+        return isServiceSet() && isInitialized;
+    }
+
+
+    @Override
+    public boolean isConnected() {
+        if (displayConnectionMessages)
+            aapsLogger.debug(LTag.PUMP, getLogPrefix() + "isConnected");
+        return isServiceSet() && isServiceInitialized();
+    }
+
+
+    @Override
+    public boolean isConnecting() {
+        if (displayConnectionMessages)
+            aapsLogger.debug(LTag.PUMP, getLogPrefix() + "isConnecting");
+        return !isServiceSet() || !isServiceInitialized();
+    }
+
+
+    @Override
+    public void getPumpStatus() {
+
+        if (firstRun) {
+            initializePump(!isRefresh);
+        }
+
+//        getPodPumpStatus();
+//
+//        if (firstRun) {
+//            initializePump(!isRefresh);
+//        } else {
+//            refreshAnyStatusThatNeedsToBeRefreshed();
+//        }
+//
+//        MainApp.bus().post(new EventMedtronicPumpValuesChanged());
+    }
+
+
+    public void resetStatusState() {
+        firstRun = true;
+        isRefresh = true;
+    }
+
+
+    private void setRefreshButtonEnabled(boolean enabled) {
+        rxBus.send(new EventOmnipodRefreshButtonState(enabled));
+    }
+
+
+    private void initializePump(boolean realInit) {
+
+        aapsLogger.info(LTag.PUMP, getLogPrefix() + "initializePump - start");
+
+        if (omnipodCommunicationManager == null) {
+            omnipodCommunicationManager = OmnipodDashCommunicationManager.getInstance();
+        }
+
+//        setRefreshButtonEnabled(false);
+//
+//        getPodPumpStatus();
+//
+//        if (isRefresh) {
+//            if (isPumpNotReachable()) {
+//                if (isLoggingEnabled())
+//                    LOG.error(getLogPrefix() + "initializePump::Pump unreachable.");
+//                MedtronicUtil.sendNotification(MedtronicNotificationType.PumpUnreachable);
+//
+//                setRefreshButtonEnabled(true);
+//
+//                return;
+//            }
+//
+//            MedtronicUtil.dismissNotification(MedtronicNotificationType.PumpUnreachable);
+//        }
+//
+//        this.pumpState = PumpDriverState.Connected;
+//
+//        pumpStatusLocal.setLastCommunicationToNow();
+//        setRefreshButtonEnabled(true);
+
+        // TODO need to read status and BasalProfile if pod inited and pod status and set correct commands enabled
+
+        if (!isRefresh) {
+            pumpState = PumpDriverState.Initialized;
+        }
+
+        if (!sentIdToFirebase) {
+            Bundle params = new Bundle();
+            params.putString("version", BuildConfig.VERSION);
+            //fabricPrivacy.logCustom().logEvent("OmnipodPumpInit", params);
+
+            sentIdToFirebase = true;
+        }
+
+        isInitialized = true;
+        // this.pumpState = PumpDriverState.Initialized;
+
+        this.firstRun = false;
+    }
+
+
+    protected void triggerUIChange() {
+        rxBus.send(new EventOmnipodPumpValuesChanged());
+    }
+
+
+    // OPERATIONS not supported by Pump or Plugin
+
+    //private List<CustomAction> customActions = null;
+
+
+    @Override
+    public List<CustomAction> getCustomActions() {
+
+        if (customActions == null) {
+            this.customActions = Arrays.asList(
+//                    customActionPairAndPrime, //
+//                    customActionFillCanullaSetBasalProfile, //
+//                    customActionDeactivatePod, //
+//                    customActionResetPod
+            );
+        }
+
+        return this.customActions;
+    }
+
+
+    @Override
+    public void timezoneOrDSTChanged(TimeChangeType timeChangeType) {
+
+//        if (isLoggingEnabled())
+//            LOG.warn(getLogPrefix() + "Time, Date and/or TimeZone changed. ");
+//
+//        this.hasTimeDateOrTimeZoneChanged = true;
+    }
+
+
+}

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/comm/OmnipodDashCommunicationManager.java

@@ -0,0 +1,127 @@
+package info.nightscout.androidaps.plugins.pump.omnipod_dash.comm;
+
+import android.content.Context;
+
+import info.nightscout.androidaps.data.DetailedBolusInfo;
+import info.nightscout.androidaps.data.Profile;
+import info.nightscout.androidaps.data.PumpEnactResult;
+import info.nightscout.androidaps.plugins.pump.common.data.TempBasalPair;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.ble.RFSpy;
+import info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response.podinfo.PodInfoRecentPulseLog;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.OmnipodCommunicationManagerInterface;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInitActionType;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodInitReceiver;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.state.PodSessionState;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
+
+/**
+ * Created by andy on 4.8.2019
+ */
+// TODO refactor to use dagger, just commented out errors
+public class OmnipodDashCommunicationManager implements OmnipodCommunicationManagerInterface {
+
+    // TODO Dagger
+
+//    private static final Logger LOG = LoggerFactory.getLogger(L.PUMPCOMM);
+
+    private static OmnipodDashCommunicationManager omnipodCommunicationManager;
+    private String errorMessage;
+
+
+    public OmnipodDashCommunicationManager(Context context, RFSpy rfspy) {
+        omnipodCommunicationManager = this;
+//        OmnipodUtil.getPumpStatus().previousConnection = SP.getLong(
+//                RileyLinkConst.Prefs.LastGoodDeviceCommunicationTime, 0L);
+    }
+
+    private PodSessionState getPodSessionState() {
+        return null;
+    }
+
+    public static OmnipodDashCommunicationManager getInstance() {
+        return omnipodCommunicationManager;
+    }
+
+    //@Override
+    protected void configurePumpSpecificSettings() {
+        //pumpStatus = OmnipodUtil.getPumpStatus();
+    }
+
+    public String getErrorResponse() {
+        return this.errorMessage;
+    }
+
+//    private boolean isLogEnabled() {
+//        return L.isEnabled(L.PUMPCOMM);
+//    }
+
+    @Override
+    public PumpEnactResult initPod(PodInitActionType podInitActionType, PodInitReceiver podInitReceiver, Profile profile) {
+        return null;
+    }
+
+    @Override
+    public PumpEnactResult getPodStatus() {
+        return null;
+    }
+
+    @Override
+    public PumpEnactResult deactivatePod(PodInitReceiver podInitReceiver) {
+        return null;
+    }
+
+    @Override
+    public PumpEnactResult setBasalProfile(Profile profile) {
+        return null;
+    }
+
+    @Override
+    public PumpEnactResult resetPodStatus() {
+        return null;
+    }
+
+    @Override
+    public PumpEnactResult setBolus(DetailedBolusInfo detailedBolusInfo) {
+        return null;
+    }
+
+    public PumpEnactResult setBolus(Double parameter, boolean isSmb) {
+        return null;
+    }
+
+    @Override
+    public PumpEnactResult cancelBolus() {
+        return null;
+    }
+
+    @Override
+    public PumpEnactResult setTemporaryBasal(TempBasalPair tbr) {
+        return null;
+    }
+
+    @Override
+    public PumpEnactResult cancelTemporaryBasal() {
+        return null;
+    }
+
+    @Override
+    public PumpEnactResult acknowledgeAlerts() {
+        return null;
+    }
+
+    @Override
+    public PumpEnactResult setTime() {
+        return null;
+    }
+
+    @Override
+    public void setPumpStatus(OmnipodPumpStatus pumpStatusLocal) {
+
+    }
+
+    @Override
+    public PodInfoRecentPulseLog readPulseLog() {
+        return null;
+    }
+
+}

app/src/main/java/info/nightscout/androidaps/plugins/pump/omnipod_dash/driver/OmnipodDashPumpStatus.java

@@ -0,0 +1,24 @@
+package info.nightscout.androidaps.plugins.pump.omnipod_dash.driver;
+
+import javax.inject.Inject;
+import javax.inject.Singleton;
+
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType;
+import info.nightscout.androidaps.plugins.pump.common.hw.rileylink.RileyLinkUtil;
+import info.nightscout.androidaps.plugins.pump.omnipod.driver.OmnipodPumpStatus;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
+import info.nightscout.androidaps.utils.sharedPreferences.SP;
+
+@Singleton
+public class OmnipodDashPumpStatus extends OmnipodPumpStatus {
+
+    @Inject
+    public OmnipodDashPumpStatus(ResourceHelper resourceHelper,
+                                 SP sp,
+                                 RxBusWrapper rxBus,
+                                 RileyLinkUtil rileyLinkUtil) {
+        super(resourceHelper, sp, rxBus, rileyLinkUtil);
+        this.pumpType = PumpType.Insulet_Omnipod_Dash;
+    }
+}

app/src/main/res/values/strings.xml

@@ -1881,13 +1881,16 @@
     <string name="omnipod_error_pod_not_attached">No active pod.</string>
 
     <string name="omnipod_driver_error_setup_action_verification_failed">Command verification failed.</string>
-    <string name="omnipod_driver_error_unexpected_exception_type">An unexpected error occured. Please report! (type: %1$s).</string>
+    <string name="omnipod_driver_error_unexpected_exception_type">An unexpected error occurred. Please report! (type: %1$s).</string>
     <string name="omnipod_driver_error_invalid_parameters">Communication failed: received invalid input parameters.</string>
-    <string name="omnipod_driver_error_communication_failed">Communication failed.</string>
+    <string name="omnipod_driver_error_communication_failed_timeout">Communication failed: timeout.</string>
+    <string name="omnipod_driver_error_communication_failed_unexpected_exception">Communication failed: an unexpected error occurred. Please report!</string>
     <string name="omnipod_driver_error_crc_mismatch">Communication failed: message integrity verification failed.</string>
     <string name="omnipod_driver_error_invalid_packet_type">Communication failed: received an invalid packet from the Pod.</string>
     <string name="omnipod_driver_error_invalid_progress_state">Communication failed: the Pod is in a wrong state.</string>
     <string name="omnipod_driver_error_invalid_response">Communication failed: received an invalid response from the Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_sequence_number">Communication failed: received a message with an invalid sequence number from the Pod.</string>
+    <string name="omnipod_driver_error_invalid_message_address">Communication failed: received a message with an invalid address from the Pod.</string>
     <string name="omnipod_driver_error_message_decoding_failed">Communication failed: failed to decode message from the Pod.</string>
     <string name="omnipod_driver_error_nonce_resync_failed">Communication failed: nonce resync failed.</string>
     <string name="omnipod_driver_error_nonce_out_of_sync">Communication failed: nonce out of sync.</string>

app/src/main/res/xml/pref_omnipod.xml

@@ -1,15 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    <PreferenceCategory android:title="@string/omnipod_name">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
-        <info.nightscout.androidaps.plugins.pump.common.ui.RileyLinkSelectPreference
+    <PreferenceCategory
-            android:id="@+id/rileylink_mac_address_omnipod"
+        android:title="@string/omnipod_name"
+        app:initialExpandedChildrenCount="0">
+
+        <Preference
             android:enabled="true"
+            android:key="@string/key_rileylink_mac_address"
             android:summary=""
-            android:title="RileyLink Configuration"
+            android:title="RileyLink Configuration">
-            android:key="@string/key_rileylink_mac_address">
             <intent android:action="info.nightscout.androidaps.plugins.PumpCommon.dialog.RileyLinkBLEScanActivity" />
-        </info.nightscout.androidaps.plugins.pump.common.ui.RileyLinkSelectPreference>
+        </Preference>
 
         <SwitchPreference
             android:defaultValue="true"
@@ -42,4 +45,4 @@
             android:title="@string/omnipod_config_timechange_enabled" />
 
     </PreferenceCategory>
-</PreferenceScreen>
+</androidx.preference.PreferenceScreen>

app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/command/SetupPodCommandTest.java

@@ -7,10 +7,10 @@ import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 
 import static org.junit.Assert.assertArrayEquals;
 
-public class ConfigurePodCommandTest {
+public class SetupPodCommandTest {
     @Test
     public void testEncoding() {
-        ConfigurePodCommand configurePodCommand = new ConfigurePodCommand( //
+        SetupPodCommand setupPodCommand = new SetupPodCommand( //
                 0x1f00ee87, //
                 new DateTime(2013, 4, 5, 22, 52, 0), //
                 41847,  //
@@ -18,7 +18,7 @@ public class ConfigurePodCommandTest {
 
         assertArrayEquals( //
                 ByteUtil.fromHexString("03131f00ee87140404050d16340000a3770003ab37"), // From https://github.com/openaps/openomni/wiki/Command-03-Setup-Pod
-                configurePodCommand.getRawData());
+                setupPodCommand.getRawData());
     }
 
     // TODO add tests

app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/ErrorResponseTest.java

@@ -3,7 +3,8 @@ package info.nightscout.androidaps.plugins.pump.omnipod.comm.message.response;
 import org.junit.Test;
 
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.ErrorResponseType;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventCode;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodProgressStatus;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
@@ -33,14 +34,19 @@ public class ErrorResponseTest {
         byte[] encodedData = ByteUtil.fromHexString("060314fa92");
 
         ErrorResponse errorResponse = new ErrorResponse(encodedData);
-        assertEquals(ErrorResponseType.BAD_NONCE, errorResponse.getErrorResponseType());
+        assertEquals(ErrorResponse.ERROR_RESPONSE_CODE_BAD_NONCE, errorResponse.getErrorResponseCode());
-        // TODO add assertion one nonce search key (obtain captures first)
+        // TODO add assertion on nonce search key (obtain captures first)
+        assertNull(errorResponse.getFaultEventCode());
+        assertNull(errorResponse.getPodProgressStatus());
     }
 
     @Test
-    public void testUnknownError() {
+    public void testOtherError() {
-        ErrorResponse errorResponse = new ErrorResponse(ByteUtil.fromHexString("060307fa92"));
+        ErrorResponse errorResponse = new ErrorResponse(ByteUtil.fromHexString("0603101308"));
+        assertEquals(0x10, errorResponse.getErrorResponseCode());
+        assertEquals(FaultEventCode.MESSAGE_LENGTH_TOO_LONG, errorResponse.getFaultEventCode());
+        assertEquals(PodProgressStatus.ABOVE_FIFTY_UNITS, errorResponse.getPodProgressStatus());
 
-        assertNull(errorResponse.getErrorResponseType());
+        assertNull(errorResponse.getNonceSearchKey());
     }
 }

app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/StatusResponseTest.java

@@ -42,7 +42,7 @@ public class StatusResponseTest {
         StatusResponse statusResponse = new StatusResponse(bytes);
 
         assertEquals(DeliveryStatus.NORMAL, statusResponse.getDeliveryStatus());
-        assertEquals(PodProgressStatus.RUNNING_ABOVE_FIFTY_UNITS, statusResponse.getPodProgressStatus());
+        assertEquals(PodProgressStatus.ABOVE_FIFTY_UNITS, statusResponse.getPodProgressStatus());
         assertNull("Reservoir level should be null", statusResponse.getReservoirLevel());
         assertEquals(Duration.standardMinutes(1307).getMillis(), statusResponse.getTimeActive().getMillis());
         assertEquals(60.05, statusResponse.getInsulinDelivered(), 0.000001);
@@ -59,7 +59,7 @@ public class StatusResponseTest {
         StatusResponse statusResponse = new StatusResponse(bytes);
 
         assertEquals(DeliveryStatus.NORMAL, statusResponse.getDeliveryStatus());
-        assertEquals(PodProgressStatus.RUNNING_BELOW_FIFTY_UNITS, statusResponse.getPodProgressStatus());
+        assertEquals(PodProgressStatus.FIFTY_OR_LESS_UNITS, statusResponse.getPodProgressStatus());
         assertEquals(24.4, statusResponse.getReservoirLevel(), 0.000001);
         assertEquals(Duration.standardMinutes(4261).getMillis(), statusResponse.getTimeActive().getMillis());
         assertEquals(156.7, statusResponse.getInsulinDelivered(), 0.000001);
@@ -93,7 +93,7 @@ public class StatusResponseTest {
 
         assertTrue(Duration.standardMinutes(3547).isEqual(statusResponse.getTimeActive()));
         assertEquals(DeliveryStatus.NORMAL, statusResponse.getDeliveryStatus());
-        assertEquals(PodProgressStatus.RUNNING_BELOW_FIFTY_UNITS, statusResponse.getPodProgressStatus());
+        assertEquals(PodProgressStatus.FIFTY_OR_LESS_UNITS, statusResponse.getPodProgressStatus());
         assertEquals(129.45, statusResponse.getInsulinDelivered(), 0.00001);
         assertEquals(46.00, statusResponse.getReservoirLevel(), 0.00001);
         assertEquals(2.2, statusResponse.getInsulinNotDelivered(), 0.0001);

app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/VersionResponseTest.java

@@ -7,10 +7,14 @@ import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodProgressStatus;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
 
 public class VersionResponseTest {
     @Test
-    public void testRawDataShortResponse() {
+    public void testRawDataAssignAddressVersionResponse() {
         byte[] encodedData = ByteUtil.fromHexString("011502070002070002020000a64000097c279c1f08ced2");
 
         VersionResponse versionResponse = new VersionResponse(encodedData);
@@ -18,7 +22,7 @@ public class VersionResponseTest {
     }
 
     @Test
-    public void testRawDataShortResponseWithLongerMessage() {
+    public void testRawDataAssignAddressVersionResponseWithLongerMessage() {
         byte[] encodedData = ByteUtil.fromHexString("011502070002070002020000a64000097c279c1f08ced201");
         byte[] expected = ByteUtil.fromHexString("011502070002070002020000a64000097c279c1f08ced2");
 
@@ -27,7 +31,7 @@ public class VersionResponseTest {
     }
 
     @Test
-    public void testRawDataLongResponse() {
+    public void testRawDataSetupPodVersionResponse() {
         byte[] encodedData = ByteUtil.fromHexString("011b13881008340a5002070002070002030000a3770003ab371f00ee87");
 
         VersionResponse versionResponse = new VersionResponse(encodedData);
@@ -36,7 +40,7 @@ public class VersionResponseTest {
     }
 
     @Test
-    public void testRawDataLongResponseWithLongerMessage() {
+    public void testRawDataSetupPodVersionResponseWithLongerMessage() {
         byte[] encodedData = ByteUtil.fromHexString("011b13881008340a5002070002070002030000a3770003ab371f00ee8701");
         byte[] expected = ByteUtil.fromHexString("011b13881008340a5002070002070002030000a3770003ab371f00ee87");
 
@@ -45,25 +49,33 @@ public class VersionResponseTest {
     }
 
     @Test
-    public void testVersionResponse() {
+    public void testAssignAddressVersionResponse() {
         VersionResponse versionResponse = new VersionResponse(ByteUtil.fromHexString("011502070002070002020000a64000097c279c1f08ced2"));
 
+        assertTrue(versionResponse.isAssignAddressVersionResponse());
+        assertFalse(versionResponse.isSetupPodVersionResponse());
         assertEquals(0x1f08ced2, versionResponse.getAddress());
         assertEquals(42560, versionResponse.getLot());
         assertEquals(621607, versionResponse.getTid());
         assertEquals("2.7.0", versionResponse.getPiVersion().toString());
         assertEquals("2.7.0", versionResponse.getPmVersion().toString());
+        assertNotNull(versionResponse.getRssi());
+        assertNotNull(versionResponse.getGain());
     }
 
     @Test
-    public void testLongVersionResponse() {
+    public void testSetupPodVersionResponse() {
         VersionResponse versionResponse = new VersionResponse(ByteUtil.fromHexString("011b13881008340a5002070002070002030000a3770003ab371f00ee87"));
 
+        assertFalse(versionResponse.isAssignAddressVersionResponse());
+        assertTrue(versionResponse.isSetupPodVersionResponse());
         assertEquals(0x1f00ee87, versionResponse.getAddress());
         assertEquals(41847, versionResponse.getLot());
         assertEquals(240439, versionResponse.getTid());
-        assertEquals(PodProgressStatus.PAIRING_SUCCESS, versionResponse.getPodProgressStatus());
+        assertEquals(PodProgressStatus.PAIRING_COMPLETED, versionResponse.getPodProgressStatus());
         assertEquals("2.7.0", versionResponse.getPiVersion().toString());
         assertEquals("2.7.0", versionResponse.getPmVersion().toString());
+        assertNull(versionResponse.getRssi());
+        assertNull(versionResponse.getGain());
     }
 }

app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoDataLogTest.java

@@ -4,7 +4,7 @@ import org.joda.time.Duration;
 import org.junit.Test;
 
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventType;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventCode;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -14,7 +14,7 @@ public class PodInfoDataLogTest {
     public void testDecoding() {
         PodInfoDataLog podInfoDataLog = new PodInfoDataLog(ByteUtil.fromHexString("030100010001043c"), 8); // From https://github.com/ps2/rileylink_ios/blob/omnipod-testing/OmniKitTests/PodInfoTests.swift
 
-        assertEquals(FaultEventType.FAILED_FLASH_ERASE, podInfoDataLog.getFaultEventType());
+        assertEquals(FaultEventCode.FAILED_FLASH_ERASE, podInfoDataLog.getFaultEventCode());
         assertTrue(Duration.standardMinutes(1).isEqual(podInfoDataLog.getTimeFaultEvent()));
         assertTrue(Duration.standardMinutes(1).isEqual(podInfoDataLog.getTimeSinceActivation()));
         assertEquals(4, podInfoDataLog.getDataChunkSize());

app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultAndInitializationTimeTest.java

@@ -5,7 +5,7 @@ import org.joda.time.Duration;
 import org.junit.Test;
 
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventType;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventCode;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -15,7 +15,7 @@ public class PodInfoFaultAndInitializationTimeTest {
     public void testDecoding() {
         PodInfoFaultAndInitializationTime podInfoFaultAndInitializationTime = new PodInfoFaultAndInitializationTime(ByteUtil.fromHexString("059200010000000000000000091912170e")); // From https://github.com/ps2/rileylink_ios/blob/omnipod-testing/OmniKitTests/PodInfoTests.swift
 
-        assertEquals(FaultEventType.BAD_PUMP_REQ_2_STATE, podInfoFaultAndInitializationTime.getFaultEventType());
+        assertEquals(FaultEventCode.BAD_PUMP_REQ_2_STATE, podInfoFaultAndInitializationTime.getFaultEventCode());
         assertTrue(Duration.standardMinutes(1).isEqual(podInfoFaultAndInitializationTime.getTimeFaultEvent()));
 
         DateTime dateTime = podInfoFaultAndInitializationTime.getInitializationTime();

app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/comm/message/response/podinfo/PodInfoFaultEventTest.java

@@ -5,7 +5,7 @@ import org.junit.Test;
 
 import info.nightscout.androidaps.plugins.pump.common.utils.ByteUtil;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.DeliveryStatus;
-import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventType;
+import info.nightscout.androidaps.plugins.pump.omnipod.defs.FaultEventCode;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.LogEventErrorCode;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.PodProgressStatus;
 
@@ -20,11 +20,11 @@ public class PodInfoFaultEventTest {
     public void testPodInfoFaultEventNoFaultAlerts() {
         PodInfoFaultEvent podInfoFaultEvent = new PodInfoFaultEvent(ByteUtil.fromHexString("02080100000a003800000003ff008700000095ff0000"));
 
-        assertEquals(PodProgressStatus.RUNNING_ABOVE_FIFTY_UNITS, podInfoFaultEvent.getPodProgressStatus());
+        assertEquals(PodProgressStatus.ABOVE_FIFTY_UNITS, podInfoFaultEvent.getPodProgressStatus());
         assertEquals(DeliveryStatus.NORMAL, podInfoFaultEvent.getDeliveryStatus());
         assertEquals(0, podInfoFaultEvent.getInsulinNotDelivered(), 0.000001);
         assertEquals(0x0a, podInfoFaultEvent.getPodMessageCounter());
-        assertEquals(FaultEventType.NO_FAULTS, podInfoFaultEvent.getFaultEventType());
+        assertEquals(FaultEventCode.NO_FAULTS, podInfoFaultEvent.getFaultEventCode());
         assertTrue(Duration.ZERO.isEqual(podInfoFaultEvent.getFaultEventTime()));
         assertNull(podInfoFaultEvent.getReservoirLevel());
         assertTrue(Duration.standardSeconds(8100).isEqual(podInfoFaultEvent.getTimeSinceActivation()));
@@ -44,14 +44,14 @@ public class PodInfoFaultEventTest {
         assertEquals(DeliveryStatus.SUSPENDED, podInfoFaultEvent.getDeliveryStatus());
         assertEquals(0, podInfoFaultEvent.getInsulinNotDelivered(), 0.000001);
         assertEquals(0x09, podInfoFaultEvent.getPodMessageCounter());
-        assertEquals(FaultEventType.PRIME_OPEN_COUNT_TOO_LOW, podInfoFaultEvent.getFaultEventType());
+        assertEquals(FaultEventCode.PRIME_OPEN_COUNT_TOO_LOW, podInfoFaultEvent.getFaultEventCode());
         assertTrue(Duration.standardSeconds(60).isEqual(podInfoFaultEvent.getFaultEventTime()));
         assertNull(podInfoFaultEvent.getReservoirLevel());
         assertTrue(Duration.standardSeconds(60).isEqual(podInfoFaultEvent.getTimeSinceActivation()));
         assertEquals(0, podInfoFaultEvent.getUnacknowledgedAlerts().getRawValue());
         assertFalse(podInfoFaultEvent.isFaultAccessingTables());
         assertEquals(LogEventErrorCode.NONE, podInfoFaultEvent.getLogEventErrorType());
-        assertEquals(PodProgressStatus.READY_FOR_BASAL_SCHEDULE, podInfoFaultEvent.getPodProgressStatusAtTimeOfFirstLoggedFaultEvent());
+        assertEquals(PodProgressStatus.PRIMING_COMPLETED, podInfoFaultEvent.getPodProgressStatusAtTimeOfFirstLoggedFaultEvent());
         assertEquals(2, podInfoFaultEvent.getReceiverLowGain());
         assertEquals(46, podInfoFaultEvent.getRadioRSSI());
     }
@@ -65,13 +65,13 @@ public class PodInfoFaultEventTest {
         assertEquals(101.7, podInfoFaultEvent.getTotalInsulinDelivered(), 0.000001);
         assertEquals(0, podInfoFaultEvent.getInsulinNotDelivered(), 0.000001);
         assertEquals(0x04, podInfoFaultEvent.getPodMessageCounter());
-        assertEquals(FaultEventType.BASAL_OVER_INFUSION_PULSE, podInfoFaultEvent.getFaultEventType());
+        assertEquals(FaultEventCode.BASAL_OVER_INFUSION_PULSE, podInfoFaultEvent.getFaultEventCode());
         assertTrue(Duration.standardMinutes(2559).isEqual(podInfoFaultEvent.getFaultEventTime()));
         assertNull(podInfoFaultEvent.getReservoirLevel());
         assertEquals(0, podInfoFaultEvent.getUnacknowledgedAlerts().getRawValue());
         assertFalse(podInfoFaultEvent.isFaultAccessingTables());
         assertEquals(LogEventErrorCode.NONE, podInfoFaultEvent.getLogEventErrorType());
-        assertEquals(PodProgressStatus.RUNNING_ABOVE_FIFTY_UNITS, podInfoFaultEvent.getPodProgressStatusAtTimeOfFirstLoggedFaultEvent());
+        assertEquals(PodProgressStatus.ABOVE_FIFTY_UNITS, podInfoFaultEvent.getPodProgressStatusAtTimeOfFirstLoggedFaultEvent());
         assertEquals(0, podInfoFaultEvent.getReceiverLowGain());
         assertEquals(35, podInfoFaultEvent.getRadioRSSI());
     }
@@ -85,13 +85,13 @@ public class PodInfoFaultEventTest {
         assertEquals(11.8, podInfoFaultEvent.getTotalInsulinDelivered(), 0.000001);
         assertEquals(0.05, podInfoFaultEvent.getInsulinNotDelivered(), 0.000001);
         assertEquals(0x02, podInfoFaultEvent.getPodMessageCounter());
-        assertEquals(FaultEventType.OCCLUSION_CHECK_ABOVE_THRESHOLD, podInfoFaultEvent.getFaultEventType());
+        assertEquals(FaultEventCode.OCCLUSION_CHECK_ABOVE_THRESHOLD, podInfoFaultEvent.getFaultEventCode());
         assertTrue(Duration.standardMinutes(616).isEqual(podInfoFaultEvent.getFaultEventTime()));
         assertNull(podInfoFaultEvent.getReservoirLevel());
         assertEquals(0, podInfoFaultEvent.getUnacknowledgedAlerts().getRawValue());
         assertFalse(podInfoFaultEvent.isFaultAccessingTables());
         assertEquals(LogEventErrorCode.INTERNAL_2_BIT_VARIABLE_SET_AND_MANIPULATED_IN_MAIN_LOOP_ROUTINES_2, podInfoFaultEvent.getLogEventErrorType());
-        assertEquals(PodProgressStatus.RUNNING_ABOVE_FIFTY_UNITS, podInfoFaultEvent.getPodProgressStatusAtTimeOfFirstLoggedFaultEvent());
+        assertEquals(PodProgressStatus.ABOVE_FIFTY_UNITS, podInfoFaultEvent.getPodProgressStatusAtTimeOfFirstLoggedFaultEvent());
         assertEquals(2, podInfoFaultEvent.getReceiverLowGain());
         assertEquals(39, podInfoFaultEvent.getRadioRSSI());
     }
@@ -105,13 +105,13 @@ public class PodInfoFaultEventTest {
         assertEquals(11.8, podInfoFaultEvent.getTotalInsulinDelivered(), 0.000001);
         assertEquals(3276.75, podInfoFaultEvent.getInsulinNotDelivered(), 0.000001); // Insane and will not happen, but this verifies that we convert it to an unsigned int
         assertEquals(0x02, podInfoFaultEvent.getPodMessageCounter());
-        assertEquals(FaultEventType.OCCLUSION_CHECK_ABOVE_THRESHOLD, podInfoFaultEvent.getFaultEventType());
+        assertEquals(FaultEventCode.OCCLUSION_CHECK_ABOVE_THRESHOLD, podInfoFaultEvent.getFaultEventCode());
         assertTrue(Duration.standardMinutes(616).isEqual(podInfoFaultEvent.getFaultEventTime()));
         assertNull(podInfoFaultEvent.getReservoirLevel());
         assertEquals(0, podInfoFaultEvent.getUnacknowledgedAlerts().getRawValue());
         assertFalse(podInfoFaultEvent.isFaultAccessingTables());
         assertEquals(LogEventErrorCode.INTERNAL_2_BIT_VARIABLE_SET_AND_MANIPULATED_IN_MAIN_LOOP_ROUTINES_2, podInfoFaultEvent.getLogEventErrorType());
-        assertEquals(PodProgressStatus.RUNNING_ABOVE_FIFTY_UNITS, podInfoFaultEvent.getPodProgressStatusAtTimeOfFirstLoggedFaultEvent());
+        assertEquals(PodProgressStatus.ABOVE_FIFTY_UNITS, podInfoFaultEvent.getPodProgressStatusAtTimeOfFirstLoggedFaultEvent());
         assertEquals(2, podInfoFaultEvent.getReceiverLowGain());
         assertEquals(39, podInfoFaultEvent.getRadioRSSI());
     }

app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/defs/state/PodSessionStateTest.java

@@ -5,38 +5,20 @@ import org.joda.time.DateTimeUtils;
 import org.joda.time.DateTimeZone;
 import org.joda.time.Duration;
 import org.junit.After;
-import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.mockito.Mock;
-import org.powermock.core.classloader.annotations.PrepareForTest;
-import org.powermock.modules.junit4.PowerMockRunner;
-
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.MainApp;
-import info.nightscout.androidaps.logging.L;
 import info.nightscout.androidaps.plugins.pump.omnipod.defs.FirmwareVersion;
-//import info.nightscout.androidaps.testing.mockers.AAPSMocker;
-import info.nightscout.androidaps.utils.SP;
 
 import static org.junit.Assert.assertEquals;
 
-@Ignore("Not Dagger compliant")
-@RunWith(PowerMockRunner.class)
-@PrepareForTest({MainApp.class, SP.class, L.class})
 public class PodSessionStateTest {
-//    @Before
-//    public void setup() {
-////        AAPSMocker.mockMainApp();
-////        AAPSMocker.mockApplicationContext();
-////        AAPSMocker.mockSP();
-//    }
-
     @Mock HasAndroidInjector hasAndroidInjector;
 
-    //@Test
+    @Test
+    @Ignore("Not Dagger compliant") // FIXME
     public void times() {
         DateTimeZone timeZone = DateTimeZone.UTC;
         DateTimeZone.setDefault(timeZone);
@@ -55,7 +37,8 @@ public class PodSessionStateTest {
         assertEquals(Duration.standardHours(1).plus(Duration.standardMinutes(2).plus(Duration.standardSeconds(3))), podSessionState.getScheduleOffset());
     }
 
-    //@Test
+    @Test
+    @Ignore("Not Dagger compliant") // FIXME
     public void changeSystemTimeZoneWithoutChangingPodTimeZone() {
         DateTimeZone timeZone = DateTimeZone.UTC;
         DateTimeZone.setDefault(timeZone);
@@ -79,7 +62,8 @@ public class PodSessionStateTest {
         assertEquals(Duration.standardHours(1).plus(Duration.standardMinutes(2).plus(Duration.standardSeconds(3))), podSessionState.getScheduleOffset());
     }
 
-    //@Test
+    @Test
+    @Ignore("Not Dagger compliant") // FIXME
     public void changeSystemTimeZoneAndChangePodTimeZone() {
         DateTimeZone timeZone = DateTimeZone.UTC;
         DateTimeZone.setDefault(timeZone);
@@ -104,8 +88,8 @@ public class PodSessionStateTest {
         assertEquals(Duration.standardHours(3).plus(Duration.standardMinutes(2).plus(Duration.standardSeconds(3))), podSessionState.getScheduleOffset());
     }
 
-//    @After
+    @After
-//    public void tearDown() {
+    public void tearDown() {
-//        DateTimeUtils.setCurrentMillisSystem();
+        DateTimeUtils.setCurrentMillisSystem();
-//    }
+    }
 }

app/src/test/java/info/nightscout/androidaps/plugins/pump/omnipod/driver/comm/AapsOmnipodManagerTest.java

@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.omnipod.driver.comm;
 
 import org.joda.time.Duration;
-import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.rules.ExpectedException;
@@ -16,12 +15,11 @@ import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.mock;
 import static org.powermock.api.mockito.PowerMockito.when;
 
-@Ignore("Not dev/dagger compliant. Needs to be fixed")
 public class AapsOmnipodManagerTest {
     @Rule
     public ExpectedException thrown = ExpectedException.none();
 
-    //@Test
+    @Test
     public void validProfile() {
         Profile profile = mock(Profile.class);
 
@@ -61,14 +59,14 @@ public class AapsOmnipodManagerTest {
         assertEquals(3.05D, entry3.getRate(), 0.000001);
     }
 
-    //@Test
+    @Test
     public void invalidProfileNullProfile() {
         thrown.expect(IllegalArgumentException.class);
         thrown.expectMessage("Profile can not be null");
         AapsOmnipodManager.mapProfileToBasalSchedule(null);
     }
 
-    //@Test
+    @Test
     public void invalidProfileNullEntries() {
         thrown.expect(IllegalArgumentException.class);
         thrown.expectMessage("Basal values can not be null");
@@ -86,15 +84,15 @@ public class AapsOmnipodManagerTest {
         AapsOmnipodManager.mapProfileToBasalSchedule(profile);
     }
 
-    //@Test
+    @Test
     public void invalidProfileNonZeroOffset() {
         thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("Invalid start time");
+        thrown.expectMessage("First basal schedule entry should have 0 offset");
 
         Profile profile = mock(Profile.class);
 
         Profile.ProfileValue value = mock(Profile.ProfileValue.class);
-        value.timeAsSeconds = 500;
+        value.timeAsSeconds = 1800;
         value.value = 0.5D;
 
         when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
@@ -104,7 +102,7 @@ public class AapsOmnipodManagerTest {
         AapsOmnipodManager.mapProfileToBasalSchedule(profile);
     }
 
-    //@Test
+    @Test
     public void invalidProfileMoreThan24Hours() {
         thrown.expect(IllegalArgumentException.class);
         thrown.expectMessage("Invalid start time");
@@ -127,7 +125,7 @@ public class AapsOmnipodManagerTest {
         AapsOmnipodManager.mapProfileToBasalSchedule(profile);
     }
 
-    //@Test
+    @Test
     public void invalidProfileNegativeOffset() {
         thrown.expect(IllegalArgumentException.class);
         thrown.expectMessage("Invalid start time");
@@ -145,21 +143,21 @@ public class AapsOmnipodManagerTest {
         AapsOmnipodManager.mapProfileToBasalSchedule(profile);
     }
 
-    //@Test
+    @Test
-    public void invalidProfileUnsupportedPrecision() {
+    public void roundsToSupportedPrecision() {
-        thrown.expect(IllegalArgumentException.class);
-        thrown.expectMessage("Unsupported basal rate precision");
-
         Profile profile = mock(Profile.class);
 
         Profile.ProfileValue value = mock(Profile.ProfileValue.class);
-        value.timeAsSeconds = 500;
+        value.timeAsSeconds = 0;
         value.value = 0.04D;
 
         when(profile.getBasalValues()).thenReturn(new Profile.ProfileValue[]{
                 value,
         });
 
-        AapsOmnipodManager.mapProfileToBasalSchedule(profile);
+        BasalSchedule basalSchedule = AapsOmnipodManager.mapProfileToBasalSchedule(profile);
+        BasalScheduleEntry basalScheduleEntry = basalSchedule.getEntries().get(0);
+
+        assertEquals(0.05D, basalScheduleEntry.getRate(), 0.000001);
     }
 }

core/src/main/java/info/nightscout/androidaps/logging/LTag.kt

@@ -18,7 +18,7 @@ enum class LTag(val tag: String, val defaultValue : Boolean = true, val requires
     NOTIFICATION("NOTIFICATION"),
     NSCLIENT("NSCLIENT"),
     PUMP("PUMP"),
-    PUMPBTCOMM("PUMPBTCOMM", defaultValue = false),
+    PUMPBTCOMM("PUMPBTCOMM", defaultValue = true),
     PUMPCOMM("PUMPCOMM"),
     PUMPQUEUE("PUMPQUEUE"),
     PROFILE("PROFILE"),