EOpatch -> :pump

app/build.gradle

@@ -189,6 +189,7 @@ dependencies {
     implementation project(':pump:danars')
     implementation project(':pump:danar')
     implementation project(':pump:diaconn')
+    implementation project(':pump:eopatch')
     implementation project(':insight')
     implementation project(':pump:medtronic')
     implementation project(':pump:pump-common')
@@ -198,7 +199,6 @@ dependencies {
     implementation project(':pump:omnipod-dash')
     implementation project(':automation')
     implementation project(':openhumans')
-    implementation project(':eopatch')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 

app/src/main/java/info/nightscout/androidaps/di/AppComponent.kt

@@ -70,7 +70,7 @@ import javax.inject.Singleton
         WorkersModule::class,
         DiaconnG8Module::class,
         OpenHumansModule::class,
-        SharedModule::class
+        SharedModule::class,
         EopatchModule::class,
         SharedModule::class,
         UiModule::class,

crowdin.yml

@@ -43,8 +43,8 @@ files:
     translation: /insight/src/main/res/values-%android_code%/exceptions.xml
   - source: /automation/src/main/res/values/strings.xml
     translation: /automation/src/main/res/values-%android_code%/strings.xml
-  - source: /eopatch/src/main/res/values/strings.xml
-    translation: /eopatch/src/main/res/values-%android_code%/strings.xml
+  - source: /pump/eopatch/src/main/res/values/strings.xml
+    translation: /pump/eopatch/src/main/res/values-%android_code%/strings.xml
   - source: /pump/diaconn/src/main/res/values/strings.xml
     translation: /pump/diaconn/src/main/res/values-%android_code%/strings.xml
   - source: /pump/pump-common/src/main/res/values/strings.xml

pump/eopatch/build.gradle

@@ -19,9 +19,10 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation (files("libs/eopatch_core.aar"))
-    implementation project(':core')
+    implementation project(':libraries')
     implementation project(':shared')
     implementation project(':database')
+    implementation project(':core')
 
     //RxAndroidBle
     implementation "com.polidea.rxandroidble3:rxandroidble:1.16.0"

pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/EopatchPumpPlugin.kt

@@ -199,7 +199,7 @@ class EopatchPumpPlugin @Inject constructor(
 
                 disposable.dispose()
                 aapsLogger.info(LTag.PUMP, "Basal Profile was set: ${isSuccess?:false}")
-                if(isSuccess?:false) {
+                if(isSuccess == true) {
                     rxBus.send(EventNewNotification(Notification(Notification.PROFILE_SET_OK, rh.gs(R.string.profile_set_ok), Notification.INFO, 60)))
                     return PumpEnactResult(injector).success(true).enacted(true)
                 }else{

pump/eopatch/src/main/java/info/nightscout/androidaps/plugins/pump/eopatch/alarm/AlarmManager.kt

@@ -2,7 +2,6 @@ package info.nightscout.androidaps.plugins.pump.eopatch.alarm
 
 import android.content.Context
 import android.content.Intent
-import android.util.Log
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueue
 import info.nightscout.androidaps.interfaces.PumpSync
@@ -14,7 +13,12 @@ import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.plugins.pump.eopatch.EONotification
 import info.nightscout.androidaps.plugins.pump.eopatch.EoPatchRxBus
 import info.nightscout.androidaps.plugins.pump.eopatch.R
-import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode.*
+import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode.A005
+import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode.A016
+import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode.A020
+import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode.B000
+import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode.B001
+import info.nightscout.androidaps.plugins.pump.eopatch.alarm.AlarmCode.B012
 import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPatchManager
 import info.nightscout.androidaps.plugins.pump.eopatch.ble.IPreferenceManager
 import info.nightscout.androidaps.plugins.pump.eopatch.code.AlarmCategory