diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
index 24dadb14d1..544580925a 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -7,7 +7,7 @@ import dagger.android.AndroidInjector
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.core.di.CoreModule
 import info.nightscout.androidaps.dana.di.DanaModule
-import info.nightscout.androidaps.danar.di.DanaRServicesModule
+import info.nightscout.androidaps.danar.di.DanaRModule
 import info.nightscout.androidaps.danars.di.DanaRSModule
 import javax.inject.Singleton
 
@@ -35,7 +35,7 @@ import javax.inject.Singleton
         UIModule::class,
         CoreModule::class,
         DanaModule::class,
-        DanaRServicesModule::class,
+        DanaRModule::class,
         DanaRSModule::class
     ]
 )
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt
index 4716a22dca..fe42eb0305 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_EventsTest.kt
@@ -60,9 +60,6 @@ class DanaRS_Packet_APS_History_EventsTest : DanaRSTestBase() {
         Assert.assertEquals(expectedValues[4], returnedValues[4])
         // second
         Assert.assertEquals(expectedValues[5], returnedValues[5])
-        // test message decoding
-        testPacket.handleMessage(createArray(50, 0.toByte()))
-        Assert.assertEquals(false, testPacket.failed)
         Assert.assertEquals("APS_HISTORY_EVENTS", testPacket.friendlyName)
     }
 
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
index 5b86df3888..04afc60cf6 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaPump
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -26,7 +27,7 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_ArrayTest : DanaRSTestBase() {
         // test message decoding
         packet.handleMessage(createArray(34, 0.toByte()))
         // are pump units MG/DL ???
-        Assert.assertEquals(info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL, danaPump.units)
+        Assert.assertEquals(DanaPump.UNITS_MGDL, danaPump.units)
         Assert.assertEquals(false, packet.failed)
         packet.handleMessage(createArray(34, 3.toByte()))
         Assert.assertEquals(true, packet.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
index 1b8ff9c3bc..21716b37c8 100644
--- a/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_General_Get_Shipping_InformationTest.kt
@@ -31,8 +31,6 @@ class DanaRS_Packet_General_Get_Shipping_InformationTest : DanaRSTestBase() {
         Assert.assertEquals(true, packet.failed)
         // everything ok :)
         packet = DanaRS_Packet_General_Get_Shipping_Information(packetInjector)
-        packet.handleMessage(createArray(18, 0.toByte()))
-        Assert.assertEquals(false, packet.failed)
         Assert.assertEquals("REVIEW__GET_SHIPPING_INFORMATION", packet.friendlyName)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
index 44da056f3c..602274a128 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/DanaRTestBase.kt
@@ -3,18 +3,26 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.TestBase
-import info.nightscout.androidaps.db.TemporaryBasal
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.interfaces.TreatmentsInterface
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.db.TemporaryBasal
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.sharedPreferences.SP
 import org.junit.Before
 import org.mockito.Mock
 import org.mockito.Mockito.`when`
+import org.powermock.core.classloader.annotations.PrepareForTest
 
+@PrepareForTest(DetailedBolusInfoStorage::class, ConstraintChecker::class)
 open class DanaRTestBase : TestBase() {
 
     @Mock lateinit var sp: SP
@@ -23,6 +31,15 @@ open class DanaRTestBase : TestBase() {
     @Mock lateinit var dateUtil: DateUtil
     @Mock lateinit var databaseHelper: DatabaseHelperInterface
     @Mock lateinit var treatmentsInterface: TreatmentsInterface
+    @Mock lateinit var danaRPlugin: DanaRPlugin
+    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
+    @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
+    @Mock lateinit var resourceHelper: ResourceHelper
+    @Mock lateinit var configBuilder: ConfigBuilderInterface
+    @Mock lateinit var commandQueue: CommandQueueProvider
+    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    @Mock lateinit var constraintChecker: ConstraintChecker
+    @Mock lateinit var nsUpload: NSUpload
 
     @Before
     fun prepareMock() {
@@ -31,6 +48,23 @@ open class DanaRTestBase : TestBase() {
 
     val injector = HasAndroidInjector {
         AndroidInjector {
+            if (it is MessageBase) {
+                it.aapsLogger = aapsLogger
+                it.dateUtil = dateUtil
+                it.danaPump = danaPump
+                it.danaRPlugin = danaRPlugin
+                it.danaRKoreanPlugin = danaRKoreanPlugin
+                it.danaRv2Plugin = danaRv2Plugin
+                it.rxBus = RxBusWrapper()
+                it.resourceHelper = resourceHelper
+                it.activePlugin = activePluginProvider
+                it.configBuilder = configBuilder
+                it.detailedBolusInfoStorage = detailedBolusInfoStorage
+                it.constraintChecker = constraintChecker
+                it.nsUpload = nsUpload
+                it.databaseHelper = databaseHelper
+                it.commandQueue = commandQueue
+            }
             if (it is TemporaryBasal) {
                 it.aapsLogger = aapsLogger
                 it.activePlugin = activePluginProvider
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
index 9aa7f2dad3..a80a581bec 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MessageHashTableRTest.kt
@@ -1,22 +1,13 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.MessageHashTableR
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -25,21 +16,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class, ConfigBuilderPlugin::class)
 class MessageHashTableRTest : DanaRTestBase() {
 
-    @Mock lateinit var rxBus: RxBusWrapper
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var constraintChecker: ConstraintChecker
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
-    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
-    @Mock lateinit var commandQueue: CommandQueueProvider
-    @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
-    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
-    @Mock lateinit var nsUpload: NSUpload
 
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTable = MessageHashTableR(aapsLogger, rxBus, resourceHelper, constraintChecker, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, nsUpload, injector, databaseHelper, dateUtil)
+        val messageHashTable = MessageHashTableR(injector)
         val testMessage = messageHashTable.findMessage(0x41f2)
         Assert.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
index a6b6f246d9..1eec5b7473 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusProgressTest.kt
@@ -5,27 +5,22 @@ import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.danar.comm.MsgBolusProgress
 import info.nightscout.androidaps.db.Treatment
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.ArgumentMatchers
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 class MsgBolusProgressTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    val rxBus = RxBusWrapper()
 
     @Test fun runTest() {
         `when`(resourceHelper.gs(ArgumentMatchers.eq(R.string.bolusdelivering), ArgumentMatchers.anyDouble())).thenReturn("Delivering %1\$.2fU")
         danaPump.bolusingTreatment = Treatment(HasAndroidInjector { AndroidInjector { } })
         danaPump.bolusAmountToBeDelivered = 3.0
-        val packet = MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaPump)
+        val packet = MsgBolusProgress(injector)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
index e5693f33a2..da5a814bad 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartTest.kt
@@ -6,7 +6,6 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -15,11 +14,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConstraintChecker::class)
 class MsgBolusStartTest : DanaRTestBase() {
 
-    @Mock lateinit var constraintChecker: ConstraintChecker
-
     @Test fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(Constraint(anyObject()))).thenReturn(Constraint(0.0))
-        val packet = MsgBolusStart(aapsLogger, constraintChecker, danaPump, 1.0)
+        val packet = MsgBolusStart(injector, 1.0)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
index bd4f6ca35c..6c89a58db0 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStartWithSpeedTest.kt
@@ -6,7 +6,6 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -15,11 +14,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConstraintChecker::class)
 class MsgBolusStartWithSpeedTest : DanaRTestBase() {
 
-    @Mock lateinit var constraintChecker: ConstraintChecker
-
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(Constraint(anyObject()))).thenReturn(Constraint(0.0))
-        val packet = MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, 0.0, 0)
+        val packet = MsgBolusStartWithSpeed(injector, 0.0, 0)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
index 45281f2797..d1b353c259 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgBolusStopTest.kt
@@ -4,26 +4,20 @@ import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.R
 import info.nightscout.androidaps.danar.comm.MsgBolusStop
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.db.Treatment
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 class MsgBolusStopTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    val rxBus = RxBusWrapper()
-
     @Test fun runTest() {
         `when`(resourceHelper.gs(R.string.overview_bolusprogress_delivered)).thenReturn("Delivered")
         danaPump.bolusingTreatment = Treatment(HasAndroidInjector { AndroidInjector { } })
-        val packet = MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump)
+        val packet = MsgBolusStop(injector)
 
         // test message decoding
         packet.handleMessage(ByteArray(100))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
index 3faa03b87e..be0165938f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgCheckValueTest.kt
@@ -1,25 +1,22 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgCheckValue
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 class MsgCheckValueTest : DanaRTestBase() {
 
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-
     @Test fun runTest() {
-        val packet = MsgCheckValue(aapsLogger, danaPump, danaRPlugin)
+        val packet = MsgCheckValue(injector)
 
         // test message decoding
         val array = ByteArray(100)
-        putByteToArray(array, 0, info.nightscout.androidaps.dana.DanaPump.EXPORT_MODEL.toByte())
+        putByteToArray(array, 0, DanaPump.EXPORT_MODEL.toByte())
         packet.handleMessage(array)
-        Assert.assertEquals(info.nightscout.androidaps.dana.DanaPump.EXPORT_MODEL, danaPump.hwModel)
+        Assert.assertEquals(DanaPump.EXPORT_MODEL, danaPump.hwModel)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
index 4ccc113fa4..a67bad6612 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgErrorTest.kt
@@ -1,13 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgError
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.api.mockito.PowerMockito
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -16,13 +13,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(NSUpload::class)
 class MsgErrorTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var nsUpload: NSUpload
-    val rxBus = RxBusWrapper()
-
     @Test fun runTest() {
         PowerMockito.mockStatic(NSUpload::class.java)
-        val packet = MsgError(aapsLogger, rxBus, resourceHelper, danaPump, nsUpload)
+        val packet = MsgError(injector)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
index ffea0e4dbe..1f3154a95f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAlarmTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryAlarm
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -9,10 +8,8 @@ import org.powermock.modules.junit4.PowerMockRunner
 @RunWith(PowerMockRunner::class)
 class MsgHistoryAlarmTest : DanaRTestBase() {
 
-    val rxBus = RxBusWrapper()
-
     @Test fun runTest() {
-        val packet = MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper)
+        val packet = MsgHistoryAlarm(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
index e9cb529359..0e45e40cc6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllDoneTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryAllDoneTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryAllDone(aapsLogger, danaPump)
+        val packet = MsgHistoryAllDone(injector)
 
         // test message decoding
         packet.handleMessage(ByteArray(0))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
index 7384ce84d7..cd95f1a530 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryAllTest.kt
@@ -3,7 +3,6 @@ package info.nightscout.androidaps.plugins.pump.danaR.comm
 import info.nightscout.androidaps.MainApp
 import info.nightscout.androidaps.danar.comm.MsgHistoryAll
 import info.nightscout.androidaps.db.DatabaseHelper
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -13,16 +12,13 @@ import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(MainApp::class)
 class MsgHistoryAllTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        PowerMockito.mockStatic(MainApp::class.java)
-        `when`(MainApp.getDbHelper()).thenReturn(PowerMockito.mock(DatabaseHelper::class.java))
-        val packet = MsgHistoryAll(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryAll(injector)
 
         // test message decoding
-        val array = ByteArray(100)
+        val array = createArray(100, 2)
 
         putByteToArray(array, 0, 1)
         packet.handleMessage(array)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
index 79ec7d8fdc..05022714fd 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBasalHourTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryBasalHour
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryBasalHourTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryBasalHour(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryBasalHour(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
index 9852196047..cbeabe16d1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryBolusTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryBolus
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryBolusTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryBolus(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryBolus(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
index e455a469ba..1433cb0470 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryCarboTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryCarbo
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryCarboTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryCarbo(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryCarbo(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
index 0d00fab90a..eae5d34e86 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDailyInsulinTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryDailyInsulin
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryDailyInsulinTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryDailyInsulin(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryDailyInsulin(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
index 50fa9b5b1d..86706531cf 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryDoneTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryDoneTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryDone(aapsLogger, danaPump)
+        val packet = MsgHistoryDone(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
index f13bcadec9..f2618a2bb7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryErrorTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryError
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryErrorTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryError(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryError(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
index bc3ab42785..3ec8c737dc 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryGlucoseTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryGlucose
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryGlucoseTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryGlucose(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryGlucose(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
index 3f350d3cb2..0bfceb6477 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewDoneTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryNewDoneTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryNewDone(aapsLogger, danaPump)
+        val packet = MsgHistoryNewDone(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
index daf56f0b10..229a21dde6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryNewTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryNew
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryNewTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryNew(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryNew(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
index fc6a9d3fbd..ccbb985ede 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistoryRefillTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistoryRefill
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistoryRefillTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistoryRefill(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistoryRefill(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
index dcc199df53..a45322f5b9 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgHistorySuspendTest.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgHistorySuspend
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
@@ -10,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgHistorySuspendTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgHistorySuspend(aapsLogger, RxBusWrapper(), dateUtil, databaseHelper)
+        val packet = MsgHistorySuspend(injector)
         // nothing left to test
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
index 070205489a..dac1589cac 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBasicTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgInitConnStatusBasicTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgInitConnStatusBasic(aapsLogger, danaPump)
+        val packet = MsgInitConnStatusBasic(injector)
 
         // test message decoding
         val array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
index 8a4b42d3c9..96c3ead153 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusBolusTest.kt
@@ -1,21 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgInitConnStatusBolus
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 class MsgInitConnStatusBolusTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-
     @Test fun runTest() {
-        val packet = MsgInitConnStatusBolus(aapsLogger, RxBusWrapper(), resourceHelper, danaPump)
+        val packet = MsgInitConnStatusBolus(injector)
 
         // test message decoding
         var array = ByteArray(100)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
index fc236fa9a7..f86c346ba2 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusOptionTest.kt
@@ -1,14 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgInitConnStatusOption
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.virtual.VirtualPumpPlugin
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.api.mockito.PowerMockito
 import org.powermock.core.classloader.annotations.PrepareForTest
@@ -18,12 +14,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(VirtualPumpPlugin::class)
 class MsgInitConnStatusOptionTest : DanaRTestBase() {
 
-    @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var resourceHelper: ResourceHelper
-
     @Test fun runTest() {
-        `when`(activePlugin.activePump).thenReturn(PowerMockito.mock(VirtualPumpPlugin::class.java))
-        val packet = MsgInitConnStatusOption(aapsLogger, RxBusWrapper(), resourceHelper, danaPump, activePlugin)
+        `when`(activePluginProvider.activePump).thenReturn(PowerMockito.mock(VirtualPumpPlugin::class.java))
+        val packet = MsgInitConnStatusOption(injector)
 
         // test message decoding
         packet.handleMessage(createArray(20, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
index 813c8fa940..be2a069952 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgInitConnStatusTimeTest.kt
@@ -1,31 +1,22 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.MsgInitConnStatusTime
-import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import org.junit.Assert
 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
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin::class, info.nightscout.androidaps.danar.DanaRPlugin::class, ConfigBuilderPlugin::class)
+@PrepareForTest(DanaRKoreanPlugin::class, DanaRPlugin::class, ConfigBuilderPlugin::class, CommandQueueProvider::class)
 class MsgInitConnStatusTimeTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
-    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
-    @Mock lateinit var commandQueue: CommandQueueProvider
-
     @Test fun runTest() {
-        val packet = MsgInitConnStatusTime(aapsLogger, RxBusWrapper(), resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil)
+        val packet = MsgInitConnStatusTime(injector)
 
         // test message decoding
         packet.handleMessage(createArray(20, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
index 235d5e6757..426086e1b7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStartTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgPCCommStartTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgPCCommStart(aapsLogger)
+        val packet = MsgPCCommStart(injector)
 
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
index 10452ad547..75b60f6686 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgPCCommStopTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgPCCommStopTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgPCCommStop(aapsLogger)
+        val packet = MsgPCCommStop(injector)
 
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
index 24be4bf480..bafa3b3376 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetActivateBasalProfileTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSetActivateBasalProfileTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSetActivateBasalProfile(aapsLogger, 1.toByte())
+        val packet = MsgSetActivateBasalProfile(injector, 1.toByte())
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
index a74a940e0f..56c2c51d0e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetBasalProfileTest.kt
@@ -1,21 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgSetBasalProfile
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 class MsgSetBasalProfileTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-
     @Test fun runTest() {
-        val packet = MsgSetBasalProfile(aapsLogger, RxBusWrapper(), resourceHelper, 1.toByte(), Array(24) { 1.0 })
+        val packet = MsgSetBasalProfile(injector, 1.toByte(), Array(24) { 1.0 })
 
         // test message decoding
         packet.handleMessage(createArray(34, 2.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
index 9bedcdf29c..9a0ba905ee 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetCarbsEntryTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSetCarbsEntryTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSetCarbsEntry(aapsLogger, System.currentTimeMillis(), 10)
+        val packet = MsgSetCarbsEntry(injector, System.currentTimeMillis(), 10)
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
index ad28decac2..967fed825b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStartTest.kt
@@ -6,7 +6,6 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -15,11 +14,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConstraintChecker::class)
 class MsgSetExtendedBolusStartTest : DanaRTestBase() {
 
-    @Mock lateinit var constraintChecker: ConstraintChecker
-
     @Test fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val packet = MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 2.0, 2.toByte())
+        val packet = MsgSetExtendedBolusStart(injector, 2.0, 2.toByte())
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
index a870698fdf..dfac8cbfd3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetExtendedBolusStopTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSetExtendedBolusStopTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSetExtendedBolusStop(aapsLogger)
+        val packet = MsgSetExtendedBolusStop(injector)
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
index f2b1de97da..79e43acd7e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetSingleBasalProfileTest.kt
@@ -1,21 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgSetSingleBasalProfile
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 class MsgSetSingleBasalProfileTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-
     @Test fun runTest() {
-        val packet = MsgSetSingleBasalProfile(aapsLogger, RxBusWrapper(), resourceHelper,  createArray(24, 2.0))
+        val packet = MsgSetSingleBasalProfile(injector, createArray(24, 2.0))
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
index f67d0f2aad..715a491779 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTempBasalStartTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSetTempBasalStartTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSetTempBasalStart(aapsLogger, 250, 1)
+        val packet = MsgSetTempBasalStart(injector, 250, 1)
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
index db01c3c138..44a1c64ddb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetTimeTest.kt
@@ -5,13 +5,12 @@ import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.powermock.modules.junit4.PowerMockRunner
-import java.util.*
 
 @RunWith(PowerMockRunner::class)
 class MsgSetTimeTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSetTime(aapsLogger, dateUtil, Date(System.currentTimeMillis()))
+        val packet = MsgSetTime(injector, System.currentTimeMillis())
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
index 69f814faf7..14c70f4a04 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSetUserOptionsTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSetUserOptionsTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSetUserOptions(aapsLogger, danaPump)
+        val packet = MsgSetUserOptions(injector)
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
         Assert.assertEquals(true, packet.failed)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
index 56f7e96971..532d6e0c7b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingActiveProfileTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgSettingActiveProfile
 import org.junit.Assert
 import org.junit.Test
@@ -11,10 +10,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingActiveProfileTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingActiveProfile(aapsLogger, danaPump)
+        val packet = MsgSettingActiveProfile(injector)
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 1), danaPump.activeProfile)
+        Assert.assertEquals(packet.intFromBuff(createArray(34, 7.toByte()), 0, 1), danaPump.activeProfile)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
index eddf05406e..cf172d5f50 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalProfileAllTest.kt
@@ -9,7 +9,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingBasalProfileAllTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingBasalProfileAll(aapsLogger, danaPump)
+        val packet = MsgSettingBasalProfileAll(injector)
 
         // test message decoding
         packet.handleMessage(createArray(400, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
index dadb640d2d..7d281f6b50 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingBasalTest.kt
@@ -1,13 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.interfaces.PumpDescription
-import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgSettingBasal
+import info.nightscout.androidaps.interfaces.PumpDescription
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -16,15 +13,13 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(info.nightscout.androidaps.danar.DanaRPlugin::class)
 class MsgSettingBasalTest : DanaRTestBase() {
 
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-
     @Test fun runTest() {
         `when`(danaRPlugin.getPumpDescription()).thenReturn(PumpDescription())
-        val packet = MsgSettingBasal(aapsLogger, danaPump, danaRPlugin)
+        val packet = MsgSettingBasal(injector)
 
         // test message decoding
         packet.handleMessage(createArray(100, 1.toByte()))
-        val expected = MessageBase.intFromBuff(createArray(100, 1.toByte()), 2 * 1, 2)
+        val expected = packet.intFromBuff(createArray(100, 1.toByte()), 2 * 1, 2)
         Assert.assertEquals(expected.toDouble() / 100.0, danaPump.pumpProfiles!![danaPump.activeProfile][1], 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
index c69532df2d..5a779d70b6 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingGlucoseTest.kt
@@ -10,7 +10,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingGlucoseTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingGlucose(aapsLogger, danaPump)
+        val packet = MsgSettingGlucose(injector)
 
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
index 3d0ab552c0..95152aed97 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMaxValuesTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgSettingMaxValues
 import org.junit.Assert
 import org.junit.Test
@@ -11,10 +10,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingMaxValuesTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingMaxValues(aapsLogger, danaPump)
+        val packet = MsgSettingMaxValues(injector)
 
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2).toDouble() / 100.0, danaPump.maxBolus, 0.0)
+        Assert.assertEquals(packet.intFromBuff(createArray(10, 7.toByte()), 0, 2).toDouble() / 100.0, danaPump.maxBolus, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
index 9e3387d2ed..1c7126485b 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingMealTest.kt
@@ -1,31 +1,23 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.MsgSettingMeal
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 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
 
 @RunWith(PowerMockRunner::class)
-@PrepareForTest(info.nightscout.androidaps.danar.DanaRPlugin::class, info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin::class)
+@PrepareForTest(DanaRPlugin::class, DanaRKoreanPlugin::class)
 class MsgSettingMealTest : DanaRTestBase() {
 
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
-
     @Test fun runTest() {
-        val packet = MsgSettingMeal(aapsLogger, RxBusWrapper(), resourceHelper, danaPump, danaRKoreanPlugin)
+        val packet = MsgSettingMeal(injector)
 
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 1.toByte()), 0, 1).toDouble() / 100.0, danaPump.bolusStep, 0.0)
+        Assert.assertEquals(packet.intFromBuff(createArray(10, 1.toByte()), 0, 1).toDouble() / 100.0, danaPump.bolusStep, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
index dd574c4200..d04e4dcfcb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosAllTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatiosAll
 import org.junit.Assert
 import org.junit.Test
@@ -11,11 +11,11 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingProfileRatiosAllTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingProfileRatiosAll(aapsLogger, danaPump)
-        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
+        val packet = MsgSettingProfileRatiosAll(injector)
+        danaPump.units = DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.morningCIR)
+        Assert.assertEquals(packet.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.morningCIR)
     }
 
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
index 8e56b1defb..2cc012862c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingProfileRatiosTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgSettingProfileRatios
 import org.junit.Assert
 import org.junit.Test
@@ -11,10 +11,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingProfileRatiosTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingProfileRatios(aapsLogger, danaPump)
-        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
+        val packet = MsgSettingProfileRatios(injector)
+        danaPump.units = DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.currentCIR)
+        Assert.assertEquals(packet.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.currentCIR)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
index 81f6f33b35..f99a68d472 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingPumpTimeTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgSettingPumpTime
 import org.junit.Assert
 import org.junit.Test
@@ -12,17 +12,17 @@ import java.util.*
 class MsgSettingPumpTimeTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingPumpTime(aapsLogger, danaPump, dateUtil)
-        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
+        val packet = MsgSettingPumpTime(injector)
+        danaPump.units = DanaPump.UNITS_MGDL
         // test message decoding
         val bytes = createArray(34, 7.toByte())
         val time = Date(
-            100 + MessageBase.intFromBuff(bytes, 5, 1),
-            MessageBase.intFromBuff(bytes, 4, 1) - 1,
-            MessageBase.intFromBuff(bytes, 3, 1),
-            MessageBase.intFromBuff(bytes, 2, 1),
-            MessageBase.intFromBuff(bytes, 1, 1),
-            MessageBase.intFromBuff(bytes, 0, 1)
+            100 + packet.intFromBuff(bytes, 5, 1),
+            packet.intFromBuff(bytes, 4, 1) - 1,
+            packet.intFromBuff(bytes, 3, 1),
+            packet.intFromBuff(bytes, 2, 1),
+            packet.intFromBuff(bytes, 1, 1),
+            packet.intFromBuff(bytes, 0, 1)
         ).time
         packet.handleMessage(bytes)
         Assert.assertEquals(time, danaPump.pumpTime)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
index 200f6801c5..f75ed71ba7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingShippingInfoTest.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgSettingShippingInfo
 import org.junit.Assert
@@ -11,8 +12,8 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingShippingInfoTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingShippingInfo(aapsLogger, danaPump)
-        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
+        val packet = MsgSettingShippingInfo(injector)
+        danaPump.units = DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
         Assert.assertEquals(MessageBase.stringFromBuff(createArray(34, 7.toByte()), 0, 10), danaPump.serialNumber)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
index 6b77343b60..c9c300081d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgSettingUserOptionsTest.kt
@@ -11,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSettingUserOptionsTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgSettingUserOptions(aapsLogger, danaPump)
+        val packet = MsgSettingUserOptions(injector)
         danaPump.units = DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(48, 7.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
index e140a22205..910e84830f 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBasicTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgStatusBasic
 import org.junit.Assert
 import org.junit.Test
@@ -11,9 +10,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgStatusBasicTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgStatusBasic(aapsLogger, danaPump)
+        val packet = MsgStatusBasic(injector)
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaPump.dailyTotalUnits, 0.0)
+        Assert.assertEquals(packet.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaPump.dailyTotalUnits, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
index 4bda015615..4621f34029 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusBolusExtendedTest.kt
@@ -1,25 +1,19 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgStatusBolusExtended
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 class MsgStatusBolusExtendedTest : DanaRTestBase() {
 
-    @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
-
     @Test
     fun runTest() {
-        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
-        val packet = MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil)
+        `when`(activePluginProvider.activeTreatments).thenReturn(treatmentsInterface)
+        val packet = MsgStatusBolusExtended(injector)
         // test message decoding
         val array = ByteArray(100)
         putByteToArray(array, 0, 1)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
index df34e11c0f..3872536d6e 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusProfileTest.kt
@@ -1,6 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.comm.MsgStatusProfile
 import org.junit.Assert
 import org.junit.Test
@@ -11,10 +11,10 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgStatusProfileTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgStatusProfile(aapsLogger, danaPump)
-        danaPump.units = info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL
+        val packet = MsgStatusProfile(injector)
+        danaPump.units = DanaPump.UNITS_MGDL
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.currentCIR)
+        Assert.assertEquals(packet.intFromBuff(createArray(10, 7.toByte()), 0, 2), danaPump.currentCIR)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
index e08bbeab66..8827e59bcb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTempBasalTest.kt
@@ -1,13 +1,10 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
 import info.nightscout.androidaps.danar.comm.MsgStatusTempBasal
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -16,12 +13,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConfigBuilderPlugin::class)
 class MsgStatusTempBasalTest : DanaRTestBase() {
 
-    @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
-
     @Test fun runTest() {
-        `when`(activePlugin.activeTreatments).thenReturn(treatmentsPlugin)
-        val packet = MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector)
+        `when`(activePluginProvider.activeTreatments).thenReturn(treatmentsInterface)
+        val packet = MsgStatusTempBasal(injector)
         // test message decoding
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
index 9f86f604b3..ad8ef6a2d1 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaR/comm/MsgStatusTest.kt
@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.plugins.pump.danaR.comm
 
-import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.danar.comm.MsgStatus
 import org.junit.Assert
 import org.junit.Test
@@ -11,9 +10,9 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgStatusTest : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = MsgStatus(aapsLogger, danaPump)
+        val packet = MsgStatus(injector)
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaPump.dailyTotalUnits, 0.0)
+        Assert.assertEquals(packet.intFromBuff(createArray(34, 7.toByte()), 0, 3).toDouble() / 750.0, danaPump.dailyTotalUnits, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
index 3703dc4c3d..1632760ba7 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRKorean/comm/MessageHashTableRKoreanTest.kt
@@ -1,42 +1,26 @@
 package info.nightscout.androidaps.plugins.pump.danaRKorean.comm
 
-import info.nightscout.androidaps.danars.comm.DanaRSTestBase
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.danaRKorean.comm.MessageHashTableRKorean
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danaRKorean.comm.MessageHashTableRKorean
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
 
 @RunWith(PowerMockRunner::class)
 @PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class, ConfigBuilderPlugin::class)
-class MessageHashTableRKoreanTest : DanaRSTestBase() {
+class MessageHashTableRKoreanTest : DanaRTestBase() {
 
-    @Mock lateinit var constraintChecker: ConstraintChecker
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
-    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
-    @Mock lateinit var commandQueue: CommandQueueProvider
-    @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
-    @Mock lateinit var nsUpload: NSUpload
-    @Mock lateinit var databaseHelper: DatabaseHelperInterface
 
     @Test fun runTest() {
         Mockito.`when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTable = MessageHashTableRKorean(aapsLogger, rxBus, resourceHelper, constraintChecker, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, activePlugin, dateUtil, nsUpload, databaseHelper, injector)
+        val messageHashTable = MessageHashTableRKorean(injector)
         val testMessage = messageHashTable.findMessage(0x41f2)
         Assert.assertEquals("CMD_HISTORY_ALL", testMessage.messageName)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
index 096e20e2bc..f531aa25ad 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MessageHashTable_rv2Test.kt
@@ -1,28 +1,16 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
-import android.content.Context
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danaRv2.comm.MessageHashTableRv2
 import info.nightscout.androidaps.danaRv2.comm.MsgStatusAPS_v2
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.plugins.treatments.TreatmentsPlugin
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
-import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import org.powermock.core.classloader.annotations.PrepareForTest
 import org.powermock.modules.junit4.PowerMockRunner
@@ -31,29 +19,15 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(ConstraintChecker::class, DetailedBolusInfoStorage::class, ConfigBuilderPlugin::class)
 class MessageHashTable_rv2Test : DanaRTestBase() {
 
-    @Mock lateinit var context: Context
-    @Mock lateinit var rxBus: RxBusWrapper
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var constraintChecker: ConstraintChecker
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
-    @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
-    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
-    @Mock lateinit var commandQueue: CommandQueueProvider
-    @Mock lateinit var activePlugin: ActivePluginProvider
-    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
-    @Mock lateinit var treatmentsPlugin: TreatmentsPlugin
-    @Mock lateinit var nsUpload: NSUpload
-
     @Test
     fun runTest() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
-        val messageHashTableRv2 = MessageHashTableRv2(aapsLogger, rxBus, resourceHelper, constraintChecker, danaPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue, activePlugin, detailedBolusInfoStorage, nsUpload, injector, DateUtil(context, resourceHelper), databaseHelper)
-        val forTesting: MessageBase = MsgStatusAPS_v2(aapsLogger, danaPump)
+        val messageHashTableRv2 = MessageHashTableRv2(injector)
+        val forTesting: MessageBase = MsgStatusAPS_v2(injector)
         val testPacket: MessageBase = messageHashTableRv2.findMessage(forTesting.command)
         Assert.assertEquals(0xE001, testPacket.command.toLong())
         // try putting another command
-        val testMessage = MessageBase()
+        val testMessage = MessageBase(injector)
         testMessage.SetCommand(0xE005)
         messageHashTableRv2.put(testMessage)
         Assert.assertEquals(0xE005, messageHashTableRv2.findMessage(0xE005).command.toLong())
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
index 3d1af1fa52..f8aeb37b1d 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgCheckValue_v2Test.kt
@@ -1,18 +1,15 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danaRv2.comm.MsgCheckValue_v2
-import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.plugins.configBuilder.ConfigBuilderPlugin
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 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
 
@@ -20,19 +17,11 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(DanaRKoreanPlugin::class, DanaRPlugin::class, DanaRv2Plugin::class, ConfigBuilderPlugin::class)
 class MsgCheckValue_v2Test : DanaRTestBase() {
 
-    val rxBus = RxBusWrapper()
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var danaRPlugin: DanaRPlugin
-    @Mock lateinit var danaRKoreanPlugin: DanaRKoreanPlugin
-    @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
-    @Mock lateinit var configBuilderPlugin: ConfigBuilderPlugin
-    @Mock lateinit var commandQueue: CommandQueueProvider
-
     @Test
     fun runTest() {
-        val packet = MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue)
+        val packet = MsgCheckValue_v2(injector)
         // test message decoding
         packet.handleMessage(createArray(34, 3.toByte()))
-        Assert.assertEquals(info.nightscout.androidaps.dana.DanaPump.EXPORT_MODEL, danaPump.hwModel)
+        Assert.assertEquals(DanaPump.EXPORT_MODEL, danaPump.hwModel)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
index a7e4082c11..1adaee10a3 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgHistoryEvents_v2Test.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
-import android.content.Context
-import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danaRv2.comm.MsgHistoryEvents_v2
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import org.junit.Assert
 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
 
@@ -19,16 +13,11 @@ import org.powermock.modules.junit4.PowerMockRunner
 @PrepareForTest(DetailedBolusInfoStorage::class)
 class MsgHistoryEvents_v2Test : DanaRTestBase() {
 
-    @Mock lateinit var context: Context
-    @Mock lateinit var resourceHelper: ResourceHelper
-    @Mock lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
-    @Mock lateinit var danaRv2Plugin: DanaRv2Plugin
-
     @Test @Throws(Exception::class) fun runTest() {
-        val packet = MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, RxBusWrapper(), activePluginProvider, injector, DateUtil(context, resourceHelper), 0)
+        val packet = MsgHistoryEvents_v2(injector, 0)
 
         // test message decoding
-        val array = ByteArray(100)
+        val array = createArray(100, 2)
 
         putByteToArray(array, 0, 0xFF.toByte())
         packet.handleMessage(array)
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
index 0a275c8418..228a953b5c 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetAPSTempBasalStart_v2Test.kt
@@ -1,8 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
-import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.danar.comm.MessageBase.intFromBuff
 import info.nightscout.androidaps.danars.comm.DanaRS_Packet_APS_Basal_Set_Temporary_Basal.Companion.PARAM30MIN
+import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -14,33 +13,33 @@ class MsgSetAPSTempBasalStart_v2Test : DanaRTestBase() {
     @Test fun runTest() {
 
         // test low hard limit
-        var packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, -1, true, false)
-        Assert.assertEquals(0, intFromBuff(packet.buffer, 0, 2))
-        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        var packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(injector, -1, true, false)
+        Assert.assertEquals(0, packet.intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, packet.intFromBuff(packet.buffer, 2, 1))
         // test high hard limit
-        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 550, true, false)
-        Assert.assertEquals(500, intFromBuff(packet.buffer, 0, 2))
-        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(injector, 550, true, false)
+        Assert.assertEquals(500, packet.intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, packet.intFromBuff(packet.buffer, 2, 1))
         // test setting 15 min
-        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 50, true, false)
-        Assert.assertEquals(50, intFromBuff(packet.buffer, 0, 2))
-        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(injector, 50, true, false)
+        Assert.assertEquals(50, packet.intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, packet.intFromBuff(packet.buffer, 2, 1))
         // test setting 30 min
-        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 50, false, true)
-        Assert.assertEquals(50, intFromBuff(packet.buffer, 0, 2))
-        Assert.assertEquals(PARAM30MIN, intFromBuff(packet.buffer, 2, 1))
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(injector, 50, false, true)
+        Assert.assertEquals(50, packet.intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(PARAM30MIN, packet.intFromBuff(packet.buffer, 2, 1))
         // over 200% set always 15 min
-        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 250, false, true)
-        Assert.assertEquals(250, intFromBuff(packet.buffer, 0, 2))
-        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(injector, 250, false, true)
+        Assert.assertEquals(250, packet.intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, packet.intFromBuff(packet.buffer, 2, 1))
         // test low hard limit
-        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, -1, false, true)
-        Assert.assertEquals(0, intFromBuff(packet.buffer, 0, 2))
-        Assert.assertEquals(PARAM30MIN, intFromBuff(packet.buffer, 2, 1))
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(injector, -1, false, true)
+        Assert.assertEquals(0, packet.intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(PARAM30MIN, packet.intFromBuff(packet.buffer, 2, 1))
         // test high hard limit
-        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(aapsLogger, 550, false, true)
-        Assert.assertEquals(500, intFromBuff(packet.buffer, 0, 2))
-        Assert.assertEquals(packet.PARAM15MIN, intFromBuff(packet.buffer, 2, 1))
+        packet = info.nightscout.androidaps.danaRv2.comm.MsgSetAPSTempBasalStart_v2(injector, 550, false, true)
+        Assert.assertEquals(500, packet.intFromBuff(packet.buffer, 0, 2))
+        Assert.assertEquals(packet.PARAM15MIN, packet.intFromBuff(packet.buffer, 2, 1))
 
         // test message decoding
         packet.handleMessage(byteArrayOf(0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte(), 0.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt
index 0510313426..8d21eab349 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgSetHistoryEntry_v2Test.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
+import info.nightscout.androidaps.danaRv2.comm.MsgSetHistoryEntry_v2
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
@@ -10,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgSetHistoryEntry_v2Test : DanaRTestBase() {
 
     @Test fun runTest() {
-        var packet = info.nightscout.androidaps.danaRv2.comm.MsgSetHistoryEntry_v2(aapsLogger, 1, System.currentTimeMillis(), 1, 0)
+        val packet = MsgSetHistoryEntry_v2(injector, 1, System.currentTimeMillis(), 1, 0)
         // test message decoding
         // != 1 fails
         packet.handleMessage(createArray(34, 2.toByte()))
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
index 9f3685644c..9f92821b35 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusAPS_v2Test.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
+import info.nightscout.androidaps.danaRv2.comm.MsgStatusAPS_v2
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.danar.comm.MessageBase
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -12,11 +12,11 @@ class MsgStatusAPS_v2Test : DanaRTestBase() {
 
     @Test
     fun runTest() {
-        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusAPS_v2(aapsLogger, danaPump)
+        val packet = MsgStatusAPS_v2(injector)
         // test iob
         //TODO Find a way to mock treatments plugin
         val testArray = createArray(34, 7.toByte())
-        val iob = MessageBase.intFromBuff(testArray, 0, 2) / 100.0
+        val iob = packet.intFromBuff(testArray, 0, 2) / 100.0
         packet.handleMessage(testArray)
         Assert.assertEquals(iob, danaPump.iob, 0.0)
     }
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
index ba93f8e707..33f96373eb 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusBolusExtended_v2Test.kt
@@ -1,7 +1,7 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
+import info.nightscout.androidaps.danaRv2.comm.MsgStatusBolusExtended_v2
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
-import info.nightscout.androidaps.danar.comm.MessageBase
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -12,9 +12,9 @@ class MsgStatusBolusExtended_v2Test : DanaRTestBase() {
 
     @Test
     fun runTest() {
-        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusBolusExtended_v2(aapsLogger, danaPump)
+        val packet = MsgStatusBolusExtended_v2(injector)
         // test message decoding
         packet.handleMessage(createArray(34, 7.toByte()))
-        Assert.assertEquals(MessageBase.intFromBuff(createArray(10, 7.toByte()), 2, 2).toDouble() / 100.0, danaPump.extendedBolusAmount, 0.0)
+        Assert.assertEquals(packet.intFromBuff(createArray(10, 7.toByte()), 2, 2).toDouble() / 100.0, danaPump.extendedBolusAmount, 0.0)
     }
 }
\ No newline at end of file
diff --git a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
index 7843fbb85c..b1b6da6960 100644
--- a/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
+++ b/app/src/test/java/info/nightscout/androidaps/plugins/pump/danaRv2/comm/MsgStatusTempBasal_v2Test.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.plugins.pump.danaRv2.comm
 
+import info.nightscout.androidaps.danaRv2.comm.MsgStatusTempBasal_v2
 import info.nightscout.androidaps.plugins.pump.danaR.comm.DanaRTestBase
 import org.junit.Assert
 import org.junit.Test
@@ -10,7 +11,7 @@ import org.powermock.modules.junit4.PowerMockRunner
 class MsgStatusTempBasal_v2Test : DanaRTestBase() {
 
     @Test fun runTest() {
-        val packet = info.nightscout.androidaps.danaRv2.comm.MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil)
+        val packet = MsgStatusTempBasal_v2(injector)
         // test message decoding
         packet.handleMessage(createArray(34, 1.toByte()))
         Assert.assertEquals(true, danaPump.isTempBasalInProgress)
diff --git a/core/src/test/java/info/nightscout/androidaps/core/ExampleUnitTest.kt b/core/src/test/java/info/nightscout/androidaps/core/ExampleUnitTest.kt
deleted file mode 100644
index 35bc1a6629..0000000000
--- a/core/src/test/java/info/nightscout/androidaps/core/ExampleUnitTest.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package info.nightscout.androidaps.core
-
-import org.junit.Test
-
-import org.junit.Assert.*
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
-
-    @Test
-    fun addition_isCorrect() {
-        assertEquals(4, 2 + 2)
-    }
-}
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt
index c5f46ff919..eced4a9afa 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MessageHashTableRKorean.kt
@@ -1,82 +1,56 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.*
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MessageHashTableRKorean @Inject constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    resourceHelper: ResourceHelper,
-    constraintChecker: ConstraintChecker,
-    danaPump: DanaPump,
-    danaRPlugin: DanaRPlugin,
-    danaRKoreanPlugin: DanaRKoreanPlugin,
-    configBuilderPlugin: ConfigBuilderInterface,
-    commandQueue: CommandQueueProvider,
-    activePlugin: ActivePluginProvider,
-    dateUtil: DateUtil,
-    nsUpload: NSUpload,
-    databaseHelper: DatabaseHelperInterface,
-    injector: HasAndroidInjector
+    private val injector: HasAndroidInjector
 ) : MessageHashTableBase {
 
     private var messages: HashMap<Int, MessageBase> = HashMap()
 
     init {
-        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump))                 // 0x0101 CMD_MEALINS_STOP
-        put(MsgBolusStart(aapsLogger, constraintChecker, danaPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
-        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-        put(MsgStatusProfile(aapsLogger, danaPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-        put(MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector))           // 0x0205 CMD_PUMP_EXERCISE_MODE
-        put(MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil))       // 0x0207 CMD_PUMP_EXPANS_INS_I
-        put(MsgStatusBasic_k(aapsLogger, danaPump))               // 0x020A CMD_PUMP_INITVIEW_I
-        put(MsgStatus_k(aapsLogger, danaPump))                    // 0x020B CMD_PUMP_STATUS
-        put(MsgInitConnStatusTime_k(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))        // 0x0301 CMD_PUMPINIT_TIME_INFO
-        put(MsgInitConnStatusBolus_k(aapsLogger, rxBus, resourceHelper, danaPump, activePlugin))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-        put(MsgInitConnStatusBasic_k(aapsLogger, rxBus, resourceHelper, danaPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
-        put(MsgSetTempBasalStart(aapsLogger, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
-        put(MsgSetCarbsEntry(aapsLogger, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
-        put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
-        put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
-        put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError(aapsLogger, rxBus, resourceHelper, danaPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
-        put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
-        put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil, databaseHelper))       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3107 CMD_HISTORY_CARBOHY
-        put(MsgSettingBasal_k(aapsLogger, danaPump, danaRKoreanPlugin))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
-        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-        put(MsgSettingProfileRatios(aapsLogger, danaPump))      // 0x3204 CMD_SETTING_V_CCC_I
-        put(MsgSettingMaxValues(aapsLogger, danaPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-        put(MsgSettingBasalProfileAll_k(aapsLogger, danaPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-        put(MsgSettingShippingInfo(aapsLogger, danaPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
-        put(MsgSettingGlucose(aapsLogger, danaPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime(aapsLogger, danaPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
-        put(MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
-        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x41F2 CMD_HISTORY_ALL
-        put(MsgHistoryNewDone(aapsLogger, danaPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x42F2 CMD_HISTORY_NEW
-        put(MsgCheckValue_k(aapsLogger, danaPump, danaRKoreanPlugin))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
+        put(MsgBolusStop(injector))                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart(injector, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusProgress(injector))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile(injector))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+        put(MsgStatusTempBasal(injector))           // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended(injector))       // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBasic_k(injector))               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus_k(injector))                    // 0x020B CMD_PUMP_STATUS
+        put(MsgInitConnStatusTime_k(injector))        // 0x0301 CMD_PUMPINIT_TIME_INFO
+        put(MsgInitConnStatusBolus_k(injector))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic_k(injector))       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgSetTempBasalStart(injector, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
+        put(MsgSetCarbsEntry(injector, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
+        put(MsgSetTempBasalStop(injector))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
+        put(MsgSetExtendedBolusStop(injector))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
+        put(MsgSetExtendedBolusStart(injector, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
+        put(MsgError(injector))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgPCCommStart(injector))               // 0x3001 CMD_CONNECT
+        put(MsgPCCommStop(injector))                // 0x3002 CMD_DISCONNECT
+        put(MsgHistoryBolus(injector))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(injector))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(injector))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(injector))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryCarbo(injector))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgSettingBasal_k(injector))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
+        put(MsgSettingMeal(injector))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
+        put(MsgSettingProfileRatios(injector))      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues(injector))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll_k(injector))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo(injector))       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose(injector))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime(injector))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSetSingleBasalProfile(injector, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
+        put(MsgHistoryAll(injector))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryNewDone(injector))            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNew(injector))                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgCheckValue_k(injector))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
     }
 
     override fun put(message: MessageBase) {
@@ -84,6 +58,6 @@ class MessageHashTableRKorean @Inject constructor(
     }
 
     override fun findMessage(command: Int): MessageBase {
-        return messages[command] ?: MessageBase()
+        return messages[command] ?: MessageBase(injector)
     }
 }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
index 2161598069..362240338c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgCheckValue_k.kt
@@ -1,17 +1,12 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
 class MsgCheckValue_k(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val danaRKoreanPlugin: DanaRKoreanPlugin
-
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0xF0F1)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
index 4a578f2cb7..07999f5267 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBasic_k.kt
@@ -1,22 +1,16 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusBasic_k(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0303)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
index 7a3e75114c..290121b7ac 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusBolus_k.kt
@@ -1,24 +1,16 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
-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.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusBolus_k(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump,
-    private val activePlugin: ActivePluginProvider
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0302)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
index f990fe8346..c884364b03 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgInitConnStatusTime_k.kt
@@ -1,33 +1,17 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.events.EventRebuildTabs
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusTime_k(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump,
-    private val danaRPlugin: DanaRPlugin,
-    private val danaRKoreanPlugin: DanaRKoreanPlugin,
-    private val configBuilderPlugin: ConfigBuilderInterface,
-    private val commandQueue: CommandQueueProvider,
-    private val dateUtil: DateUtil
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0301)
@@ -46,7 +30,7 @@ class MsgInitConnStatusTime_k(
             danaRPlugin.setFragmentVisible(PluginType.PUMP, true)
             danaPump.reset() // mark not initialized
             //If profile coming from pump, switch it as well
-            configBuilderPlugin.storeSettings("ChangingKoreanDanaDriver")
+            configBuilder.storeSettings("ChangingKoreanDanaDriver")
             rxBus.send(EventRebuildTabs())
             commandQueue.readStatus("PumpDriverChange", null) // force new connection
             return
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
index 4a2e6bb063..3b286a3de1 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasalProfileAll_k.kt
@@ -1,8 +1,7 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import java.util.*
 
@@ -15,9 +14,8 @@ import java.util.*
  * THIS IS BROKEN IN PUMP... SENDING ONLY 1 PROFILE
  */
 class MsgSettingBasalProfileAll_k(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3206)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
index 150099293d..4e3bfb11ec 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgSettingBasal_k.kt
@@ -1,17 +1,13 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import java.util.*
 
 class MsgSettingBasal_k(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val danaRKoreanPlugin: DanaRKoreanPlugin
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3202)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
index 2ac86a5085..559dde782d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatusBasic_k.kt
@@ -1,14 +1,12 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
 class MsgStatusBasic_k(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x020A)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
index b0f7004955..0f0815bd93 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/comm/MsgStatus_k.kt
@@ -1,14 +1,12 @@
 package info.nightscout.androidaps.danaRKorean.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 
 class MsgStatus_k(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x020B)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
index 2bacae53cb..e9963d8ba3 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRKorean/services/DanaRKoreanExecutionService.java
@@ -4,7 +4,6 @@ import android.os.Binder;
 import android.os.SystemClock;
 
 import java.io.IOException;
-import java.util.Date;
 
 import javax.inject.Inject;
 
@@ -12,6 +11,10 @@ import info.nightscout.androidaps.Constants;
 import info.nightscout.androidaps.dana.DanaPump;
 import info.nightscout.androidaps.dana.events.EventDanaRNewStatus;
 import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.danaRKorean.comm.MessageHashTableRKorean;
+import info.nightscout.androidaps.danaRKorean.comm.MsgCheckValue_k;
+import info.nightscout.androidaps.danaRKorean.comm.MsgSettingBasal_k;
+import info.nightscout.androidaps.danaRKorean.comm.MsgStatusBasic_k;
 import info.nightscout.androidaps.danar.DanaRPlugin;
 import info.nightscout.androidaps.danar.R;
 import info.nightscout.androidaps.danar.SerialIOThread;
@@ -50,10 +53,6 @@ import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
 import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification;
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
-import info.nightscout.androidaps.danaRKorean.comm.MessageHashTableRKorean;
-import info.nightscout.androidaps.danaRKorean.comm.MsgCheckValue_k;
-import info.nightscout.androidaps.danaRKorean.comm.MsgSettingBasal_k;
-import info.nightscout.androidaps.danaRKorean.comm.MsgStatusBasic_k;
 import info.nightscout.androidaps.queue.commands.Command;
 import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.T;
@@ -128,10 +127,10 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         try {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
             //MsgStatus_k statusMsg = new MsgStatus_k();
-            MsgStatusBasic_k statusBasicMsg = new MsgStatusBasic_k(aapsLogger, danaPump);
-            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector);
-            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil);
-            MsgCheckValue_k checkValue = new MsgCheckValue_k(aapsLogger, danaPump, danaRKoreanPlugin);
+            MsgStatusBasic_k statusBasicMsg = new MsgStatusBasic_k(injector);
+            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(injector);
+            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector);
+            MsgCheckValue_k checkValue = new MsgCheckValue_k(injector);
 
             if (danaPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
@@ -154,7 +153,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
             Profile profile = profileFunction.getProfile();
             if (profile != null && Math.abs(danaPump.getCurrentBasal() - profile.getBasal()) >= danaRKoreanPlugin.getPumpDescription().basalStep) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(injector));
                 if (!danaRKoreanPlugin.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(new EventProfileNeedsUpdate());
                 }
@@ -162,15 +161,15 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
             if (danaPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !danaRKoreanPlugin.isInitialized()) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin));
-                mSerialIOThread.sendMessage(new MsgSettingBasal_k(aapsLogger, danaPump, danaRKoreanPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(injector));
+                mSerialIOThread.sendMessage(new MsgSettingMeal(injector));
+                mSerialIOThread.sendMessage(new MsgSettingBasal_k(injector));
                 //0x3201
-                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingMaxValues(injector));
+                mSerialIOThread.sendMessage(new MsgSettingGlucose(injector));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(injector));
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
-                mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
                 if (danaPump.getPumpTime() == 0) {
                     // initial handshake was not successfull
                     // deinitialize pump
@@ -184,8 +183,8 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
                 if (Math.abs(timeDiff) > 10) {
                     waitForWholeMinute(); // Dana can set only whole minute
                     // add 10sec to be sure we are over minute (will be cutted off anyway)
-                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, dateUtil, new Date(DateUtil.now() + T.secs(10).msecs())));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                    mSerialIOThread.sendMessage(new MsgSetTime(injector, DateUtil.now() + T.secs(10).msecs()));
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
                     timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
@@ -213,12 +212,12 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(aapsLogger, percent, durationInHours));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(injector, percent, durationInHours));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -226,8 +225,8 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     public boolean tempBasalStop() {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -235,8 +234,8 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     public boolean extendedBolus(double insulin, int durationInHalfHours) {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(aapsLogger, constraintChecker, insulin, (byte) (durationInHalfHours & 0xFF)));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(injector, insulin, (byte) (durationInHalfHours & 0xFF)));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -244,8 +243,8 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
     public boolean extendedBolusStop() {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(injector));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -261,12 +260,12 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
         danaPump.setBolusingTreatment(t);
         danaPump.setBolusDone(false);
-        MsgBolusStart start = new MsgBolusStart(aapsLogger, constraintChecker, danaPump, amount);
+        MsgBolusStart start = new MsgBolusStart(injector, amount);
         danaPump.setBolusStopped(false);
         danaPump.setBolusStopForced(false);
 
         if (carbs > 0) {
-            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(aapsLogger, carbtime, carbs));
+            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(injector, carbtime, carbs));
         }
 
         if (amount > 0) {
@@ -298,7 +297,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
 
     public boolean carbsEntry(int amount) {
         if (!isConnected()) return false;
-        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(aapsLogger, System.currentTimeMillis(), amount);
+        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(injector, System.currentTimeMillis(), amount);
         mSerialIOThread.sendMessage(msg);
         return true;
     }
@@ -317,7 +316,7 @@ public class DanaRKoreanExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
         Double[] basal = danaPump.buildDanaRProfileRecord(profile);
-        MsgSetSingleBasalProfile msgSet = new MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, basal);
+        MsgSetSingleBasalProfile msgSet = new MsgSetSingleBasalProfile(injector, basal);
         mSerialIOThread.sendMessage(msgSet);
         danaPump.setLastSettingsRead(0); // force read full settings
         getPumpStatus();
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
index f0e3f4570f..89764534d6 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MessageHashTableRv2.kt
@@ -1,104 +1,74 @@
 package info.nightscout.androidaps.danaRv2.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.comm.*
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
-import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MessageHashTableRv2 @Inject constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    resourceHelper: ResourceHelper,
-    constraintChecker: ConstraintChecker,
-    danaPump: DanaPump,
-    danaRPlugin: DanaRPlugin,
-    danaRKoreanPlugin: DanaRKoreanPlugin,
-    danaRv2Plugin: DanaRv2Plugin,
-    configBuilderPlugin: ConfigBuilderInterface,
-    commandQueue: CommandQueueProvider,
-    activePlugin: ActivePluginProvider,
-    detailedBolusInfoStorage: DetailedBolusInfoStorage,
-    nsUpload: NSUpload,
-    injector: HasAndroidInjector,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
+    private val injector: HasAndroidInjector
 ) : MessageHashTableBase {
 
     private var messages: HashMap<Int, MessageBase> = HashMap()
 
     init {
-        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump))                 // 0x0101 CMD_MEALINS_STOP
-        put(MsgBolusStart(aapsLogger, constraintChecker, danaPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
-        put(MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
-        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-        put(MsgStatusProfile(aapsLogger, danaPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-        put(MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil))        // 0x0205 CMD_PUMP_EXERCISE_MODE
-        put(MsgStatusBolusExtended_v2(aapsLogger, danaPump))    // 0x0207 CMD_PUMP_EXPANS_INS_I
-        put(MsgStatusBasic(aapsLogger, danaPump))               // 0x020A CMD_PUMP_INITVIEW_I
-        put(MsgStatus(aapsLogger, danaPump))                    // 0x020B CMD_PUMP_STATUS
-        put(MsgInitConnStatusTime(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))        // 0x0301 CMD_PUMPINIT_TIME_INFO
-        put(MsgInitConnStatusBolus(aapsLogger, rxBus, resourceHelper, danaPump))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-        put(MsgInitConnStatusBasic(aapsLogger, danaPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
-        put(MsgInitConnStatusOption(aapsLogger, rxBus, resourceHelper, danaPump, activePlugin))      // 0x0304 CMD_PUMPINIT_OPTION
-        put(MsgSetTempBasalStart(aapsLogger, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
-        put(MsgSetCarbsEntry(aapsLogger, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
-        put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
-        put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
-        put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError(aapsLogger, rxBus, resourceHelper, danaPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
-        put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
-        put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil, databaseHelper))       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryError(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3106 CMD_HISTORY_ERROR
-        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3107 CMD_HISTORY_CARBOHY
-        put(MsgHistoryRefill(aapsLogger, rxBus, dateUtil, databaseHelper))             // 0x3108 CMD_HISTORY_REFILL
-        put(MsgHistorySuspend(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3109 CMD_HISTORY_SUSPEND
-        put(MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil, databaseHelper))          // 0x310A CMD_HISTORY_BASAL_HOUR
-        put(MsgHistoryDone(aapsLogger, danaPump))               // 0x31F1 CMD_HISTORY_DONT_USED
-        put(MsgSettingBasal(aapsLogger, danaPump, danaRPlugin))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
-        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-        put(MsgSettingProfileRatios(aapsLogger, danaPump))      // 0x3204 CMD_SETTING_V_CCC_I
-        put(MsgSettingMaxValues(aapsLogger, danaPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-        put(MsgSettingBasalProfileAll(aapsLogger, danaPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-        put(MsgSettingShippingInfo(aapsLogger, danaPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
-        put(MsgSettingGlucose(aapsLogger, danaPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime(aapsLogger, danaPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
-        put(MsgSettingUserOptions(aapsLogger, danaPump))        // 0x320B CMD_SETTING_V_USER_OPTIONS
-        put(MsgSettingActiveProfile(aapsLogger, danaPump))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
-        put(MsgSettingProfileRatiosAll(aapsLogger, danaPump))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
-        put(MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
-        put(MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, 0.toByte(), Array(24) { 0.0 }))           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
-        put(MsgSetUserOptions(aapsLogger, danaPump))            // 0x330B CMD_SETTING_USER_OPTIONS_S
-        put(MsgSetActivateBasalProfile(aapsLogger, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
-        put(MsgHistoryAllDone(aapsLogger, danaPump))            // 0x41F1 CMD_HISTORY_ALL_DONE
-        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x41F2 CMD_HISTORY_ALL
-        put(MsgHistoryNewDone(aapsLogger, danaPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x42F2 CMD_HISTORY_NEW
-        put(MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
-        put(MsgStatusAPS_v2(aapsLogger, danaPump))              // 0xE001 CMD_PUMPSTATUS_APS
-        put(MsgSetAPSTempBasalStart_v2(aapsLogger, 0, false, false))   // 0xE002 CMD_PUMPSET_APSTEMP
-        put(MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, activePlugin, injector, dateUtil))          // 0xE003 CMD_GET_HISTORY
-        put(MsgSetHistoryEntry_v2(aapsLogger, 0, 0, 0, 0))        // 0xE004 CMD_SET_HISTORY_ENTRY
+        put(MsgBolusStop(injector))                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart(injector, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusStartWithSpeed(injector, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
+        put(MsgBolusProgress(injector))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile(injector))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+        put(MsgStatusTempBasal_v2(injector))        // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended_v2(injector))    // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBasic(injector))               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus(injector))                    // 0x020B CMD_PUMP_STATUS
+        put(MsgInitConnStatusTime(injector))        // 0x0301 CMD_PUMPINIT_TIME_INFO
+        put(MsgInitConnStatusBolus(injector))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic(injector))       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgInitConnStatusOption(injector))      // 0x0304 CMD_PUMPINIT_OPTION
+        put(MsgSetTempBasalStart(injector, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
+        put(MsgSetCarbsEntry(injector, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
+        put(MsgSetTempBasalStop(injector))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
+        put(MsgSetExtendedBolusStop(injector))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
+        put(MsgSetExtendedBolusStart(injector, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
+        put(MsgError(injector))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgPCCommStart(injector))               // 0x3001 CMD_CONNECT
+        put(MsgPCCommStop(injector))                // 0x3002 CMD_DISCONNECT
+        put(MsgHistoryBolus(injector))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(injector))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(injector))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(injector))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryError(injector))              // 0x3106 CMD_HISTORY_ERROR
+        put(MsgHistoryCarbo(injector))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgHistoryRefill(injector))             // 0x3108 CMD_HISTORY_REFILL
+        put(MsgHistorySuspend(injector))            // 0x3109 CMD_HISTORY_SUSPEND
+        put(MsgHistoryBasalHour(injector))          // 0x310A CMD_HISTORY_BASAL_HOUR
+        put(MsgHistoryDone(injector))               // 0x31F1 CMD_HISTORY_DONT_USED
+        put(MsgSettingBasal(injector))        // 0x3202 CMD_SETTING_V_BASAL_INS_I
+        put(MsgSettingMeal(injector))        // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
+        put(MsgSettingProfileRatios(injector))      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues(injector))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll(injector))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo(injector))       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose(injector))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime(injector))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSettingUserOptions(injector))        // 0x320B CMD_SETTING_V_USER_OPTIONS
+        put(MsgSettingActiveProfile(injector))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
+        put(MsgSettingProfileRatiosAll(injector))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
+        put(MsgSetSingleBasalProfile(injector, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
+        put(MsgSetBasalProfile(injector, 0.toByte(), Array(24) { 0.0 }))           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
+        put(MsgSetUserOptions(injector))            // 0x330B CMD_SETTING_USER_OPTIONS_S
+        put(MsgSetActivateBasalProfile(injector, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
+        put(MsgHistoryAllDone(injector))            // 0x41F1 CMD_HISTORY_ALL_DONE
+        put(MsgHistoryAll(injector))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryNewDone(injector))            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNew(injector))                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgCheckValue_v2(injector))        // 0xF0F1 CMD_PUMP_CHECK_VALUE
+        put(MsgStatusAPS_v2(injector))              // 0xE001 CMD_PUMPSTATUS_APS
+        put(MsgSetAPSTempBasalStart_v2(injector, 0, false, false))   // 0xE002 CMD_PUMPSET_APSTEMP
+        put(MsgHistoryEvents_v2(injector))          // 0xE003 CMD_GET_HISTORY
+        put(MsgSetHistoryEntry_v2(injector, 0, 0, 0, 0))        // 0xE004 CMD_SET_HISTORY_ENTRY
     }
 
     override fun put(message: MessageBase) {
@@ -106,6 +76,6 @@ class MessageHashTableRv2 @Inject constructor(
     }
 
     override fun findMessage(command: Int): MessageBase {
-        return messages[command] ?: MessageBase()
+        return messages[command] ?: MessageBase(injector)
     }
 }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
index 64d15af883..184acdec55 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgCheckValue_v2.kt
@@ -1,33 +1,18 @@
 package info.nightscout.androidaps.danaRv2.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
-import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.events.EventRebuildTabs
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgCheckValue_v2(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump,
-    private val danaRPlugin: DanaRPlugin,
-    private val danaRKoreanPlugin: DanaRKoreanPlugin,
-    private val danaRv2Plugin: DanaRv2Plugin,
-    private val configBuilderPlugin: ConfigBuilderInterface,
-    private val commandQueue: CommandQueueProvider
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
 
     init {
@@ -41,7 +26,7 @@ class MsgCheckValue_v2(
         danaPump.hwModel = intFromBuff(bytes, 0, 1)
         danaPump.protocol = intFromBuff(bytes, 1, 1)
         danaPump.productCode = intFromBuff(bytes, 2, 1)
-        if (danaPump.hwModel != info.nightscout.androidaps.dana.DanaPump.EXPORT_MODEL) {
+        if (danaPump.hwModel != DanaPump.EXPORT_MODEL) {
             danaPump.reset()
             val notification = Notification(Notification.WRONG_DRIVER, resourceHelper.gs(R.string.pumpdrivercorrected), Notification.NORMAL)
             rxBus.send(EventNewNotification(notification))
@@ -53,7 +38,7 @@ class MsgCheckValue_v2(
             danaRPlugin.setFragmentVisible(PluginType.PUMP, false)
             danaPump.reset() // mark not initialized
             //If profile coming from pump, switch it as well
-            configBuilderPlugin.storeSettings("ChangingDanaRv2Driver")
+            configBuilder.storeSettings("ChangingDanaRv2Driver")
             rxBus.send(EventRebuildTabs())
             commandQueue.readStatus("PumpDriverChange", null) // force new connection
             return
@@ -69,7 +54,7 @@ class MsgCheckValue_v2(
             danaRPlugin.setPluginEnabled(PluginType.PUMP, true)
             danaRPlugin.setFragmentVisible(PluginType.PUMP, true)
             //If profile coming from pump, switch it as well
-            configBuilderPlugin.storeSettings("ChangingDanaRv2Driver")
+            configBuilder.storeSettings("ChangingDanaRv2Driver")
             rxBus.send(EventRebuildTabs())
             commandQueue.readStatus("PumpDriverChange", null) // force new connection
             return
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
index 13e5ed1e51..ae2c29e8be 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgHistoryEvents_v2.kt
@@ -1,7 +1,6 @@
 package info.nightscout.androidaps.danaRv2.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.data.DetailedBolusInfo
@@ -9,26 +8,14 @@ import info.nightscout.androidaps.db.ExtendedBolus
 import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.db.TemporaryBasal
 import info.nightscout.androidaps.events.EventPumpStatusChanged
-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.bolusInfo.DetailedBolusInfoStorage
 import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 
 class MsgHistoryEvents_v2 constructor(
-    val aapsLogger: AAPSLogger,
-    val resourceHelper: ResourceHelper,
-    private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
-    val danaRv2Plugin: DanaRv2Plugin,
-    val rxBus: RxBusWrapper,
-    val activePlugin: ActivePluginProvider,
     private val injector: HasAndroidInjector,
-    private val dateUtil: DateUtil,
     var from: Long = 0
-) : MessageBase() {
+) : MessageBase(injector) {
 
     init {
         SetCommand(0xE003)
@@ -175,7 +162,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "CARBS " + dateUtil.timeString(datetime)
             }
 
-            else                                                        -> {
+            else                                                       -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "Event: " + recordCode + " " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Param1: " + param1 + " Param2: " + param2)
                 status = "UNKNOWN " + dateUtil.timeString(datetime)
             }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
index 8e09ee1273..cd1d36e29c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetAPSTempBasalStart_v2.kt
@@ -1,16 +1,16 @@
 package info.nightscout.androidaps.danaRv2.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.logging.LTag
 
 @Suppress("UNUSED_PARAMETER")
 class MsgSetAPSTempBasalStart_v2(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var percent: Int,
     fifteenMinutes: Boolean,
     thirtyMinutes: Boolean
-) : MessageBase() {
+) : MessageBase(injector) {
 
     val PARAM30MIN = 160
     val PARAM15MIN = 150
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt
index 7a73fc4c00..c19a3912a7 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgSetHistoryEntry_v2.kt
@@ -1,14 +1,14 @@
 package info.nightscout.androidaps.danaRv2.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.logging.LTag
 import java.util.*
 
 class MsgSetHistoryEntry_v2(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     type: Int, time: Long, param1: Int, param2: Int
-) : MessageBase() {
+) : MessageBase(injector) {
 
     init {
         SetCommand(0xE004)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
index d09355299e..383d190a48 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusAPS_v2.kt
@@ -1,14 +1,12 @@
 package info.nightscout.androidaps.danaRv2.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.logging.LTag
 
 class MsgStatusAPS_v2(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0xE001)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt
index 425c5c0469..f0afbabcb2 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusBolusExtended_v2.kt
@@ -1,15 +1,13 @@
 package info.nightscout.androidaps.danaRv2.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
+import info.nightscout.androidaps.logging.LTag
 import kotlin.math.ceil
 
 class MsgStatusBolusExtended_v2(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0207)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt
index cdd72aae2a..53f2c81e1d 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/comm/MsgStatusTempBasal_v2.kt
@@ -1,17 +1,13 @@
 package info.nightscout.androidaps.danaRv2.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.comm.MessageBase
-import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.logging.LTag
 import kotlin.math.ceil
 
 class MsgStatusTempBasal_v2(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val dateUtil: DateUtil
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0205)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
index 87d689530f..41267b5854 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danaRv2/services/DanaRv2ExecutionService.java
@@ -6,7 +6,6 @@ import android.os.Binder;
 import android.os.SystemClock;
 
 import java.io.IOException;
-import java.util.Date;
 
 import javax.inject.Inject;
 
@@ -157,11 +156,11 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     public void getPumpStatus() {
         try {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
-            MsgStatus statusMsg = new MsgStatus(aapsLogger, danaPump);
-            MsgStatusBasic statusBasicMsg = new MsgStatusBasic(aapsLogger, danaPump);
-            MsgStatusTempBasal_v2 tempStatusMsg = new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil);
-            MsgStatusBolusExtended_v2 exStatusMsg = new MsgStatusBolusExtended_v2(aapsLogger, danaPump);
-            MsgCheckValue_v2 checkValue = new MsgCheckValue_v2(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, danaRv2Plugin, configBuilderPlugin, commandQueue);
+            MsgStatus statusMsg = new MsgStatus(injector);
+            MsgStatusBasic statusBasicMsg = new MsgStatusBasic(injector);
+            MsgStatusTempBasal_v2 tempStatusMsg = new MsgStatusTempBasal_v2(injector);
+            MsgStatusBolusExtended_v2 exStatusMsg = new MsgStatusBolusExtended_v2(injector);
+            MsgCheckValue_v2 checkValue = new MsgCheckValue_v2(injector);
 
             if (danaPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
@@ -184,14 +183,14 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             PumpInterface pump = activePlugin.getActivePump();
             if (profile != null && Math.abs(danaPump.getCurrentBasal() - profile.getBasal()) >= pump.getPumpDescription().basalStep) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(injector));
                 if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(new EventProfileNeedsUpdate());
                 }
             }
 
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
-            mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+            mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
             if (danaPump.getPumpTime() == 0) {
                 // initial handshake was not successfull
                 // deinitialize pump
@@ -221,8 +220,8 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
                 } else {
                     waitForWholeMinute(); // Dana can set only whole minute
                     // add 10sec to be sure we are over minute (will be cutted off anyway)
-                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, dateUtil, new Date(DateUtil.now() + T.secs(10).msecs())));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                    mSerialIOThread.sendMessage(new MsgSetTime(injector, DateUtil.now() + T.secs(10).msecs()));
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
                     timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
@@ -231,17 +230,17 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             long now = System.currentTimeMillis();
             if (danaPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !pump.isInitialized()) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(injector));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(injector));
+                mSerialIOThread.sendMessage(new MsgSettingMeal(injector));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(injector));
                 //0x3201
-                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingUserOptions(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingMaxValues(injector));
+                mSerialIOThread.sendMessage(new MsgSettingGlucose(injector));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(injector));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(injector));
+                mSerialIOThread.sendMessage(new MsgSettingUserOptions(injector));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(injector));
                 danaPump.setLastSettingsRead(now);
             }
 
@@ -268,12 +267,12 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(aapsLogger, percent, durationInHours));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(injector, percent, durationInHours));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(injector));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -283,12 +282,12 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(aapsLogger, percent, durationInMinutes == 15, durationInMinutes == 30));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(injector, percent, durationInMinutes == 15, durationInMinutes == 30));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(injector));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -303,12 +302,12 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(aapsLogger, percent, durationInMinutes == 15, durationInMinutes == 30));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetAPSTempBasalStart_v2(injector, percent, durationInMinutes == 15, durationInMinutes == 30));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(injector));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -317,8 +316,8 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     public boolean tempBasalStop() {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(aapsLogger, danaPump, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal_v2(injector));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -327,8 +326,8 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     public boolean extendedBolus(double insulin, int durationInHalfHours) {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(aapsLogger, constraintChecker, insulin, (byte) (durationInHalfHours & 0xFF)));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2(aapsLogger, danaPump));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(injector, insulin, (byte) (durationInHalfHours & 0xFF)));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2(injector));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -337,8 +336,8 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
     public boolean extendedBolusStop() {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2(aapsLogger, danaPump));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(injector));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended_v2(injector));
         loadEvents();
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
@@ -354,16 +353,16 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         final int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
         MessageBase start;
         if (preferencesSpeed == 0)
-            start = new MsgBolusStart(aapsLogger, constraintChecker, danaPump, amount);
+            start = new MsgBolusStart(injector, amount);
         else
-            start = new MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, amount, preferencesSpeed);
+            start = new MsgBolusStartWithSpeed(injector, amount, preferencesSpeed);
         danaPump.setBolusStopped(false);
         danaPump.setBolusStopForced(false);
 
         if (carbs > 0) {
-            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(aapsLogger, carbtime, carbs);
+            MsgSetCarbsEntry msg = new MsgSetCarbsEntry(injector, carbtime, carbs);
             mSerialIOThread.sendMessage(msg);
-            MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(aapsLogger, DanaPump.CARBS, carbtime, carbs, 0);
+            MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(injector, DanaPump.CARBS, carbtime, carbs, 0);
             mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
             lastHistoryFetched = Math.min(lastHistoryFetched, carbtime - T.mins(1).msecs());
         }
@@ -420,7 +419,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
             public void run() {
                 // load last bolus status
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)));
-                mSerialIOThread.sendMessage(new MsgStatus(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgStatus(injector));
                 bolusingEvent.setPercent(100);
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)));
             }
@@ -430,9 +429,9 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
 
     public boolean carbsEntry(int amount, long time) {
         if (!isConnected()) return false;
-        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(aapsLogger, time, amount);
+        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(injector, time, amount);
         mSerialIOThread.sendMessage(msg);
-        MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(aapsLogger, DanaPump.CARBS, time, amount, 0);
+        MsgSetHistoryEntry_v2 msgSetHistoryEntry_v2 = new MsgSetHistoryEntry_v2(injector, DanaPump.CARBS, time, amount, 0);
         mSerialIOThread.sendMessage(msgSetHistoryEntry_v2);
         lastHistoryFetched = Math.min(lastHistoryFetched, time - T.mins(1).msecs());
         return true;
@@ -449,7 +448,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected())
             return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
-        MsgHistoryEvents_v2 msg = new MsgHistoryEvents_v2(aapsLogger, resourceHelper, detailedBolusInfoStorage, danaRv2Plugin, rxBus, activePlugin, injector, dateUtil, lastHistoryFetched);
+        MsgHistoryEvents_v2 msg = new MsgHistoryEvents_v2(injector, lastHistoryFetched);
         aapsLogger.debug(LTag.PUMP, "Loading event history from: " + dateUtil.dateAndTimeString(lastHistoryFetched));
 
         mSerialIOThread.sendMessage(msg);
@@ -469,9 +468,9 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
         Double[] basal = danaPump.buildDanaRProfileRecord(profile);
-        MsgSetBasalProfile msgSet = new MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, (byte) 0, basal);
+        MsgSetBasalProfile msgSet = new MsgSetBasalProfile(injector, (byte) 0, basal);
         mSerialIOThread.sendMessage(msgSet);
-        MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile(aapsLogger, (byte) 0);
+        MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile(injector, (byte) 0);
         mSerialIOThread.sendMessage(msgActivate);
         danaPump.setLastSettingsRead(0); // force read full settings
         getPumpStatus();
@@ -483,7 +482,7 @@ public class DanaRv2ExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected())
             return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
-        MsgSetUserOptions msg = new MsgSetUserOptions(aapsLogger, danaPump);
+        MsgSetUserOptions msg = new MsgSetUserOptions(injector);
         mSerialIOThread.sendMessage(msg);
         SystemClock.sleep(200);
         return new PumpEnactResult(injector).success(!msg.failed);
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
index fc9e9ab6ec..9f918a416c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageBase.java
@@ -3,19 +3,33 @@ package info.nightscout.androidaps.danar.comm;
 import android.annotation.TargetApi;
 import android.os.Build;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.joda.time.DateTime;
 
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.GregorianCalendar;
 
-import info.nightscout.androidaps.logging.L;
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.dana.DanaPump;
+import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin;
+import info.nightscout.androidaps.danaRv2.DanaRv2Plugin;
+import info.nightscout.androidaps.danar.DanaRPlugin;
+import info.nightscout.androidaps.interfaces.ActivePluginProvider;
+import info.nightscout.androidaps.interfaces.CommandQueueProvider;
+import info.nightscout.androidaps.interfaces.ConfigBuilderInterface;
+import info.nightscout.androidaps.interfaces.DatabaseHelperInterface;
+import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
-import info.nightscout.androidaps.logging.StacktraceLoggerWrapper;
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper;
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker;
+import info.nightscout.androidaps.plugins.general.nsclient.NSUpload;
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage;
 import info.nightscout.androidaps.utils.CRC;
+import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.resources.ResourceHelper;
 
 /*
  *  00  01   02  03   04   05  06
@@ -24,22 +38,39 @@ import info.nightscout.androidaps.utils.CRC;
  */
 
 public class MessageBase {
-    private static Logger log = StacktraceLoggerWrapper.getLogger(LTag.PUMPCOMM);
+    @Inject public AAPSLogger aapsLogger;
+    @Inject public DateUtil dateUtil;
+    @Inject public DanaPump danaPump;
+    @Inject public DanaRPlugin danaRPlugin;
+    @Inject public DanaRKoreanPlugin danaRKoreanPlugin;
+    @Inject public DanaRv2Plugin danaRv2Plugin;
+    @Inject public RxBusWrapper rxBus;
+    @Inject public ResourceHelper resourceHelper;
+    @Inject public ActivePluginProvider activePlugin;
+    @Inject public ConfigBuilderInterface configBuilder;
+    @Inject public CommandQueueProvider commandQueue;
+    @Inject public DetailedBolusInfoStorage detailedBolusInfoStorage;
+    @Inject public ConstraintChecker constraintChecker;
+    @Inject public NSUpload nsUpload;
+    @Inject public DatabaseHelperInterface databaseHelper;
+    HasAndroidInjector injector;
+
     public byte[] buffer = new byte[512];
     private int position = 6;
 
     public boolean received = false;
     public boolean failed = false;
 
+    public MessageBase(HasAndroidInjector injector) {
+        injector.androidInjector().inject(this);
+        this. injector = injector;
+    }
+
     public void SetCommand(int cmd) {
         this.buffer[4] = (byte) (cmd >> 8 & 0xFF);
         this.buffer[5] = (byte) (cmd & 0xFF);
     }
 
-    public void resetBuffer() {
-        position = 6;
-    }
-
     public void AddParamByte(byte data) {
         this.buffer[this.position++] = data;
     }
@@ -66,13 +97,15 @@ public class MessageBase {
         AddParamByte((byte) (date.get(Calendar.SECOND)));
     }
 
-    public void AddParamDateTime(Date date) {
-        AddParamByte((byte) (date.getSeconds()));
-        AddParamByte((byte) (date.getMinutes()));
-        AddParamByte((byte) (date.getHours()));
-        AddParamByte((byte) (date.getDate()));
-        AddParamByte((byte) (date.getMonth() + 1));
-        AddParamByte((byte) (date.getYear() - 100));
+    public void AddParamDateTimeReversed(long timestamp) {
+        GregorianCalendar date = new GregorianCalendar();
+        date.setTimeInMillis(timestamp);
+        AddParamByte((byte) (date.get(Calendar.SECOND)));
+        AddParamByte((byte) (date.get(Calendar.MINUTE)));
+        AddParamByte((byte) (date.get(Calendar.HOUR_OF_DAY)));
+        AddParamByte((byte) (date.get(Calendar.DAY_OF_MONTH)));
+        AddParamByte((byte) (date.get(Calendar.MONTH) + 1));
+        AddParamByte((byte) (date.get(Calendar.YEAR) - 1900 - 100));
     }
 
     public byte[] getRawMessageBytes() {
@@ -97,13 +130,11 @@ public class MessageBase {
     }
 
     public void handleMessage(byte[] bytes) {
-        if (L.isEnabled(LTag.PUMPCOMM)) {
-            if (bytes.length > 6) {
-                int command = (bytes[5] & 0xFF) | ((bytes[4] << 8) & 0xFF00);
-                log.debug("UNPROCESSED MSG: " + getMessageName() + " Command: " + String.format("%04X", command) + " Data: " + toHexString(bytes));
-            } else {
-                log.debug("MISFORMATTED MSG: " + toHexString(bytes));
-            }
+        if (bytes.length > 6) {
+            int command = (bytes[5] & 0xFF) | ((bytes[4] << 8) & 0xFF00);
+            aapsLogger.debug(LTag.PUMPCOMM, "UNPROCESSED MSG: " + getMessageName() + " Command: " + String.format("%04X", command) + " Data: " + toHexString(bytes));
+        } else {
+            aapsLogger.debug(LTag.PUMPCOMM, "MISFORMATTED MSG: " + toHexString(bytes));
         }
     }
 
@@ -115,11 +146,11 @@ public class MessageBase {
         return command;
     }
 
-    public static int byteFromRawBuff(byte[] buff, int offset) {
+    public int byteFromRawBuff(byte[] buff, int offset) {
         return buff[offset] & 0xFF;
     }
 
-    public static int intFromBuff(byte[] buff, int offset, int length) {
+    public int intFromBuff(byte[] buff, int offset, int length) {
         offset += 6;
         switch (length) {
             case 1:
@@ -134,37 +165,39 @@ public class MessageBase {
         return 0;
     }
 
-    public static long dateTimeFromBuff(byte[] buff, int offset) {
+    public long dateTimeFromBuff(byte[] buff, int offset) {
         return
-                new Date(
-                        100 + intFromBuff(buff, offset, 1),
-                        intFromBuff(buff, offset + 1, 1) - 1,
+                new DateTime(
+                        2000 + intFromBuff(buff, offset, 1),
+                        intFromBuff(buff, offset + 1, 1),
                         intFromBuff(buff, offset + 2, 1),
                         intFromBuff(buff, offset + 3, 1),
                         intFromBuff(buff, offset + 4, 1),
                         0
-                ).getTime();
+                ).getMillis();
     }
 
-    public static synchronized long dateTimeSecFromBuff(byte[] buff, int offset) {
+    public synchronized long dateTimeSecFromBuff(byte[] buff, int offset) {
         return
-                new Date(
-                        100 + intFromBuff(buff, offset, 1),
-                        intFromBuff(buff, offset + 1, 1) - 1,
+                new DateTime(
+                        2000 + intFromBuff(buff, offset, 1),
+                        intFromBuff(buff, offset + 1, 1),
                         intFromBuff(buff, offset + 2, 1),
                         intFromBuff(buff, offset + 3, 1),
                         intFromBuff(buff, offset + 4, 1),
                         intFromBuff(buff, offset + 5, 1)
-                ).getTime();
+                ).getMillis();
     }
 
-    public static long dateFromBuff(byte[] buff, int offset) {
+    public long dateFromBuff(byte[] buff, int offset) {
         return
-                new Date(
-                        100 + intFromBuff(buff, offset, 1),
-                        intFromBuff(buff, offset + 1, 1) - 1,
-                        intFromBuff(buff, offset + 2, 1)
-                ).getTime();
+                new DateTime(
+                        2000 + intFromBuff(buff, offset, 1),
+                        intFromBuff(buff, offset + 1, 1),
+                        intFromBuff(buff, offset + 2, 1),
+                        0,
+                        0
+                ).getMillis();
     }
 
     @TargetApi(Build.VERSION_CODES.KITKAT)
@@ -184,7 +217,7 @@ public class MessageBase {
     }
 
     public static String toHexString(byte[] buff) {
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         int count = 0;
         for (byte element : buff) {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt
index 9ecf8c8d12..4e36973f26 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MessageHashTableR.kt
@@ -1,99 +1,73 @@
 package info.nightscout.androidaps.danar.comm
 
 import dagger.android.HasAndroidInjector
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
 class MessageHashTableR @Inject constructor(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    resourceHelper: ResourceHelper,
-    constraintChecker: ConstraintChecker,
-    danaPump: DanaPump,
-    danaRPlugin: DanaRPlugin,
-    danaRKoreanPlugin: DanaRKoreanPlugin,
-    configBuilderPlugin: ConfigBuilderInterface,
-    commandQueue: CommandQueueProvider,
-    activePlugin: ActivePluginProvider,
-    nsUpload: NSUpload,
-    injector: HasAndroidInjector,
-    databaseHelper: DatabaseHelperInterface,
-    dateUtil: DateUtil
+    private val injector: HasAndroidInjector
 ) : MessageHashTableBase {
 
     var messages: HashMap<Int, MessageBase> = HashMap()
 
     init {
-        put(MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump))                 // 0x0101 CMD_MEALINS_STOP
-        put(MsgBolusStart(aapsLogger, constraintChecker, danaPump, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
-        put(MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
-        put(MsgBolusProgress(aapsLogger, resourceHelper, rxBus, danaPump))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
-        put(MsgStatusProfile(aapsLogger, danaPump))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
-        put(MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector))           // 0x0205 CMD_PUMP_EXERCISE_MODE
-        put(MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil))       // 0x0207 CMD_PUMP_EXPANS_INS_I
-        put(MsgStatusBasic(aapsLogger, danaPump))               // 0x020A CMD_PUMP_INITVIEW_I
-        put(MsgStatus(aapsLogger, danaPump))                    // 0x020B CMD_PUMP_STATUS
+        put(MsgBolusStop(injector))                 // 0x0101 CMD_MEALINS_STOP
+        put(MsgBolusStart(injector, 0.0))                // 0x0102 CMD_MEALINS_START_DATA
+        put(MsgBolusStartWithSpeed(injector, 0.0, 0))       // 0x0104 CMD_MEALINS_START_DATA_SPEED
+        put(MsgBolusProgress(injector))             // 0x0202 CMD_PUMP_THIS_REMAINDER_MEAL_INS
+        put(MsgStatusProfile(injector))             // 0x0204 CMD_PUMP_CALCULATION_SETTING
+        put(MsgStatusTempBasal(injector))           // 0x0205 CMD_PUMP_EXERCISE_MODE
+        put(MsgStatusBolusExtended(injector))       // 0x0207 CMD_PUMP_EXPANS_INS_I
+        put(MsgStatusBasic(injector))               // 0x020A CMD_PUMP_INITVIEW_I
+        put(MsgStatus(injector))                    // 0x020B CMD_PUMP_STATUS
         // 0x0301 CMD_PUMPINIT_TIME_INFO
-        put(MsgInitConnStatusTime(aapsLogger, rxBus, resourceHelper, danaPump, danaRPlugin, danaRKoreanPlugin, configBuilderPlugin, commandQueue, dateUtil))
-        put(MsgInitConnStatusBolus(aapsLogger, rxBus, resourceHelper, danaPump))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
-        put(MsgInitConnStatusBasic(aapsLogger, danaPump))       // 0x0303 CMD_PUMPINIT_INIT_INFO
-        put(MsgInitConnStatusOption(aapsLogger, rxBus, resourceHelper, danaPump, activePlugin))      // 0x0304 CMD_PUMPINIT_OPTION
-        put(MsgSetTempBasalStart(aapsLogger, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
-        put(MsgSetCarbsEntry(aapsLogger, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
-        put(MsgSetTempBasalStop(aapsLogger))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
-        put(MsgSetExtendedBolusStop(aapsLogger))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
-        put(MsgSetExtendedBolusStart(aapsLogger, constraintChecker, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
-        put(MsgError(aapsLogger, rxBus, resourceHelper, danaPump, nsUpload))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
-        put(MsgPCCommStart(aapsLogger))               // 0x3001 CMD_CONNECT
-        put(MsgPCCommStop(aapsLogger))                // 0x3002 CMD_DISCONNECT
-        put(MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3101 CMD_HISTORY_MEAL_INS
-        put(MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil, databaseHelper))       // 0x3102 CMD_HISTORY_DAY_INS
-        put(MsgHistoryGlucose(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3104 CMD_HISTORY_GLUCOSE
-        put(MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3105 CMD_HISTORY_ALARM
-        put(MsgHistoryError(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3106 CMD_HISTORY_ERROR
-        put(MsgHistoryCarbo(aapsLogger, rxBus, dateUtil, databaseHelper))              // 0x3107 CMD_HISTORY_CARBOHY
-        put(MsgHistoryRefill(aapsLogger, rxBus, dateUtil, databaseHelper))             // 0x3108 CMD_HISTORY_REFILL
-        put(MsgHistorySuspend(aapsLogger, rxBus, dateUtil, databaseHelper))            // 0x3109 CMD_HISTORY_SUSPEND
-        put(MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil, databaseHelper))          // 0x310A CMD_HISTORY_BASAL_HOUR
-        put(MsgHistoryDone(aapsLogger, danaPump))               // 0x31F1 CMD_HISTORY_DONT_USED
+        put(MsgInitConnStatusTime(injector))
+        put(MsgInitConnStatusBolus(injector))       // 0x0302 CMD_PUMPINIT_BOLUS_INFO
+        put(MsgInitConnStatusBasic(injector))       // 0x0303 CMD_PUMPINIT_INIT_INFO
+        put(MsgInitConnStatusOption(injector))      // 0x0304 CMD_PUMPINIT_OPTION
+        put(MsgSetTempBasalStart(injector, 0, 0))         // 0x0401 CMD_PUMPSET_EXERCISE_S
+        put(MsgSetCarbsEntry(injector, 0, 0))             // 0x0402 CMD_PUMPSET_HIS_S
+        put(MsgSetTempBasalStop(injector))          // 0x0403 CMD_PUMPSET_EXERCISE_STOP
+        put(MsgSetExtendedBolusStop(injector))      // 0x0406 CMD_PUMPSET_EXPANS_INS_STOP
+        put(MsgSetExtendedBolusStart(injector, 0.0, 0))     // 0x0407 CMD_PUMPSET_EXPANS_INS_S
+        put(MsgError(injector))                     // 0x0601 CMD_PUMPOWAY_SYSTEM_STATUS
+        put(MsgPCCommStart(injector))               // 0x3001 CMD_CONNECT
+        put(MsgPCCommStop(injector))                // 0x3002 CMD_DISCONNECT
+        put(MsgHistoryBolus(injector))              // 0x3101 CMD_HISTORY_MEAL_INS
+        put(MsgHistoryDailyInsulin(injector))       // 0x3102 CMD_HISTORY_DAY_INS
+        put(MsgHistoryGlucose(injector))            // 0x3104 CMD_HISTORY_GLUCOSE
+        put(MsgHistoryAlarm(injector))              // 0x3105 CMD_HISTORY_ALARM
+        put(MsgHistoryError(injector))              // 0x3106 CMD_HISTORY_ERROR
+        put(MsgHistoryCarbo(injector))              // 0x3107 CMD_HISTORY_CARBOHY
+        put(MsgHistoryRefill(injector))             // 0x3108 CMD_HISTORY_REFILL
+        put(MsgHistorySuspend(injector))            // 0x3109 CMD_HISTORY_SUSPEND
+        put(MsgHistoryBasalHour(injector))          // 0x310A CMD_HISTORY_BASAL_HOUR
+        put(MsgHistoryDone(injector))               // 0x31F1 CMD_HISTORY_DONT_USED
         // 0x3202 CMD_SETTING_V_BASAL_INS_I
-        put(MsgSettingBasal(aapsLogger, danaPump, danaRPlugin))
+        put(MsgSettingBasal(injector))
         // 0x3203 CMD_SETTING_V_MEAL_SETTING_I
-        put(MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin))
-        put(MsgSettingProfileRatios(aapsLogger, danaPump))      // 0x3204 CMD_SETTING_V_CCC_I
-        put(MsgSettingMaxValues(aapsLogger, danaPump))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
-        put(MsgSettingBasalProfileAll(aapsLogger, danaPump))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
-        put(MsgSettingShippingInfo(aapsLogger, danaPump))       // 0x3207 CMD_SETTING_V_SHIPPING_I
-        put(MsgSettingGlucose(aapsLogger, danaPump))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
-        put(MsgSettingPumpTime(aapsLogger, danaPump, dateUtil))           // 0x320A CMD_SETTING_V_TIME_I
-        put(MsgSettingUserOptions(aapsLogger, danaPump))        // 0x320B CMD_SETTING_V_USER_OPTIONS
-        put(MsgSettingActiveProfile(aapsLogger, danaPump))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
-        put(MsgSettingProfileRatiosAll(aapsLogger, danaPump))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
-        put(MsgSetSingleBasalProfile(aapsLogger, rxBus, resourceHelper, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
-        put(MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, 0.toByte(), Array(24) { 0.0 }))           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
-        put(MsgSetUserOptions(aapsLogger, danaPump))            // 0x330B CMD_SETTING_USER_OPTIONS_S
-        put(MsgSetActivateBasalProfile(aapsLogger, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
-        put(MsgHistoryAllDone(aapsLogger, danaPump))            // 0x41F1 CMD_HISTORY_ALL_DONE
-        put(MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x41F2 CMD_HISTORY_ALL
-        put(MsgHistoryNewDone(aapsLogger, danaPump))            // 0x42F1 CMD_HISTORY_NEW_DONE
-        put(MsgHistoryNew(aapsLogger, rxBus, dateUtil, databaseHelper))                // 0x42F2 CMD_HISTORY_NEW
+        put(MsgSettingMeal(injector))
+        put(MsgSettingProfileRatios(injector))      // 0x3204 CMD_SETTING_V_CCC_I
+        put(MsgSettingMaxValues(injector))          // 0x3205 CMD_SETTING_V_MAX_VALUE_I
+        put(MsgSettingBasalProfileAll(injector))    // 0x3206 CMD_SETTING_V_BASAL_PROFILE_ALL
+        put(MsgSettingShippingInfo(injector))       // 0x3207 CMD_SETTING_V_SHIPPING_I
+        put(MsgSettingGlucose(injector))            // 0x3209 CMD_SETTING_V_GLUCOSEandEASY
+        put(MsgSettingPumpTime(injector))           // 0x320A CMD_SETTING_V_TIME_I
+        put(MsgSettingUserOptions(injector))        // 0x320B CMD_SETTING_V_USER_OPTIONS
+        put(MsgSettingActiveProfile(injector))      // 0x320C CMD_SETTING_V_PROFILE_NUMBER
+        put(MsgSettingProfileRatiosAll(injector))   // 0x320D CMD_SETTING_V_CIR_CF_VALUE
+        put(MsgSetSingleBasalProfile(injector, Array(24) { 0.0 }))     // 0x3302 CMD_SETTING_BASAL_INS_S
+        put(MsgSetBasalProfile(injector, 0.toByte(), Array(24) { 0.0 }))           // 0x3306 CMD_SETTING_BASAL_PROFILE_S
+        put(MsgSetUserOptions(injector))            // 0x330B CMD_SETTING_USER_OPTIONS_S
+        put(MsgSetActivateBasalProfile(injector, 0.toByte()))   // 0x330C CMD_SETTING_PROFILE_NUMBER_S
+        put(MsgHistoryAllDone(injector))            // 0x41F1 CMD_HISTORY_ALL_DONE
+        put(MsgHistoryAll(injector))                // 0x41F2 CMD_HISTORY_ALL
+        put(MsgHistoryNewDone(injector))            // 0x42F1 CMD_HISTORY_NEW_DONE
+        put(MsgHistoryNew(injector))                // 0x42F2 CMD_HISTORY_NEW
         // 0xF0F1 CMD_PUMP_CHECK_VALUE
-        put(MsgCheckValue(aapsLogger, danaPump, danaRPlugin))
+        put(MsgCheckValue(injector))
     }
 
     override fun put(message: MessageBase) {
@@ -101,6 +75,6 @@ class MessageHashTableR @Inject constructor(
     }
 
     override fun findMessage(command: Int): MessageBase {
-        return messages[command] ?: MessageBase()
+        return messages[command] ?: MessageBase(injector)
     }
 }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
index ecc27bed6a..2cceeb10f1 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusProgress.kt
@@ -1,20 +1,14 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 import kotlin.math.min
 
 class MsgBolusProgress(
-    private val aapsLogger: AAPSLogger,
-    private val resourceHelper: ResourceHelper,
-    private val rxBus: RxBusWrapper,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0202)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
index 4ea0916bec..66ba788656 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStart.kt
@@ -1,17 +1,13 @@
 package info.nightscout.androidaps.danar.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgBolusStart(
-    private val aapsLogger: AAPSLogger,
-    constraintChecker: ConstraintChecker,
-    private val danaPump: DanaPump,
+    injector: HasAndroidInjector,
     private var amount: Double
-) : MessageBase() {
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0102)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
index a683851ae3..845d6407d9 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStartWithSpeed.kt
@@ -1,18 +1,14 @@
 package info.nightscout.androidaps.danar.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgBolusStartWithSpeed(
-    private val aapsLogger: AAPSLogger,
-    constraintChecker: ConstraintChecker,
-    private val danaPump: DanaPump,
+    injector: HasAndroidInjector,
     private var amount: Double,
     speed: Int
-) : MessageBase() {
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0104)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
index 8d9ae93671..a531d1cc03 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgBolusStop.kt
@@ -1,19 +1,13 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgBolusStop(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0101)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
index afc59a642c..d6c9ef2255 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgCheckValue.kt
@@ -1,15 +1,12 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danar.DanaRPlugin
+import info.nightscout.androidaps.logging.LTag
 
 class MsgCheckValue(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val danaRPlugin: DanaRPlugin
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0xF0F1)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
index 2f451ee8ac..4791424d8e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgError.kt
@@ -1,21 +1,13 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.plugins.general.nsclient.NSUpload
 import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgError(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump,
-    private val nsUpload: NSUpload
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0601)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt
index 81750a9eac..c531f30ad4 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAlarm.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryAlarm(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3105)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
index 5c437ddc77..f7573d14c2 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAll.kt
@@ -1,19 +1,13 @@
 package info.nightscout.androidaps.danar.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.db.DanaRHistoryRecord
 import info.nightscout.androidaps.events.EventDanaRSyncStatus
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 open class MsgHistoryAll(
-    val aapsLogger: AAPSLogger,
-    val rxBus: RxBusWrapper,
-    private val dateUtil: DateUtil,
-    private val databaseHelper: DatabaseHelperInterface
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x41F2)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
index c439f5af77..431a301a7a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryAllDone.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgHistoryAllDone(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x41F1)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt
index 14b7c009c6..a90847871e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBasalHour.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryBasalHour(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x310A)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt
index 94ee55b969..b7f2cd011a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryBolus.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryBolus(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3101)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt
index 9f55b2c5e2..2aa76526d7 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryCarbo.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryCarbo(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3107)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt
index 173eaa29ea..df0e3135d6 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDailyInsulin.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryDailyInsulin(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3102)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
index 2279fd40d9..a528a630c4 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryDone.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgHistoryDone(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x31F1)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt
index e8ee5fd720..55ddadb91a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryError.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryError(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3106)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt
index 325154157d..15f40773fa 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryGlucose.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryGlucose(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3104)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt
index 1ba71e3138..21e9d23672 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNew.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryNew(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x42F2)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
index ce9cd5ed89..77f627d8ff 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryNewDone.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgHistoryNewDone(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x42F1)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt
index 66494adfbb..1b4b38d67b 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistoryRefill.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistoryRefill(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3108)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt
index a37fad26f9..a0b6bbb9a3 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgHistorySuspend.kt
@@ -1,17 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.interfaces.DatabaseHelperInterface
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
-import info.nightscout.androidaps.utils.DateUtil
 
 class MsgHistorySuspend(
-    aapsLogger: AAPSLogger,
-    rxBus: RxBusWrapper,
-    dateUtil: DateUtil,
-    databaseHelper: DatabaseHelperInterface
-) : MsgHistoryAll(aapsLogger, rxBus, dateUtil, databaseHelper) {
+    injector: HasAndroidInjector
+) : MsgHistoryAll(injector) {
 
     init {
         SetCommand(0x3109)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
index 0ec5675d8d..c0b3864df1 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBasic.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgInitConnStatusBasic(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0303)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
index b53541a077..f866533d08 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusBolus.kt
@@ -1,21 +1,15 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusBolus(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0302)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
index e44fda8252..3fa4ef120c 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusOption.kt
@@ -1,23 +1,15 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaPump
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.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.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusOption(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump,
-    private val activePlugin: ActivePluginProvider
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0304)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
index b03946d4ba..090d4ee443 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgInitConnStatusTime.kt
@@ -1,32 +1,16 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
-import info.nightscout.androidaps.danar.DanaRPlugin
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.events.EventRebuildTabs
-import info.nightscout.androidaps.interfaces.CommandQueueProvider
-import info.nightscout.androidaps.interfaces.ConfigBuilderInterface
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.DateUtil
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgInitConnStatusTime(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump,
-    private val danaRPlugin: DanaRPlugin,
-    private val danaRKoreanPlugin: DanaRKoreanPlugin,
-    private val configBuilderPlugin: ConfigBuilderInterface,
-    private val commandQueue: CommandQueueProvider,
-    private val dateUtil: DateUtil
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0301)
@@ -45,7 +29,7 @@ class MsgInitConnStatusTime(
             danaRPlugin.setFragmentVisible(PluginType.PUMP, false)
             danaPump.reset() // mark not initialized
             //If profile coming from pump, switch it as well
-            configBuilderPlugin.storeSettings("ChangingDanaDriver")
+            configBuilder.storeSettings("ChangingDanaDriver")
             rxBus.send(EventRebuildTabs())
             commandQueue.readStatus("PumpDriverChange", null) // force new connection
             failed = false
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt
index 3765d47905..3bb8aca2df 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStart.kt
@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 
 class MsgPCCommStart constructor(
-    private val aapsLogger: AAPSLogger
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3001)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt
index c2c2ee78d8..e71226a556 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgPCCommStop.kt
@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 
 class MsgPCCommStop(
-    private val aapsLogger: AAPSLogger
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3002)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt
index ba60178a34..da1f3fc439 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetActivateBasalProfile.kt
@@ -1,12 +1,12 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 
 class MsgSetActivateBasalProfile(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     index: Byte
-) : MessageBase() {
+) : MessageBase(injector) {
 
     // index 0-3
     init {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
index f49a34b394..b72acacffe 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetBasalProfile.kt
@@ -1,20 +1,16 @@
 package info.nightscout.androidaps.danar.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgSetBasalProfile(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
+    injector: HasAndroidInjector,
     index: Byte,
     values: Array<Double>
-) : MessageBase() {
+) : MessageBase(injector) {
 
     // index 0-3
     init {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt
index 611da11862..bf5010d5e6 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetCarbsEntry.kt
@@ -1,14 +1,14 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 import java.util.*
 
 class MsgSetCarbsEntry(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     val time: Long,
     val amount: Int
-) : MessageBase() {
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0402)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
index cb13f2c2e1..e4af85ecf0 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStart.kt
@@ -1,17 +1,15 @@
 package info.nightscout.androidaps.danar.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.Constraint
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 
 class MsgSetExtendedBolusStart(
-    private val aapsLogger: AAPSLogger,
-    constraintChecker: ConstraintChecker,
+    injector: HasAndroidInjector,
     private var amount: Double,
     private var halfhours: Byte
 
-) : MessageBase() {
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0407)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt
index b655ba6361..422fef6875 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetExtendedBolusStop.kt
@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 
 class MsgSetExtendedBolusStop(
-    private val aapsLogger: AAPSLogger
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0406)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
index c194eebe0e..fe183a648e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetSingleBasalProfile.kt
@@ -1,19 +1,15 @@
 package info.nightscout.androidaps.danar.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgSetSingleBasalProfile(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
+    injector: HasAndroidInjector,
     values: Array<Double>
-) : MessageBase() {
+) : MessageBase(injector) {
 
     // index 0-3
     init {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt
index e9f9a201c2..85a515d78b 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStart.kt
@@ -1,13 +1,13 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 
 class MsgSetTempBasalStart(
-    private val aapsLogger: AAPSLogger,
+    injector: HasAndroidInjector,
     private var percent: Int,
     private var durationInHours: Int
-) : MessageBase() {
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0401)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt
index 97551b446c..8fa27bec42 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTempBasalStop.kt
@@ -1,11 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
 
 class MsgSetTempBasalStop(
-    private val aapsLogger: AAPSLogger
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0403)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt
index aa526f19ad..e9a61dcb9f 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetTime.kt
@@ -1,19 +1,16 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.utils.DateUtil
-import java.util.*
 
 class MsgSetTime(
-    private val aapsLogger: AAPSLogger,
-    private val dateUtil: DateUtil,
-    time: Date
-) : MessageBase() {
+    injector: HasAndroidInjector,
+    time: Long
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x330a)
-        AddParamDateTime(time)
+        AddParamDateTimeReversed(time)
         aapsLogger.debug(LTag.PUMPCOMM, "New message: time:" + dateUtil.dateAndTimeString(time))
     }
 
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
index ab69e4017c..68d6ef73d9 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSetUserOptions.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgSetUserOptions(
-    private val aapsLogger: AAPSLogger,
-    danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x330B)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
index dbc313ad4e..09ae3d740e 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingActiveProfile.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgSettingActiveProfile(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x320C)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
index ed377cb020..dd62d52352 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasal.kt
@@ -1,16 +1,12 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danar.DanaRPlugin
 import java.util.*
 
 class MsgSettingBasal(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val danaRPlugin: DanaRPlugin
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3202)
@@ -18,7 +14,7 @@ class MsgSettingBasal(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        danaPump.pumpProfiles =  Array(4) {Array(48) {0.0} }
+        danaPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
         for (index in 0..23) {
             var basal = intFromBuff(bytes, 2 * index, 2)
             if (basal < danaRPlugin.pumpDescription.basalMinimumRate) basal = 0
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
index b16cdff6b4..44314f131a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingBasalProfileAll.kt
@@ -1,8 +1,7 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 import java.util.*
 
 /**
@@ -14,9 +13,8 @@ import java.util.*
  * THIS IS BROKEN IN PUMP... SENDING ONLY 1 PROFILE
  */
 class MsgSettingBasalProfileAll(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     override fun handleMessage(bytes: ByteArray) {
         danaPump.pumpProfiles = Array(4) { Array(48) { 0.0 } }
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
index f5516d564c..dd101f3240 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingGlucose.kt
@@ -1,16 +1,15 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.logging.LTag
 
 /**
  * Created by mike on 05.07.2016.
  */
 class MsgSettingGlucose(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3209)
@@ -20,7 +19,7 @@ class MsgSettingGlucose(
     override fun handleMessage(bytes: ByteArray) {
         danaPump.units = intFromBuff(bytes, 0, 1)
         danaPump.easyBasalMode = intFromBuff(bytes, 1, 1)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Easy basal mode: " + danaPump.easyBasalMode)
     }
 }
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
index acf3578439..aa5dba7afb 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMaxValues.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgSettingMaxValues(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3205)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
index 48ee127a37..2b235de981 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingMeal.kt
@@ -1,24 +1,16 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.interfaces.PluginType
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.general.overview.events.EventDismissNotification
 import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
-import info.nightscout.androidaps.utils.resources.ResourceHelper
 
 class MsgSettingMeal(
-    private val aapsLogger: AAPSLogger,
-    private val rxBus: RxBusWrapper,
-    private val resourceHelper: ResourceHelper,
-    private val danaPump: DanaPump,
-    private val danaRKoreanPlugin: DanaRKoreanPlugin
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3203)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
index 861660cd6d..47d37d746a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatios.kt
@@ -1,13 +1,12 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.logging.LTag
 
 class MsgSettingProfileRatios(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3204)
@@ -15,7 +14,7 @@ class MsgSettingProfileRatios(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) {
+        if (danaPump.units == DanaPump.UNITS_MGDL) {
             danaPump.currentCIR = intFromBuff(bytes, 0, 2)
             danaPump.currentCF = intFromBuff(bytes, 2, 2).toDouble()
             danaPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
@@ -28,7 +27,7 @@ class MsgSettingProfileRatios(
             danaPump.currentTarget = intFromBuff(bytes, 6, 2) / 100.0
             danaPump.currentAIDR = intFromBuff(bytes, 8, 1)
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump CIR: " + danaPump.currentCIR)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump CF: " + danaPump.currentCF)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump AI: " + danaPump.currentAI)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
index ba199acfa6..5ae004ceac 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingProfileRatiosAll.kt
@@ -1,13 +1,12 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.logging.LTag
 
 class MsgSettingProfileRatiosAll(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x320D)
@@ -15,7 +14,7 @@ class MsgSettingProfileRatiosAll(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) {
+        if (danaPump.units == DanaPump.UNITS_MGDL) {
             danaPump.morningCIR = intFromBuff(bytes, 0, 2)
             danaPump.morningCF = intFromBuff(bytes, 2, 2).toDouble()
             danaPump.afternoonCIR = intFromBuff(bytes, 4, 2)
@@ -34,7 +33,7 @@ class MsgSettingProfileRatiosAll(
             danaPump.nightCIR = intFromBuff(bytes, 12, 2)
             danaPump.nightCF = intFromBuff(bytes, 14, 2) / 100.0
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CIR: " + danaPump.morningCIR)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CF: " + danaPump.morningCF)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CIR: " + danaPump.afternoonCIR)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
index 88ecc856e4..5fffb9cf71 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingPumpTime.kt
@@ -1,5 +1,6 @@
 package info.nightscout.androidaps.danar.comm
 
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.dana.DanaPump
@@ -8,10 +9,8 @@ import org.joda.time.DateTime
 import java.util.*
 
 class MsgSettingPumpTime(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val dateUtil: DateUtil
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x320A)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
index a0540c4524..20515fd4e8 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingShippingInfo.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgSettingShippingInfo(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x3207)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
index d687513c94..9f3350a579 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgSettingUserOptions.kt
@@ -1,14 +1,12 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 import java.util.*
 
 class MsgSettingUserOptions(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
 
     init {
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
index 2160ba8616..92100e07b1 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatus.kt
@@ -1,14 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgStatus(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x020B)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
index 087eedeb77..b3e8f25b84 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBasic.kt
@@ -1,13 +1,11 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 
 class MsgStatusBasic(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x020A)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
index b6e707b96c..2daf290d93 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusBolusExtended.kt
@@ -3,20 +3,12 @@ package info.nightscout.androidaps.danar.comm
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.db.ExtendedBolus
 import info.nightscout.androidaps.db.Source
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
-import info.nightscout.androidaps.utils.DateUtil
 import kotlin.math.ceil
 
 class MsgStatusBolusExtended(
-    private val injector: HasAndroidInjector,
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val activePlugin: ActivePluginProvider,
-    private val dateUtil: DateUtil
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0207)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
index 263cdf8b9b..ec84c0184a 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusProfile.kt
@@ -1,13 +1,12 @@
 package info.nightscout.androidaps.danar.comm
 
-import info.nightscout.androidaps.logging.AAPSLogger
-import info.nightscout.androidaps.logging.LTag
+import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.logging.LTag
 
 class MsgStatusProfile(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0204)
@@ -15,7 +14,7 @@ class MsgStatusProfile(
     }
 
     override fun handleMessage(bytes: ByteArray) {
-        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) {
+        if (danaPump.units == DanaPump.UNITS_MGDL) {
             danaPump.currentCIR = intFromBuff(bytes, 0, 2)
             danaPump.currentCF = intFromBuff(bytes, 2, 2).toDouble()
             danaPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
@@ -26,7 +25,7 @@ class MsgStatusProfile(
             danaPump.currentAI = intFromBuff(bytes, 4, 2) / 100.0
             danaPump.currentTarget = intFromBuff(bytes, 6, 2) / 100.0
         }
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units (saved): " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump CIR: " + danaPump.currentCIR)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump CF: " + danaPump.currentCF)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump AI: " + danaPump.currentAI)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
index d8791c83ab..c354da3bb0 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/comm/MsgStatusTempBasal.kt
@@ -3,18 +3,12 @@ package info.nightscout.androidaps.danar.comm
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.db.Source
 import info.nightscout.androidaps.db.TemporaryBasal
-import info.nightscout.androidaps.interfaces.ActivePluginProvider
-import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
-import info.nightscout.androidaps.dana.DanaPump
 import kotlin.math.ceil
 
 class MsgStatusTempBasal(
-    private val aapsLogger: AAPSLogger,
-    private val danaPump: DanaPump,
-    private val activePlugin: ActivePluginProvider,
-    private val injector: HasAndroidInjector
-) : MessageBase() {
+    injector: HasAndroidInjector
+) : MessageBase(injector) {
 
     init {
         SetCommand(0x0205)
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt b/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt
new file mode 100644
index 0000000000..f9c9b58f8d
--- /dev/null
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRCommModule.kt
@@ -0,0 +1,83 @@
+package info.nightscout.androidaps.danar.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.danaRKorean.comm.*
+import info.nightscout.androidaps.danaRv2.comm.*
+import info.nightscout.androidaps.danar.comm.*
+
+@Module
+@Suppress("unused")
+abstract class DanaRCommModule {
+
+    @ContributesAndroidInjector abstract fun contributesMessageBase(): MessageBase
+    @ContributesAndroidInjector abstract fun contributesMsgSetTime(): MsgSetTime
+    @ContributesAndroidInjector abstract fun contributesMsgBolusProgress(): MsgBolusProgress
+    @ContributesAndroidInjector abstract fun contributesMsgBolusStart(): MsgBolusStart
+    @ContributesAndroidInjector abstract fun contributesMsgBolusStartWithSpeed(): MsgBolusStartWithSpeed
+    @ContributesAndroidInjector abstract fun contributesMsgBolusStop(): MsgBolusStop
+    @ContributesAndroidInjector abstract fun contributesMsgCheckValue(): MsgCheckValue
+    @ContributesAndroidInjector abstract fun contributesMsgError(): MsgError
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryAll(): MsgHistoryAll
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryAllDone(): MsgHistoryAllDone
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryDone(): MsgHistoryDone
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryNewDone(): MsgHistoryNewDone
+    @ContributesAndroidInjector abstract fun contributesMsgInitConnStatusBasic(): MsgInitConnStatusBasic
+    @ContributesAndroidInjector abstract fun contributesMsgInitConnStatusBolus(): MsgInitConnStatusBolus
+    @ContributesAndroidInjector abstract fun contributesMsgInitConnStatusOption(): MsgInitConnStatusOption
+    @ContributesAndroidInjector abstract fun contributesMsgInitConnStatusTime(): MsgInitConnStatusTime
+    @ContributesAndroidInjector abstract fun contributesMsgPCCommStart(): MsgPCCommStart
+    @ContributesAndroidInjector abstract fun contributesMsgPCCommStop(): MsgPCCommStop
+    @ContributesAndroidInjector abstract fun contributesMsgSetActivateBasalProfile(): MsgSetActivateBasalProfile
+    @ContributesAndroidInjector abstract fun contributesMsgSetBasalProfile(): MsgSetBasalProfile
+    @ContributesAndroidInjector abstract fun contributesMsgSetCarbsEntry(): MsgSetCarbsEntry
+    @ContributesAndroidInjector abstract fun contributesMsgSetExtendedBolusStart(): MsgSetExtendedBolusStart
+    @ContributesAndroidInjector abstract fun contributesMsgSetExtendedBolusStop(): MsgSetExtendedBolusStop
+    @ContributesAndroidInjector abstract fun contributesMsgSetSingleBasalProfile(): MsgSetSingleBasalProfile
+    @ContributesAndroidInjector abstract fun contributesMsgSetTempBasalStart(): MsgSetTempBasalStart
+    @ContributesAndroidInjector abstract fun contributesMsgSetTempBasalStop(): MsgSetTempBasalStop
+    @ContributesAndroidInjector abstract fun contributesMsgSetUserOptions(): MsgSetUserOptions
+    @ContributesAndroidInjector abstract fun contributesMsgSettingActiveProfile(): MsgSettingActiveProfile
+    @ContributesAndroidInjector abstract fun contributesMsgSettingBasal(): MsgSettingBasal
+    @ContributesAndroidInjector abstract fun contributesMsgSettingBasalProfileAll(): MsgSettingBasalProfileAll
+    @ContributesAndroidInjector abstract fun contributesMsgSettingGlucose(): MsgSettingGlucose
+    @ContributesAndroidInjector abstract fun contributesMsgSettingMaxValues(): MsgSettingMaxValues
+    @ContributesAndroidInjector abstract fun contributesMsgSettingMeal(): MsgSettingMeal
+    @ContributesAndroidInjector abstract fun contributesMsgSettingProfileRatios(): MsgSettingProfileRatios
+    @ContributesAndroidInjector abstract fun contributesMsgSettingProfileRatiosAll(): MsgSettingProfileRatiosAll
+    @ContributesAndroidInjector abstract fun contributesMsgSettingPumpTime(): MsgSettingPumpTime
+    @ContributesAndroidInjector abstract fun contributesMsgSettingShippingInfo(): MsgSettingShippingInfo
+    @ContributesAndroidInjector abstract fun contributesMsgSettingUserOptions(): MsgSettingUserOptions
+    @ContributesAndroidInjector abstract fun contributesMsgStatus(): MsgStatus
+    @ContributesAndroidInjector abstract fun contributesMsgStatusBasic(): MsgStatusBasic
+    @ContributesAndroidInjector abstract fun contributesMsgStatusBolusExtended(): MsgStatusBolusExtended
+    @ContributesAndroidInjector abstract fun contributesMsgStatusProfile(): MsgStatusProfile
+    @ContributesAndroidInjector abstract fun contributesMsgStatusTempBasal(): MsgStatusTempBasal
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryBolus(): MsgHistoryBolus
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryDailyInsulin(): MsgHistoryDailyInsulin
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryGlucose(): MsgHistoryGlucose
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryAlarm(): MsgHistoryAlarm
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryError(): MsgHistoryError
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryCarbo(): MsgHistoryCarbo
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryRefill(): MsgHistoryRefill
+    @ContributesAndroidInjector abstract fun contributesMsgHistorySuspend(): MsgHistorySuspend
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryBasalHour(): MsgHistoryBasalHour
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryNew(): MsgHistoryNew
+
+    @ContributesAndroidInjector abstract fun contributesMsgCheckValue_v2(): MsgCheckValue_v2
+    @ContributesAndroidInjector abstract fun contributesMsgHistoryEvents_v2(): MsgHistoryEvents_v2
+    @ContributesAndroidInjector abstract fun contributesMsgSetAPSTempBasalStart_v2(): MsgSetAPSTempBasalStart_v2
+    @ContributesAndroidInjector abstract fun contributesMsgSetHistoryEntry_v2(): MsgSetHistoryEntry_v2
+    @ContributesAndroidInjector abstract fun contributesMsgStatusAPS_v2(): MsgStatusAPS_v2
+    @ContributesAndroidInjector abstract fun contributesMsgStatusBolusExtended_v2(): MsgStatusBolusExtended_v2
+    @ContributesAndroidInjector abstract fun contributesMsgStatusTempBasal_v2(): MsgStatusTempBasal_v2
+
+    @ContributesAndroidInjector abstract fun contributesMsgCheckValue_k(): MsgCheckValue_k
+    @ContributesAndroidInjector abstract fun contributesMsgInitConnStatusBasic_k(): MsgInitConnStatusBasic_k
+    @ContributesAndroidInjector abstract fun contributesMsgInitConnStatusBolus_k(): MsgInitConnStatusBolus_k
+    @ContributesAndroidInjector abstract fun contributesMsgInitConnStatusTime_k(): MsgInitConnStatusTime_k
+    @ContributesAndroidInjector abstract fun contributesMsgSettingBasalProfileAll_k(): MsgSettingBasalProfileAll_k
+    @ContributesAndroidInjector abstract fun contributesMsgSettingBasal_k(): MsgSettingBasal_k
+    @ContributesAndroidInjector abstract fun contributesMsgStatusBasic_k(): MsgStatusBasic_k
+    @ContributesAndroidInjector abstract fun contributesMsgStatus_k(): MsgStatus_k
+}
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRModule.kt b/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRModule.kt
new file mode 100644
index 0000000000..021d3573d7
--- /dev/null
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/di/DanaRModule.kt
@@ -0,0 +1,9 @@
+package info.nightscout.androidaps.danar.di
+
+import dagger.Module
+
+@Module(includes = [
+    DanaRCommModule::class,
+    DanaRServicesModule::class
+])
+open class DanaRModule
\ No newline at end of file
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
index 44f2950eb6..2fc6d2500f 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/AbstractDanaRExecutionService.java
@@ -211,7 +211,7 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
 
     public void bolusStop() {
         aapsLogger.debug(LTag.PUMP, "bolusStop >>>>> @ " + (danaPump.getBolusingTreatment() == null ? "" : danaPump.getBolusingTreatment().insulin));
-        MsgBolusStop stop = new MsgBolusStop(aapsLogger, rxBus, resourceHelper, danaPump);
+        MsgBolusStop stop = new MsgBolusStop(injector);
         danaPump.setBolusStopForced(true);
         if (isConnected()) {
             mSerialIOThread.sendMessage(stop);
@@ -230,42 +230,42 @@ public abstract class AbstractDanaRExecutionService extends DaggerService {
         MessageBase msg = null;
         switch (type) {
             case RecordTypes.RECORD_TYPE_ALARM:
-                msg = new MsgHistoryAlarm(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryAlarm(injector);
                 break;
             case RecordTypes.RECORD_TYPE_BASALHOUR:
-                msg = new MsgHistoryBasalHour(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryBasalHour(injector);
                 break;
             case RecordTypes.RECORD_TYPE_BOLUS:
-                msg = new MsgHistoryBolus(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryBolus(injector);
                 break;
             case RecordTypes.RECORD_TYPE_CARBO:
-                msg = new MsgHistoryCarbo(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryCarbo(injector);
                 break;
             case RecordTypes.RECORD_TYPE_DAILY:
-                msg = new MsgHistoryDailyInsulin(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryDailyInsulin(injector);
                 break;
             case RecordTypes.RECORD_TYPE_ERROR:
-                msg = new MsgHistoryError(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryError(injector);
                 break;
             case RecordTypes.RECORD_TYPE_GLUCOSE:
-                msg = new MsgHistoryGlucose(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryGlucose(injector);
                 break;
             case RecordTypes.RECORD_TYPE_REFILL:
-                msg = new MsgHistoryRefill(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistoryRefill(injector);
                 break;
             case RecordTypes.RECORD_TYPE_SUSPEND:
-                msg = new MsgHistorySuspend(aapsLogger, rxBus, dateUtil, databaseHelper);
+                msg = new MsgHistorySuspend(injector);
                 break;
         }
         danaPump.setHistoryDoneReceived(false);
-        mSerialIOThread.sendMessage(new MsgPCCommStart(aapsLogger));
+        mSerialIOThread.sendMessage(new MsgPCCommStart(injector));
         SystemClock.sleep(400);
         mSerialIOThread.sendMessage(msg);
         while (!danaPump.getHistoryDoneReceived() && mRfcommSocket.isConnected()) {
             SystemClock.sleep(100);
         }
         SystemClock.sleep(200);
-        mSerialIOThread.sendMessage(new MsgPCCommStop(aapsLogger));
+        mSerialIOThread.sendMessage(new MsgPCCommStop(injector));
         result.success = true;
         result.comment = "OK";
         return result;
diff --git a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
index fa95da936c..5d78247577 100644
--- a/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
+++ b/danar/src/main/java/info/nightscout/androidaps/danar/services/DanaRExecutionService.java
@@ -4,7 +4,6 @@ import android.os.Binder;
 import android.os.SystemClock;
 
 import java.io.IOException;
-import java.util.Date;
 
 import javax.inject.Inject;
 
@@ -64,6 +63,7 @@ import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewB
 import info.nightscout.androidaps.plugins.general.overview.notifications.Notification;
 import info.nightscout.androidaps.queue.Callback;
 import info.nightscout.androidaps.queue.commands.Command;
+import info.nightscout.androidaps.utils.DateUtil;
 import info.nightscout.androidaps.utils.resources.ResourceHelper;
 import info.nightscout.androidaps.utils.sharedPreferences.SP;
 
@@ -136,11 +136,11 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     public void getPumpStatus() {
         try {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpstatus)));
-            MsgStatus statusMsg = new MsgStatus(aapsLogger, danaPump);
-            MsgStatusBasic statusBasicMsg = new MsgStatusBasic(aapsLogger, danaPump);
-            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector);
-            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil);
-            MsgCheckValue checkValue = new MsgCheckValue(aapsLogger, danaPump, danaRPlugin);
+            MsgStatus statusMsg = new MsgStatus(injector);
+            MsgStatusBasic statusBasicMsg = new MsgStatusBasic(injector);
+            MsgStatusTempBasal tempStatusMsg = new MsgStatusTempBasal(injector);
+            MsgStatusBolusExtended exStatusMsg = new MsgStatusBolusExtended(injector);
+            MsgCheckValue checkValue = new MsgCheckValue(injector);
 
             if (danaPump.isNewPump()) {
                 mSerialIOThread.sendMessage(checkValue);
@@ -163,7 +163,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
             Profile profile = profileFunction.getProfile();
             if (profile != null && Math.abs(danaPump.getCurrentBasal() - profile.getBasal()) >= danaRPlugin.getPumpDescription().basalStep) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(injector));
                 if (!danaRPlugin.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
                     rxBus.send(new EventProfileNeedsUpdate());
                 }
@@ -171,19 +171,19 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
 
             if (danaPump.getLastSettingsRead() + 60 * 60 * 1000L < now || !danaRPlugin.isInitialized()) {
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)));
-                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingMeal(aapsLogger, rxBus, resourceHelper, danaPump, danaRKoreanPlugin));
-                mSerialIOThread.sendMessage(new MsgSettingBasal(aapsLogger, danaPump, danaRPlugin));
+                mSerialIOThread.sendMessage(new MsgSettingShippingInfo(injector));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(injector));
+                mSerialIOThread.sendMessage(new MsgSettingMeal(injector));
+                mSerialIOThread.sendMessage(new MsgSettingBasal(injector));
                 //0x3201
-                mSerialIOThread.sendMessage(new MsgSettingMaxValues(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingGlucose(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(aapsLogger, danaPump));
-                mSerialIOThread.sendMessage(new MsgSettingUserOptions(aapsLogger, danaPump));
+                mSerialIOThread.sendMessage(new MsgSettingMaxValues(injector));
+                mSerialIOThread.sendMessage(new MsgSettingGlucose(injector));
+                mSerialIOThread.sendMessage(new MsgSettingActiveProfile(injector));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatios(injector));
+                mSerialIOThread.sendMessage(new MsgSettingProfileRatiosAll(injector));
+                mSerialIOThread.sendMessage(new MsgSettingUserOptions(injector));
                 rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)));
-                mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
                 if (danaPump.getPumpTime() == 0) {
                     // initial handshake was not successfull
                     // deinitialize pump
@@ -195,8 +195,8 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
                 long timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                 aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 if (Math.abs(timeDiff) > 10) {
-                    mSerialIOThread.sendMessage(new MsgSetTime(aapsLogger, dateUtil, new Date()));
-                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(aapsLogger, danaPump, dateUtil));
+                    mSerialIOThread.sendMessage(new MsgSetTime(injector, DateUtil.now()));
+                    mSerialIOThread.sendMessage(new MsgSettingPumpTime(injector));
                     timeDiff = (danaPump.getPumpTime() - System.currentTimeMillis()) / 1000L;
                     aapsLogger.debug(LTag.PUMP, "Pump time difference: " + timeDiff + " seconds");
                 }
@@ -224,12 +224,12 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         if (danaPump.isTempBasalInProgress()) {
             rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
+            mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
             SystemClock.sleep(500);
         }
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(aapsLogger, percent, durationInHours));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStart(injector, percent, durationInHours));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -237,8 +237,8 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     public boolean tempBasalStop() {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)));
-        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusTempBasal(aapsLogger, danaPump, activePlugin, injector));
+        mSerialIOThread.sendMessage(new MsgSetTempBasalStop(injector));
+        mSerialIOThread.sendMessage(new MsgStatusTempBasal(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -246,8 +246,8 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     public boolean extendedBolus(double insulin, int durationInHalfHours) {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(aapsLogger, constraintChecker, insulin, (byte) (durationInHalfHours & 0xFF)));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStart(injector, insulin, (byte) (durationInHalfHours & 0xFF)));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -255,8 +255,8 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
     public boolean extendedBolusStop() {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)));
-        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(aapsLogger));
-        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector, aapsLogger, danaPump, activePlugin, dateUtil));
+        mSerialIOThread.sendMessage(new MsgSetExtendedBolusStop(injector));
+        mSerialIOThread.sendMessage(new MsgStatusBolusExtended(injector));
         rxBus.send(new EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING));
         return true;
     }
@@ -275,14 +275,14 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         int preferencesSpeed = sp.getInt(R.string.key_danars_bolusspeed, 0);
         MessageBase start;
         if (preferencesSpeed == 0)
-            start = new MsgBolusStart(aapsLogger, constraintChecker, danaPump, amount);
+            start = new MsgBolusStart(injector, amount);
         else
-            start = new MsgBolusStartWithSpeed(aapsLogger, constraintChecker, danaPump, amount, preferencesSpeed);
+            start = new MsgBolusStartWithSpeed(injector, amount, preferencesSpeed);
         danaPump.setBolusStopped(false);
         danaPump.setBolusStopForced(false);
 
         if (carbs > 0) {
-            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(aapsLogger, carbtime, carbs));
+            mSerialIOThread.sendMessage(new MsgSetCarbsEntry(injector, carbtime, carbs));
         }
 
         if (amount > 0) {
@@ -368,7 +368,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
 
     public boolean carbsEntry(int amount) {
         if (!isConnected()) return false;
-        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(aapsLogger, System.currentTimeMillis(), amount);
+        MsgSetCarbsEntry msg = new MsgSetCarbsEntry(injector, System.currentTimeMillis(), amount);
         mSerialIOThread.sendMessage(msg);
         return true;
     }
@@ -387,9 +387,9 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected()) return false;
         rxBus.send(new EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)));
         Double[] basal = danaPump.buildDanaRProfileRecord(profile);
-        MsgSetBasalProfile msgSet = new MsgSetBasalProfile(aapsLogger, rxBus, resourceHelper, (byte) 0, basal);
+        MsgSetBasalProfile msgSet = new MsgSetBasalProfile(injector, (byte) 0, basal);
         mSerialIOThread.sendMessage(msgSet);
-        MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile(aapsLogger, (byte) 0);
+        MsgSetActivateBasalProfile msgActivate = new MsgSetActivateBasalProfile(injector, (byte) 0);
         mSerialIOThread.sendMessage(msgActivate);
         danaPump.setLastSettingsRead(0); // force read full settings
         getPumpStatus();
@@ -401,7 +401,7 @@ public class DanaRExecutionService extends AbstractDanaRExecutionService {
         if (!isConnected())
             return new PumpEnactResult(injector).success(false);
         SystemClock.sleep(300);
-        MsgSetUserOptions msg = new MsgSetUserOptions(aapsLogger, danaPump);
+        MsgSetUserOptions msg = new MsgSetUserOptions(injector);
         mSerialIOThread.sendMessage(msg);
         SystemClock.sleep(200);
         return new PumpEnactResult(injector).success(!msg.failed);
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
index 619700d90b..eacdfc1ffa 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet.java
@@ -3,8 +3,9 @@ package info.nightscout.androidaps.danars.comm;
 import android.annotation.TargetApi;
 import android.os.Build;
 
+import org.joda.time.DateTime;
+
 import java.nio.charset.StandardCharsets;
-import java.util.Date;
 
 import javax.inject.Inject;
 
@@ -117,14 +118,14 @@ public class DanaRS_Packet {
 
     public static synchronized long dateTimeSecFromBuff(byte[] buff, int offset) {
         return
-                new Date(
-                        100 + intFromBuff(buff, offset, 1),
-                        intFromBuff(buff, offset + 1, 1) - 1,
+                new DateTime(
+                        2000 + intFromBuff(buff, offset, 1),
+                        intFromBuff(buff, offset + 1, 1),
                         intFromBuff(buff, offset + 2, 1),
                         intFromBuff(buff, offset + 3, 1),
                         intFromBuff(buff, offset + 4, 1),
                         intFromBuff(buff, offset + 5, 1)
-                ).getTime();
+                ).getMillis();
     }
 
     protected static int intFromBuff(byte[] b, int srcStart, int srcLength) {
@@ -159,11 +160,13 @@ public class DanaRS_Packet {
 
     public long dateFromBuff(byte[] buff, int offset) {
         return
-                new Date(
-                        100 + byteArrayToInt(getBytes(buff, offset, 1)),
-                        byteArrayToInt(getBytes(buff, offset + 1, 1)) - 1,
-                        byteArrayToInt(getBytes(buff, offset + 2, 1))
-                ).getTime();
+                new DateTime(
+                        2000 + byteArrayToInt(getBytes(buff, offset, 1)),
+                        byteArrayToInt(getBytes(buff, offset + 1, 1)),
+                        byteArrayToInt(getBytes(buff, offset + 2, 1)),
+                        0,
+                        0
+                ).getMillis();
     }
 
     @TargetApi(Build.VERSION_CODES.KITKAT)
@@ -180,7 +183,7 @@ public class DanaRS_Packet {
         if (buff == null)
             return "";
 
-        StringBuffer sb = new StringBuffer();
+        StringBuilder sb = new StringBuilder();
 
         int count = 0;
         for (byte element : buff) {
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
index eb3f5529aa..d2e8bbc3dd 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_APS_History_Events.kt
@@ -85,7 +85,7 @@ open class DanaRS_Packet_APS_History_Events(
         val extendedBolus = ExtendedBolus(injector).date(datetime).source(Source.PUMP).pumpId(datetime)
         val status: String
         when (recordCode.toInt()) {
-            info.nightscout.androidaps.dana.DanaPump.TEMPSTART         -> {
+            DanaPump.TEMPSTART         -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
                 temporaryBasal.percentRate = param1
                 temporaryBasal.durationInMinutes = param2
@@ -93,13 +93,13 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "TEMPSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.TEMPSTOP          -> {
+            DanaPump.TEMPSTOP          -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime))
                 activePlugin.activeTreatments.addToHistoryTempBasal(temporaryBasal)
                 status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.EXTENDEDSTART     -> {
+            DanaPump.EXTENDEDSTART     -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
@@ -107,13 +107,13 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.EXTENDEDSTOP      -> {
+            DanaPump.EXTENDEDSTOP      -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.BOLUS             -> {
+            DanaPump.BOLUS             -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                     ?: DetailedBolusInfo()
                 detailedBolusInfo.date = datetime
@@ -125,7 +125,7 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.DUALBOLUS         -> {
+            DanaPump.DUALBOLUS         -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                     ?: DetailedBolusInfo()
                 detailedBolusInfo.date = datetime
@@ -137,7 +137,7 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.DUALEXTENDEDSTART -> {
+            DanaPump.DUALEXTENDEDSTART -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 extendedBolus.insulin = param1 / 100.0
                 extendedBolus.durationInMinutes = param2
@@ -145,42 +145,42 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.DUALEXTENDEDSTOP  -> {
+            DanaPump.DUALEXTENDEDSTOP  -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 activePlugin.activeTreatments.addToHistoryExtendedBolus(extendedBolus)
                 status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.SUSPENDON         -> {
+            DanaPump.SUSPENDON         -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDON " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.SUSPENDOFF        -> {
+            DanaPump.SUSPENDOFF        -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDOFF " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.REFILL            -> {
+            DanaPump.REFILL            -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 if (sp.getBoolean(R.string.key_rs_loginsulinchange, true))
                     nsUpload.generateCareportalEvent(CareportalEvent.INSULINCHANGE, datetime, resourceHelper.gs(R.string.danarspump))
                 status = "REFILL " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.PRIME             -> {
+            DanaPump.PRIME             -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 if (sp.getBoolean(R.string.key_rs_logcanulachange, true))
                     nsUpload.generateCareportalEvent(CareportalEvent.SITECHANGE, datetime, resourceHelper.gs(R.string.danarspump))
                 status = "PRIME " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.PROFILECHANGE     -> {
+            DanaPump.PROFILECHANGE     -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PROFILECHANGE (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " No: " + param1 + " CurrentRate: " + param2 / 100.0 + "U/h")
                 status = "PROFILECHANGE " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.CARBS             -> {
+            DanaPump.CARBS             -> {
                 val emptyCarbsInfo = DetailedBolusInfo()
                 emptyCarbsInfo.carbs = param1.toDouble()
                 emptyCarbsInfo.date = datetime
@@ -191,7 +191,7 @@ open class DanaRS_Packet_APS_History_Events(
                 status = "CARBS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.PRIMECANNULA      -> {
+            DanaPump.PRIMECANNULA      -> {
                 aapsLogger.debug(LTag.PUMPCOMM, "EVENT PRIMECANNULA(" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "PRIMECANNULA " + dateUtil.timeString(datetime)
             }
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
index 327c4c99be..d476115d63 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_CIR_CF_Array.kt
@@ -48,7 +48,7 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
         val cf02: Double
         val cf04: Double
         val cf06: Double
-        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) {
+        if (danaPump.units == DanaPump.UNITS_MGDL) {
             dataIndex += dataSize
             dataSize = 2
             danaPump.morningCF = byteArrayToInt(getBytes(data, dataIndex, dataSize)).toDouble()
@@ -95,7 +95,7 @@ class DanaRS_Packet_Bolus_Get_CIR_CF_Array(
         }
         if (danaPump.units < 0 || danaPump.units > 1) failed = true
         aapsLogger.debug(LTag.PUMPCOMM, "Language: $language")
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CIR: " + danaPump.morningCIR)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump morning CF: " + danaPump.morningCF)
         aapsLogger.debug(LTag.PUMPCOMM, "Current pump afternoon CIR: " + danaPump.afternoonCIR)
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
index a1fddcbea9..fff895b239 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Bolus_Get_Calculation_Information.kt
@@ -42,14 +42,14 @@ class DanaRS_Packet_Bolus_Get_Calculation_Information(
         dataIndex += dataSize
         dataSize = 1
         danaPump.units = byteArrayToInt(getBytes(data, dataIndex, dataSize))
-        if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MMOL) {
+        if (danaPump.units == DanaPump.UNITS_MMOL) {
             danaPump.currentCF = danaPump.currentCF / 100.0
             danaPump.currentTarget = danaPump.currentTarget / 100.0
             currentBG = currentBG / 100.0
         }
         if (error != 0) failed = true
         aapsLogger.debug(LTag.PUMPCOMM, "Result: $error")
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "Current BG: $currentBG")
         aapsLogger.debug(LTag.PUMPCOMM, "Carbs: $carbohydrate")
         aapsLogger.debug(LTag.PUMPCOMM, "Current target: " + danaPump.currentTarget)
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
index 65ca61945e..c9fe481da8 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRS_Packet_Option_Get_User_Option.kt
@@ -74,7 +74,7 @@ class DanaRS_Packet_Option_Get_User_Option(
         aapsLogger.debug(LTag.PUMPCOMM, "lcdOnTimeSec: " + danaPump.lcdOnTimeSec)
         aapsLogger.debug(LTag.PUMPCOMM, "backlightOnTimeSec: " + danaPump.backlightOnTimeSec)
         aapsLogger.debug(LTag.PUMPCOMM, "selectedLanguage: " + danaPump.selectedLanguage)
-        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == info.nightscout.androidaps.dana.DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump units: " + if (danaPump.units == DanaPump.UNITS_MGDL) "MGDL" else "MMOL")
         aapsLogger.debug(LTag.PUMPCOMM, "shutdownHour: " + danaPump.shutdownHour)
         aapsLogger.debug(LTag.PUMPCOMM, "lowReservoirRate: " + danaPump.lowReservoirRate)
         aapsLogger.debug(LTag.PUMPCOMM, "refillAmount: " + danaPump.refillAmount)