diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index ff53f4004f..3646d57340 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -6,6 +6,7 @@
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="6" />
       <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="6" />
       <option name="BLANK_LINES_AROUND_BLOCK_WHEN_BRANCHES" value="1" />
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
     </JetCodeStyleSettings>
     <codeStyleSettings language="JAVA">
       <option name="METHOD_ANNOTATION_WRAP" value="0" />
@@ -124,6 +125,7 @@
       </arrangement>
     </codeStyleSettings>
     <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
       <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" />
       <option name="LINE_COMMENT_ADD_SPACE" value="true" />
       <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" />
diff --git a/app/build.gradle b/app/build.gradle
index 85354209ff..cdd71b51ac 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -111,7 +111,7 @@ android {
     defaultConfig {
         multiDexEnabled true
         versionCode 1500
-        version "2.8.2.1-dev-e5"
+        version "2.8.2.2-dev"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
@@ -192,6 +192,7 @@ dependencies {
     implementation project(':omnipod-common')
     implementation project(':omnipod-eros')
     implementation project(':omnipod-dash')
+    implementation project(':diaconn')
 
     implementation fileTree(include: ['*.jar'], dir: 'libs')
 
diff --git a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
index e7ea847509..4c253c55f8 100644
--- a/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/activities/MyPreferenceFragment.kt
@@ -14,6 +14,7 @@ import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danars.DanaRSPlugin
+import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
 import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.events.EventPreferenceChange
 import info.nightscout.androidaps.events.EventRebuildTabs
@@ -99,6 +100,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
     @Inject lateinit var passwordCheck: PasswordCheck
     @Inject lateinit var nsSettingStatus: NSSettingsStatus
     @Inject lateinit var openHumansUploader: OpenHumansUploader
+    @Inject lateinit var diaconnG8Plugin: DiaconnG8Plugin
 
     override fun onAttach(context: Context) {
         AndroidSupportInjection.inject(this)
@@ -173,6 +175,7 @@ class MyPreferenceFragment : PreferenceFragmentCompat(), OnSharedPreferenceChang
             addPreferencesFromResourceIfEnabled(localInsightPlugin, rootKey, config.PUMPDRIVERS)
             addPreferencesFromResourceIfEnabled(comboPlugin, rootKey, config.PUMPDRIVERS)
             addPreferencesFromResourceIfEnabled(medtronicPumpPlugin, rootKey, config.PUMPDRIVERS)
+            addPreferencesFromResourceIfEnabled(diaconnG8Plugin, rootKey, config.PUMPDRIVERS)
             addPreferencesFromResource(R.xml.pref_pump, rootKey, config.PUMPDRIVERS)
             addPreferencesFromResourceIfEnabled(virtualPumpPlugin, rootKey)
             addPreferencesFromResourceIfEnabled(insulinOrefFreePeakPlugin, rootKey)
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 5b74972932..5432082ada 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/AppComponent.kt
@@ -13,6 +13,7 @@ import info.nightscout.androidaps.danar.di.DanaRModule
 import info.nightscout.androidaps.danars.di.DanaRSModule
 import info.nightscout.androidaps.database.DatabaseModule
 import info.nightscout.androidaps.di.CoreModule
+import info.nightscout.androidaps.diaconn.di.DiaconnG8Module
 import info.nightscout.androidaps.insight.di.InsightDatabaseModule
 import info.nightscout.androidaps.insight.di.InsightModule
 import info.nightscout.androidaps.plugins.pump.common.di.PumpCommonModule
@@ -56,7 +57,8 @@ import javax.inject.Singleton
         InsightModule::class,
         InsightDatabaseModule::class,
         WorkersModule::class,
-        OHUploaderModule::class
+        OHUploaderModule::class,
+        DiaconnG8Module::class
     ]
 )
 interface AppComponent : AndroidInjector<MainApp> {
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
index 40bce88096..7b467893d3 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/PluginsModule.kt
@@ -8,6 +8,7 @@ import info.nightscout.androidaps.danaRKorean.DanaRKoreanPlugin
 import info.nightscout.androidaps.danaRv2.DanaRv2Plugin
 import info.nightscout.androidaps.danar.DanaRPlugin
 import info.nightscout.androidaps.danars.DanaRSPlugin
+import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
 import info.nightscout.androidaps.interfaces.PluginBase
 import info.nightscout.androidaps.plugins.aps.loop.LoopPlugin
 import info.nightscout.androidaps.plugins.aps.openAPSAMA.OpenAPSAMAPlugin
@@ -158,6 +159,12 @@ abstract class PluginsModule {
     // @IntKey(155)
     // abstract fun bindOmnipodPumpPlugin(plugin: OmnipodErosPumpPlugin): PluginBase
 
+    @Binds
+    @PumpDriver
+    @IntoMap
+    @IntKey(155)
+    abstract fun bindDiaconnG8Plugin(plugin: DiaconnG8Plugin): PluginBase
+
     @Binds
     @NotNSClient
     @IntoMap
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
index f9cf203e5e..398eca586f 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/FillDialog.kt
@@ -191,7 +191,7 @@ class FillDialog : DialogFragmentWithDate() {
         commandQueue.bolus(detailedBolusInfo, object : Callback() {
             override fun run() {
                 if (!result.success) {
-                    ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                    ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
                 }
             }
         })
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
index 8d55d861a6..12d14ef265 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt
@@ -224,7 +224,7 @@ class InsulinDialog : DialogFragmentWithDate() {
                             commandQueue.bolus(detailedBolusInfo, object : Callback() {
                                 override fun run() {
                                     if (!result.success) {
-                                        ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                                        ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
                                     }
                                 }
                             })
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
index 5cffcd0427..493656f1cf 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/LoopDialog.kt
@@ -324,7 +324,7 @@ class LoopDialog : DaggerDialogFragment() {
                 commandQueue.cancelTempBasal(true, object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                         }
                     }
                 })
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
index 10df72c584..f5c02a69d4 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TempBasalDialog.kt
@@ -119,7 +119,7 @@ class TempBasalDialog : DialogFragmentWithDate() {
                 val callback: Callback = object : Callback() {
                     override fun run() {
                         if (!result.success) {
-                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                            ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                         }
                     }
                 }
diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
index a76863bce2..060eaff132 100644
--- a/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dialogs/TreatmentDialog.kt
@@ -174,7 +174,7 @@ class TreatmentDialog : DialogFragmentWithDate() {
                             commandQueue.bolus(detailedBolusInfo, object : Callback() {
                                 override fun run() {
                                     if (!result.success) {
-                                        ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                                        ErrorHelperActivity.runAlarm(ctx, result.comment, resourceHelper.gs(R.string.treatmentdeliveryerror), R.raw.boluserror)
                                     }
                                 }
                             })
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
index 40a32ddcc2..82a7713b5d 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.kt
@@ -631,7 +631,7 @@ open class LoopPlugin @Inject constructor(
             commandQueue.tempBasalAbsolute(0.0, durationInMinutes, true, profile, PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND, object : Callback() {
                 override fun run() {
                     if (!result.success) {
-                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                     }
                 }
             })
@@ -639,7 +639,7 @@ open class LoopPlugin @Inject constructor(
             commandQueue.tempBasalPercent(0, durationInMinutes, true, profile, PumpSync.TemporaryBasalType.EMULATED_PUMP_SUSPEND, object : Callback() {
                 override fun run() {
                     if (!result.success) {
-                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                     }
                 }
             })
@@ -648,7 +648,7 @@ open class LoopPlugin @Inject constructor(
             commandQueue.cancelExtended(object : Callback() {
                 override fun run() {
                     if (!result.success) {
-                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.extendedbolusdeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                        ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.extendedbolusdeliveryerror), R.raw.boluserror)
                     }
                 }
             })
@@ -666,7 +666,7 @@ open class LoopPlugin @Inject constructor(
         commandQueue.cancelTempBasal(true, object : Callback() {
             override fun run() {
                 if (!result.success) {
-                    ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), info.nightscout.androidaps.dana.R.raw.boluserror)
+                    ErrorHelperActivity.runAlarm(context, result.comment, resourceHelper.gs(R.string.tempbasaldeliveryerror), R.raw.boluserror)
                 }
             }
         })
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
index 26a478240a..4440eda924 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/configBuilder/ProfileFunctionImplementation.kt
@@ -67,14 +67,15 @@ class ProfileFunctionImplementation @Inject constructor(
     override fun getProfile(): Profile? =
         getProfile(dateUtil.now())
 
+    @Synchronized
     override fun getProfile(time: Long): Profile? {
         val rounded = time - time % 1000
         val cached = cache[rounded]
         if (cached != null) {
-//            aapsLogger.debug("XXXXXXXXXXXXXXX HIT getProfile for $time $rounded")
+//            aapsLogger.debug("HIT getProfile for $time $rounded")
             return cached
         }
-//        aapsLogger.debug("XXXXXXXXXXXXXXX getProfile called for $time")
+//        aapsLogger.debug("getProfile called for $time")
         val ps = repository.getEffectiveProfileSwitchActiveAt(time).blockingGet()
         if (ps is ValueWrapper.Existing) {
             val sealed = ProfileSealed.EPS(ps.value)
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
index 8ffbd696ee..60fc700dcf 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/actions/ActionsFragment.kt
@@ -29,6 +29,7 @@ import info.nightscout.androidaps.extensions.toStringMedium
 import info.nightscout.androidaps.extensions.toStringShort
 import info.nightscout.androidaps.extensions.toVisibility
 import info.nightscout.androidaps.activities.HistoryBrowseActivity
+import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.Config
@@ -304,7 +305,11 @@ class ActionsFragment : DaggerFragment() {
         val activeBgSource = activePlugin.activeBgSource
         historyBrowser?.visibility = (profile != null).toVisibility()
         fill?.visibility = (pump.pumpDescription.isRefillingCapable && pump.isInitialized() && !pump.isSuspended()).toVisibility()
-        pumpBatteryChange?.visibility = (pump.pumpDescription.isBatteryReplaceable || (pump is OmnipodErosPumpPlugin && pump.isUseRileyLinkBatteryLevel && pump.isBatteryChangeLoggingEnabled)).toVisibility()
+        if(pump is DiaconnG8Plugin) {
+            pumpBatteryChange?.visibility = (pump.pumpDescription.isBatteryReplaceable && !pump.isBatteryChangeLoggingEnabled()).toVisibility()
+        } else {
+            pumpBatteryChange?.visibility = (pump.pumpDescription.isBatteryReplaceable || (pump is OmnipodErosPumpPlugin && pump.isUseRileyLinkBatteryLevel && pump.isBatteryChangeLoggingEnabled)).toVisibility()
+        }
         tempTarget?.visibility = (profile != null && config.APS).toVisibility()
         tddStats?.visibility = pump.pumpDescription.supportsTDDs.toVisibility()
 
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/DataSyncSelectorImplementation.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/DataSyncSelectorImplementation.kt
index c5a41f057a..a164ab6ab9 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/DataSyncSelectorImplementation.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/nsclient/DataSyncSelectorImplementation.kt
@@ -360,10 +360,10 @@ class DataSyncSelectorImplementation @Inject constructor(
             when {
                 // without nsId = create new
                 te.first.interfaceIDs.nightscoutId == null ->
-                    nsClientPlugin.nsClientService?.dbAdd("treatments", te.first.toJson(true), DataSyncSelector.PairTherapyEvent(te.first, te.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbAdd("treatments", te.first.toJson(true, dateUtil), DataSyncSelector.PairTherapyEvent(te.first, te.second), "$startId/$lastDbId")
                 // nsId = update
                 te.first.interfaceIDs.nightscoutId != null ->
-                    nsClientPlugin.nsClientService?.dbUpdate("treatments", te.first.interfaceIDs.nightscoutId, te.first.toJson(false), DataSyncSelector.PairTherapyEvent(te.first, te.second), "$startId/$lastDbId")
+                    nsClientPlugin.nsClientService?.dbUpdate("treatments", te.first.interfaceIDs.nightscoutId, te.first.toJson(false, dateUtil), DataSyncSelector.PairTherapyEvent(te.first, te.second), "$startId/$lastDbId")
             }
             return true
         }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
index 88ff303484..eb834614c4 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobCalculatorPlugin.kt
@@ -482,7 +482,7 @@ open class IobCobCalculatorPlugin @Inject constructor(
             for (pos in extendedBoluses.indices) {
                 val e = extendedBoluses[pos]
                 if (e.timestamp > toTime) continue
-                if (e.end > now) e.end = now
+                if (e.end > now) e.duration = now - e.timestamp
                 val profile = profileFunction.getProfile(e.timestamp) ?: return total
                 val calc = e.iobCalc(toTime, profile, activePlugin.activeInsulin)
                 total.plus(calc)
@@ -551,7 +551,7 @@ open class IobCobCalculatorPlugin @Inject constructor(
             val t = temporaryBasals[pos]
             if (t.timestamp > toTime) continue
             val profile = profileFunction.getProfile(t.timestamp) ?: continue
-            if (t.end > now) t.end = now
+            if (t.end > now) t.duration = now - t.timestamp
             val calc = t.iobCalc(toTime, profile, activePlugin.activeInsulin)
             //log.debug("BasalIOB " + new Date(time) + " >>> " + calc.basalIob);
             total.plus(calc)
@@ -563,7 +563,7 @@ open class IobCobCalculatorPlugin @Inject constructor(
                 val e = extendedBoluses[pos]
                 if (e.timestamp > toTime) continue
                 val profile = profileFunction.getProfile(e.timestamp) ?: continue
-                if (e.end > now) e.end = now
+                if (e.end > now) e.duration = now - e.timestamp
                 val calc = e.iobCalc(toTime, profile, activePlugin.activeInsulin)
                 totalExt.plus(calc)
             }
@@ -586,7 +586,7 @@ open class IobCobCalculatorPlugin @Inject constructor(
             val t = temporaryBasals[pos]
             if (t.timestamp > toTime) continue
             val profile = profileFunction.getProfile(t.timestamp) ?: continue
-            if (t.end > now) t.end = now
+            if (t.end > now) t.duration = now - t.timestamp
             val calc = t.iobCalc(toTime, profile, lastAutosensResult, exercise_mode, half_basal_exercise_target, isTempTarget, activePlugin.activeInsulin)
             //log.debug("BasalIOB " + new Date(time) + " >>> " + calc.basalIob);
             total.plus(calc)
@@ -598,7 +598,7 @@ open class IobCobCalculatorPlugin @Inject constructor(
                 val e = extendedBoluses[pos]
                 if (e.timestamp > toTime) continue
                 val profile = profileFunction.getProfile(e.timestamp) ?: continue
-                if (e.end > now) e.end = now
+                if (e.end > now) e.duration = now - e.timestamp
                 val calc = e.iobCalc(toTime, profile, lastAutosensResult, exercise_mode, half_basal_exercise_target, isTempTarget, activePlugin.activeInsulin)
                 totalExt.plus(calc)
             }
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
index 0b11136ed1..1d2eb8f84e 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt
@@ -129,7 +129,7 @@ class LocalProfileFragment : DaggerFragment() {
         binding.dia.setParams(currentProfile.dia, hardLimits.minDia(), hardLimits.maxDia(), 0.1, DecimalFormat("0.0"), false, binding.save, textWatch)
         binding.dia.tag = "LP_DIA"
         TimeListEdit(context, aapsLogger, dateUtil, view, R.id.ic, "IC", resourceHelper.gs(R.string.ic_label), currentProfile.ic, null, hardLimits.minIC(), hardLimits.maxIC(), 0.1, DecimalFormat("0.0"), save)
-        basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.basal_holder, "BASAL", resourceHelper.gs(R.string.basal_label) + ": " + sumLabel(), currentProfile.basal, null, pumpDescription.basalMinimumRate, 10.0, 0.01, DecimalFormat("0.00"), save)
+        basalView = TimeListEdit(context, aapsLogger, dateUtil, view, R.id.basal_holder, "BASAL", resourceHelper.gs(R.string.basal_label) + ": " + sumLabel(), currentProfile.basal, null, pumpDescription.basalMinimumRate, pumpDescription.basalMaximumRate, 0.01, DecimalFormat("0.00"), save)
         if (units == Constants.MGDL) {
             TimeListEdit(context, aapsLogger, dateUtil, view, R.id.isf, "ISF", resourceHelper.gs(R.string.isf_label), currentProfile.isf, null, HardLimits.MIN_ISF, HardLimits.MAX_ISF, 1.0, DecimalFormat("0"), save)
             TimeListEdit(context, aapsLogger, dateUtil, view, R.id.target, "TARGET", resourceHelper.gs(R.string.target_label), currentProfile.targetLow, currentProfile.targetHigh, HardLimits.VERY_HARD_LIMIT_TARGET_BG[0].toDouble(), HardLimits.VERY_HARD_LIMIT_TARGET_BG[1].toDouble(), 1.0, DecimalFormat("0"), save)
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.kt
index f959eff033..58a0570eaf 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadEvents.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.queue.commands
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Dana
+import info.nightscout.androidaps.interfaces.Diaconn
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.queue.Callback
 import javax.inject.Inject
@@ -22,6 +23,13 @@ class CommandLoadEvents(
             aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
             callback?.result(r)?.run()
         }
+
+        if (pump is Diaconn) {
+            val diaconnPump = pump as Diaconn
+            val r = diaconnPump.loadHistory()
+            aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
+            callback?.result(r)?.run()
+        }
     }
 
     override fun status(): String = "LOAD EVENTS"
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.kt
index 431b4fe12e..3ff9c133c1 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandLoadHistory.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.queue.commands
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Dana
+import info.nightscout.androidaps.interfaces.Diaconn
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.queue.Callback
 import javax.inject.Inject
@@ -23,6 +24,13 @@ class CommandLoadHistory(
             aapsLogger.debug(LTag.PUMPQUEUE, "Result success: " + r.success + " enacted: " + r.enacted)
             callback?.result(r)?.run()
         }
+
+        if (pump is Diaconn) {
+            val diaconnG8Pump = pump as Diaconn
+            val r = diaconnG8Pump.loadHistory()
+            aapsLogger.debug(LTag.PUMPQUEUE, "Result success: " + r.success + " enacted: " + r.enacted)
+            callback?.result(r)?.run()
+        }
     }
 
     override fun status(): String = "LOAD HISTORY $type"
diff --git a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.kt b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.kt
index abefe7e00e..7460529e67 100644
--- a/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.kt
+++ b/app/src/main/java/info/nightscout/androidaps/queue/commands/CommandSetUserSettings.kt
@@ -3,6 +3,7 @@ package info.nightscout.androidaps.queue.commands
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Dana
+import info.nightscout.androidaps.interfaces.Diaconn
 import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.queue.Callback
 import javax.inject.Inject
@@ -21,6 +22,12 @@ class CommandSetUserSettings(
             aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
             callback?.result(r)?.run()
         }
+
+        if (pump is Diaconn) {
+            val r = pump.setUserOptions()
+            aapsLogger.debug(LTag.PUMPQUEUE, "Result success: ${r.success} enacted: ${r.enacted}")
+            callback?.result(r)?.run()
+        }
     }
 
     override fun status(): String = "SET USER SETTINGS"
diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml
index 7fdd0bc9b8..255884713c 100644
--- a/app/src/main/res/values-af-rZA/strings.xml
+++ b/app/src/main/res/values-af-rZA/strings.xml
@@ -75,8 +75,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pomp</string>
     <string name="configbuilder_pump_description">Watter pomp wil jy gebruik met AndroidAPS?</string>
-    <string name="configbuilder_treatments">Behandelings</string>
-    <string name="configbuilder_treatments_description">Watter plugin moet gebruik word vir behandeling hantering?</string>
     <string name="configbuilder_profile">Profiel</string>
     <string name="configbuilder_profile_description">Watter profiel moet AndroidAPS gebruik?</string>
     <string name="configbuilder_aps">APS</string>
diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml
index e7e28af80c..4cc954ceb3 100644
--- a/app/src/main/res/values-bg-rBG/strings.xml
+++ b/app/src/main/res/values-bg-rBG/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Помпа</string>
     <string name="configbuilder_pump_description">Каква помпа използвате с AndroidAPS?</string>
-    <string name="configbuilder_treatments">Лечения</string>
-    <string name="configbuilder_treatments_description">Коя приставка да използваме за леченията?</string>
     <string name="configbuilder_profile">Профил</string>
     <string name="configbuilder_profile_description">Кой тип профил да използва AndroidAPS?</string>
     <string name="configbuilder_aps">Алгоритъм за APS</string>
diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml
index da4afe91e2..7ad7205bc0 100644
--- a/app/src/main/res/values-cs-rCZ/strings.xml
+++ b/app/src/main/res/values-cs-rCZ/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Péče</string>
     <string name="configbuilder_pump">Pumpa</string>
     <string name="configbuilder_pump_description">Jakou pumpu chcete používat s AndroidAPS?</string>
-    <string name="configbuilder_treatments">Ošetření</string>
-    <string name="configbuilder_treatments_description">Jaký plugin chcete používat pro ukládání informací?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Jaký profil má AndroidAPS používat?</string>
     <string name="configbuilder_aps">APS</string>
@@ -911,6 +909,8 @@
     <string name="ns_receive_temp_target_summary">Přijmout dočasné cíle zadané prostřednictvím NS nebo NSClienta</string>
     <string name="ns_receive_profile_switch">Přijímat přepnutí profilu</string>
     <string name="ns_receive_profile_switch_summary">Přijmout přepnutí profilu zadané prostřednictvím NS nebo NSClienta</string>
+    <string name="ns_receive_offline_event">Přijímat události APS offline</string>
+    <string name="ns_receive_offline_event_summary">Přijmout APS offline události zadané prostřednictvím NS nebo NSClienta</string>
     <string name="ns_receive_insulin">Přijímat inzulín</string>
     <string name="ns_receive_insulin_summary">Přijmout inzulín vložený přes NS nebo NSClient (není dodán, pouze započítán do IOB)</string>
     <string name="ns_receive_carbs">Přijímat sacharidy</string>
@@ -919,4 +919,6 @@
     <string name="ns_receive_therapy_events_summary">Přijmout léčebné události (výměna setu, inzulínu, baterie atd.) zadané prostřednictvím NS nebo NSClienta</string>
     <string name="ns_receive_cgm">Přijímat/doplňovat glykémie</string>
     <string name="ns_receive_cgm_summary">Přijmout CGM data z NS</string>
+    <string name="sms_timeout_while_wating">Vypršel časový limit při čekání na dokončení předchozí komunikace s pumpou</string>
+    <string name="smscommunicator_another_bolus_in_queue">Ve frontě je další bolus. Zkuste to znovu později.</string>
 </resources>
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index 86ba955765..343b658687 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pumpe</string>
     <string name="configbuilder_pump_description">Welche Pumpe möchtest Du mit AndroidAPS nutzen?</string>
-    <string name="configbuilder_treatments">Behandlungen</string>
-    <string name="configbuilder_treatments_description">Welches Plugin soll zum Verarbeiten von Behandlungen genutzt werden?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Welches Profil soll AndroidAPS nutzen?</string>
     <string name="configbuilder_aps">APS</string>
@@ -918,4 +916,6 @@ Unerwartetes Verhalten.</string>
     <string name="ns_receive_therapy_events_summary">Ereignisse (Kanülen-, Ampullen-, Batteriewechsel etc.) akzeptieren, die in NS oder NSClient eingegeben wurden</string>
     <string name="ns_receive_cgm">Historische CGM Daten ergänzen</string>
     <string name="ns_receive_cgm_summary">CGM Daten von NS akzeptieren</string>
+    <string name="sms_timeout_while_wating">Zeitüberschreitung beim Warten auf das Ende der vorherigen Kommunikation mit der Pumpe</string>
+    <string name="smscommunicator_another_bolus_in_queue">In der Warteschlange befindet sich ein weiterer Bolus. Bitte später erneut versuchen.</string>
 </resources>
diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml
index 6917843c6d..3969bec2de 100644
--- a/app/src/main/res/values-el-rGR/strings.xml
+++ b/app/src/main/res/values-el-rGR/strings.xml
@@ -77,8 +77,6 @@
     <string name="careportal">Φροντίδα</string>
     <string name="configbuilder_pump">Αντλία</string>
     <string name="configbuilder_pump_description">Ποια αντλία θα θέλατε να χρησιμοποιήσετε με το AndroidAPS;</string>
-    <string name="configbuilder_treatments">Θεραπείες</string>
-    <string name="configbuilder_treatments_description">Ποια προσθήκη πρέπει να χρησιμοποιηθεί για το χειρισμό της θεραπείας;</string>
     <string name="configbuilder_profile">Προφίλ</string>
     <string name="configbuilder_profile_description">Ποιο προφίλ πρέπει να χρησιμοποιήσει το AndroidAPS;</string>
     <string name="configbuilder_aps">APS</string>
diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml
index 068c0dd9a3..68f73bddbd 100644
--- a/app/src/main/res/values-es-rES/strings.xml
+++ b/app/src/main/res/values-es-rES/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Portal de Tratamientos</string>
     <string name="configbuilder_pump">Bomba</string>
     <string name="configbuilder_pump_description">¿Qué bomba quieres utilizar con AndroidAPS?</string>
-    <string name="configbuilder_treatments">Tratamientos</string>
-    <string name="configbuilder_treatments_description">¿Que complemento quieres usar para el manejo del tratamiento?</string>
     <string name="configbuilder_profile">Perfil</string>
     <string name="configbuilder_profile_description">¿Qué perfil debe usar AndroidAPS?</string>
     <string name="configbuilder_aps">APS</string>
diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml
index f35d33e14d..8d09db340b 100644
--- a/app/src/main/res/values-fr-rFR/strings.xml
+++ b/app/src/main/res/values-fr-rFR/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pompe</string>
     <string name="configbuilder_pump_description">Quelle pompe souhaitez-vous utiliser avec AndroidAPS ?</string>
-    <string name="configbuilder_treatments">Traitements</string>
-    <string name="configbuilder_treatments_description">Quel plugin doit être utilisé pour la gestion des traitements ?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Quel profil doit utiliser AndroidAPS ?</string>
     <string name="configbuilder_aps">APS</string>
@@ -96,7 +94,7 @@
     <string name="loop_aps_label">APS</string>
     <string name="loop_constraintsprocessed_label">Après traitement des restrictions</string>
     <string name="loop_tbrsetbypump_label">Basal temporaire défini par la pompe</string>
-    <string name="noapsselected">Pas d\'APS séléctionné ou pas de résultat fourni</string>
+    <string name="noapsselected">Pas d\'APS sélectionné ou pas de résultat fourni</string>
     <string name="safety">Sécurité</string>
     <string name="openapsma_disabled">Plugin désactivé</string>
     <string name="constraints_violation">Violation des restrictions</string>
@@ -732,7 +730,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Absorption lente des glucides détectée : %2$d%% du temps. Vérifiez de nouveau votre calcul. Les GA (Glucides Actifs) peuvent être surestimés et alors plus d\'insuline pourrait être délivré !!!!!</font>]]></string>
     <string name="partialboluswizard">Injecter cette partie de Bolus calculée par l’assistant [%]</string>
     <string name="deliverpartofboluswizard">L\'assistant Bolus effectue le calcul mais seulement cette partie de l\'insuline calculée est délivrée. Utile avec l\'algorithme SMB.</string>
-    <string name="snooze">Report alarme</string>
+    <string name="snooze">Masquer</string>
     <string name="increasingmaxbasal">Augmentation de la valeur du débit Basal max parce que ce paramètre est inférieur au débit Basal max de votre profil</string>
     <string name="smscommunicator_messagebody">Message invalide</string>
     <string name="format_bg_isf">%1$s SI: %2$.1f</string>
@@ -912,6 +910,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="ns_receive_temp_target_summary">Accepter les cibles temporaires entrées via NS ou NSClient</string>
     <string name="ns_receive_profile_switch">Recevoir les changements de profil</string>
     <string name="ns_receive_profile_switch_summary">Accepter les changements de profil entrés via NS ou NSClient</string>
+    <string name="ns_receive_offline_event">Recevoir les événements APS hors ligne</string>
+    <string name="ns_receive_offline_event_summary">Accepter les événements APS hors ligne entrés via NS ou NSClient</string>
     <string name="ns_receive_insulin">Recevoir l\'insuline</string>
     <string name="ns_receive_insulin_summary">Acceptez l\'insuline entrée via NS ou NSClient (elle n\'est pas injectée, uniquement pour le calcul pour IA)</string>
     <string name="ns_receive_carbs">Recevoir les glucides</string>
@@ -920,4 +920,6 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="ns_receive_therapy_events_summary">Accepter les événements de thérapie (canule, insuline, changement de batterie, etc.) entrés via NS ou NSClient</string>
     <string name="ns_receive_cgm">Recevoir/remplir les anciennes données MGC</string>
     <string name="ns_receive_cgm_summary">Accepter les données MGC de NS</string>
+    <string name="sms_timeout_while_wating">Délai d\'attente pour finir la communication précédente avec la pompe</string>
+    <string name="smscommunicator_another_bolus_in_queue">Un autre bolus est en file d\'attente. Réessayez plus tard.</string>
 </resources>
diff --git a/app/src/main/res/values-ga-rIE/strings.xml b/app/src/main/res/values-ga-rIE/strings.xml
index 755334e67f..ed0ea2a53c 100644
--- a/app/src/main/res/values-ga-rIE/strings.xml
+++ b/app/src/main/res/values-ga-rIE/strings.xml
@@ -35,7 +35,6 @@
     <string name="sms_delta">Deilte:</string>
     <string name="treatments">Cóireálacha</string>
     <string name="configbuilder_pump">Caidéil</string>
-    <string name="configbuilder_treatments">Cóireálacha</string>
     <string name="configbuilder_profile">Próifíl</string>
     <string name="configbuilder_aps">APS</string>
     <string name="configbuilder_general">Ginearálta</string>
diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml
index dae339b46c..c2e5b91a3e 100644
--- a/app/src/main/res/values-it-rIT/strings.xml
+++ b/app/src/main/res/values-it-rIT/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Portale</string>
     <string name="configbuilder_pump">Micro</string>
     <string name="configbuilder_pump_description">Quale microinfusore desideri usare con AndroidAPS?</string>
-    <string name="configbuilder_treatments">Trattamenti</string>
-    <string name="configbuilder_treatments_description">Quale plugin dovrebbe essere usato per la gestione del trattamento?</string>
     <string name="configbuilder_profile">Profilo</string>
     <string name="configbuilder_profile_description">Quale profilo AndroidAPS dovrebbe usare?</string>
     <string name="configbuilder_aps">APS</string>
@@ -778,6 +776,7 @@
     <string name="randombg_short">BG</string>
     <string name="tools">Strumenti</string>
     <string name="show_calculation">Mostra calcolo</string>
+    <string name="show_removed">Mostra rimossi</string>
     <string name="clearqueueconfirm">Cancellare la coda? Tutti i dati in coda andranno persi!</string>
     <string name="ebstopsloop">L\'uso della funzione bolo esteso interromperà la modalità loop chiuso per il tempo di esecuzione del bolo esteso. Lo vuoi davvero?</string>
     <string name="closed_loop_disabled_with_eb">Loop chiuso disabilitato a causa dell\'esecuzione di un bolo esteso</string>
@@ -899,9 +898,27 @@
     <string name="profile_max_daily_basal_value">Valore max basale (profilo)</string>
     <string name="current_basal_value">Valore basale corrente</string>
     <string name="profile_carbs_ratio_value">Valore rapporto CHO (profilo)</string>
+    <string name="full_sync">Sincronizzazione completa</string>
+    <string name="prime">Caricamento</string>
+    <string name="ns_sync_options">Sincronizzazione</string>
+    <string name="ns_upload_summary">Profili, boli, CHO, basali temporanee vengono caricati su NS</string>
+    <string name="ns_upload">Carica dati su NS</string>
+    <string name="ns_receive_profile_store">Ricevi \"store\" profilo</string>
+    <string name="ns_receive_profile_store_summary">Sincronizza i profili da NS al profilo locale</string>
     <string name="ns_receive_temp_target">Ricevi target temporanei</string>
+    <string name="ns_receive_temp_target_summary">Accetta target temporanei inseriti tramite NS o NSClient</string>
     <string name="ns_receive_profile_switch">Ricevi cambi profilo</string>
+    <string name="ns_receive_profile_switch_summary">Accetta cambi profilo inseriti tramite NS o NSClient</string>
+    <string name="ns_receive_offline_event">Ricevi eventi APS offline</string>
+    <string name="ns_receive_offline_event_summary">Accetta eventi APS offline inseriti tramite NS o NSClient</string>
     <string name="ns_receive_insulin">Ricevi insulina</string>
+    <string name="ns_receive_insulin_summary">Accetta insulina inserita tramite NS o NSClient (non viene erogata, solo calcolata per IOB)</string>
     <string name="ns_receive_carbs">Ricevi CHO</string>
+    <string name="ns_receive_carbs_summary">Accetta CHO inseriti tramite NS o NSClient</string>
+    <string name="ns_receive_therapy_events">Ricevi eventi terapia</string>
+    <string name="ns_receive_therapy_events_summary">Accetta eventi terapia (cambio cannula, insulina, batteria, ecc.) inseriti tramite NS o NSClient</string>
+    <string name="ns_receive_cgm">Ricevi/riempi dati CGM</string>
     <string name="ns_receive_cgm_summary">Accetta dati CGM da NS</string>
+    <string name="sms_timeout_while_wating">Timeout nell\'attesa della fine della precedente comunicazione col micro.</string>
+    <string name="smscommunicator_another_bolus_in_queue">C\'è un altro bolo in coda. Riprova più tardi.</string>
 </resources>
diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml
index 63ac905f46..ee5889d917 100644
--- a/app/src/main/res/values-iw-rIL/strings.xml
+++ b/app/src/main/res/values-iw-rIL/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">פורטל טיפולים</string>
     <string name="configbuilder_pump">משאבה</string>
     <string name="configbuilder_pump_description">עם איזו משאבה אתם מעוניינים להשתמש ב-AndroidAPS?</string>
-    <string name="configbuilder_treatments">טיפולים</string>
-    <string name="configbuilder_treatments_description">איזה תוסף ישמש לתפעול הטיפולים?</string>
     <string name="configbuilder_profile">פרופיל</string>
     <string name="configbuilder_profile_description">באיזה פרופיל על AndroidAPS להשתמש?</string>
     <string name="configbuilder_aps">APS</string>
@@ -911,6 +909,8 @@
     <string name="ns_receive_temp_target_summary">קבלת ערכי מטרה זמניים שהוגדרו בנייטסקאוט או ב-NSClient</string>
     <string name="ns_receive_profile_switch">קבלת החלפות פרופיל</string>
     <string name="ns_receive_profile_switch_summary">קבלת החלפות פרופיל שהוגדרו בנייטסקאוט או ב-NSClient</string>
+    <string name="ns_receive_offline_event">אחזר אירועים לא מקוונים</string>
+    <string name="ns_receive_offline_event_summary">קבל אירועים לא מקוונים שנרשמו דרך נייטסקאוט או NSClient</string>
     <string name="ns_receive_insulin">קבלת אינסולין</string>
     <string name="ns_receive_insulin_summary">קבלת אינסולין שהוזן באמצעות נייטסקאוט או NSClient (הוא לא מוזרק, רק מחושב רק כאינסולין פעיל)</string>
     <string name="ns_receive_carbs">קבלת פחמימות</string>
@@ -919,4 +919,6 @@
     <string name="ns_receive_therapy_events_summary">קבלת אירועי טיפול (צינורית, אינסולין, החלפת סוללה) שצוינו באמצעות נייטסקאוט או NSClient</string>
     <string name="ns_receive_cgm">קבלת\\טעינת נתוני סנסור</string>
     <string name="ns_receive_cgm_summary">קבלת נתוני סנסור מנייטסקאוט</string>
+    <string name="sms_timeout_while_wating">בהמתנה עד לסיום תקשורת קודמת עם המשאבה</string>
+    <string name="smscommunicator_another_bolus_in_queue">ישנו בולוס נוסף בתור. נסו שוב מאוחר יותר.</string>
 </resources>
diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml
index 40430fb863..0afbb9358d 100644
--- a/app/src/main/res/values-ko-rKR/strings.xml
+++ b/app/src/main/res/values-ko-rKR/strings.xml
@@ -77,8 +77,6 @@
     <string name="careportal">케어포털</string>
     <string name="configbuilder_pump">펌프</string>
     <string name="configbuilder_pump_description">어떤 펌프를 AndroidAPS에서 사용하시겠습니까?</string>
-    <string name="configbuilder_treatments">관리</string>
-    <string name="configbuilder_treatments_description">관리를 위해서 어떤 플러그인을 사용합니까?</string>
     <string name="configbuilder_profile">프로파일</string>
     <string name="configbuilder_profile_description">어떤 프로파일을 AndroidAPS에서 사용합니까?</string>
     <string name="configbuilder_aps">APS</string>
diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml
index 0d6ab9e074..fac5bc203d 100644
--- a/app/src/main/res/values-lt-rLT/strings.xml
+++ b/app/src/main/res/values-lt-rLT/strings.xml
@@ -80,8 +80,6 @@
     <string name="careportal">Priežiūra</string>
     <string name="configbuilder_pump">Pompa</string>
     <string name="configbuilder_pump_description">Kokią pompą naudosite su AndroidAPS?</string>
-    <string name="configbuilder_treatments">Terapija</string>
-    <string name="configbuilder_treatments_description">Kuris įskiepis bus naudojamas terapijos tvarkymui?</string>
     <string name="configbuilder_profile">Profilis</string>
     <string name="configbuilder_profile_description">Kurį profilį naudos AndroidAPS?</string>
     <string name="configbuilder_aps">DKS</string>
diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml
index 8f9ba618cd..b9c916af95 100644
--- a/app/src/main/res/values-nl-rNL/strings.xml
+++ b/app/src/main/res/values-nl-rNL/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pomp</string>
     <string name="configbuilder_pump_description">Welke pomp wil je gaan gebruiken met AndroidAPS?</string>
-    <string name="configbuilder_treatments">Behandelingen</string>
-    <string name="configbuilder_treatments_description">Welke plugin moet worden gebruikt voor de Behandelingen?</string>
     <string name="configbuilder_profile">Profiel</string>
     <string name="configbuilder_profile_description">Welk profiel moet AndroidAPS gebruiken?</string>
     <string name="configbuilder_aps">APS</string>
diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml
index 0f85c408c7..e63e0eba9a 100644
--- a/app/src/main/res/values-no-rNO/strings.xml
+++ b/app/src/main/res/values-no-rNO/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pumpe</string>
     <string name="configbuilder_pump_description">Hvilken pumpe ønsker du å bruke sammen med AndroidAPS?</string>
-    <string name="configbuilder_treatments">Behandlinger</string>
-    <string name="configbuilder_treatments_description">Hvilken plugin burde brukes til håndtering av behandlinger?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Hvilken profil bør AndroidAPS bruke?</string>
     <string name="configbuilder_aps">APS</string>
@@ -778,6 +776,7 @@
     <string name="randombg_short">BS</string>
     <string name="tools">Verktøy</string>
     <string name="show_calculation">Vis beregning</string>
+    <string name="show_removed">Vis slettede</string>
     <string name="clearqueueconfirm">Slett køen? All data i køen vil gå tapt!</string>
     <string name="ebstopsloop">Bruk av forlenget bolus funksjon vil deaktivere lukket loop i perioden med forlenget bolus. Vil du virkelig dette?</string>
     <string name="closed_loop_disabled_with_eb">Lukket loop deaktivert på grunn av forlenget bolus</string>
@@ -899,4 +898,25 @@
     <string name="profile_max_daily_basal_value">Profil maksimal basal dose</string>
     <string name="current_basal_value">Aktiv basal dose</string>
     <string name="profile_carbs_ratio_value">Profil karbohydratfaktor (IK)</string>
+    <string name="full_sync">Full synkronisering</string>
+    <string name="prime">Prime</string>
+    <string name="ns_sync_options">Synkronisering</string>
+    <string name="ns_upload_summary">Profiler, boluser, karbohydrater, midlertidige basaler lastes opp til NS</string>
+    <string name="ns_upload">Last opp data til NS</string>
+    <string name="ns_receive_profile_store">Hent lagrede profiler</string>
+    <string name="ns_receive_profile_store_summary">Synkroniser profiler fra NS til lokal profil</string>
+    <string name="ns_receive_temp_target">Motta midlertidige BS mål</string>
+    <string name="ns_receive_temp_target_summary">Aksepter midlertidige mål angitt med NS eller NSClient</string>
+    <string name="ns_receive_profile_switch">Motta profilbytter</string>
+    <string name="ns_receive_profile_switch_summary">Aksepter profilbytter som er angitt via NS eller NSClient</string>
+    <string name="ns_receive_offline_event">Motta APS offline hendelser</string>
+    <string name="ns_receive_offline_event_summary">Aksepter APS offline hendelser lagt inn gjennom NS eller NSKlient</string>
+    <string name="ns_receive_insulin">Motta insulin</string>
+    <string name="ns_receive_insulin_summary">Aksepter insulin angitt via NS eller NSClient (enhetene er ikke dosert, kun beregnet mot IOB)</string>
+    <string name="ns_receive_carbs">Motta karbohydrater</string>
+    <string name="ns_receive_carbs_summary">Aksepter karbohydrater angitt med NS eller NSClient</string>
+    <string name="ns_receive_therapy_events">Motta behandlingshendelser</string>
+    <string name="ns_receive_therapy_events_summary">Godta behandlingshendelser (kanyle, insulin, batteribytte osv.) som er lagt inn gjennom NS eller NSClient</string>
+    <string name="ns_receive_cgm">Motta/tilbakefyll CGM data</string>
+    <string name="ns_receive_cgm_summary">Aksepter CGM data fra NS</string>
 </resources>
diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml
index 1b2c1b26b2..bc8c65242e 100644
--- a/app/src/main/res/values-pl-rPL/strings.xml
+++ b/app/src/main/res/values-pl-rPL/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">PortalOpieki</string>
     <string name="configbuilder_pump">Pompa</string>
     <string name="configbuilder_pump_description">Którą pompę chcesz wykorzystać do AndroidAPS?</string>
-    <string name="configbuilder_treatments">Terapia</string>
-    <string name="configbuilder_treatments_description">Która wtyczka powinna być używana do obsługi leczenia?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Który profil będzie używany w AndroidAPS?</string>
     <string name="configbuilder_aps">APS</string>
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index e75601545e..48f5835d62 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -78,8 +78,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Bomba</string>
     <string name="configbuilder_pump_description">Qual a bomba que gostaria de usar com AndroidAPS?</string>
-    <string name="configbuilder_treatments">Tratamentos</string>
-    <string name="configbuilder_treatments_description">Qual o plugin que deve ser usado para os tratamentos?</string>
     <string name="configbuilder_profile">Perfil</string>
     <string name="configbuilder_profile_description">Qual perfil o AndroidAPS deve usar?</string>
     <string name="configbuilder_aps">APS</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index aa36535290..95b3d18ad7 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Bomba</string>
     <string name="configbuilder_pump_description">Qual a bomba que gostaria de utilizar com AndroidAPS?</string>
-    <string name="configbuilder_treatments">Tratamentos</string>
-    <string name="configbuilder_treatments_description">Qual o plugin que deve ser usado para os tratamentos?</string>
     <string name="configbuilder_profile">Perfil</string>
     <string name="configbuilder_profile_description">Que perfil deverá ser usado pelo AndroidAPS?</string>
     <string name="configbuilder_aps">APS</string>
diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml
index eeb6707fdd..370ab6cdf3 100644
--- a/app/src/main/res/values-ro-rRO/strings.xml
+++ b/app/src/main/res/values-ro-rRO/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pompă</string>
     <string name="configbuilder_pump_description">Ce pompă doriți să folosiți cu AndroidAPS?</string>
-    <string name="configbuilder_treatments">Tratamente</string>
-    <string name="configbuilder_treatments_description">Ce plugin doriți să folosiți pentru gestionarea tratamentelor?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Ce profil doriți să folosească AndroidAPS?</string>
     <string name="configbuilder_aps">APS</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index b9edc29846..f21417bab2 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Портал лечения / назначений</string>
     <string name="configbuilder_pump">помпа</string>
     <string name="configbuilder_pump_description">Какой помпой вы хотели бы пользоваться с AndroidAPS?</string>
-    <string name="configbuilder_treatments">назначения</string>
-    <string name="configbuilder_treatments_description">Каким плагином пользоваться для выполнения назначений?</string>
     <string name="configbuilder_profile">профиль</string>
     <string name="configbuilder_profile_description">Какой профиль следует использовать в AndroidAPS?</string>
     <string name="configbuilder_aps">система ИПЖ</string>
@@ -921,4 +919,6 @@ Context | Edit Context</string>
     <string name="ns_receive_therapy_events_summary">Принимать события терапии (катетер, инсулин, изменение батареи и т. д.) через NS или NSClient</string>
     <string name="ns_receive_cgm">Получать/заполнять данные мониторинга CGM</string>
     <string name="ns_receive_cgm_summary">Принимать данные мониторинга CGM из NS</string>
+    <string name="sms_timeout_while_wating">Таймаут во время ожидания окончания предыдущего соединения с помпой</string>
+    <string name="smscommunicator_another_bolus_in_queue">В очереди есть еще один болюс. Повторите попытку позже.</string>
 </resources>
diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml
index 936d9a2b36..25519b199c 100644
--- a/app/src/main/res/values-sk-rSK/strings.xml
+++ b/app/src/main/res/values-sk-rSK/strings.xml
@@ -81,8 +81,6 @@
     <string name="careportal">Starostlivosť</string>
     <string name="configbuilder_pump">Pumpa</string>
     <string name="configbuilder_pump_description">Akú pumpu chcete používať s AndroidAPS?</string>
-    <string name="configbuilder_treatments">Ošetrenia</string>
-    <string name="configbuilder_treatments_description">Aký modul chcete používať pre spracovanie ošetrení?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Aký profil má používať AndroidAPS?</string>
     <string name="configbuilder_aps">APS</string>
@@ -911,6 +909,8 @@
     <string name="ns_receive_temp_target_summary">Prijať dočasné ciele zadané prostredníctvom NS, alebo NSClienta</string>
     <string name="ns_receive_profile_switch">Prijímať prepnutia profilov</string>
     <string name="ns_receive_profile_switch_summary">Prijať prepnutia profilov zadané prostredníctvom NS, alebo NSClienta</string>
+    <string name="ns_receive_offline_event">Prijímať udalosti APS offline</string>
+    <string name="ns_receive_offline_event_summary">Prijať APS offline udalosti zadané prostredníctvom NS, alebo NSClienta</string>
     <string name="ns_receive_insulin">Prijímať inzulín</string>
     <string name="ns_receive_insulin_summary">Prijať inzulín vložený cez NS, alebo NSClient (nie je dodaný, iba započítaný do IOB)</string>
     <string name="ns_receive_carbs">Prijímať sacharidy</string>
diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml
index f86149ac29..b5853150c3 100644
--- a/app/src/main/res/values-sv-rSE/strings.xml
+++ b/app/src/main/res/values-sv-rSE/strings.xml
@@ -82,8 +82,6 @@ Eversense-appen.</string>
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pump</string>
     <string name="configbuilder_pump_description">Vilken pump vill du använda med AndroidAPS?</string>
-    <string name="configbuilder_treatments">Behandlingar</string>
-    <string name="configbuilder_treatments_description">Vilket insticksprogram ska användas för att hantera behandlingar?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Vilken profil ska AndroidAPS använda?</string>
     <string name="configbuilder_aps">APS</string>
diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml
index 2e9efe6091..da43d1f516 100644
--- a/app/src/main/res/values-tr-rTR/strings.xml
+++ b/app/src/main/res/values-tr-rTR/strings.xml
@@ -73,8 +73,6 @@
     <string name="careportal">Careportal</string>
     <string name="configbuilder_pump">Pompa</string>
     <string name="configbuilder_pump_description">Hangi pompa ile AndroidAPS kullanmak istersiniz?</string>
-    <string name="configbuilder_treatments">Tedaviler</string>
-    <string name="configbuilder_treatments_description">Hangi eklenti tedavi işleme için kullanılsın?</string>
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Hangi profili AndroidAPS kullanmalı?</string>
     <string name="configbuilder_aps">APS (YPS)</string>
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 76ef7ce813..910992c926 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -74,8 +74,6 @@
     <string name="careportal">护理记录</string>
     <string name="configbuilder_pump">胰岛素泵</string>
     <string name="configbuilder_pump_description">你想用 AndroidAPS连接哪个胰岛素泵？</string>
-    <string name="configbuilder_treatments">治疗</string>
-    <string name="configbuilder_treatments_description">什么插件应该用于治疗处理？</string>
     <string name="configbuilder_profile">配置文件</string>
     <string name="configbuilder_profile_description">AndroidAPS 应该使用哪个配置文件？</string>
     <string name="configbuilder_aps">APS</string>
diff --git a/automation/build.gradle b/automation/build.gradle
index 55565f892b..54199af9b9 100644
--- a/automation/build.gradle
+++ b/automation/build.gradle
@@ -8,13 +8,6 @@ apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
 
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
-
 dependencies {
     implementation project(':core')
     implementation project(':database')
diff --git a/automation/src/main/res/values-fr-rFR/strings.xml b/automation/src/main/res/values-fr-rFR/strings.xml
index 449448894d..44315399d7 100644
--- a/automation/src/main/res/values-fr-rFR/strings.xml
+++ b/automation/src/main/res/values-fr-rFR/strings.xml
@@ -3,9 +3,9 @@
     <string name="automation_short">Auto</string>
     <string name="automation">Automatisation</string>
     <string name="automation_description">Tâches d\'automatisation définies par l\'utilisateur</string>
-    <string name="automation_missing_task_name">Merci d\'entrer le nom de la tâche.</string>
-    <string name="automation_missing_trigger">Merci de spécifier au moins un déclencheur.</string>
-    <string name="automation_missing_action">Merci de spécifier au moins une action.</string>
+    <string name="automation_missing_task_name">Veuillez entrer un nom pour la tâche.</string>
+    <string name="automation_missing_trigger">Veuillez spécifier au moins un déclencheur.</string>
+    <string name="automation_missing_action">Veuillez spécifier au moins une action.</string>
     <string name="alarm_message">Alarme: %1$s</string>
     <string name="alarm_short">Alarme:</string>
     <string name="message_short">Mess :</string>
diff --git a/build.gradle b/build.gradle
index d3da9fe611..66960d8c38 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ buildscript {
         dexmakerVersion = "1.2"
         retrofit2Version = '2.9.0'
         okhttp3Version = '4.9.0'
-        byteBuddyVersion = '1.11.3'
+        byteBuddyVersion = '1.11.5'
 
         androidx_junit = '1.1.2'
         androidx_rules = '1.4.0-alpha04'
@@ -44,12 +44,9 @@ buildscript {
         maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
     }
     dependencies {
-        // Update to 4.2.1 is not possible because it forces use build-tools 30.0.2
-        // and this is not available in travis so far
-        // see https://issuetracker.google.com/issues/162255866
-        classpath 'com.android.tools.build:gradle:4.1.3'
-        classpath 'com.google.gms:google-services:4.3.5'
-        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.0'
+        classpath 'com.android.tools.build:gradle:7.1.0-alpha02'
+        classpath 'com.google.gms:google-services:4.3.8'
+        classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.1'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/combo/build.gradle b/combo/build.gradle
index 8020051b31..e7f0567cf9 100644
--- a/combo/build.gradle
+++ b/combo/build.gradle
@@ -8,13 +8,6 @@ apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
 
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
-
 dependencies {
     implementation project(':core')
 }
\ No newline at end of file
diff --git a/combo/src/main/res/values-fr-rFR/strings.xml b/combo/src/main/res/values-fr-rFR/strings.xml
index 321624b7f2..53e1970f73 100644
--- a/combo/src/main/res/values-fr-rFR/strings.xml
+++ b/combo/src/main/res/values-fr-rFR/strings.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="description_pump_combo">Intégration des pompes Accu-Chek Combo il faut avoir Ruffy installé</string>
-    <string name="combo_programming_bolus">Programmer la pompe pour injecter un bolus</string>
+    <string name="description_pump_combo">Pour l\'intégration des pompes Accu-Chek Combo, il faut d\'abord installer Ruffy</string>
+    <string name="combo_programming_bolus">Programmation de la pompe pour injecter un bolus</string>
     <string name="combo_pump_state_label">État</string>
     <string name="combo_pump_activity_label">Activité</string>
     <string name="combo_no_pump_connection">Pas de connexion depuis %1$d min</string>
@@ -10,13 +10,13 @@
     <string name="combo_pump_state_suspended_due_to_error">Arrêté pour cause d\'erreur</string>
     <string name="combo_pump_state_suspended_by_user">Arrêté par l\'utilisateur</string>
     <string name="combo_pump_state_running">En cours d\'exécution</string>
-    <string name="combo_pump_action_cancelling_tbr">Annulation en cours du TBR</string>
-    <string name="combo_pump_action_setting_tbr">Paramétrer TBR (%1$d%% / %2$d min) </string>
+    <string name="combo_pump_action_cancelling_tbr">Annulation du DBT</string>
+    <string name="combo_pump_action_setting_tbr">Réglage DBT (%1$d%% / %2$d min)</string>
     <string name="combo_pump_action_bolusing">Injection du Bolus en cours (%1$.1f U)</string>
     <string name="combo_pump_action_refreshing">Actualisation en cours</string>
     <string name="combo_pump_unsupported_operation">L\'opération demandée n\'est pas prise en charge par la pompe</string>
     <string name="combo_low_suspend_forced_notification">Utilisation dangereuse : les bolus étendus ou carrés sont actifs. Le mode Boucle a été programmé pour des suspensions seulement pour 6 heures. Uniquement les bolus normaux sont pris en charge par le mode Boucle</string>
-    <string name="combo_force_disabled_notification">Utilisation dangereuse : la pompe utilise un profil avec taux basal différent de celui du premier. Le mode Boucle a été désactivé. Sélectionner le premier profil sur la pompe et rafraîchir.</string>
+    <string name="combo_force_disabled_notification">Utilisation dangereuse : la pompe utilise un profil avec un taux basal différent du premier. Le mode Boucle a été désactivé. Sélectionner le premier profil sur la pompe et rafraîchir.</string>
     <string name="bolus_frequency_exceeded">Un bolus avec la même quantité d’insuline a été demandé au cours de la dernière minute. Pour prévenir l’administration accidentelle de deux bolus à la fois et pour protéger contre les bugs, ceci (bolus) n\'est pas autorisé.</string>
     <string name="combo_pump_connected_now">Maintenant</string>
     <string name="combo_activity_reading_pump_history">Lecture historique pompe</string>
@@ -37,13 +37,13 @@
     <string name="combo_invalid_setup">Paramétrage de la pompe invalide. Vérifiez la documentation et le menu QUICK INFO en utilisant le logiciel de configuration 360.</string>
     <string name="combo_actvity_reading_basal_profile">Lecture du profil basal</string>
     <string name="combo_bolus_rejected_due_to_pump_history_change">L\'historique de la pompe a été modifié depuis le calcul du bolus. Le bolus n\'a pas été administré. Merci de recalculer le bolus s\'il est toujours nécessaire.</string>
-    <string name="combo_error_updating_treatment_record">Le bolus a été délivré mais il n\'a pas pu être ajouté à l\'historique des traitements. Ceci peut se produire lorsque deux petits bolus de la même taille sont gérés dans les deux dernières minutes. Merci de vérifier l\'historique de la pompe et les entrées de traitements puis utilisez le Careportal pour y ajouter les entrées manquantes. Assurez-vous de ne pas ajouter des entrées au cours de la même minute et pour la même quantité d\'insuline.</string>
+    <string name="combo_error_updating_treatment_record">Le bolus a été délivré mais il n\'a pas pu être ajouté à l\'historique des traitements. Ceci peut se produire lorsque deux petits bolus de même taille sont injectés dans les deux dernières minutes. Veuillez vérifier l\'historique de la pompe et les entrées de traitements puis utilisez Careportal pour y ajouter les entrées manquantes. Assurez-vous de ne pas ajouter d\'entrées au cours de la même minute et pour la même quantité d\'insuline.</string>
     <string name="combo_high_temp_rejected_due_to_pump_history_changes">Rejet cible temporaire haute parce que le calcul ne prend pas en compte les changements récents de l\'historique pompe</string>
     <string name="combo_activity_checking_pump_state">Actualisation de l\'état de la pompe</string>
     <string name="combo_warning_pump_basal_rate_changed">Le taux basal de la pompe a été modifié et sera bientôt actualisé</string>
     <string name="combo_error_failure_reading_changed_basal_rate">Le pourcentage de basal a changé dans la pompe mais sa lecture a échoué</string>
     <string name="combo_activity_checking_for_history_changes">Vérification des modifications de l\'historique</string>
-    <string name="combo_error_multiple_boluses_with_identical_timestamp">De multiples bolus similaires viennent d\'être importés dans la même minute. Un seul enregistrement a pu être ajouté aux traitements. Merci de vérifier la pompe et d\'ajouter manuellement un enregistrement de bolus en utilisant l\'onglet Careportal. Assurez vous de créer ce bolus avec un temps différent de tous les autres Bolus.</string>
+    <string name="combo_error_multiple_boluses_with_identical_timestamp">De multiples bolus similaires viennent d\'être importés dans la même minute. Un seul enregistrement a pu être ajouté aux traitements. Veuillez vérifier la pompe et d\'ajouter manuellement un enregistrement de bolus en utilisant l\'onglet Careportal. Assurez vous de créer ce bolus avec un temps différent de tous les autres Bolus.</string>
     <string name="about_link_urls">\n\ndocumentation :\nhttps://androidaps.readthedocs.io/fr/latest/\n\nfacebook :\nhttps://www.facebook.com/groups/AndroidAPSUsers</string>
     <string name="combo_check_date">Le dernier bolus enregistré date d\'il y a plus de 24h ou est dans le futur. Vérifiez que la date dans la pompe est correctement définie.</string>
     <string name="combo_suspious_bolus_time">L\'heure/date sur la pompe du dernier bolus administré semble erroné. L\'IA est probablement incorrecte. Vérifiez l\'heure/date de la pompe.</string>
diff --git a/core/build.gradle b/core/build.gradle
index 9b2d54be1e..e3a916bdae 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -9,12 +9,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
 
 dependencies {
     implementation project(':database')
diff --git a/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
index 1015274a08..0e29d22b00 100644
--- a/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
+++ b/core/src/main/java/info/nightscout/androidaps/activities/TDDStatsActivity.kt
@@ -26,6 +26,7 @@ import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.CommandQueueProvider
 import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
 import info.nightscout.androidaps.plugins.bus.RxBusWrapper
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.queue.Callback
@@ -232,11 +233,15 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
     @SuppressLint("SetTextI18n")
     private fun loadDataFromDB() {
         historyList.clear()
-        historyList.addAll(repository.getLastTotalDailyDoses(10, false).blockingGet())
+        // timestamp DESC sorting!
+        historyList.addAll(repository.getLastTotalDailyDoses(10, true).blockingGet())
 
         //only use newest 10
         historyList = historyList.subList(0, min(10, historyList.size))
 
+        // dummies reset
+        dummies.clear()
+
         //fill single gaps
         val df: DateFormat = SimpleDateFormat("dd.MM.", Locale.getDefault())
         for (i in 0 until historyList.size - 1) {
@@ -425,7 +430,7 @@ class TDDStatsActivity : NoSplashAppCompatActivity() {
 
     private fun isOldData(historyList: List<TotalDailyDose>): Boolean {
         val type = activePlugin.activePump.pumpDescription.pumpType
-        val startsYesterday = type == PumpType.DANA_R || type == PumpType.DANA_RS || type == PumpType.DANA_RV2 || type == PumpType.DANA_R_KOREAN || type == PumpType.ACCU_CHEK_INSIGHT_VIRTUAL
+        val startsYesterday = type == PumpType.DANA_R || type == PumpType.DANA_RS || type == PumpType.DANA_RV2 || type == PumpType.DANA_R_KOREAN || type == PumpType.ACCU_CHEK_INSIGHT_VIRTUAL || type == PumpType.DIACONN_G8
         val df: DateFormat = SimpleDateFormat("dd.MM.", Locale.getDefault())
         return historyList.size < 3 || df.format(Date(historyList[0].timestamp)) != df.format(Date(System.currentTimeMillis() - if (startsYesterday) 1000 * 60 * 60 * 24 else 0))
     }
diff --git a/core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt b/core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt
index 898fa5f371..f02488f617 100644
--- a/core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt
+++ b/core/src/main/java/info/nightscout/androidaps/extensions/TherapyEventExtension.kt
@@ -97,11 +97,11 @@ fun therapyEventFromJson(jsonObject: JSONObject): TherapyEvent? {
     return te
 }
 
-fun TherapyEvent.toJson(isAdd: Boolean): JSONObject =
+fun TherapyEvent.toJson(isAdd: Boolean, dateUtil: DateUtil): JSONObject =
     JSONObject()
         .put("eventType", type.text)
         .put("isValid", isValid)
-        .put("created_at", timestamp)
+        .put("created_at", dateUtil.toISOString(timestamp))
         .put("enteredBy", enteredBy)
         .put("units", if (glucoseUnit == TherapyEvent.GlucoseUnit.MGDL) Constants.MGDL else Constants.MMOL)
         .also {
diff --git a/core/src/main/java/info/nightscout/androidaps/interfaces/Diaconn.kt b/core/src/main/java/info/nightscout/androidaps/interfaces/Diaconn.kt
new file mode 100644
index 0000000000..be3bfa1b87
--- /dev/null
+++ b/core/src/main/java/info/nightscout/androidaps/interfaces/Diaconn.kt
@@ -0,0 +1,8 @@
+package info.nightscout.androidaps.interfaces
+
+import info.nightscout.androidaps.data.PumpEnactResult
+
+interface Diaconn {
+    fun loadHistory(): PumpEnactResult // for history browser
+    fun setUserOptions(): PumpEnactResult // pump etc settings
+}
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt b/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt
index 47b977e5d8..a7ac2b5596 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/common/ManufacturerType.kt
@@ -9,5 +9,6 @@ enum class ManufacturerType(val description: String) {
     Animas("Animas"),
     Cellnovo("Cellnovo"),
     Roche("Roche"),
-    Ypsomed("Ypsomed");
+    Ypsomed("Ypsomed"),
+    G2e("G2e");
 }
\ No newline at end of file
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.kt
index b8e74bb0a6..1ceac452df 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpCapability.kt
@@ -23,6 +23,7 @@ enum class PumpCapability {
     MedtronicCapabilities(arrayOf(Bolus, TempBasal, BasalProfileSet, Refill, ReplaceBattery, TDD)),
     OmnipodCapabilities(arrayOf(Bolus, TempBasal, BasalProfileSet, BasalRate30min)),
     YpsomedCapabilities(arrayOf(Bolus, ExtendedBolus, TempBasal, BasalProfileSet, Refill, ReplaceBattery, TDD, ManualTDDLoad)),  // BasalRates (separately grouped)
+    DiaconnCapabilities(arrayOf(Bolus, ExtendedBolus, TempBasal, BasalProfileSet, Refill, ReplaceBattery, TDD, ManualTDDLoad)), //
     BasalRate_Duration15minAllowed,
     BasalRate_Duration30minAllowed,
     BasalRate_Duration15and30minAllowed(arrayOf(BasalRate_Duration15minAllowed, BasalRate_Duration30minAllowed)),
diff --git a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt
index 387386f927..88d268b6f1 100644
--- a/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt
+++ b/core/src/main/java/info/nightscout/androidaps/plugins/pump/common/defs/PumpType.kt
@@ -284,7 +284,23 @@ enum class PumpType {
         model = "USER",
         tbrSettings = DoseSettings(1.0, 15, 24 * 60, 0.0, 500.0),
         extendedBolusSettings = DoseSettings(0.1, 15, 12 * 60, 0.1),
-        pumpCapability = PumpCapability.MDI);
+        pumpCapability = PumpCapability.MDI),
+
+    //Diaconn Pump
+    DIACONN_G8(description = "DiaconnG8",
+        manufacturer = ManufacturerType.G2e,
+        model = "Diaconn G8",
+        bolusSize = 0.01,
+        specialBolusSize = null,
+        extendedBolusSettings = DoseSettings(0.05, 10, 5 * 60, 0.05),
+        pumpTempBasalType = PumpTempBasalType.Absolute,
+        tbrSettings = DoseSettings(0.01, 30, 24 * 60, 0.0, 6.0),
+        specialBasalDurations = PumpCapability.BasalRate_Duration30minAllowed,
+        baseBasalMinValue = 0.05,
+        baseBasalMaxValue = 3.0,
+        baseBasalStep = 0.01,
+        baseBasalSpecialSteps = null,
+        pumpCapability = PumpCapability.DanaWithHistoryCapabilities);
 
     val description: String
     var manufacturer: ManufacturerType? = null
@@ -444,5 +460,6 @@ enum class PumpType {
             YPSOPUMP                    -> InterfaceIDs.PumpType.YPSOPUMP
             MDI                         -> InterfaceIDs.PumpType.MDI
             USER                        -> InterfaceIDs.PumpType.USER
+            DIACONN_G8                  -> InterfaceIDs.PumpType.DIACONN_G8
         }
 }
\ No newline at end of file
diff --git a/core/src/main/res/values-bg-rBG/strings.xml b/core/src/main/res/values-bg-rBG/strings.xml
index ac97acedbc..13f1cbb625 100644
--- a/core/src/main/res/values-bg-rBG/strings.xml
+++ b/core/src/main/res/values-bg-rBG/strings.xml
@@ -62,6 +62,7 @@
     <string name="eventtype">Тип събитие</string>
     <string name="mgdl">мг/дл</string>
     <string name="mmol">ммол/л</string>
+    <string name="shortgram">гр.</string>
     <string name="advancedsettings_title">Допълнителни настройки</string>
     <string name="bluetooth">Bluetooth</string>
     <string name="btwatchdog_title">BT ограничения</string>
@@ -202,6 +203,7 @@
     <string name="wear">Часовник</string>
     <string name="automation">Автоматизация</string>
     <string name="custom">По избор</string>
+    <string name="pump">Помпа</string>
     <string name="loop">Кръг - Loop</string>
     <!--    Command-->
     <string name="connectiontimedout">Времето за връзка изтече</string>
@@ -285,6 +287,13 @@
     <string name="saturday_short">С</string>
     <string name="sunday_short">Н</string>
     <!-- User Entry -->
+    <string name="uel_cancel_bolus">СПРИ БОЛУС</string>
+    <string name="ue_source">Източник</string>
+    <string name="ue_action">Действие</string>
+    <plurals name="hours">
+        <item quantity="one">%1$d час</item>
+        <item quantity="other">%1$d часа</item>
+    </plurals>
     <plurals name="minutes">
         <item quantity="one">%1$d минутa</item>
         <item quantity="other">%1$d минути</item>
diff --git a/core/src/main/res/values-cs-rCZ/strings.xml b/core/src/main/res/values-cs-rCZ/strings.xml
index 1140bdd2f1..1fb65bf365 100644
--- a/core/src/main/res/values-cs-rCZ/strings.xml
+++ b/core/src/main/res/values-cs-rCZ/strings.xml
@@ -382,6 +382,9 @@
     <string name="ue_timestamp">Datum</string>
     <string name="ue_none">Žádné jednotky</string>
     <string name="ue_export_to_csv">Exportovat uživatelské záznamy do Excelu (csv)</string>
+    <string name="uel_loop_change">SMYČKA ZMĚNĚNA</string>
+    <string name="uel_loop_removed">SMYČKA ODEBRÁNA</string>
+    <string name="uel_other">JINÉ</string>
     <plurals name="days">
         <item quantity="one">%1$d den</item>
         <item quantity="few">%1$d dnů</item>
diff --git a/core/src/main/res/values-fr-rFR/strings.xml b/core/src/main/res/values-fr-rFR/strings.xml
index 4a784f34ba..dca16eb3a9 100644
--- a/core/src/main/res/values-fr-rFR/strings.xml
+++ b/core/src/main/res/values-fr-rFR/strings.xml
@@ -11,7 +11,7 @@
     <string name="tempbasaldeliveryerror">Erreur injection basal temporaire</string>
     <string name="goingtodeliver">%1$.2f U vont être injectées</string>
     <string name="waitingforpump">Attente connection pompe</string>
-    <string name="connectingfor">Connexion à %1$d en cours</string>
+    <string name="connectingfor">Connexion en cours : %1$d sec.</string>
     <string name="bolusdelivering">%1$.2f U ont été injectées</string>
     <string name="handshaking">Connexion</string>
     <string name="connecting">Connection en cours</string>
@@ -382,6 +382,9 @@
     <string name="ue_timestamp">Horodatage</string>
     <string name="ue_none">Aucune unité</string>
     <string name="ue_export_to_csv">Exporter les entrées utilisateur vers Excel (csv)</string>
+    <string name="uel_loop_change">BOUCLE CHANGÉE</string>
+    <string name="uel_loop_removed">BOUCLE SUPPRIMÉE</string>
+    <string name="uel_other">AUTRE</string>
     <plurals name="days">
         <item quantity="one">%1$d jour</item>
         <item quantity="other">%1$d jours</item>
diff --git a/core/src/main/res/values-it-rIT/strings.xml b/core/src/main/res/values-it-rIT/strings.xml
index 62b4a7441d..f769ae42f9 100644
--- a/core/src/main/res/values-it-rIT/strings.xml
+++ b/core/src/main/res/values-it-rIT/strings.xml
@@ -105,6 +105,7 @@
     <string name="notes_label">Note</string>
     <string name="remove_button">Rimuovi</string>
     <string name="addnew">Aggiungi nuovo</string>
+    <string name="wrong_pump_data">I dati arrivano da un micro differente. Cambia il driver del micro per resettarne lo stato.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Limitazione max velocità basale a %1$.2f U/h a causa di: %2$s</string>
     <string name="pumplimit">limite micro</string>
@@ -211,6 +212,7 @@
     <string name="pump">Micro</string>
     <string name="loop">Loop</string>
     <string name="ns">NS</string>
+    <string name="record">Record</string>
     <!--    Command-->
     <string name="connectiontimedout">Time out connessione</string>
     <!--    PumpEnactResult-->
@@ -300,6 +302,7 @@
     <string name="uel_carbs">CHO</string>
     <string name="uel_extended_carbs">CHO ESTESI</string>
     <string name="uel_temp_basal">BASALE TEMPORANEA</string>
+    <string name="uel_tt">TARGET TEMPORANEO</string>
     <string name="uel_new_profile">NUOVO PROFILO</string>
     <string name="uel_clone_profile">CLONA PROFILO</string>
     <string name="uel_store_profile">MEMORIZZA PROFILO</string>
@@ -318,21 +321,25 @@
     <string name="uel_clear_pairing_keys">CANCELLA CHIAVI DI ASSOCIAZIONE</string>
     <string name="uel_accepts_temp_basal">ACCETTA BASALE TEMPORANEA</string>
     <string name="uel_cancel_temp_basal">CANCELLA BASALE TEMPORANEA</string>
+    <string name="uel_cancel_bolus">CANCELLA BOLO</string>
     <string name="uel_cancel_extended_bolus">CANCELLA BOLO ESTESO</string>
+    <string name="uel_cancel_tt">CANCELLA TARGET TEMPORANEO</string>
     <string name="uel_careportal">PORTALE</string>
     <string name="uel_site_change">CAMBIO POSIZIONE CANNULA</string>
     <string name="uel_reservoir_change">CAMBIO SERBATOIO</string>
     <string name="uel_calibration">CALIBRAZIONE</string>
     <string name="uel_prime_bolus">BOLO DI CARICAMENTO</string>
     <string name="uel_treatment">TRATTAMENTO</string>
-    <string name="uel_careportal_ns_refresh">PORTALE NS AGGIORNAMENTO</string>
-    <string name="uel_profile_switch_ns_refresh">CAMBIO PROFILO NS AGGIORNAMENTO</string>
-    <string name="uel_treatments_ns_refresh">TRATTAMENTI NS AGGIORNAMENTO</string>
+    <string name="uel_careportal_ns_refresh">PORTALE NS: AGGIORNAMENTO</string>
+    <string name="uel_profile_switch_ns_refresh">CAMBIO PROFILO NS: AGGIORNAMENTO</string>
+    <string name="uel_treatments_ns_refresh">TRATTAMENTI NS: AGGIORNAMENTO</string>
+    <string name="uel_tt_ns_refresh">TARGET TEMPORANEO NS: AGGIORNAMENTO</string>
     <string name="uel_automation_removed">AUTOMAZIONE RIMOSSA</string>
     <string name="uel_bg_removed">BG RIMOSSO</string>
     <string name="uel_careportal_removed">PORTALE RIMOSSO</string>
     <string name="uel_bolus_removed">BOLO RIMOSSO</string>
     <string name="uel_carbs_removed">CHO RIMOSSI</string>
+    <string name="uel_temp_basal_removed">BASALE TEMPORANEA RIMOSSA</string>
     <string name="uel_extended_bolus_removed">BOLO ESTESO RIMOSSO</string>
     <string name="uel_food">CIBO</string>
     <string name="uel_food_removed">CIBO RIMOSSO</string>
@@ -340,6 +347,7 @@
     <string name="uel_profile_switch_removed">CAMBIO PROFILO RIMOSSO</string>
     <string name="uel_restart_events_removed">EVENTI DI RIAVVIO RIMOSSI</string>
     <string name="uel_treatment_removed">TRATTAMENTO RIMOSSO</string>
+    <string name="uel_tt_removed">TARGET TEMPORANEO RIMOSSO</string>
     <string name="uel_ns_paused">NS IN PAUSA</string>
     <string name="uel_ns_resume">NS RIPRESA</string>
     <string name="uel_ns_queue_cleared">CODA NS CANCELLATA</string>
@@ -360,12 +368,23 @@
     <string name="uel_import_databases">IMPORTA DATABASE</string>
     <string name="uel_otp_export">ESPORTAZIONE OTP</string>
     <string name="uel_otp_reset">RESET OTP</string>
+    <string name="uel_stop_sms">STOP SMS</string>
     <string name="uel_export_csv">ESPORTA VOCI UTENTE</string>
+    <string name="uel_start_aaps">AVVIA AAPS</string>
+    <string name="uel_exit_aaps">USCITA AAPS</string>
+    <string name="uel_plugin_enabled">PLUGIN ABILITATO</string>
+    <string name="uel_plugin_disabled">PLUGIN DISABILITATO</string>
     <string name="uel_unknown">SCONOSCIUTO</string>
     <string name="ue_string">Stringa</string>
     <string name="ue_source">Fonte</string>
+    <string name="ue_utc_offset">Offset UTC</string>
     <string name="ue_action">Azione</string>
+    <string name="ue_timestamp">Data e ora</string>
+    <string name="ue_none">Nessuna unità</string>
     <string name="ue_export_to_csv">Esporta voci utente in Excel (csv)</string>
+    <string name="uel_loop_change">LOOP CAMBIATO</string>
+    <string name="uel_loop_removed">LOOP RIMOSSO</string>
+    <string name="uel_other">ALTRO</string>
     <plurals name="days">
         <item quantity="one">%1$d giorno</item>
         <item quantity="other">%1$d giorni</item>
diff --git a/core/src/main/res/values-iw-rIL/strings.xml b/core/src/main/res/values-iw-rIL/strings.xml
index ef704b5f4d..3159c19f7a 100644
--- a/core/src/main/res/values-iw-rIL/strings.xml
+++ b/core/src/main/res/values-iw-rIL/strings.xml
@@ -382,6 +382,9 @@
     <string name="ue_timestamp">חתימת זמן</string>
     <string name="ue_none">ללא יחידה</string>
     <string name="ue_export_to_csv">יצוא ערכי משתמש לאקסל (csv)</string>
+    <string name="uel_loop_change">הלולאה שונתה</string>
+    <string name="uel_loop_removed">הלולאה הוסרה</string>
+    <string name="uel_other">אחר</string>
     <plurals name="days">
         <item quantity="one">%1$d יום</item>
         <item quantity="two">%1$d ימים</item>
diff --git a/core/src/main/res/values-no-rNO/strings.xml b/core/src/main/res/values-no-rNO/strings.xml
index 8087301f35..5dc889cffd 100644
--- a/core/src/main/res/values-no-rNO/strings.xml
+++ b/core/src/main/res/values-no-rNO/strings.xml
@@ -105,6 +105,7 @@
     <string name="notes_label">Merknader</string>
     <string name="remove_button">Fjern</string>
     <string name="addnew">Legg til ny</string>
+    <string name="wrong_pump_data">Data kommer fra forskjellige pumper. Bytt pumpevalg for å nullstille pumpens tilstand.</string>
     <!--    Constraints-->
     <string name="limitingbasalratio">Begrenser maks basal dose til %1$.2f E/t på grunn av %2$s</string>
     <string name="pumplimit">pumpebegrensning</string>
@@ -208,6 +209,10 @@
     <string name="wear">Wear</string>
     <string name="automation">Automatisering</string>
     <string name="custom">Egendefinert</string>
+    <string name="pump">Pumpe</string>
+    <string name="loop">Loop</string>
+    <string name="ns">NS</string>
+    <string name="record">Registrer</string>
     <!--    Command-->
     <string name="connectiontimedout">Tilkoblingen ble tidsavbrutt</string>
     <!--    PumpEnactResult-->
@@ -297,6 +302,7 @@
     <string name="uel_carbs">KARBO</string>
     <string name="uel_extended_carbs">FORLENGET KARBO</string>
     <string name="uel_temp_basal">TEMP BASAL</string>
+    <string name="uel_tt">MIDLERTIDIG BS MÅL</string>
     <string name="uel_new_profile">NY PROFIL</string>
     <string name="uel_clone_profile">KOPIER PROFIL</string>
     <string name="uel_store_profile">LAGRE PROFIL</string>
@@ -315,23 +321,33 @@
     <string name="uel_clear_pairing_keys">NULLSTILL PARRINGS NØKLER</string>
     <string name="uel_accepts_temp_basal">AKSEPTER TEMP BASAL</string>
     <string name="uel_cancel_temp_basal">AVBRYT TEMP BASAL</string>
+    <string name="uel_cancel_bolus">AVBRYT BOLUS</string>
     <string name="uel_cancel_extended_bolus">AVBRYT FORLENGET BOLUS</string>
+    <string name="uel_cancel_tt">AVBRYT MIDLERTIDIG BS MÅL</string>
     <string name="uel_careportal">CAREPORTAL</string>
+    <string name="uel_site_change">BYTTE SLANGESETT</string>
+    <string name="uel_reservoir_change">BYTTE RESERVOAR</string>
     <string name="uel_calibration">KALIBRERING</string>
     <string name="uel_prime_bolus">PRIME BOLUS</string>
     <string name="uel_treatment">BEHANDLING</string>
     <string name="uel_careportal_ns_refresh">CAREPORTAL NS OPPDATER</string>
     <string name="uel_profile_switch_ns_refresh">PROFILBYTTE NS OPPDATER</string>
     <string name="uel_treatments_ns_refresh">BEHANDLINGER NS OPPDATER</string>
+    <string name="uel_tt_ns_refresh">OPPDATER MIDLERTIDIG BS MÅL NS</string>
     <string name="uel_automation_removed">AUTOMASJON FJERNET</string>
     <string name="uel_bg_removed">BS FJERNET</string>
     <string name="uel_careportal_removed">CAREPORTAL FJERNET</string>
+    <string name="uel_bolus_removed">BOLUS FJERNET</string>
+    <string name="uel_carbs_removed">KARBO FJERNET</string>
+    <string name="uel_temp_basal_removed">MIDLERTIDIG BS MÅL FJERNET</string>
     <string name="uel_extended_bolus_removed">FORLENGET BOLUS FJERNET</string>
+    <string name="uel_food">MAT</string>
     <string name="uel_food_removed">MÅLTID FJERNET</string>
     <string name="uel_profile_removed">PROFIL FJERNET</string>
     <string name="uel_profile_switch_removed">PROFILBYTTE FJERNET</string>
     <string name="uel_restart_events_removed">RESTART HENDELSER FJERNET</string>
     <string name="uel_treatment_removed">BEHANDLING FJERNET</string>
+    <string name="uel_tt_removed">MIDLERTIDIG BS MÅL FJERNET</string>
     <string name="uel_ns_paused">NS PAUSET</string>
     <string name="uel_ns_resume">GJENOPPTA NS</string>
     <string name="uel_ns_queue_cleared">NS KØ SLETTET</string>
@@ -352,9 +368,23 @@
     <string name="uel_import_databases">IMPORTER DATABASER</string>
     <string name="uel_otp_export">OTP EKSPORT</string>
     <string name="uel_otp_reset">OTP RESET</string>
+    <string name="uel_stop_sms">STOPP SMS</string>
     <string name="uel_export_csv">EKSPORTER BRUKEROPPFØRINGER</string>
+    <string name="uel_start_aaps">START AAPS</string>
+    <string name="uel_exit_aaps">AVSLUTT AAPS</string>
+    <string name="uel_plugin_enabled">PLUGIN AKTIVERT</string>
+    <string name="uel_plugin_disabled">PLUGIN DEAKTIVERT</string>
     <string name="uel_unknown">UKJENT</string>
+    <string name="ue_string">Tekst</string>
+    <string name="ue_source">Kildekode</string>
+    <string name="ue_utc_offset">UTC tid forskyvning</string>
+    <string name="ue_action">Handling</string>
+    <string name="ue_timestamp">Tidspunkt</string>
+    <string name="ue_none">Ingen enhet</string>
     <string name="ue_export_to_csv">Eksporter brukeroppføringer til Excel (csv)</string>
+    <string name="uel_loop_change">LOOP ENDRET</string>
+    <string name="uel_loop_removed">LOOP FJERNET</string>
+    <string name="uel_other">ANNET</string>
     <plurals name="days">
         <item quantity="one">%1$d dag</item>
         <item quantity="other">%1$d dager</item>
diff --git a/core/src/main/res/values-sk-rSK/strings.xml b/core/src/main/res/values-sk-rSK/strings.xml
index efbb0c3052..aaf22657af 100644
--- a/core/src/main/res/values-sk-rSK/strings.xml
+++ b/core/src/main/res/values-sk-rSK/strings.xml
@@ -382,6 +382,9 @@
     <string name="ue_timestamp">Časová pečiatka</string>
     <string name="ue_none">Žiadna jednotka</string>
     <string name="ue_export_to_csv">Exportovať užívateľské záznamy do Excelu (csv)</string>
+    <string name="uel_loop_change">UZAVRETÝ OKRUH ZMENENÝ</string>
+    <string name="uel_loop_removed">UZAVRETÝ OKRUH ODSTRÁNENÝ</string>
+    <string name="uel_other">INÉ</string>
     <plurals name="days">
         <item quantity="one">%1$d deň</item>
         <item quantity="few">%1$d dní</item>
diff --git a/crowdin.yml b/crowdin.yml
index 4939f67605..d43fae2787 100644
--- a/crowdin.yml
+++ b/crowdin.yml
@@ -39,3 +39,5 @@ files:
     translation: /insight/src/main/res/values-%android_code%/exceptions.xml
   - source: /automation/src/main/res/values/strings.xml
     translation: /automation/src/main/res/values-%android_code%/strings.xml
+  - source: /diaconn/src/main/res/values/strings.xml
+    translation: /diaconn/src/main/res/values-%android_code%/strings.xml
diff --git a/dana/build.gradle b/dana/build.gradle
index 33b66a5090..91897b762a 100644
--- a/dana/build.gradle
+++ b/dana/build.gradle
@@ -10,8 +10,6 @@ apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
 android {
     defaultConfig {
-        versionCode 1
-        versionName "1.0"
         kapt {
             arguments {
                 arg("room.incremental", "true")
diff --git a/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
index bcbdea9165..56cf61dcfc 100644
--- a/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
+++ b/dana/src/main/java/info/nightscout/androidaps/dana/DanaPump.kt
@@ -406,7 +406,8 @@ class DanaPump @Inject constructor(
             0x05 -> PumpType.DANA_RS
             0x06 -> PumpType.DANA_RS_KOREAN
             0x07 -> PumpType.DANA_I
-            else -> PumpType.DANA_R
+            0x09 -> PumpType.DANA_I
+            else -> PumpType.USER
         }
 
     companion object {
diff --git a/dana/src/main/res/values-fr-rFR/strings.xml b/dana/src/main/res/values-fr-rFR/strings.xml
index 594074b7a3..0e1a7c6d9f 100644
--- a/dana/src/main/res/values-fr-rFR/strings.xml
+++ b/dana/src/main/res/values-fr-rFR/strings.xml
@@ -43,7 +43,7 @@
     <string name="gettingpumpsettings">Obtenir les paramètres pompe</string>
     <string name="gettingpumptime">Obtenir l\'heure de la pompe</string>
     <string name="largetimedifftitle">Différence horaire importante</string>
-    <string name="largetimediff">Différence horaire importante:\nL\'heure de la pompe est en écart de plus d\'une heure et demi.\nMerci d\'ajuster manuellement l\'heure de la pompe et assurez-vous que la lecture de l\'historique de la pompe ne cause pas de dysfonctionnements.\nSi possible, effacez l\'historique de la pompe avant de modifier l\'heure ou désactivez la Boucle Fermée pour une DAI après la dernière entrée erronée de l\'historique et au minimum une DAI à partir de maintenant.</string>
+    <string name="largetimediff">Différence horaire importante:\nL\'heure de la pompe est en écart de plus d\'une heure et demi.\nVeuillez ajuster manuellement l\'heure de la pompe et assurez-vous que la lecture de l\'historique de la pompe ne cause pas de dysfonctionnements.\nSi possible, effacez l\'historique de la pompe avant de modifier l\'heure ou désactivez la Boucle Fermée pour une DAI après la dernière entrée erronée de l\'historique et au minimum une DAI à partir de maintenant.</string>
     <string name="pairfirst">Veuillez appairer votre pompe avec votre téléphone !</string>
     <string name="approachingdailylimit">Limite quotidienne d\'insuline proche</string>
     <string name="startingbolus">Injection du bolus démarrée</string>
diff --git a/danar/build.gradle b/danar/build.gradle
index 09899f5540..0915729e0f 100644
--- a/danar/build.gradle
+++ b/danar/build.gradle
@@ -7,12 +7,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
 
 dependencies {
     implementation project(':core')
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 0cd213a56a..cff117939c 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,6 +1,7 @@
 package info.nightscout.androidaps.danaRv2.comm
 
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaPump
 import info.nightscout.androidaps.danar.R
 import info.nightscout.androidaps.danar.comm.MessageBase
 import info.nightscout.androidaps.events.EventPumpStatusChanged
@@ -69,7 +70,7 @@ class MsgHistoryEvents_v2 constructor(
         val param2 = intFromBuff(bytes, 9, 2)
         val status: String
         when (recordCode.toInt()) {
-            info.nightscout.androidaps.dana.DanaPump.TEMPSTART         -> {
+            DanaPump.TEMPSTART         -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
                 val temporaryBasalInfo = temporaryBasalStorage.findTemporaryBasal(datetime, param1.toDouble())
                 pumpSync.syncTemporaryBasalWithPumpId(
@@ -84,7 +85,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "TEMPSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.TEMPSTOP          -> {
+            DanaPump.TEMPSTOP -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime))
                 pumpSync.syncStopTemporaryBasalWithPumpId(
                     timestamp = datetime,
@@ -94,7 +95,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "TEMPSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.EXTENDEDSTART     -> {
+            DanaPump.EXTENDEDSTART     -> {
                 val newRecord = pumpSync.syncExtendedBolusWithPumpId(
                     timestamp = datetime,
                     amount = param1 / 100.0,
@@ -107,7 +108,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.EXTENDEDSTOP      -> {
+            DanaPump.EXTENDEDSTOP      -> {
                 val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
                     timestamp = datetime,
                     endPumpId = datetime,
@@ -117,7 +118,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.BOLUS             -> {
+            DanaPump.BOLUS             -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                 val newRecord = pumpSync.syncBolusWithPumpId(
                     timestamp = datetime,
@@ -130,7 +131,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "BOLUS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.DUALBOLUS         -> {
+            DanaPump.DUALBOLUS         -> {
                 val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(datetime, param1 / 100.0)
                 val newRecord = pumpSync.syncBolusWithPumpId(
                     timestamp = datetime,
@@ -143,7 +144,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "DUALBOLUS " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.DUALEXTENDEDSTART -> {
+            DanaPump.DUALEXTENDEDSTART -> {
                 val newRecord = pumpSync.syncExtendedBolusWithPumpId(
                     timestamp = datetime,
                     amount = param1 / 100.0,
@@ -156,7 +157,7 @@ class MsgHistoryEvents_v2 constructor(
                 status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.DUALEXTENDEDSTOP  -> {
+            DanaPump.DUALEXTENDEDSTOP  -> {
                 val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
                     timestamp = datetime,
                     endPumpId = datetime,
@@ -166,32 +167,32 @@ class MsgHistoryEvents_v2 constructor(
                 status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.SUSPENDON         -> {
+            DanaPump.SUSPENDON         -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDON (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDON " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.SUSPENDOFF        -> {
+            DanaPump.SUSPENDOFF        -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT SUSPENDOFF (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "SUSPENDOFF " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.REFILL            -> {
+            DanaPump.REFILL            -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT REFILL (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "REFILL " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.PRIME             -> {
+            DanaPump.PRIME             -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "EVENT PRIME (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U")
                 status = "PRIME " + dateUtil.timeString(datetime)
             }
 
-            info.nightscout.androidaps.dana.DanaPump.PROFILECHANGE     -> {
+            DanaPump.PROFILECHANGE     -> {
                 aapsLogger.debug(LTag.PUMPBTCOMM, "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 newRecord = pumpSync.syncCarbsWithTimestamp(
                     timestamp = datetime,
                     amount = param1.toDouble(),
diff --git a/danars/build.gradle b/danars/build.gradle
index 9ac3aa3f9a..075ebd5e0a 100644
--- a/danars/build.gradle
+++ b/danars/build.gradle
@@ -11,8 +11,6 @@ android {
     ndkVersion "21.1.6352462"
 
     defaultConfig {
-        versionCode 1
-        versionName "1.0"
 
         ndk {
             moduleName "BleCommandUtil"
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
index fdd97c7a4a..ffe87ed77b 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/DanaRSPlugin.kt
@@ -9,13 +9,15 @@ import android.text.format.DateFormat
 import androidx.preference.Preference
 import dagger.android.HasAndroidInjector
 import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.dana.comm.RecordTypes
 import info.nightscout.androidaps.danars.events.EventDanaRSDeviceChange
 import info.nightscout.androidaps.danars.services.DanaRSService
 import info.nightscout.androidaps.data.DetailedBolusInfo
-import info.nightscout.androidaps.interfaces.Profile
 import info.nightscout.androidaps.data.PumpEnactResult
 import info.nightscout.androidaps.events.EventAppExit
 import info.nightscout.androidaps.events.EventConfigBuilderChange
+import info.nightscout.androidaps.extensions.convertedToAbsolute
+import info.nightscout.androidaps.extensions.plannedRemainingMinutes
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.logging.AAPSLogger
 import info.nightscout.androidaps.logging.LTag
@@ -31,8 +33,6 @@ import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalSt
 import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
 import info.nightscout.androidaps.utils.*
 import info.nightscout.androidaps.utils.T.Companion.mins
-import info.nightscout.androidaps.extensions.convertedToAbsolute
-import info.nightscout.androidaps.extensions.plannedRemainingMinutes
 import info.nightscout.androidaps.utils.resources.ResourceHelper
 import info.nightscout.androidaps.utils.rx.AapsSchedulers
 import info.nightscout.androidaps.utils.sharedPreferences.SP
@@ -622,7 +622,7 @@ class DanaRSPlugin @Inject constructor(
     }
 
     override val isFakingTempsByExtendedBoluses: Boolean = false
-    override fun loadTDDs(): PumpEnactResult = loadHistory(info.nightscout.androidaps.dana.comm.RecordTypes.RECORD_TYPE_DAILY)
+    override fun loadTDDs(): PumpEnactResult = loadHistory(RecordTypes.RECORD_TYPE_DAILY)
     override fun canHandleDST(): Boolean = false
     override fun clearPairing() {
         sp.remove(resourceHelper.gs(R.string.key_danars_pairingkey) + mDeviceName)
diff --git a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt
index 4c26d38dc1..dbfbf8dc6f 100644
--- a/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt
+++ b/danars/src/main/java/info/nightscout/androidaps/danars/comm/DanaRSPacketAPSHistoryEvents.kt
@@ -137,7 +137,7 @@ open class DanaRSPacketAPSHistoryEvents(
                     isAbsolute = false,
                     type = temporaryBasalInfo?.type,
                     pumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
                 aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT TEMPSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Ratio: " + param1 + "% Duration: " + param2 + "min")
                 status = "TEMPSTART " + dateUtil.timeString(datetime)
@@ -147,7 +147,7 @@ open class DanaRSPacketAPSHistoryEvents(
                 val newRecord = pumpSync.syncStopTemporaryBasalWithPumpId(
                     timestamp = datetime,
                     endPumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
                 aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT TEMPSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")")
                 status = "TEMPSTOP " + dateUtil.timeString(datetime)
@@ -160,7 +160,7 @@ open class DanaRSPacketAPSHistoryEvents(
                     duration = T.mins(param2.toLong()).msecs(),
                     isEmulatingTB = false,
                     pumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
                 aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 status = "EXTENDEDSTART " + dateUtil.timeString(datetime)
@@ -170,7 +170,7 @@ open class DanaRSPacketAPSHistoryEvents(
                 val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
                     timestamp = datetime,
                     endPumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
                 aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 status = "EXTENDEDSTOP " + dateUtil.timeString(datetime)
@@ -183,7 +183,7 @@ open class DanaRSPacketAPSHistoryEvents(
                     amount = param1 / 100.0,
                     type = detailedBolusInfo?.bolusType,
                     pumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
                 aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U ")
                 status = "BOLUS " + dateUtil.timeString(datetime)
@@ -196,7 +196,7 @@ open class DanaRSPacketAPSHistoryEvents(
                     amount = param1 / 100.0,
                     type = detailedBolusInfo?.bolusType,
                     pumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
                 aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Bolus: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 status = "DUALBOLUS " + dateUtil.timeString(datetime)
@@ -209,7 +209,7 @@ open class DanaRSPacketAPSHistoryEvents(
                     duration = T.mins(param2.toLong()).msecs(),
                     isEmulatingTB = false,
                     pumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
                 aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT DUALEXTENDEDSTART (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Amount: " + param1 / 100.0 + "U Duration: " + param2 + "min")
                 status = "DUALEXTENDEDSTART " + dateUtil.timeString(datetime)
@@ -219,7 +219,7 @@ open class DanaRSPacketAPSHistoryEvents(
                 val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
                     timestamp = datetime,
                     endPumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
                 aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT DUALEXTENDEDSTOP (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Delivered: " + param1 / 100.0 + "U RealDuration: " + param2 + "min")
                 status = "DUALEXTENDEDSTOP " + dateUtil.timeString(datetime)
@@ -264,7 +264,7 @@ open class DanaRSPacketAPSHistoryEvents(
                     timestamp = datetime,
                     amount = param1.toDouble(),
                     pumpId = pumpId,
-                    pumpType = PumpType.DANA_RS,
+                    pumpType = danaPump.pumpType(),
                     pumpSerial = danaPump.serialNumber)
                 aapsLogger.debug(LTag.PUMPCOMM, "[" + pumpId + "] " + (if (newRecord) "**NEW** " else "") + "EVENT CARBS (" + recordCode + ") " + dateUtil.dateAndTimeString(datetime) + " (" + datetime + ")" + " Carbs: " + param1 + "g")
                 status = "CARBS " + dateUtil.timeString(datetime)
diff --git a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt
index d8388ad435..1fa4f4c7ee 100644
--- a/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt
+++ b/danars/src/test/java/info/nightscout/androidaps/danars/comm/DanaRsMessageHashTableTest.kt
@@ -2,12 +2,13 @@ package info.nightscout.androidaps.danars.comm
 
 import dagger.android.AndroidInjector
 import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.dana.DanaPump
+import info.nightscout.androidaps.danars.DanaRSTestBase
 import info.nightscout.androidaps.danars.encryption.BleEncryption
 import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Constraint
 import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
 import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
-import info.nightscout.androidaps.danars.DanaRSTestBase
 import org.junit.Assert
 import org.junit.Test
 import org.junit.runner.RunWith
@@ -47,7 +48,7 @@ class DanaRsMessageHashTableTest : DanaRSTestBase() {
         `when`(constraintChecker.applyBolusConstraints(anyObject())).thenReturn(Constraint(0.0))
 
         val danaRSMessageHashTable = DanaRSMessageHashTable(packetInjector)
-        val forTesting: DanaRSPacket = DanaRSPacketAPSSetEventHistory(packetInjector, info.nightscout.androidaps.dana.DanaPump.CARBS, 0, 0, 0)
+        val forTesting: DanaRSPacket = DanaRSPacketAPSSetEventHistory(packetInjector, DanaPump.CARBS, 0, 0, 0)
         val testPacket: DanaRSPacket = danaRSMessageHashTable.findMessage(forTesting.command)
         Assert.assertEquals(BleEncryption.DANAR_PACKET__OPCODE__APS_SET_EVENT_HISTORY.toLong(), testPacket.opCode.toLong())
     }
diff --git a/database/build.gradle b/database/build.gradle
index f408159e29..951064cb47 100644
--- a/database/build.gradle
+++ b/database/build.gradle
@@ -7,8 +7,6 @@ apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 
 android {
     defaultConfig {
-        versionCode 1
-        versionName "1.0"
         kapt {
             arguments {
                 arg("room.incremental", "true")
diff --git a/database/src/main/java/info/nightscout/androidaps/database/embedments/InterfaceIDs.kt b/database/src/main/java/info/nightscout/androidaps/database/embedments/InterfaceIDs.kt
index beb7eb5184..b06098f4ee 100644
--- a/database/src/main/java/info/nightscout/androidaps/database/embedments/InterfaceIDs.kt
+++ b/database/src/main/java/info/nightscout/androidaps/database/embedments/InterfaceIDs.kt
@@ -43,6 +43,7 @@ data class InterfaceIDs(
         TANDEM_T_SLIM_X2,
         YPSOPUMP,
         MDI,
+        DIACONN_G8,
         USER;
 
         companion object {
diff --git a/diaconn/build.gradle b/diaconn/build.gradle
new file mode 100644
index 0000000000..6194f079e3
--- /dev/null
+++ b/diaconn/build.gradle
@@ -0,0 +1,30 @@
+apply plugin: 'com.android.library'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+apply plugin: 'com.hiya.jacoco-android'
+
+apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
+apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
+
+android {
+    defaultConfig {
+        versionCode 1
+        versionName "1.0"
+        kapt {
+            arguments {
+                arg("room.incremental", "true")
+                arg("room.schemaLocation", "$projectDir/schemas")
+            }
+        }
+    }
+}
+
+dependencies {
+    implementation project(':core')
+
+    api "androidx.room:room-ktx:$room_version"
+    api "androidx.room:room-runtime:$room_version"
+    api "androidx.room:room-rxjava2:$room_version"
+    kapt "androidx.room:room-compiler:$room_version"
+}
\ No newline at end of file
diff --git a/diaconn/consumer-rules.pro b/diaconn/consumer-rules.pro
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/diaconn/proguard-rules.pro b/diaconn/proguard-rules.pro
new file mode 100644
index 0000000000..481bb43481
--- /dev/null
+++ b/diaconn/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/diaconn/schemas/info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase/1.json b/diaconn/schemas/info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase/1.json
new file mode 100644
index 0000000000..b6e405a524
--- /dev/null
+++ b/diaconn/schemas/info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase/1.json
@@ -0,0 +1,92 @@
+{
+  "formatVersion": 1,
+  "database": {
+    "version": 1,
+    "identityHash": "698b023da2f9efdc0351236c43eb20b6",
+    "entities": [
+      {
+        "tableName": "diaconnHistory",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`timestamp` INTEGER NOT NULL, `code` INTEGER NOT NULL, `value` REAL NOT NULL, `bolusType` TEXT NOT NULL, `stringValue` TEXT NOT NULL, `duration` INTEGER NOT NULL, `dailyBasal` REAL NOT NULL, `dailyBolus` REAL NOT NULL, `alarm` TEXT NOT NULL, PRIMARY KEY(`timestamp`))",
+        "fields": [
+          {
+            "fieldPath": "timestamp",
+            "columnName": "timestamp",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "code",
+            "columnName": "code",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "value",
+            "columnName": "value",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "bolusType",
+            "columnName": "bolusType",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "stringValue",
+            "columnName": "stringValue",
+            "affinity": "TEXT",
+            "notNull": true
+          },
+          {
+            "fieldPath": "duration",
+            "columnName": "duration",
+            "affinity": "INTEGER",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dailyBasal",
+            "columnName": "dailyBasal",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "dailyBolus",
+            "columnName": "dailyBolus",
+            "affinity": "REAL",
+            "notNull": true
+          },
+          {
+            "fieldPath": "alarm",
+            "columnName": "alarm",
+            "affinity": "TEXT",
+            "notNull": true
+          }
+        ],
+        "primaryKey": {
+          "columnNames": [
+            "timestamp"
+          ],
+          "autoGenerate": false
+        },
+        "indices": [
+          {
+            "name": "index_diaconnHistory_code_timestamp",
+            "unique": false,
+            "columnNames": [
+              "code",
+              "timestamp"
+            ],
+            "createSql": "CREATE INDEX IF NOT EXISTS `index_diaconnHistory_code_timestamp` ON `${TABLE_NAME}` (`code`, `timestamp`)"
+          }
+        ],
+        "foreignKeys": []
+      }
+    ],
+    "views": [],
+    "setupQueries": [
+      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '698b023da2f9efdc0351236c43eb20b6')"
+    ]
+  }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/AndroidManifest.xml b/diaconn/src/main/AndroidManifest.xml
new file mode 100644
index 0000000000..3ddb6c3a37
--- /dev/null
+++ b/diaconn/src/main/AndroidManifest.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="info.nightscout.androidaps.diaconn">
+
+    <uses-permission android:name="android.permission.BLUETOOTH" />
+    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
+
+    <application>
+        <activity android:name="info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity" />
+        <activity android:name="info.nightscout.androidaps.diaconn.activities.DiaconnG8UserOptionsActivity" />
+        <activity android:name="info.nightscout.androidaps.diaconn.activities.DiaconnG8BLEScanActivity">
+            <intent-filter>
+                <action android:name="info.nightscout.androidaps.plugins.PumpDiaconnG8.activities.DiaconnG8BLEScanActivity" />
+                <category android:name="android.intent.category.DEFAULT" />
+            </intent-filter>
+        </activity>
+        <service android:name="info.nightscout.androidaps.diaconn.service.DiaconnG8Service"
+            android:enabled="true"
+            android:exported="false"/>
+    </application>
+
+</manifest>
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt
new file mode 100644
index 0000000000..0c3ff324d7
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Fragment.kt
@@ -0,0 +1,198 @@
+package info.nightscout.androidaps.diaconn
+
+import android.annotation.SuppressLint
+import android.content.Intent
+import android.os.Bundle
+import android.os.Handler
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import dagger.android.support.DaggerFragment
+import info.nightscout.androidaps.activities.TDDStatsActivity
+import info.nightscout.androidaps.diaconn.databinding.DiaconnG8FragmentBinding
+import info.nightscout.androidaps.diaconn.events.EventDiaconnG8NewStatus
+import info.nightscout.androidaps.events.EventExtendedBolusChange
+import info.nightscout.androidaps.events.EventInitializationChanged
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.events.EventTempBasalChange
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Pump
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.queue.events.EventQueueChanged
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.WarnColors
+import io.reactivex.rxkotlin.plusAssign
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.android.schedulers.AndroidSchedulers
+import io.reactivex.disposables.CompositeDisposable
+import javax.inject.Inject
+
+class DiaconnG8Fragment : DaggerFragment() {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var warnColors: WarnColors
+    @Inject lateinit var dateUtil: DateUtil
+
+    private var disposable: CompositeDisposable = CompositeDisposable()
+
+    private val loopHandler = Handler()
+    private lateinit var refreshLoop: Runnable
+
+    private var _binding: DiaconnG8FragmentBinding? = null
+
+    // This property is only valid between onCreateView and
+    // onDestroyView.
+    private val binding get() = _binding!!
+
+    init {
+        refreshLoop = Runnable {
+            activity?.runOnUiThread { updateGUI() }
+            loopHandler.postDelayed(refreshLoop, T.mins(1).msecs())
+        }
+    }
+
+    override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
+                              savedInstanceState: Bundle?): View {
+        _binding = DiaconnG8FragmentBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+
+        binding.diaconnG8Pumpstatus.setBackgroundColor(resourceHelper.gc(R.color.colorInitializingBorder))
+        binding.history.setOnClickListener { startActivity(Intent(context, info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity::class.java)) }
+        binding.stats.setOnClickListener { startActivity(Intent(context, TDDStatsActivity::class.java)) }
+        binding.userOptions.setOnClickListener { startActivity(Intent(context, info.nightscout.androidaps.diaconn.activities.DiaconnG8UserOptionsActivity::class.java)) }
+        binding.btconnection.setOnClickListener {
+            aapsLogger.debug(LTag.PUMP, "Clicked connect to pump")
+            diaconnG8Pump.lastConnection = 0
+            commandQueue.readStatus("Clicked connect to pump", null)
+        }
+    }
+
+    @Synchronized
+    override fun onResume() {
+        super.onResume()
+        loopHandler.postDelayed(refreshLoop, T.mins(1).msecs())
+        disposable += rxBus
+            .toObservable(EventInitializationChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventDiaconnG8NewStatus::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventExtendedBolusChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventTempBasalChange::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventQueueChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({ updateGUI() }, fabricPrivacy::logException)
+        disposable += rxBus
+            .toObservable(EventPumpStatusChanged::class.java)
+            .observeOn(AndroidSchedulers.mainThread())
+            .subscribe({
+                when (it.status) {
+                    EventPumpStatusChanged.Status.CONNECTING   ->
+                        @Suppress("SetTextI18n")
+                        binding.btconnection.text = "{fa-bluetooth-b spin} ${it.secondsElapsed}s"
+                    EventPumpStatusChanged.Status.CONNECTED    ->
+                        @Suppress("SetTextI18n")
+                        binding.btconnection.text = "{fa-bluetooth}"
+                    EventPumpStatusChanged.Status.DISCONNECTED ->
+                        @Suppress("SetTextI18n")
+                        binding.btconnection.text = "{fa-bluetooth-b}"
+                    else                                       -> {}
+                }
+                if (it.getStatus(resourceHelper) != "") {
+                    binding.diaconnG8Pumpstatus.text = it.getStatus(resourceHelper)
+                    binding.diaconnG8Pumpstatuslayout.visibility = View.VISIBLE
+                } else {
+                    binding.diaconnG8Pumpstatuslayout.visibility = View.GONE
+                }
+            }, fabricPrivacy::logException)
+        updateGUI()
+    }
+
+    @Synchronized
+    override fun onPause() {
+        super.onPause()
+        disposable.clear()
+        loopHandler.removeCallbacks(refreshLoop)
+    }
+
+    @Synchronized
+    override fun onDestroyView() {
+        super.onDestroyView()
+        _binding = null
+    }
+
+    @SuppressLint("SetTextI18n")
+    @Synchronized
+    fun updateGUI() {
+        if (_binding == null) return
+        val pump = diaconnG8Pump
+        val plugin: Pump = activePlugin.activePump
+        if (pump.lastConnection != 0L) {
+            val agoMsec = System.currentTimeMillis() - pump.lastConnection
+            val agoMin = (agoMsec.toDouble() / 60.0 / 1000.0).toInt()
+            binding.lastconnection.text = dateUtil.timeString(pump.lastConnection) + " (" + resourceHelper.gs(R.string.minago, agoMin) + ")"
+            warnColors.setColor(binding.lastconnection, agoMin.toDouble(), 16.0, 31.0)
+        }
+        if (pump.lastBolusTime != 0L) {
+            val agoMsec = System.currentTimeMillis() - pump.lastBolusTime
+            val agoHours = agoMsec.toDouble() / 60.0 / 60.0 / 1000.0
+            if (agoHours < 6)
+            // max 6h back
+                binding.lastbolus.text = dateUtil.timeString(pump.lastBolusTime) + " " + dateUtil.sinceString(pump.lastBolusTime, resourceHelper) + " " + resourceHelper.gs(R.string.formatinsulinunits, pump.lastBolusAmount)
+            else
+                binding.lastbolus.text = ""
+        }
+
+        val todayInsulinAmount = (pump.todayBaseAmount + pump.todaySnackAmount + pump.todayMealAmount)
+        val todayInsulinLimitAmount = (pump.maxBasal.toInt() * 24) + pump.maxBolusePerDay.toInt()
+        binding.dailyunits.text = resourceHelper.gs(R.string.reservoirvalue, todayInsulinAmount, todayInsulinLimitAmount)
+        warnColors.setColor(binding.dailyunits, todayInsulinAmount, todayInsulinLimitAmount * 0.75, todayInsulinLimitAmount * 0.9)
+        binding.basabasalrate.text = pump.baseInjAmount.toString() +" / "+ resourceHelper.gs(R.string.pump_basebasalrate, plugin.baseBasalRate)
+
+        binding.tempbasal.text = diaconnG8Pump.temporaryBasalToString()
+        binding.extendedbolus.text = diaconnG8Pump.extendedBolusToString()
+        binding.reservoir.text = resourceHelper.gs(R.string.reservoirvalue, pump.systemRemainInsulin, 307)
+        warnColors.setColorInverse(binding.reservoir, pump.systemRemainInsulin , 50.0, 20.0)
+        binding.battery.text = "{fa-battery-" + pump.systemRemainBattery / 25  + "}" + " ("+ pump.systemRemainBattery + " %)"
+        warnColors.setColorInverse(binding.battery, pump.systemRemainBattery.toDouble(), 51.0, 26.0)
+        binding.firmware.text = resourceHelper.gs(R.string.diaconn_g8_pump) + "\nVersion: " + pump.majorVersion.toString() + "." +  pump.minorVersion.toString() + "\nCountry: "+pump.country.toString() + "\nProductType: "+ pump.productType.toString() + "\nManufacture: " + pump.makeYear + "." + pump.makeMonth + "." + pump.makeDay
+        binding.basalstep.text = pump.basalStep.toString()
+        binding.bolusstep.text = pump.bolusStep.toString()
+        binding.serialNumber.text = pump.serialNo.toString()
+        val status = commandQueue.spannedStatus()
+        if (status.toString() == "") {
+            binding.queue.visibility = View.GONE
+        } else {
+            binding.queue.visibility = View.VISIBLE
+            binding.queue.text = status
+        }
+
+        binding.userOptions.visibility = View.VISIBLE
+    }
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt
new file mode 100644
index 0000000000..168c0f3fa5
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Plugin.kt
@@ -0,0 +1,593 @@
+package info.nightscout.androidaps.diaconn
+
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.ServiceConnection
+import android.os.IBinder
+import android.text.format.DateFormat
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.diaconn.events.EventDiaconnG8DeviceChange
+import info.nightscout.androidaps.diaconn.service.DiaconnG8Service
+import info.nightscout.androidaps.events.EventAppExit
+import info.nightscout.androidaps.events.EventConfigBuilderChange
+import info.nightscout.androidaps.extensions.convertedToAbsolute
+import info.nightscout.androidaps.extensions.plannedRemainingMinutes
+import info.nightscout.androidaps.interfaces.*
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.common.ManufacturerType
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomAction
+import info.nightscout.androidaps.plugins.general.actions.defs.CustomActionType
+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.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.TemporaryBasalStorage
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.utils.*
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import org.json.JSONException
+import org.json.JSONObject
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.math.abs
+import kotlin.math.max
+
+@Singleton
+class DiaconnG8Plugin @Inject constructor(
+    injector: HasAndroidInjector,
+    aapsLogger: AAPSLogger,
+    private val rxBus: RxBusWrapper,
+    private val context: Context,
+    resourceHelper: ResourceHelper,
+    private val constraintChecker: ConstraintChecker,
+    private val profileFunction: ProfileFunction,
+    private val sp: SP,
+    commandQueue: CommandQueueProvider,
+    private val diaconnG8Pump: DiaconnG8Pump,
+    private val pumpSync: PumpSync,
+    private val detailedBolusInfoStorage: DetailedBolusInfoStorage,
+    private val temporaryBasalStorage: TemporaryBasalStorage,
+    private val fabricPrivacy: FabricPrivacy,
+    private val dateUtil: DateUtil
+) : PumpPluginBase(PluginDescription()
+    .mainType(PluginType.PUMP)
+    .fragmentClass(DiaconnG8Fragment::class.java.name)
+    .pluginIcon(R.drawable.ic_diaconn_g8)
+    .pluginName(R.string.diaconn_g8_pump)
+    .shortName(R.string.diaconn_g8_pump_shortname)
+    .preferencesId(R.xml.pref_diaconn)
+    .description(R.string.description_pump_diaconn_g8),
+    injector, aapsLogger, resourceHelper, commandQueue
+), Pump, Diaconn, Constraints {
+
+    private val disposable = CompositeDisposable()
+    private var diaconnG8Service: DiaconnG8Service? = null
+    private var mDeviceAddress = ""
+    var mDeviceName = ""
+    override val pumpDescription = PumpDescription(PumpType.DIACONN_G8)
+
+    override fun onStart() {
+        super.onStart()
+        val intent = Intent(context, DiaconnG8Service::class.java)
+        context.bindService(intent, mConnection, Context.BIND_AUTO_CREATE)
+        disposable.add(rxBus
+            .toObservable(EventAppExit::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ context.unbindService(mConnection) }) { fabricPrivacy.logException(it) }
+        )
+        disposable.add(rxBus
+            .toObservable(EventConfigBuilderChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe { diaconnG8Pump.reset() }
+        )
+        disposable.add(rxBus
+            .toObservable(EventDiaconnG8DeviceChange::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ changePump() }) { fabricPrivacy.logException(it) }
+        )
+        changePump() // load device name
+    }
+
+    override fun onStop() {
+        context.unbindService(mConnection)
+        disposable.clear()
+        super.onStop()
+    }
+
+    private val mConnection: ServiceConnection = object : ServiceConnection {
+        override fun onServiceDisconnected(name: ComponentName) {
+            aapsLogger.debug(LTag.PUMP, "Service is disconnected")
+            diaconnG8Service = null
+        }
+
+        override fun onServiceConnected(name: ComponentName, service: IBinder) {
+            aapsLogger.debug(LTag.PUMP, "Service is connected")
+            val mLocalBinder = service as DiaconnG8Service.LocalBinder
+            diaconnG8Service = mLocalBinder.serviceInstance
+        }
+    }
+
+    fun changePump() {
+        mDeviceAddress = sp.getString(R.string.key_diaconn_g8_address, "")
+        mDeviceName = sp.getString(R.string.key_diaconn_g8_name, "")
+        diaconnG8Pump.reset()
+        commandQueue.readStatus("DeviceChanged", null)
+    }
+
+    override fun connect(reason: String) {
+        aapsLogger.debug(LTag.PUMP, "Diaconn G8 connect from: $reason")
+        if(diaconnG8Service != null && mDeviceAddress != "" && mDeviceName != "") {
+            val success = diaconnG8Service?.connect(reason, mDeviceAddress) ?: false
+            if(!success) ToastUtils.showToastInUiThread(context, resourceHelper.gs(R.string.ble_not_supported))
+        }
+    }
+
+    override fun isConnected(): Boolean = diaconnG8Service?.isConnected ?: false
+    override fun isConnecting(): Boolean = diaconnG8Service?.isConnecting ?: false
+    override fun isHandshakeInProgress(): Boolean = false
+
+
+    override fun disconnect(reason: String) {
+        aapsLogger.debug(LTag.PUMP, "Diaconn G8 disconnect from: $reason")
+        diaconnG8Service?.disconnect(reason)
+    }
+
+    override fun stopConnecting() {
+        diaconnG8Service?.stopConnecting()
+    }
+
+    override fun getPumpStatus(reason: String) {
+        diaconnG8Service?.readPumpStatus()
+        pumpDescription.basalStep = diaconnG8Pump.basalStep
+        pumpDescription.bolusStep = diaconnG8Pump.bolusStep
+        pumpDescription.basalMaximumRate = diaconnG8Pump.maxBasalPerHours
+    }
+
+    // Diaconn Pump Interface
+    override fun loadHistory(): PumpEnactResult {
+        return diaconnG8Service?.loadHistory() ?: PumpEnactResult(injector).success(false)
+    }
+
+    override fun setUserOptions(): PumpEnactResult {
+        return diaconnG8Service?.setUserSettings() ?: PumpEnactResult(injector).success(false)
+    }
+
+    // Constraints interface
+    override fun applyBasalConstraints(absoluteRate: Constraint<Double>, profile: Profile): Constraint<Double> {
+        absoluteRate.setIfSmaller(aapsLogger, diaconnG8Pump.maxBasal, resourceHelper.gs(R.string.limitingbasalratio, diaconnG8Pump.maxBasal, resourceHelper.gs(R.string.pumplimit)), this)
+        return absoluteRate
+    }
+
+    override fun applyBasalPercentConstraints(percentRate: Constraint<Int>, profile: Profile): Constraint<Int> {
+        percentRate.setIfGreater(aapsLogger, 0, resourceHelper.gs(R.string.limitingpercentrate, 0, resourceHelper.gs(R.string.itmustbepositivevalue)), this)
+        percentRate.setIfSmaller(aapsLogger, pumpDescription.maxTempPercent, resourceHelper.gs(R.string.limitingpercentrate, pumpDescription.maxTempPercent, resourceHelper.gs(R.string.pumplimit)), this)
+        return percentRate
+    }
+
+    override fun applyBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
+        insulin.setIfSmaller(aapsLogger, diaconnG8Pump.maxBolus, resourceHelper.gs(R.string.limitingbolus, diaconnG8Pump.maxBolus, resourceHelper.gs(R.string.pumplimit)), this)
+        return insulin
+    }
+
+    override fun applyExtendedBolusConstraints(insulin: Constraint<Double>): Constraint<Double> {
+        return applyBolusConstraints(insulin)
+    }
+
+    // Pump interface
+    override fun isInitialized(): Boolean  =
+        diaconnG8Pump.lastConnection > 0 && diaconnG8Pump.maxBasal > 0
+
+    override fun isSuspended(): Boolean =
+        diaconnG8Pump.basePauseStatus == 1
+
+    override fun isBusy(): Boolean =
+        diaconnG8Service?.isConnected ?: false || diaconnG8Service?.isConnecting ?: false
+
+    override fun setNewBasalProfile(profile: Profile): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        if (!isInitialized()) {
+            val notification = Notification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED, resourceHelper.gs(R.string.pumpNotInitializedProfileNotSet), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+            result.comment = resourceHelper.gs(R.string.pumpNotInitializedProfileNotSet)
+            return result
+        } else {
+            rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED))
+        }
+        return if (diaconnG8Service?.updateBasalsInPump(profile) != true) {
+            val notification = Notification(Notification.FAILED_UPDATE_PROFILE, resourceHelper.gs(R.string.failedupdatebasalprofile), Notification.URGENT)
+            rxBus.send(EventNewNotification(notification))
+            result.comment = resourceHelper.gs(R.string.failedupdatebasalprofile)
+            result
+        } else {
+            rxBus.send(EventDismissNotification(Notification.PROFILE_NOT_SET_NOT_INITIALIZED))
+            rxBus.send(EventDismissNotification(Notification.FAILED_UPDATE_PROFILE))
+            val notification = Notification(Notification.PROFILE_SET_OK, resourceHelper.gs(R.string.profile_set_ok), Notification.INFO, 60)
+            rxBus.send(EventNewNotification(notification))
+            result.success = true
+            result.enacted = true
+            result.comment = "OK"
+            result
+        }
+    }
+
+    override fun isThisProfileSet(profile: Profile): Boolean {
+        if (!isInitialized()) return true // TODO: not sure what's better. so far TRUE to prevent too many SMS
+        if (diaconnG8Pump.pumpProfiles == null) return true // TODO: not sure what's better. so far TRUE to prevent too many SMS
+        val basalValues = 24
+        val basalIncrement =  60 * 60
+        for (h in 0 until basalValues) {
+            val pumpValue = diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][h]
+            val profileValue = profile.getBasalTimeFromMidnight(h * basalIncrement)
+            if (abs(pumpValue - profileValue) > pumpDescription.basalStep) {
+                aapsLogger.debug(LTag.PUMP, "Diff found. Hour: $h Pump: $pumpValue Profile: $profileValue")
+                return false
+            }
+        }
+        return true
+    }
+
+    override fun lastDataTime(): Long = diaconnG8Pump.lastConnection
+
+    override val baseBasalRate: Double
+        get() = diaconnG8Pump.baseAmount
+    override val reservoirLevel: Double
+        get() = diaconnG8Pump.systemRemainInsulin
+    override val batteryLevel: Int
+        get() = diaconnG8Pump.systemRemainBattery
+
+
+    @Synchronized
+    override fun deliverTreatment(detailedBolusInfo: DetailedBolusInfo): PumpEnactResult {
+        detailedBolusInfo.insulin = constraintChecker.applyBolusConstraints(Constraint(detailedBolusInfo.insulin)).value()
+        return if (detailedBolusInfo.insulin > 0 || detailedBolusInfo.carbs > 0) {
+            val carbs = detailedBolusInfo.carbs
+            detailedBolusInfo.carbs = 0.0
+            var carbTimeStamp = detailedBolusInfo.carbsTimestamp ?: detailedBolusInfo.timestamp
+            if (carbTimeStamp == detailedBolusInfo.timestamp) carbTimeStamp -= T.mins(1).msecs() // better set 1 min back to prevents clash with insulin
+            detailedBolusInfoStorage.add(detailedBolusInfo) // will be picked up on reading history
+            val t = EventOverviewBolusProgress.Treatment(0.0, 0, detailedBolusInfo.bolusType == DetailedBolusInfo.BolusType.SMB)
+            var connectionOK = false
+            if (detailedBolusInfo.insulin > 0 || carbs > 0) connectionOK = diaconnG8Service?.bolus(detailedBolusInfo.insulin, carbs.toInt(), carbTimeStamp, t)
+                ?: false
+            val result = PumpEnactResult(injector)
+            result.success = connectionOK
+            result.bolusDelivered = t.insulin
+            result.carbsDelivered = detailedBolusInfo.carbs
+
+            if(result.success) result.enacted = true
+            if (!result.success) {
+                setErrorMsg(diaconnG8Pump.resultErrorCode, result)
+            } else result.comment = resourceHelper.gs(R.string.ok)
+            aapsLogger.debug(LTag.PUMP, "deliverTreatment: OK. Asked: " + detailedBolusInfo.insulin + " Delivered: " + result.bolusDelivered)
+            result
+        } else {
+            val result = PumpEnactResult(injector)
+            result.success = false
+            result.bolusDelivered = 0.0
+            result.carbsDelivered = 0.0
+            result.comment = resourceHelper.gs(R.string.invalidinput)
+            aapsLogger.error("deliverTreatment: Invalid input")
+            result
+        }
+    }
+
+    override fun stopBolusDelivering() {
+        diaconnG8Service?.bolusStop()
+    }
+
+    // This is called from APS
+    @Synchronized
+    override fun setTempBasalAbsolute(absoluteRate: Double, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: PumpSync.TemporaryBasalType): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        var absoluteAfterConstrain = constraintChecker.applyBasalConstraints(Constraint(absoluteRate), profile).value()
+        val doTempOff = baseBasalRate - absoluteAfterConstrain == 0.0
+        val doLowTemp = absoluteAfterConstrain < baseBasalRate
+        val doHighTemp = absoluteAfterConstrain > baseBasalRate
+        if (doTempOff) {
+            // If temp in progress
+            if (diaconnG8Pump.isTempBasalInProgress) {
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Stopping temp basal (doTempOff)")
+                return cancelTempBasal(false)
+            }
+            result.success = true
+            result.enacted = false
+            result.absolute = baseBasalRate
+            result.isPercent = false
+            result.isTempCancel = true
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: doTempOff OK")
+            return result
+        }
+
+        if (doLowTemp || doHighTemp) {
+            // Check if some temp is already in progress
+            if(absoluteAfterConstrain > 6.0) absoluteAfterConstrain = 6.0  // pumpLimit
+            //val activeTemp = activePluginProvider.activeTreatments.getTempBasalFromHistory(System.currentTimeMillis())
+            if (diaconnG8Pump.isTempBasalInProgress) {
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: currently running")
+                // Correct basal already set ?
+                if (diaconnG8Pump.tempBasalAbsoluteRate == absoluteAfterConstrain && diaconnG8Pump.tempBasalRemainingMin > 4) {
+                    if (!enforceNew) {
+                        result.success = true
+                        result.absolute = absoluteAfterConstrain
+                        result.enacted = false
+                        result.duration = diaconnG8Pump.tempBasalRemainingMin
+                        result.isPercent = false
+                        result.isTempCancel = false
+                        aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Correct temp basal already set (doLowTemp || doHighTemp)")
+                        return result
+                    }
+                }
+            }
+            temporaryBasalStorage.add(PumpSync.PumpState.TemporaryBasal(dateUtil.now(), T.mins(durationInMinutes.toLong()).msecs(), absoluteRate, true, tbrType, 0L, 0L))
+            // Convert duration from minutes to hours
+            aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: Setting temp basal $absoluteAfterConstrain U for $durationInMinutes mins (doLowTemp || doHighTemp)")
+            val connectionOK: Boolean = if (durationInMinutes == 15 || durationInMinutes == 30) {
+                diaconnG8Service?.tempBasalShortDuration(absoluteAfterConstrain, durationInMinutes) ?: false
+            } else {
+                val durationInHours = max(durationInMinutes / 60.0, 1.0)
+                diaconnG8Service?.tempBasal(absoluteAfterConstrain, durationInHours) ?: false
+            }
+
+            if (connectionOK && diaconnG8Pump.isTempBasalInProgress && diaconnG8Pump.tempBasalAbsoluteRate == absoluteAfterConstrain) {
+                result.enacted = true
+                result.success = true
+                result.comment = resourceHelper.gs(R.string.ok)
+                result.isTempCancel = false
+                result.duration = diaconnG8Pump.tempBasalRemainingMin
+                result.absolute = diaconnG8Pump.tempBasalAbsoluteRate
+                result.isPercent = false
+                aapsLogger.debug(LTag.PUMP, "setTempBasalAbsolute: OK")
+                return result
+            }
+        }
+
+        result.enacted = false
+        result.success = false
+        result.comment = resourceHelper.gs(R.string.tempbasaldeliveryerror)
+        aapsLogger.error("setTempBasalAbsolute: Failed to set temp basal")
+        return result
+    }
+
+    @Synchronized
+    override fun setTempBasalPercent(percent: Int, durationInMinutes: Int, profile: Profile, enforceNew: Boolean, tbrType: PumpSync.TemporaryBasalType): PumpEnactResult {
+        return if (percent == 0) {
+            setTempBasalAbsolute(0.0, durationInMinutes, profile, enforceNew, tbrType)
+        } else {
+            var absoluteValue = profile.getBasal() * (percent / 100.0)
+            absoluteValue = pumpDescription.pumpType.determineCorrectBasalSize(absoluteValue)
+            aapsLogger.warn(LTag.PUMP, "setTempBasalPercent [DiaconnG8Plugin] - You are trying to use setTempBasalPercent with percent other then 0% ($percent). This will start setTempBasalAbsolute, with calculated value ($absoluteValue). Result might not be 100% correct.")
+            setTempBasalAbsolute(absoluteValue, durationInMinutes, profile, enforceNew, tbrType)
+        }
+
+    }
+
+    @Synchronized
+    override fun setExtendedBolus(insulin: Double, durationInMinutes: Int): PumpEnactResult {
+        var insulinAfterConstraint = constraintChecker.applyExtendedBolusConstraints(Constraint(insulin)).value()
+        // needs to be rounded
+        insulinAfterConstraint = Round.roundTo(insulinAfterConstraint, pumpDescription.extendedBolusStep)
+        val result = PumpEnactResult(injector)
+
+        if (diaconnG8Pump.isExtendedInProgress && abs(diaconnG8Pump.extendedBolusAmount - insulinAfterConstraint) < pumpDescription.extendedBolusStep) {
+            result.enacted = false
+            result.success = true
+            result.comment = resourceHelper.gs(R.string.ok)
+            result.duration = diaconnG8Pump.extendedBolusRemainingMinutes
+            result.absolute = diaconnG8Pump.extendedBolusAbsoluteRate
+            result.isPercent = false
+            result.isTempCancel = false
+            aapsLogger.debug(LTag.PUMP, "setExtendedBolus: Correct extended bolus already set. Current: " + diaconnG8Pump.extendedBolusAmount + " Asked: " + insulinAfterConstraint)
+            return result
+        }
+        val connectionOK = diaconnG8Service?.extendedBolus(insulinAfterConstraint, durationInMinutes)
+            ?: false
+
+        if (connectionOK) {
+            result.enacted = true
+            result.success = true
+            result.comment = resourceHelper.gs(R.string.ok)
+            result.isTempCancel = false
+            result.duration = diaconnG8Pump.extendedBolusRemainingMinutes
+            result.absolute = diaconnG8Pump.extendedBolusAbsoluteRate
+            result.bolusDelivered = diaconnG8Pump.extendedBolusAmount
+            result.isPercent = false
+            aapsLogger.debug(LTag.PUMP, "setExtendedBolus: OK")
+            return result
+        }
+
+        result.enacted = false
+        result.success = false
+        setErrorMsg(diaconnG8Pump.resultErrorCode, result)
+        aapsLogger.error("setExtendedBolus: Failed to extended bolus")
+        return result
+    }
+
+    @Synchronized
+    override fun cancelTempBasal(enforceNew: Boolean): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        if (diaconnG8Pump.isTempBasalInProgress) {
+            diaconnG8Service?.tempBasalStop()
+            result.success = !diaconnG8Pump.isTempBasalInProgress
+            result.enacted = true
+            result.isTempCancel = true
+            if(!result.success) setErrorMsg(diaconnG8Pump.resultErrorCode, result)
+        } else {
+            result.success = true
+            result.enacted = false
+            result.isTempCancel = true
+            result.comment = resourceHelper.gs(R.string.ok)
+            aapsLogger.debug(LTag.PUMP, "cancelRealTempBasal: OK")
+        }
+        return result
+    }
+
+    @Synchronized override fun cancelExtendedBolus(): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+        if (diaconnG8Pump.isExtendedInProgress) {
+            diaconnG8Service?.extendedBolusStop()
+            result.success = !diaconnG8Pump.isExtendedInProgress
+            result.enacted = true
+            if(!result.success) {
+                setErrorMsg(diaconnG8Pump.resultErrorCode, result)
+                diaconnG8Service?.readPumpStatus()
+            }
+
+       } else {
+            result.success = true
+            result.enacted = false
+            result.comment = resourceHelper.gs(R.string.ok)
+            aapsLogger.debug(LTag.PUMP, "cancelExtendedBolus: OK")
+        }
+        return result
+    }
+
+    override fun getJSONStatus(profile: Profile, profileName: String, version: String): JSONObject {
+        val now = System.currentTimeMillis()
+        if (diaconnG8Pump.lastConnection + 60 * 60 * 1000L < System.currentTimeMillis()) {
+            return JSONObject()
+        }
+        val pumpJson = JSONObject()
+        val battery = JSONObject()
+        val status = JSONObject()
+        val extended = JSONObject()
+        try {
+            battery.put("percent", diaconnG8Pump.systemRemainBattery)
+            status.put("status", if (diaconnG8Pump.pumpSuspended) "suspended" else "normal")
+            status.put("timestamp", dateUtil.toISOString(diaconnG8Pump.lastConnection))
+            extended.put("Version", version)
+            if (diaconnG8Pump.lastBolusTime != 0L) {
+                extended.put("LastBolus", dateUtil.dateAndTimeString(diaconnG8Pump.lastBolusTime))
+                extended.put("LastBolusAmount", diaconnG8Pump.lastBolusAmount)
+            }
+            val tb = pumpSync.expectedPumpState().temporaryBasal
+            if (tb != null) {
+                extended.put("TempBasalAbsoluteRate", tb.convertedToAbsolute(now, profile))
+                extended.put("TempBasalStart", dateUtil.dateAndTimeString(tb.timestamp))
+                extended.put("TempBasalRemaining", tb.plannedRemainingMinutes)
+            }
+            val eb = pumpSync.expectedPumpState().extendedBolus
+            if (eb != null) {
+                extended.put("ExtendedBolusAbsoluteRate", eb.rate)
+                extended.put("ExtendedBolusStart", dateUtil.dateAndTimeString(eb.timestamp))
+                extended.put("ExtendedBolusRemaining", eb.plannedRemainingMinutes)
+            }
+            extended.put("BaseBasalRate", baseBasalRate)
+            try {
+                extended.put("ActiveProfile", profileFunction.getProfileName())
+            } catch (e: Exception) {
+                aapsLogger.error("Unhandled exception", e)
+            }
+            pumpJson.put("battery", battery)
+            pumpJson.put("status", status)
+            pumpJson.put("extended", extended)
+            pumpJson.put("reservoir", diaconnG8Pump.systemRemainInsulin.toInt())
+            pumpJson.put("clock", dateUtil.toISOString(now))
+        } catch (e: JSONException) {
+            aapsLogger.error("Unhandled exception", e)
+        }
+        return pumpJson
+    }
+
+    override fun manufacturer(): ManufacturerType {
+        return ManufacturerType.G2e
+    }
+
+    override fun model(): PumpType {
+        return PumpType.DIACONN_G8
+    }
+
+    override fun serialNumber(): String {
+        return diaconnG8Pump.serialNo.toString()
+    }
+
+    override fun shortStatus(veryShort: Boolean): String {
+        var ret = ""
+        if (diaconnG8Pump.lastConnection != 0L) {
+            val agoMillis = System.currentTimeMillis() - diaconnG8Pump.lastConnection
+            val agoMin = (agoMillis / 60.0 / 1000.0).toInt()
+            ret += "LastConn: $agoMin minago\n"
+        }
+        if (diaconnG8Pump.lastBolusTime != 0L)
+            ret += "LastBolus: ${DecimalFormatter.to2Decimal(diaconnG8Pump.lastBolusAmount)}U @${DateFormat.format("HH:mm", diaconnG8Pump.lastBolusTime)}"
+
+        if (diaconnG8Pump.isTempBasalInProgress)
+            ret += "Temp: ${diaconnG8Pump.temporaryBasalToString()}"
+
+        if (diaconnG8Pump.isExtendedInProgress)
+            ret += "Extended: ${diaconnG8Pump.extendedBolusToString()}\n"
+
+        if (!veryShort) {
+            ret += "TDD: ${DecimalFormatter.to0Decimal(diaconnG8Pump.dailyTotalUnits)} / ${diaconnG8Pump.maxDailyTotalUnits} U"
+        }
+        ret += "Reserv: ${DecimalFormatter.to0Decimal(diaconnG8Pump.systemRemainInsulin)} U"
+        ret += "Batt: ${diaconnG8Pump.systemRemainBattery}"
+        return ret
+    }
+    override val isFakingTempsByExtendedBoluses: Boolean = false
+    override fun loadTDDs(): PumpEnactResult = loadHistory()
+    override fun getCustomActions(): List<CustomAction>? = null
+    override fun executeCustomAction(customActionType: CustomActionType) {}
+    override fun canHandleDST(): Boolean = false
+
+    fun isBatteryChangeLoggingEnabled():Boolean {
+        return sp.getBoolean(R.string.key_diaconn_g8_logbatterychange, false)
+    }
+
+    fun isInsulinChangeLoggingEnabled():Boolean {
+        return sp.getBoolean(R.string.key_diaconn_g8_loginsulinchange, false)
+    }
+
+    @Synchronized
+    fun setErrorMsg(errorCode: Int, result: PumpEnactResult) {
+        when (errorCode) {
+            1 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_1)
+            2 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_2)
+            3 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_3)
+            4 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_4)
+            6 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_6)
+            7 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_7)
+            8 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_8)
+            9 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_9)
+            10 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_10)
+            11 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_11)
+            12 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_12)
+            13 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_13)
+            14 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_14)
+            15 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_15)
+            32 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_32)
+            33 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_33)
+            34 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_34)
+            35 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_35)
+            36 -> result.comment = resourceHelper.gs(R.string.diaconn_g8_errorcode_36)
+            else -> result.comment = "not defined Error code: $errorCode"
+        }
+    }
+
+    override fun preprocessPreferences(preferenceFragment: PreferenceFragmentCompat) {
+
+        val bolusSpeedPreference: Preference? = preferenceFragment.findPreference(resourceHelper.gs(R.string.key_diaconn_g8_bolusspeed))
+        bolusSpeedPreference?.setOnPreferenceChangeListener { _, newValue ->
+            val intBolusSpeed = newValue.toString().toInt()
+
+            diaconnG8Pump.bolusSpeed = intBolusSpeed
+            diaconnG8Pump.speed = intBolusSpeed
+            diaconnG8Pump.setUserOptionType = DiaconnG8Pump.BOLUS_SPEED
+            sp.putBoolean("diaconn_g8_isbolusspeedsync", false)
+
+            true
+        }
+    }
+
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt
new file mode 100644
index 0000000000..77739cf9e9
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/DiaconnG8Pump.kt
@@ -0,0 +1,374 @@
+package info.nightscout.androidaps.diaconn
+
+
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.T
+import javax.inject.Inject
+import javax.inject.Singleton
+import kotlin.math.max
+import kotlin.math.min
+import kotlin.math.roundToInt
+
+@Singleton
+class DiaconnG8Pump @Inject constructor(
+    private val aapsLogger: AAPSLogger,
+    private val dateUtil: DateUtil
+) {
+
+
+    var maxBolusePerDay: Double = 0.0
+    var pumpIncarnationNum: Int = 65536
+    var isPumpVersionGe2_63: Boolean = false // is pumpVersion higher then 2.63
+    var insulinWarningGrade: Int =0
+    var insulinWarningProcess: Int =0
+    var insulinWarningRemain: Int =0
+    var batteryWaningGrade: Int = 0
+    var batteryWaningProcess: Int = 0
+    var batteryWaningRemain: Int = 0
+    var injectionBlockType: Int =0
+    var injectionBlockRemainAmount: Double = 0.0
+    var injectionBlockProcess: Int = 0
+    var injectionBlockGrade: Int = 0
+    var lastConnection: Long = 0
+    var lastSettingsRead: Long = 0
+
+    // time
+    private var pumpTime: Long = 0
+
+    fun setPumpTime(value: Long) {
+        pumpTime = value
+    }
+    fun getPumpTime() = pumpTime
+
+    // Status
+    var pumpSuspended = false
+    var dailyTotalUnits = 0.0
+    var maxDailyTotalUnits = 0
+    var bolusStep = 0.01
+    var basalStep = 0.01
+    var iob = 0.0
+
+
+    var bolusBlocked = false
+    var lastBolusTime: Long = 0
+    var lastBolusAmount = 0.0
+
+
+    /*
+     * TEMP BASALS
+     */
+    var tempBasalStart: Long = 0
+    var tempBasalDuration: Long = 0 // in milliseconds
+    var tempBasalAbsoluteRate: Double = 0.0
+    var tempBasalPercent: Int = 0
+
+    var tempBasalTotalSec: Long
+        set(durationInSec) {
+            tempBasalDuration = T.secs(durationInSec).msecs()
+        }
+        get() = T.msecs(tempBasalDuration).mins()
+    var isTempBasalInProgress: Boolean
+        get() = tempBasalStart != 0L && dateUtil.now() in tempBasalStart..tempBasalStart + tempBasalDuration
+        set(isRunning) {
+            if (isRunning) throw IllegalArgumentException("Use to cancel TBR only")
+            else {
+                tempBasalStart = 0L
+                tempBasalDuration = 0L
+                tempBasalAbsoluteRate = 0.0
+            }
+        }
+    val tempBasalRemainingMin: Int
+        get() = max(T.msecs(tempBasalStart + tempBasalDuration - dateUtil.now()).mins().toInt(), 0)
+
+    fun temporaryBasalToString(): String {
+        if (!isTempBasalInProgress) return ""
+
+        val passedMin = ((min(dateUtil.now(), tempBasalStart + tempBasalDuration) - tempBasalStart) / 60.0 / 1000).roundToInt()
+        return tempBasalAbsoluteRate.toString() + "U/h @" +
+            dateUtil.timeString(tempBasalStart) +
+            " " + passedMin + "/" + T.msecs(tempBasalDuration).mins() + "'"
+    }
+
+    fun fromTemporaryBasal(tbr: PumpSync.PumpState.TemporaryBasal?) {
+        if (tbr == null) {
+            tempBasalStart = 0
+            tempBasalDuration = 0
+            tempBasalAbsoluteRate = 0.0
+        } else {
+            tempBasalStart = tbr.timestamp
+            tempBasalDuration = tbr.duration
+            tempBasalAbsoluteRate = tbr.rate
+        }
+    }
+
+    /*
+    * EXTENDED BOLUSES
+    */
+    var extendedBolusStart: Long = 0
+    var extendedBolusDuration: Long = 0
+    var extendedBolusAmount = 0.0
+
+    var isExtendedInProgress: Boolean
+        get() = extendedBolusStart != 0L && dateUtil.now() in extendedBolusStart..extendedBolusStart + extendedBolusDuration
+        set(isRunning) {
+            if (isRunning) throw IllegalArgumentException("Use to cancel EB only")
+            else {
+                extendedBolusStart = 0L
+                extendedBolusDuration = 0L
+                extendedBolusAmount = 0.0
+            }
+        }
+    val extendedBolusPassedMinutes:Int
+        get() = T.msecs(max(0, dateUtil.now() - extendedBolusStart)).mins().toInt()
+    val extendedBolusRemainingMinutes: Int
+        get() = max(T.msecs(extendedBolusStart + extendedBolusDuration - dateUtil.now()).mins().toInt(), 0)
+    private val extendedBolusDurationInMinutes: Int
+        get() = T.msecs(extendedBolusDuration).mins().toInt()
+
+    var extendedBolusAbsoluteRate: Double
+        get() = extendedBolusAmount * T.hours(1).msecs() / extendedBolusDuration
+        set(rate) {
+            extendedBolusAmount = rate * extendedBolusDuration / T.hours(1).msecs()
+        }
+
+    fun extendedBolusToString(): String {
+        if (!isExtendedInProgress) return ""
+        //return "E "+ DecimalFormatter.to2Decimal(extendedBolusDeliveredSoFar) +"/" + DecimalFormatter.to2Decimal(extendedBolusAbsoluteRate) + "U/h @" +
+        //     " " + extendedBolusPassedMinutes + "/" + extendedBolusMinutes + "'"
+        return "E "+ DecimalFormatter.to2Decimal(extendedBolusAbsoluteRate) + "U/h @" +
+            dateUtil.timeString(extendedBolusStart) +
+            " " + extendedBolusPassedMinutes + "/" + extendedBolusDurationInMinutes + "'"
+    }
+
+    fun fromExtendedBolus(eb: PumpSync.PumpState.ExtendedBolus?) {
+        if (eb == null) {
+            extendedBolusStart = 0
+            extendedBolusDuration = 0
+            extendedBolusAmount = 0.0
+        } else {
+            extendedBolusStart = eb.timestamp
+            extendedBolusDuration = eb.duration
+            extendedBolusAmount = eb.amount
+        }
+    }
+    // Profile
+    var units = 0
+    var activeProfile = 0
+    var pumpProfiles: Array<Array<Double>>? = null
+
+    //Limits
+    var maxBolus = 0.0
+    var maxBasal = 0.0
+
+    // User settings
+    var setUserOptionType = 0 // ALARM:0, LCD:1, LANG:2, BOLUS_SPEED:3
+    var beepAndAlarm = 0
+    var alarmIntesity = 0
+    var lcdOnTimeSec = 0
+    var selectedLanguage = 0
+    var bolusSpeed = 0
+
+    var resultErrorCode: Int = 0 // last start bolus erroCode
+
+    // Bolus settings
+    var historyDoneReceived: Boolean = false // true when last history message is received
+    var bolusingTreatment: EventOverviewBolusProgress.Treatment? = null // actually delivered treatment
+    var bolusAmountToBeDelivered = 0.0 // amount to be delivered
+    var bolusProgressLastTimeStamp: Long = 0 // timestamp of last bolus progress message
+    var bolusStopped = false // bolus finished
+    var bolusStopForced = false // bolus forced to stop by user
+    var bolusDone = false // success end
+
+    // LGS Status
+    var lgsStatus: Int = 0     // LGS Status(1=LGS_ON, 2=LGS_OFF)
+    var lgsTime:Int = 0        // LGS Setting time (0~255 min)
+    var lgsElapsedTime:Int = 0 // LGS Passed Time (0~255 min)
+
+    fun buildDiaconnG8ProfileRecord(nsProfile: Profile): Array<Double> {
+        val record = Array(24) { 0.0 }
+        for (hour in 0..23) {
+            //Some values get truncated to the next lower one.
+            // -> round them to two decimals and make sure we are a small delta larger (that will get truncated)
+            val value = (100.0 * nsProfile.getBasalTimeFromMidnight((hour * 60 * 60))).roundToInt() / 100.0 + 0.00001
+            aapsLogger.debug(LTag.PUMP, "NS basal value for $hour:00 is $value")
+            record[hour] = value
+            //aapsLogger.debug(LTag.PUMP, "NS basal value * 100 for $hour:00 is $value")
+        }
+        return record
+    }
+
+    fun reset() {
+        aapsLogger.debug(LTag.PUMP, "Diaconn G8 Pump reset")
+        lastConnection = 0
+        lastSettingsRead = 0
+    }
+
+    // G8 pump
+    var result:Int = 0 // 조회결과
+
+    // 1. pump setting info
+    var systemRemainInsulin = 0.0 // 인슐린 잔량
+    var systemRemainBattery = 0 // 배터리 잔량(0~100%)
+    var systemBasePattern = 0 // 기저주입 패턴(0=없음, 1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2)
+    var systemTbStatus = 0 // 임시기저 상태(1=임시기저 중, 2=임시기저 해제)
+    var systemInjectionMealStatus = 0 // 식사주입 상태(1=주입중, 2=주입상태아님)
+    var systemInjectionSnackStatus = 0 // 일반간식 주입 상태(1=주입중, 2=주입상태아님)
+    var systemInjectionSquareStatue = 0 // 스퀘어회식 주입 상태(1=주입중, 2=주입상태아님)
+    var systemInjectionDualStatus = 0 // 더블회식 주입 상태(1=주입중, 2=주입상태아님)
+
+    // 2. basal injection suspend status (1:stop, 2:release)
+    var basePauseStatus = 0 // 상태(1=정지,2=해제)
+
+    // 3. Pump time
+    var year = 0 // 년 (18~99)
+    var month = 0 // 월 (1~12)
+    var day = 0 // 일 (1~31)
+    var hour = 0 // 시 (0~23)
+    var minute = 0 // 분 (0~59)
+    var second = 0 // 초 (0~59)
+
+
+    // 4. pump system info
+    var country = 0 // 생산국(K, C), ASCII
+    var productType = 0 // 제품종류(A ~ Z), ASCII
+    var makeYear = 0 // 제조년
+    var makeMonth = 0 // 제조월
+    var makeDay = 0 // 제조일
+    var lotNo = 0 // LOT NO
+    var serialNo = 0 // SERIAL NO
+    var majorVersion = 0 // Major 버전
+    var minorVersion = 0 // Minor 버전
+
+    // 5. pump log status
+    var pumpLastLogNum = 0 // 마지막 저장 로그 번호(0~9999)
+    var pumpWrappingCount = 0 // wrapping 카운트(0~255)
+    var apslastLogNum = 0 // 앱에서 처리한 마지막 로그 번호.
+    var apsWrappingCount = 0 // 앱에서 처리한 마지막 로그 번호.
+    var isProgressPumpLogSync = false // 로그 동기화 진행 여부
+
+    // 6. bolus speed status.
+    var speed = 0 // 주입 속도(1 ~ 8)
+    var maxBasalPerHours = 0.0
+
+    // 7. Tempbasal status
+    var tbStatus = 0 // 임시기저 상태 (1 : running, 2:not  running )
+    var tbTime = 0 // 임시기저 시간
+    var tbInjectRateRatio = 0 // 임시기저 주입량/률  1000(0.00U)~1600(6.00U), 50000(0%)~50200(200%), 50000이상이면 주입률로 판정
+    var tbElapsedTime = 0 // 임시기저 경과 시간(0~1425분)
+    var tbInjectAbsoluteValue = 0.0 // 임시기저 주입량/률  1000(0.00U)~1600(6.00U)
+
+    // 8. Basal status
+    var baseStatus = 0 // 주입상태
+    var baseHour = 0 // 현재주입시간(0~23)
+    var baseAmount = 0.0 // 주입설정량(량*100, 23.25->2325, 15.2->1520)
+    var baseInjAmount = 0.0 // 현재주입량(량*100, 23.25->2325, 15.2->1520)
+
+
+    // 9. meal bolus status
+    var mealKind = 0 // 주입종류(1=아침,2=점심,3=저녁)
+    var mealStartTime = 0 // 식사주입 시작시간(time_t)
+    var mealStatus = 0 // 주입상태(1=주입중,2=주입상태아님)
+    var mealAmount = 0.0 // 주입설정량(량*100, 23.25->2325, 15.2->1520)
+    var mealInjAmount = 0.0 // 현재주입량(량*100, 23.25->2325, 15.2->1520)
+    var mealSpeed = 0 // 주입속도(1~8)
+
+
+    // 10. snack bolus status
+    var snackStatus = 0 // 주입상태(1=주입중,2=주입상태아님)
+    var snackAmount = 0.0 // 주입설정량(량*100, 23.25->2325, 15.2->1520)
+    var snackInjAmount = 0.0 // 현재주입량(량*100, 23.25->2325, 15.2->1520)
+    var snackSpeed = 0 // 주입속도(1~8)
+
+
+    // 11. square(extended) bolus status
+    var squareStatus = 0 // 주입상태
+    var squareTime = 0 // 설정 주입시간(10~300분)
+    var squareInjTime = 0 // 경과 주입시간(10~300분)
+    var squareAmount = 0.0 // 주입 설정량
+    var squareInjAmount = 0.0 // 현재 주입량
+
+
+    // 12. daul bolus status
+    var dualStatus = 0 // 주입상태
+    var dualAmount = 0.0 // 일반주입 설정량
+    var dualInjAmount = 0.0 // 일반주입량
+    var dualSquareTime = 0 // 스퀘어주입 설정시간(10~300분)
+    var dualInjSquareTime = 0 // 스퀘어주입 경과시간(10~300분)
+    var dualSquareAmount = 0.0 // 스퀘어주입 설정량
+    var dualInjSquareAmount = 0.0 // 스퀘어주입량
+
+
+    // 13. last injection  status
+    var recentKind1 = 0 // 최근-1 주입 종류(1=식사, 2=일반간식, 3=스퀘어회식, 4=더블회식)
+    var recentTime1 = 0 // 최근-1 주입 시간
+    var recentAmount1 = 0.0 // 최근-1 주입량
+    var recentKind2 = 0 // 최근-2 주입 종류(1=식사, 2=일반간식, 3=스퀘어회식, 4=더블회식)
+    var recentTime2 = 0 // 최근-2 주입 시간
+    var recentAmount2 = 0.0 // 최근-2 주입량
+
+
+    // 14. daily injection status
+    var todayBaseAmount = 0.0 // 기저주입 총량
+    var todayMealAmount = 0.0 // 식사주입 총량
+    var todaySnackAmount = 0.0 // 회식주입 총량
+
+
+    // 15. meat setting status
+    var morningHour = 0 // 아침 개시 시간(0~23)
+    var morningAmount = 0.0 // 아침 식전량
+    var lunchHour = 0 // 점심 개시 시간(0~23)
+    var lunchAmount = 0.0 // 점심 식전량
+    var dinnerHour = 0 // 저녁 개시 시간(0~23)
+    var dinnerAmount = 0.0 // 저녁 식전량
+
+
+    // 16. basal injection status at this hour
+    var currentBasePattern = 0 // 패턴 종류 (1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2)
+    var currentBaseHour = 0 // 현재주입시간(0~23)
+    var currentBaseTbBeforeAmount = 0.0 // 해당시간의 임시기저 계산 전 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+    var currentBaseTbAfterAmount = 0.0 // 해당시간의 임시기저 계산 후 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+
+
+    // 17. saved basal pattern status
+    var baseAmount1 = 0.00// 주입량 1(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount2 = 0.0// 주입량 2(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount3 = 0.0 // 주입량 3(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount4 = 0.0 // 주입량 4(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount5 = 0.0 // 주입량 5(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount6 = 0.0 // 주입량 6(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount7 = 0.0 // 주입량 7(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount8 = 0.0 // 주입량 8(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount9 = 0.0 // 주입량 9(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount10 = 0.0 // 주입량 10(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount11 = 0.0 // 주입량 11(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount12 = 0.0 // 주입량 12(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount13 = 0.0 // 주입량 13(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount14 = 0.0 // 주입량 14(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount15 = 0.0 // 주입량 15(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount16 = 0.0 // 주입량 16(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount17 = 0.0 // 주입량 17(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount18 = 0.0 // 주입량 18(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount19 = 0.0 // 주입량 19(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount20 = 0.0 // 주입량 20(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount21 = 0.0 // 주입량 21(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount22 = 0.0 // 주입량 22(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount23 = 0.0 // 주입량 23(량*100, 23.25->2325, 15.2->1520)
+    var baseAmount24 = 0.0 // 주입량 24(량*100, 23.25->2325, 15.2->1520)
+
+    var otpNumber = 0
+
+    companion object {
+        // User settings
+        const val ALARM = 0
+        const val LCD = 1
+        const val LANG = 2
+        const val BOLUS_SPEED = 3
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt
new file mode 100644
index 0000000000..df908e0bca
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8BLEScanActivity.kt
@@ -0,0 +1,184 @@
+package info.nightscout.androidaps.diaconn.activities
+
+import android.annotation.SuppressLint
+import android.bluetooth.BluetoothAdapter
+import android.bluetooth.BluetoothDevice
+import android.bluetooth.le.BluetoothLeScanner
+import android.bluetooth.le.ScanCallback
+import android.bluetooth.le.ScanFilter
+import android.bluetooth.le.ScanResult
+import android.bluetooth.le.ScanSettings
+import android.content.pm.ActivityInfo
+import android.os.Bundle
+import android.os.Handler
+import android.os.ParcelUuid
+import android.view.View
+import android.view.ViewGroup
+import android.widget.BaseAdapter
+import android.widget.TextView
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.diaconn.events.EventDiaconnG8DeviceChange
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.databinding.DiaconnG8BlescannerActivityBinding
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.pump.common.ble.BlePreCheck
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import java.util.*
+import javax.inject.Inject
+
+class DiaconnG8BLEScanActivity : NoSplashAppCompatActivity() {
+
+    @Inject lateinit var sp: SP
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var blePreCheck: BlePreCheck
+
+    private var listAdapter: ListAdapter? = null
+    private val devices = ArrayList<BluetoothDeviceItem>()
+    private var bluetoothLeScanner: BluetoothLeScanner? = null
+    private val serviceUUID = UUID.fromString("6e400001-b5a3-f393-e0a9-e50e24dcca9e") // BLE GATT Service UUID
+
+    private lateinit var binding: DiaconnG8BlescannerActivityBinding
+
+    @SuppressLint("SourceLockedOrientationActivity")
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = DiaconnG8BlescannerActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+        requestedOrientation = ActivityInfo.SCREEN_ORIENTATION_PORTRAIT
+
+        blePreCheck.prerequisitesCheck(this)
+
+        listAdapter = ListAdapter()
+        binding.blescannerListview.emptyView = binding.blescannerNodevice
+        binding.blescannerListview.adapter = listAdapter
+        listAdapter?.notifyDataSetChanged()
+    }
+
+    override fun onResume() {
+        super.onResume()
+
+        BluetoothAdapter.getDefaultAdapter()?.let { bluetoothAdapter ->
+            if (!bluetoothAdapter.isEnabled) bluetoothAdapter.enable()
+            bluetoothLeScanner = bluetoothAdapter.bluetoothLeScanner
+            startScan()
+        }
+    }
+
+    override fun onPause() {
+        super.onPause()
+        stopScan()
+    }
+
+    private fun startScan() =
+        try {
+            val filters: MutableList<ScanFilter> = ArrayList()
+            val scan_filter = ScanFilter.Builder()
+                .setServiceUuid(ParcelUuid(serviceUUID))
+                .build()
+            filters.add(scan_filter)
+
+            val settings = ScanSettings.Builder()
+                .setScanMode(ScanSettings.SCAN_MODE_LOW_LATENCY)
+                .build()
+
+            bluetoothLeScanner?.startScan(filters, settings, mBleScanCallback)
+        } catch (e: IllegalStateException) {
+        } // ignore BT not on
+
+    private fun stopScan() =
+        try {
+            bluetoothLeScanner?.stopScan(mBleScanCallback)
+        } catch (e: IllegalStateException) {
+        } // ignore BT not on
+
+    private fun addBleDevice(device: BluetoothDevice?) {
+        if (device == null || device.name == null || device.name == "") {
+            return
+        }
+        val item = BluetoothDeviceItem(device)
+        if (devices.contains(item)) {
+            return
+        }
+        devices.add(item)
+        Handler().post { listAdapter!!.notifyDataSetChanged() }
+    }
+
+    private val mBleScanCallback: ScanCallback = object : ScanCallback() {
+        override fun onScanResult(callbackType: Int, result: ScanResult) {
+            addBleDevice(result.device)
+        }
+    }
+
+    internal inner class ListAdapter : BaseAdapter() {
+
+        override fun getCount(): Int = devices.size
+        override fun getItem(i: Int): BluetoothDeviceItem = devices[i]
+        override fun getItemId(i: Int): Long = 0
+
+        override fun getView(i: Int, convertView: View?, parent: ViewGroup?): View {
+            var v = convertView
+            val holder: ViewHolder
+            if (v == null) {
+                v = View.inflate(applicationContext, R.layout.diaconn_g8_blescanner_item, null)
+                holder = ViewHolder(v)
+                v.tag = holder
+            } else {
+                // reuse view if already exists
+                holder = v.tag as ViewHolder
+            }
+            val item = getItem(i)
+            holder.setData(item)
+            return v!!
+        }
+
+        private inner class ViewHolder(v: View) : View.OnClickListener {
+
+            private lateinit var item: BluetoothDeviceItem
+            private val name: TextView = v.findViewById(R.id.ble_name)
+            private val address: TextView = v.findViewById(R.id.ble_address)
+
+            init {
+                v.setOnClickListener(this@ViewHolder)
+            }
+
+            override fun onClick(v: View) {
+                sp.putString(R.string.key_diaconn_g8_address, item.device.address)
+                sp.putString(R.string.key_diaconn_g8_name, name.text.toString())
+                item.device.createBond()
+                rxBus.send(EventDiaconnG8DeviceChange())
+                finish()
+            }
+
+            fun setData(data: BluetoothDeviceItem) {
+                var tTitle = data.device.name
+                if (tTitle == null || tTitle == "") {
+                    tTitle = "(unknown)"
+                }
+                name.text = tTitle
+                address.text = data.device.address
+                item = data
+            }
+
+        }
+    }
+
+    //
+    inner class BluetoothDeviceItem internal constructor(val device: BluetoothDevice) {
+        override fun equals(other: Any?): Boolean {
+            if (other !is BluetoothDeviceItem) {
+                return false
+            }
+            return stringEquals(device.address, other.device.address)
+        }
+
+        private fun stringEquals(arg1: String, arg2: String): Boolean {
+            return try {
+                arg1 == arg2
+            } catch (e: Exception) {
+                false
+            }
+        }
+
+        override fun hashCode(): Int = device.hashCode()
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt
new file mode 100644
index 0000000000..06ec319cb4
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8HistoryActivity.kt
@@ -0,0 +1,257 @@
+package info.nightscout.androidaps.diaconn.activities
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import android.widget.TextView
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.common.RecordTypes
+import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecord
+import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecordDao
+import info.nightscout.androidaps.diaconn.databinding.DiaconnG8HistoryActivityBinding
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.DecimalFormatter
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.rx.AapsSchedulers
+
+
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.rxkotlin.plusAssign
+import java.util.*
+import javax.inject.Inject
+
+class DiaconnG8HistoryActivity : NoSplashAppCompatActivity() {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var diaconnHistoryRecordDao: DiaconnHistoryRecordDao
+    @Inject lateinit var dateUtil: DateUtil
+    @Inject lateinit var aapsSchedulers: AapsSchedulers
+
+    private val disposable = CompositeDisposable()
+
+    private var showingType = RecordTypes.RECORD_TYPE_ALARM
+    private var historyList: List<DiaconnHistoryRecord> = ArrayList()
+
+    class TypeList internal constructor(var type: Byte, var name: String) {
+
+        override fun toString(): String = name
+    }
+
+    private lateinit var binding: DiaconnG8HistoryActivityBinding
+
+    override fun onResume() {
+        super.onResume()
+        disposable += rxBus
+            .toObservable(EventPumpStatusChanged::class.java)
+            .observeOn(aapsSchedulers.main)
+            .subscribe({ binding.status.text = it.getStatus(resourceHelper) }) { fabricPrivacy.logException(it) }
+        swapAdapter(showingType)
+    }
+
+    override fun onPause() {
+        super.onPause()
+        disposable.clear()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = DiaconnG8HistoryActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.recyclerview.setHasFixedSize(true)
+        binding.recyclerview.layoutManager = LinearLayoutManager(this)
+        binding.recyclerview.adapter = RecyclerViewAdapter(historyList)
+        binding.status.visibility = View.GONE
+
+        // Types
+        val typeList = ArrayList<TypeList>()
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_ALARM, resourceHelper.gs(R.string.diaconn_g8_history_alarm)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BASALHOUR, resourceHelper.gs(R.string.diaconn_g8_history_basalhours)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_BOLUS, resourceHelper.gs(R.string.diaconn_g8_history_bolus)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_TB, resourceHelper.gs(R.string.diaconn_g8_history_tempbasal)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_DAILY, resourceHelper.gs(R.string.diaconn_g8_history_dailyinsulin)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_REFILL, resourceHelper.gs(R.string.diaconn_g8_history_refill)))
+        typeList.add(TypeList(RecordTypes.RECORD_TYPE_SUSPEND, resourceHelper.gs(R.string.diaconn_g8_history_suspend)))
+        binding.spinner.adapter = ArrayAdapter(this, R.layout.spinner_centered, typeList)
+
+        binding.reload.setOnClickListener {
+            val selected = binding.spinner.selectedItem as TypeList?
+                ?: return@setOnClickListener
+            runOnUiThread {
+                binding.reload.visibility = View.GONE
+                binding.status.visibility = View.VISIBLE
+            }
+            clearCardView()
+            commandQueue.loadHistory(selected.type, object : Callback() {
+                override fun run() {
+                    swapAdapter(selected.type)
+                    runOnUiThread {
+                        binding.reload.visibility = View.VISIBLE
+                        binding.status.visibility = View.GONE
+                    }
+                }
+            })
+        }
+        binding.spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                val selected = typeList[position]
+                swapAdapter(selected.type)
+                showingType = selected.type
+            }
+
+            override fun onNothingSelected(parent: AdapterView<*>?) {
+                clearCardView()
+            }
+        }
+    }
+
+    inner class RecyclerViewAdapter internal constructor(private var historyList: List<DiaconnHistoryRecord>) : RecyclerView.Adapter<RecyclerViewAdapter.HistoryViewHolder>() {
+
+        override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): HistoryViewHolder =
+            HistoryViewHolder(LayoutInflater.from(viewGroup.context).inflate(R.layout.diaconn_g8_history_item, viewGroup, false))
+
+        override fun onBindViewHolder(holder: HistoryViewHolder, position: Int) {
+            val record = historyList[position]
+            holder.time.text = dateUtil.dateAndTimeString(record.timestamp)
+            holder.value.text = DecimalFormatter.to2Decimal(record.value)
+            holder.stringValue.text = record.stringValue
+            holder.bolusType.text = record.bolusType
+            holder.duration.text = DecimalFormatter.to0Decimal(record.duration.toDouble())
+            holder.alarm.text = record.alarm
+            when (showingType) {
+                RecordTypes.RECORD_TYPE_ALARM -> {
+                    holder.time.visibility = View.VISIBLE
+                    holder.value.visibility = View.VISIBLE
+                    holder.stringValue.visibility = View.VISIBLE
+                    holder.bolusType.visibility = View.GONE
+                    holder.duration.visibility = View.GONE
+                    holder.dailyBasal.visibility = View.GONE
+                    holder.dailyBolus.visibility = View.GONE
+                    holder.dailyTotal.visibility = View.GONE
+                    holder.alarm.visibility = View.VISIBLE
+                }
+
+                RecordTypes.RECORD_TYPE_BOLUS -> {
+                    holder.time.visibility = View.VISIBLE
+                    holder.value.visibility = View.VISIBLE
+                    holder.stringValue.visibility = View.VISIBLE
+                    holder.bolusType.visibility = View.VISIBLE
+                    holder.duration.visibility = View.VISIBLE
+                    holder.dailyBasal.visibility = View.GONE
+                    holder.dailyBolus.visibility = View.GONE
+                    holder.dailyTotal.visibility = View.GONE
+                    holder.alarm.visibility = View.GONE
+                }
+
+                RecordTypes.RECORD_TYPE_DAILY -> {
+                    holder.dailyBasal.text = resourceHelper.gs(R.string.formatinsulinunits, record.dailyBasal)
+                    holder.dailyBolus.text = resourceHelper.gs(R.string.formatinsulinunits, record.dailyBolus)
+                    holder.dailyTotal.text = resourceHelper.gs(R.string.formatinsulinunits, record.dailyBolus + record.dailyBasal)
+                    holder.time.text = dateUtil.dateString(record.timestamp)
+                    holder.time.visibility = View.VISIBLE
+                    holder.value.visibility = View.GONE
+                    holder.stringValue.visibility = View.GONE
+                    holder.bolusType.visibility = View.GONE
+                    holder.duration.visibility = View.GONE
+                    holder.dailyBasal.visibility = View.VISIBLE
+                    holder.dailyBolus.visibility = View.VISIBLE
+                    holder.dailyTotal.visibility = View.VISIBLE
+                    holder.alarm.visibility = View.GONE
+                }
+
+                RecordTypes.RECORD_TYPE_BASALHOUR -> {
+                    holder.time.visibility = View.VISIBLE
+                    holder.value.visibility = View.VISIBLE
+                    holder.stringValue.visibility = View.VISIBLE
+                    holder.bolusType.visibility = View.GONE
+                    holder.duration.visibility = View.GONE
+                    holder.dailyBasal.visibility = View.GONE
+                    holder.dailyBolus.visibility = View.GONE
+                    holder.dailyTotal.visibility = View.GONE
+                    holder.alarm.visibility = View.GONE
+                }
+                RecordTypes.RECORD_TYPE_REFILL -> {
+                    holder.time.visibility = View.VISIBLE
+                    holder.value.visibility = View.VISIBLE
+                    holder.stringValue.visibility = View.VISIBLE
+                    holder.bolusType.visibility = View.GONE
+                    holder.duration.visibility = View.GONE
+                    holder.dailyBasal.visibility = View.GONE
+                    holder.dailyBolus.visibility = View.GONE
+                    holder.dailyTotal.visibility = View.GONE
+                    holder.alarm.visibility = View.GONE
+                }
+
+                RecordTypes.RECORD_TYPE_TB -> {
+                    holder.time.visibility = View.VISIBLE
+                    holder.value.visibility = View.VISIBLE
+                    holder.stringValue.visibility = View.VISIBLE
+                    holder.bolusType.visibility = View.GONE
+                    holder.duration.visibility = View.VISIBLE
+                    holder.dailyBasal.visibility = View.GONE
+                    holder.dailyBolus.visibility = View.GONE
+                    holder.dailyTotal.visibility = View.GONE
+                    holder.alarm.visibility = View.GONE
+                }
+
+                RecordTypes.RECORD_TYPE_SUSPEND -> {
+                    holder.time.visibility = View.VISIBLE
+                    holder.value.visibility = View.GONE
+                    holder.stringValue.visibility = View.VISIBLE
+                    holder.bolusType.visibility = View.GONE
+                    holder.duration.visibility = View.GONE
+                    holder.dailyBasal.visibility = View.GONE
+                    holder.dailyBolus.visibility = View.GONE
+                    holder.dailyTotal.visibility = View.GONE
+                    holder.alarm.visibility = View.GONE
+                }
+            }
+        }
+
+        override fun getItemCount(): Int {
+            return historyList.size
+        }
+
+        inner class HistoryViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+            var time: TextView = itemView.findViewById(R.id.diaconn_g8_history_time)
+            var value: TextView = itemView.findViewById(R.id.diaconn_g8_history_value)
+            var bolusType: TextView = itemView.findViewById(R.id.diaconn_g8_history_bolustype)
+            var stringValue: TextView = itemView.findViewById(R.id.diaconn_g8_history_stringvalue)
+            var duration: TextView = itemView.findViewById(R.id.diaconn_g8_history_duration)
+            var dailyBasal: TextView = itemView.findViewById(R.id.diaconn_g8_history_dailybasal)
+            var dailyBolus: TextView = itemView.findViewById(R.id.diaconn_g8_history_dailybolus)
+            var dailyTotal: TextView = itemView.findViewById(R.id.diaconn_g8_history_dailytotal)
+            var alarm: TextView = itemView.findViewById(R.id.diaconn_g8_history_alarm)
+        }
+    }
+
+    private fun swapAdapter(type: Byte) {
+        disposable += diaconnHistoryRecordDao
+            .allFromByType(dateUtil.now() - T.months(1).msecs(), type)
+            .subscribeOn(aapsSchedulers.io)
+            .observeOn(aapsSchedulers.main)
+            .subscribe { historyList -> binding.recyclerview.swapAdapter(RecyclerViewAdapter(historyList), false) }
+    }
+
+    private fun clearCardView() = binding.recyclerview.swapAdapter(RecyclerViewAdapter(ArrayList()), false)
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt
new file mode 100644
index 0000000000..4ec3c4b3a2
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/activities/DiaconnG8UserOptionsActivity.kt
@@ -0,0 +1,192 @@
+package info.nightscout.androidaps.diaconn.activities
+
+import android.content.Context
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import android.widget.AdapterView
+import android.widget.ArrayAdapter
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.activities.NoSplashAppCompatActivity
+
+
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.databinding.DiaconnG8UserOptionsActivityBinding
+
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.ToastUtils
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import java.text.DecimalFormat
+import javax.inject.Inject
+
+class DiaconnG8UserOptionsActivity : NoSplashAppCompatActivity() {
+
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var context: Context
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var sp: SP
+
+    private val disposable = CompositeDisposable()
+
+    private lateinit var binding: DiaconnG8UserOptionsActivityBinding
+
+    @Synchronized
+    override fun onResume() {
+        super.onResume()
+    }
+
+    @Synchronized
+    override fun onPause() {
+        disposable.clear()
+        super.onPause()
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        binding = DiaconnG8UserOptionsActivityBinding.inflate(layoutInflater)
+        setContentView(binding.root)
+
+        binding.saveAlarm.setOnClickListener { onSaveAlarmClick() }
+        binding.saveLcdOnTime.setOnClickListener { onSavelcdOnTimeClick() }
+        binding.saveLang.setOnClickListener { onSaveLangClick() }
+
+        binding.saveBolusSpeed.setOnClickListener { onSaveBolusSpeedClick() }
+
+        val spBolusSpeed = sp.getString("g8_bolusspeed", "5")
+
+        binding.bolusSpeed.setParams(spBolusSpeed.toDouble(), 1.0, 8.0, 1.0, DecimalFormat("1"), true, binding.saveBolusSpeed)
+
+        aapsLogger.debug(LTag.PUMP,
+            "UserOptionsLoaded:" + (System.currentTimeMillis() - diaconnG8Pump.lastConnection) / 1000 + " s ago"
+                + "\nbeepAndAlarm:" + diaconnG8Pump.beepAndAlarm
+                + "\nalarmIntesity:" + diaconnG8Pump.alarmIntesity
+                + "\nlanguage:" + diaconnG8Pump.selectedLanguage
+                + "\nlcdOnTimeSec:" + diaconnG8Pump.lcdOnTimeSec)
+
+        fillSoundCategory()
+        fillSoundSubCategory()
+
+        binding.beepAndAlarm.setSelection(diaconnG8Pump.beepAndAlarm - 1)
+        binding.alarmIntesity.setSelection(diaconnG8Pump.alarmIntesity - 1)
+
+        binding.beepAndAlarm.onItemSelectedListener = object : AdapterView.OnItemSelectedListener {
+            override fun onItemSelected(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
+                binding.alarmIntesity.visibility = if("silent" == binding.beepAndAlarm.getItemAtPosition(position).toString()) View.GONE else View.VISIBLE
+            }
+            override fun onNothingSelected(parent: AdapterView<*>?) {}
+        }
+
+        when (diaconnG8Pump.lcdOnTimeSec) {
+            1 -> binding.pumpscreentimeout10.isChecked = true
+            2 -> binding.pumpscreentimeout20.isChecked = true
+            3 -> binding.pumpscreentimeout30.isChecked = true
+        }
+
+        when (diaconnG8Pump.selectedLanguage) {
+            1 -> binding.pumplangChiness.isChecked = true
+            2 -> binding.pumplangKorean.isChecked = true
+            3 -> binding.pumplangEnglish.isChecked = true
+        }
+    }
+
+    private fun onSaveAlarmClick() {
+
+        diaconnG8Pump.setUserOptionType = DiaconnG8Pump.ALARM
+
+        diaconnG8Pump.beepAndAlarm = binding.beepAndAlarm.selectedItemPosition + 1
+        diaconnG8Pump.alarmIntesity = binding.alarmIntesity.selectedItemPosition + 1
+
+        onSaveClick()
+    }
+
+    private fun onSavelcdOnTimeClick() {
+
+        diaconnG8Pump.setUserOptionType = DiaconnG8Pump.LCD
+
+        diaconnG8Pump.lcdOnTimeSec = when {
+            binding.pumpscreentimeout10.isChecked   -> 1
+            binding.pumpscreentimeout20.isChecked   -> 2
+            binding.pumpscreentimeout30.isChecked   -> 3
+            else                                    -> 1
+        }
+
+        onSaveClick()
+    }
+
+    private fun onSaveLangClick() {
+
+        diaconnG8Pump.setUserOptionType = DiaconnG8Pump.LANG
+
+        diaconnG8Pump.selectedLanguage = when {
+            binding.pumplangChiness.isChecked   -> 1
+            binding.pumplangKorean.isChecked    -> 2
+            binding.pumplangEnglish.isChecked   -> 3
+            else                                -> 2
+        }
+
+        onSaveClick()
+    }
+
+    private fun onSaveBolusSpeedClick() {
+        val intSpeed = binding.bolusSpeed.value.toInt()
+
+        diaconnG8Pump.bolusSpeed = intSpeed
+        diaconnG8Pump.speed = intSpeed
+        diaconnG8Pump.setUserOptionType = DiaconnG8Pump.BOLUS_SPEED
+        sp.putString("g8_bolusspeed", intSpeed.toString())
+        sp.putBoolean("diaconn_g8_isbolusspeedsync", false)
+
+        ToastUtils.okToast(context, "Save Success!")
+    }
+
+    private fun onSaveClick() {
+        commandQueue.setUserOptions(object : Callback() {
+            override fun run() {
+                if (!result.success) {
+                    val i = Intent(context, ErrorHelperActivity::class.java)
+                    i.putExtra("soundid", R.raw.boluserror)
+                    i.putExtra("status", result.comment)
+                    i.putExtra("title", resourceHelper.gs(R.string.pumperror))
+                    i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    context.startActivity(i)
+                }
+            }
+        })
+        finish()
+    }
+
+    private fun fillSoundCategory() {
+        val categories = ArrayList<String>()
+        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_sound))
+        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_vibrate))
+        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_silent))
+        context.let { context ->
+            val adapterCategories = ArrayAdapter(context, R.layout.spinner_centered, categories)
+            binding.beepAndAlarm.adapter = adapterCategories
+        }
+    }
+
+    private fun fillSoundSubCategory() {
+        val categories = ArrayList<String>()
+        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_intensity_low))
+        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_intensity_middle))
+        categories.add(resourceHelper.gs(R.string.diaconn_g8_pumpalarm_intensity_high))
+        context.let { context ->
+            val adapterCategories = ArrayAdapter(context, R.layout.spinner_centered, categories)
+            binding.alarmIntesity.adapter = adapterCategories
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/common/RecordTypes.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/common/RecordTypes.kt
new file mode 100644
index 0000000000..e4fbc8122d
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/common/RecordTypes.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.diaconn.common
+
+object RecordTypes {
+    const val RECORD_TYPE_BOLUS = 0x01.toByte()
+    const val RECORD_TYPE_DAILY = 0x02.toByte()
+    const val RECORD_TYPE_ALARM = 0x03.toByte()
+    const val RECORD_TYPE_REFILL = 0x04.toByte()
+    const val RECORD_TYPE_SUSPEND = 0x05.toByte()
+    const val RECORD_TYPE_BASALHOUR = 0x06.toByte()
+    const val RECORD_TYPE_TB = 0x07.toByte()
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryDatabase.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryDatabase.kt
new file mode 100644
index 0000000000..38a082133a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryDatabase.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.diaconn.database
+
+import android.content.Context
+import androidx.room.Database
+import androidx.room.Room
+import androidx.room.RoomDatabase
+
+const val TABLE_DIACONN_HISTORY = "diaconnHistory"
+
+@Database(
+    entities = [DiaconnHistoryRecord::class],
+    exportSchema = true,
+    version = DiaconnHistoryDatabase.VERSION
+)
+abstract class DiaconnHistoryDatabase : RoomDatabase() {
+
+    abstract fun historyRecordDao(): DiaconnHistoryRecordDao
+
+    companion object {
+
+        const val VERSION = 1
+
+        fun build(context: Context) =
+            Room.databaseBuilder(
+                context.applicationContext,
+                DiaconnHistoryDatabase::class.java,
+                "diaconn_database.db"
+            )
+                .fallbackToDestructiveMigration()
+                .build()
+    }
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecord.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecord.kt
new file mode 100644
index 0000000000..46d7e28e89
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecord.kt
@@ -0,0 +1,19 @@
+package info.nightscout.androidaps.diaconn.database
+
+import androidx.room.Entity
+import androidx.room.Index
+import androidx.room.PrimaryKey
+
+@Entity(tableName = TABLE_DIACONN_HISTORY,
+    indices = [Index("code", "timestamp")])
+data class DiaconnHistoryRecord(
+    @PrimaryKey var timestamp: Long,
+    var code: Byte = 0x0F,
+    var value: Double = 0.0,
+    var bolusType: String = "None",
+    var stringValue: String = "",
+    var duration: Int = 0,
+    var dailyBasal: Double = 0.0,
+    var dailyBolus: Double = 0.0,
+    var alarm: String = ""
+)
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecordDao.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecordDao.kt
new file mode 100644
index 0000000000..127be05acd
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/database/DiaconnHistoryRecordDao.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.diaconn.database
+
+import androidx.room.Dao
+import androidx.room.Insert
+import androidx.room.OnConflictStrategy
+import androidx.room.Query
+import io.reactivex.Single
+
+@Dao
+abstract class DiaconnHistoryRecordDao {
+
+    @Query("SELECT * from $TABLE_DIACONN_HISTORY WHERE timestamp >= :timestamp AND code = :type")
+    abstract fun allFromByType(timestamp: Long, type: Byte): Single<List<DiaconnHistoryRecord>>
+
+    @Insert(onConflict = OnConflictStrategy.REPLACE)
+    abstract fun createOrUpdate(diaconnHistoryRecord: DiaconnHistoryRecord)
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ActivitiesModule.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ActivitiesModule.kt
new file mode 100644
index 0000000000..8a39b928a0
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ActivitiesModule.kt
@@ -0,0 +1,17 @@
+package info.nightscout.androidaps.diaconn.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Fragment
+import info.nightscout.androidaps.diaconn.activities.DiaconnG8BLEScanActivity
+import info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity
+import info.nightscout.androidaps.diaconn.activities.DiaconnG8UserOptionsActivity
+
+@Module
+@Suppress("unused")
+abstract class DiaconnG8ActivitiesModule {
+    @ContributesAndroidInjector abstract fun contributesDiaconnG8Fragment(): DiaconnG8Fragment
+    @ContributesAndroidInjector abstract fun contributesDiaconnG8HistoryActivity(): DiaconnG8HistoryActivity
+    @ContributesAndroidInjector abstract fun contributesDiaconnG8UserOptionsActivity(): DiaconnG8UserOptionsActivity
+    @ContributesAndroidInjector abstract fun contributesDiaconnG8BLEScanActivity(): DiaconnG8BLEScanActivity
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8Module.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8Module.kt
new file mode 100644
index 0000000000..870d460bf0
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8Module.kt
@@ -0,0 +1,12 @@
+package info.nightscout.androidaps.diaconn.di
+
+import dagger.Module
+
+@Module(includes = [
+    DiaconnG8ActivitiesModule::class,
+    DiaconnG8ServiceModule::class,
+    DiaconnG8PacketModule::class,
+    DiaconnHistoryModule::class
+])
+
+open class DiaconnG8Module
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt
new file mode 100644
index 0000000000..8a661ed7a7
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8PacketModule.kt
@@ -0,0 +1,83 @@
+package info.nightscout.androidaps.diaconn.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.diaconn.packet.*
+
+@Module
+@Suppress("unused")
+abstract class DiaconnG8PacketModule {
+    @ContributesAndroidInjector abstract fun contributesDiaconnG8Packet(): DiaconnG8Packet
+    @ContributesAndroidInjector abstract fun contributesAppCancelSettingPacket(): AppCancelSettingPacket
+    @ContributesAndroidInjector abstract fun contributesAppCancelSettingResponsePacket(): AppCancelSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesAppConfirmSettingPacket(): AppConfirmSettingPacket
+    @ContributesAndroidInjector abstract fun contributesAppConfirmSettingResponsePacket(): AppConfirmSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesSneckLimitInquirePacket(): SneckLimitInquirePacket
+    @ContributesAndroidInjector abstract fun contributesBasalLimitInquirePacket(): BasalLimitInquirePacket
+    @ContributesAndroidInjector abstract fun contributesSneckLimitInquireResponsePacket(): SneckLimitInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBasalLimitInquireResponsePacket(): BasalLimitInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBasalPauseReportPacket(): BasalPauseReportPacket
+    @ContributesAndroidInjector abstract fun contributesBasalPauseSettingPacket(): BasalPauseSettingPacket
+    @ContributesAndroidInjector abstract fun contributesBasalPauseSettingResponsePacket(): BasalPauseSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBasalSettingPacket(): BasalSettingPacket
+    @ContributesAndroidInjector abstract fun contributesBasalSettingReportPacket(): BasalSettingReportPacket
+    @ContributesAndroidInjector abstract fun contributesBasalSettingResponsePacket(): BasalSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBigMainInfoInquirePacket(): BigMainInfoInquirePacket
+    @ContributesAndroidInjector abstract fun contributesBigMainInfoInquireResponsePacket(): BigMainInfoInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBigLogInquirePacket(): BigLogInquirePacket
+    @ContributesAndroidInjector abstract fun contributesBigLogInquireResponsePacket(): BigLogInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesConfirmReportPacket(): ConfirmReportPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionBasalSettingPacket(): InjectionBasalSettingPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionBasalSettingResponsePacket(): InjectionBasalSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionSnackResultReportPacket(): InjectionSnackResultReportPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionSnactSettingPacket(): InjectionSnackSettingPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionSnackSettingResponsePacket(): InjectionSnackSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionExtendedBolusResultReportPacket(): InjectionExtendedBolusResultReportPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionExtendedBolusSettingPacket(): InjectionExtendedBolusSettingPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionExtendedBolusSettingResponsePacket(): InjectionExtendedBolusSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionBasalReportPacket(): InjectionBasalReportPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionSnackInquirePacket(): InjectionSnackInquirePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionSnackInquireResponsePacket(): InjectionSnackInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesRejectReportPacket(): RejectReportPacket
+    @ContributesAndroidInjector abstract fun contributesTempBasalReportPacket(): TempBasalReportPacket
+    @ContributesAndroidInjector abstract fun contributesTempBasalSettingPacket(): TempBasalSettingPacket
+    @ContributesAndroidInjector abstract fun contributesTempBasalSettingResponsePacket(): TempBasalSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesTempBasalInquirePacket(): TempBasalInquirePacket
+    @ContributesAndroidInjector abstract fun contributesTempBasalInquireResponsePacket(): TempBasalInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesTimeInquirePacket(): TimeInquirePacket
+    @ContributesAndroidInjector abstract fun contributesTimeInquireResponsePacket(): TimeInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesTimeReportPacket(): TimeReportPacket
+    @ContributesAndroidInjector abstract fun contributesTimeSettingPacket(): TimeSettingPacket
+    @ContributesAndroidInjector abstract fun contributesTimeSettingResponsePacket(): TimeSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesLogStatusInquirePacket(): LogStatusInquirePacket
+    @ContributesAndroidInjector abstract fun contributesLogStatusInquireResponsePacket(): LogStatusInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionCancelSettingPacket(): InjectionCancelSettingPacket
+    @ContributesAndroidInjector abstract fun contributesInjectionCancelSettingResponsePacket(): InjectionCancelSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesSoundSettingPacket(): SoundSettingPacket
+    @ContributesAndroidInjector abstract fun contributesSoundSettingResponsePacket(): SoundSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesDisplayTimeoutSettingPacket(): DisplayTimeoutSettingPacket
+    @ContributesAndroidInjector abstract fun contributesDisplayTimeoutSettingResponsePacket(): DisplayTimeoutSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesLanguageSettingPacket(): LanguageSettingPacket
+    @ContributesAndroidInjector abstract fun contributesLanguageSettingResponsePacket(): LanguageSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionBlockReportPacket(): InjectionBlockReportPacket
+    @ContributesAndroidInjector abstract fun contributesBatteryWarningReportPacket(): BatteryWarningReportPacket
+    @ContributesAndroidInjector abstract fun contributesInsulinLackReportPacket(): InsulinLackReportPacket
+    @ContributesAndroidInjector abstract fun contributesIncarnationInquirePacket(): IncarnationInquirePacket
+    @ContributesAndroidInjector abstract fun contributesIncarnationInquireResponsePacket(): IncarnationInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBolusSpeedSettingPacket(): BolusSpeedSettingPacket
+    @ContributesAndroidInjector abstract fun contributesBolusSpeedSettingResponsePacket(): BolusSpeedSettingResponsePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionSpeedInquirePacket(): BolusSpeedInquirePacket
+    @ContributesAndroidInjector abstract fun contributesInjectionSpeedInquireResponsePacket(): BolusSpeedInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBolusSpeedSettingReportPacket(): BolusSpeedSettingReportPacket
+    @ContributesAndroidInjector abstract fun contributesSoundInquirePacket(): SoundInquirePacket
+    @ContributesAndroidInjector abstract fun contributesSoundInquireResponsePacket(): SoundInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesDisplayTimeInquirePacket(): DisplayTimeInquirePacket
+    @ContributesAndroidInjector abstract fun contributesDisplayTimeInquireResponsePacket(): DisplayTimeInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesLanguageInquirePacket(): LanguageInquirePacket
+    @ContributesAndroidInjector abstract fun contributesLanguageInquireResponsePacket(): LanguageInquireResponsePacket
+    @ContributesAndroidInjector abstract fun contributesBigAPSMainInfoInquirePacket(): BigAPSMainInfoInquirePacket
+    @ContributesAndroidInjector abstract fun contributesBigAPSMainInfoInquireResponsePacket(): BigAPSMainInfoInquireResponsePacket
+
+
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ServiceModule.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ServiceModule.kt
new file mode 100644
index 0000000000..ecc84e13d7
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnG8ServiceModule.kt
@@ -0,0 +1,11 @@
+package info.nightscout.androidaps.diaconn.di
+
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.diaconn.service.DiaconnG8Service
+
+@Module
+@Suppress("unused")
+abstract class DiaconnG8ServiceModule {
+    @ContributesAndroidInjector abstract fun contributesDiaconnG8Service(): DiaconnG8Service
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnHistoryModule.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnHistoryModule.kt
new file mode 100644
index 0000000000..fed5f0ed58
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/di/DiaconnHistoryModule.kt
@@ -0,0 +1,21 @@
+package info.nightscout.androidaps.diaconn.di
+
+import android.content.Context
+import dagger.Module
+import dagger.Provides
+import info.nightscout.androidaps.diaconn.database.DiaconnHistoryDatabase
+import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecordDao
+import javax.inject.Singleton
+
+@Module
+class DiaconnHistoryModule {
+
+    @Provides
+    @Singleton
+    internal fun provideDatabase(context: Context): DiaconnHistoryDatabase = DiaconnHistoryDatabase.build(context)
+
+    @Provides
+    @Singleton
+    internal fun provideHistoryRecordDao(diaconnHistoryDatabase: DiaconnHistoryDatabase): DiaconnHistoryRecordDao =
+        diaconnHistoryDatabase.historyRecordDao()
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8DeviceChange.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8DeviceChange.kt
new file mode 100644
index 0000000000..a4c565ec9d
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8DeviceChange.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.diaconn.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventDiaconnG8DeviceChange : Event()
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8NewStatus.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8NewStatus.kt
new file mode 100644
index 0000000000..b275db0111
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/events/EventDiaconnG8NewStatus.kt
@@ -0,0 +1,5 @@
+package info.nightscout.androidaps.diaconn.events
+
+import info.nightscout.androidaps.events.Event
+
+class EventDiaconnG8NewStatus : Event()
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingPacket.kt
new file mode 100644
index 0000000000..a3cfaed4ce
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingPacket.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * AppCancelSettingPacket
+ */
+class AppCancelSettingPacket(
+    injector: HasAndroidInjector,
+    private var reqMsgType: Byte,
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x29
+        aapsLogger.debug(LTag.PUMPCOMM, "AppCancelSettingPacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.put(reqMsgType) // 명령코드
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_APP_CANCEL_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingResponsePacket.kt
new file mode 100644
index 0000000000..97f2e09403
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppCancelSettingResponsePacket.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * AppCancelSettingResponsePacket
+ */
+class AppCancelSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result =0
+    init {
+        msgType = 0xA9.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "AppCancelSettingResPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "AppCancelSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${result}")
+    }
+
+
+    override fun getFriendlyName(): String {
+        return "PUMP_APP_CANCEL_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingPacket.kt
new file mode 100644
index 0000000000..d0805f6a5f
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingPacket.kt
@@ -0,0 +1,39 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * AppConfirmSettingPacket
+ */
+class AppConfirmSettingPacket(
+    injector: HasAndroidInjector,
+    private var reqMsgType: Byte, // 명령코드
+    private var otp: Int // 응답시 전달받은 opt (random 6 digit numbner)
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x37
+        aapsLogger.debug(LTag.PUMPCOMM, "AppConfirmSettingPacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+
+        buffer.put(reqMsgType)  // 명령코드
+        buffer.putInt(otp) //  응답시 전달받은 opt (random 6digit numbner)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "reqMsgType -> ${reqMsgType}")
+        aapsLogger.debug(LTag.PUMPCOMM, "otp -> ${otp}")
+
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_APP_CONFRIM_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt
new file mode 100644
index 0000000000..f54fc49d4a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/AppConfirmSettingResponsePacket.kt
@@ -0,0 +1,43 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * AppConfirmSettingResponsePacket
+ */
+class AppConfirmSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result =0
+    init {
+        msgType = 0xB7.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "AppConfirmSettingReqPacket Response ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "AppConfirmSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${result}")
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_APP_CONFIRM_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquirePacket.kt
new file mode 100644
index 0000000000..36a484cf4a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquirePacket.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BasalLimitInquirePacket
+ */
+class BasalLimitInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x52.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BasalLimitInquirePacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_LIMIT_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt
new file mode 100644
index 0000000000..26bb9a78ab
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalLimitInquireResponsePacket.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BasalLimitInquireResponsePacket
+ */
+class BasalLimitInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x92.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BasalLimitInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BasalLimitInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+        diaconnG8Pump.maxBasalPerHours = getShortToInt(bufferData).toDouble() / 100.0  // not include tempbasal limit
+        diaconnG8Pump.maxBasal =  diaconnG8Pump.maxBasalPerHours * 2 // include tempbasal
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${diaconnG8Pump.result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "maxBasal --> ${diaconnG8Pump.maxBasal}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_LIMIT_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseReportPacket.kt
new file mode 100644
index 0000000000..f1aac0371b
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseReportPacket.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BasalPauseReportPacket
+ */
+class BasalPauseReportPacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var status:Int? = null
+
+    init {
+        msgType = 0xC3.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BasalPauseReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BasalPauseReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        status =  getByteToInt(bufferData) //(1: pauseed, 2: pause cancel)
+        aapsLogger.debug(LTag.PUMPCOMM, "status --> ${status}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_PAUSE_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingPacket.kt
new file mode 100644
index 0000000000..69c88187e9
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingPacket.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * Basal Pause Setting Packet
+ */
+class BasalPauseSettingPacket(
+    injector: HasAndroidInjector,
+    private var status:Int //(1:pause, 2: cancel pause)
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x03
+        aapsLogger.debug(LTag.PUMPCOMM, "BasalPauseSettingPacket Init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        buffer.put(status.toByte()) // (1:pause, 2: cancel pause)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_PAUSE_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingResponsePacket.kt
new file mode 100644
index 0000000000..5ec73cbe3c
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalPauseSettingResponsePacket.kt
@@ -0,0 +1,48 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BasalPauseSettingResponsePacket
+ */
+class BasalPauseSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+
+    init {
+        msgType = 0x83.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BasalPauseSettingResponsePacket Init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BasalPauseSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_PAUSE_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingPacket.kt
new file mode 100644
index 0000000000..f5ddbbdaa8
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingPacket.kt
@@ -0,0 +1,54 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BasalSettingPacket
+ */
+class BasalSettingPacket(
+    injector: HasAndroidInjector,
+    private var pattern: Int, // pattern(1=basic, 2=life1, 3=life2, 4=life3, 5=dr1, 6=dr2)
+    private var group: Int,  //hour group (1=00~05, 2=06~11, 3=12~17, 4=18~23)
+    private var amount1: Int,
+    private var amount2: Int,
+    private var amount3: Int,
+    private var amount4: Int,
+    private var amount5: Int,
+    private var amount6: Int
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x0B
+        aapsLogger.debug(LTag.PUMPCOMM, "Setting new basal rates for profile")
+
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = if (group == 4) {
+            // 마지막 그룹일때
+            prefixEncode(msgType, msgSeq, MSG_CON_END)
+        } else {
+            // 1, 2, 3 그룹일때
+            prefixEncode(msgType, msgSeq, MSG_CON_CONTINUE)
+        }
+        buffer.put(pattern.toByte()) // 패턴 종류 (1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2)
+        buffer.put(group.toByte()) // 그룹 (1=00~05, 2=06~11, 3=12~17, 4=18~23)
+        buffer.putShort(amount1.toShort()) // 주입량 1
+        buffer.putShort(amount2.toShort()) // 주입량 2
+        buffer.putShort(amount3.toShort()) // 주입량 3
+        buffer.putShort(amount4.toShort()) // 주입량 4
+        buffer.putShort(amount5.toShort()) // 주입량 5
+        buffer.putShort(amount6.toShort()) // 주입량 6
+
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingReportPacket.kt
new file mode 100644
index 0000000000..3f28ffd3e8
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingReportPacket.kt
@@ -0,0 +1,40 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BasalSettingReportPacket
+ */
+class BasalSettingReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+
+    init {
+        msgType = 0xCB.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BasalSettingReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BasalSettingReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        // no Response
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_SETTING_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingResponsePacket.kt
new file mode 100644
index 0000000000..d7902d76f9
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BasalSettingResponsePacket.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BasalSettingResponsePacket
+ */
+class BasalSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+
+    init {
+        msgType = 0x8B.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BasalSettingResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BasalSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BASAL_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BatteryWarningReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BatteryWarningReportPacket.kt
new file mode 100644
index 0000000000..260a5d7e02
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BatteryWarningReportPacket.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BatteryWarningReportPacket
+ */
+class BatteryWarningReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0xD7.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BatteryWarningReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BatteryWarningReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        diaconnG8Pump.batteryWaningGrade = getByteToInt(bufferData)
+        diaconnG8Pump.batteryWaningProcess = getByteToInt(bufferData)
+        diaconnG8Pump.batteryWaningRemain =  getByteToInt(bufferData)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "batteryWaningGrade --> ${diaconnG8Pump.batteryWaningGrade} (1:info, 2: warning , 3: major , 4: critical)")
+        aapsLogger.debug(LTag.PUMPCOMM, "batteryWaningProcess --> ${diaconnG8Pump.batteryWaningProcess} (1:skip, 2: stop , 3: ignore ) ")
+        aapsLogger.debug(LTag.PUMPCOMM, "batteryWaningRemain --> ${diaconnG8Pump.batteryWaningRemain}   (0~100%) )")
+
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BATTERY_WARNING_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquirePacket.kt
new file mode 100644
index 0000000000..7f7fb4b343
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquirePacket.kt
@@ -0,0 +1,33 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+
+ * BigAPSMainInfoInquirePacket
+ */
+class BigAPSMainInfoInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x54
+        aapsLogger.debug(LTag.PUMPCOMM, "BigAPSMainInfoInquirePacket init")
+
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BIG_APS_MAIN_INFO_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt
new file mode 100644
index 0000000000..6c784ba1e7
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigAPSMainInfoInquireResponsePacket.kt
@@ -0,0 +1,335 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.joda.time.DateTime
+import javax.inject.Inject
+import kotlin.math.floor
+
+/**
+ * BigAPSMainInfoInquireResponsePacket
+ */
+class BigAPSMainInfoInquireResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+    private var pumpDesc = PumpDescription(PumpType.DIACONN_G8)
+
+    init {
+        msgType = 0x94.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BigAPSMainInfoInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BigAPSMainInfoInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)  // 결과비트 상위 4비트 제거
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+        // 1. pump system setting info
+        diaconnG8Pump.systemRemainInsulin = floor(getShortToInt(bufferData) / 100.0)  // 인슐린 잔량
+        diaconnG8Pump.systemRemainBattery = getByteToInt(bufferData) // 베터리잔량(1~100%)
+        diaconnG8Pump.systemBasePattern = getByteToInt(bufferData) // 기저주입 패턴(0=없음, 1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2)
+        diaconnG8Pump.systemTbStatus = getByteToInt(bufferData)    // 임시기저 상태(1=임시기저 중, 2=임시기저 해제)
+        diaconnG8Pump.systemInjectionMealStatus = getByteToInt(bufferData) // 식사주입 상태(1=주입중, 2=주입상태아님)
+        diaconnG8Pump.systemInjectionSnackStatus = getByteToInt(bufferData) // 일반간식 주입 상태(1=주입중, 2=주입상태아님)
+        diaconnG8Pump.systemInjectionSquareStatue = getByteToInt(bufferData) // 스퀘어회식 주입 상태(1=주입중, 2=주입상태아님)
+        diaconnG8Pump.systemInjectionDualStatus = getByteToInt(bufferData) // 더블회식 주입 상태(1=주입중, 2=주입상태아님)
+
+        // 2. basal injection suspend status (1:stop, 2:release)
+        diaconnG8Pump.basePauseStatus = getByteToInt(bufferData) // 상태(1=정지,2=해제)
+
+        // 3. Pump time
+        diaconnG8Pump.year = getByteToInt(bufferData) + 2000   // 년 (18~99)
+        diaconnG8Pump.month = getByteToInt(bufferData)  // 월 (1~12)
+        diaconnG8Pump.day = getByteToInt(bufferData)    // 일 (1~31)
+        diaconnG8Pump.hour = getByteToInt(bufferData)   // 시 (0~23)
+        diaconnG8Pump.minute = getByteToInt(bufferData) // 분 (0~59)
+        diaconnG8Pump.second = getByteToInt(bufferData) // 초 (0~59)
+
+        //4. pump system info
+        diaconnG8Pump.country = getByteToInt(bufferData).toChar().toString().toInt() // ASCII
+        diaconnG8Pump.productType = getByteToInt(bufferData).toChar().toString().toInt() // ASCII
+        diaconnG8Pump.makeYear = getByteToInt(bufferData)
+        diaconnG8Pump.makeMonth = getByteToInt(bufferData)
+        diaconnG8Pump.makeDay = getByteToInt(bufferData)
+        diaconnG8Pump.lotNo = getByteToInt(bufferData)// LOT NO
+        diaconnG8Pump.serialNo = getShortToInt(bufferData)
+        diaconnG8Pump.majorVersion = getByteToInt(bufferData)
+        diaconnG8Pump.minorVersion = getByteToInt(bufferData)
+
+        // save current pump firmware version
+        sp.putString(resourceHelper.gs(R.string.pumpversion), diaconnG8Pump.majorVersion.toString() + "." + diaconnG8Pump.minorVersion.toString())
+
+        // 5. pump log status
+        diaconnG8Pump.pumpLastLogNum = getShortToInt(bufferData) // last saved log no
+        diaconnG8Pump.pumpWrappingCount = getByteToInt(bufferData) // wrapping count
+
+        // 6. bolus speed status.
+        diaconnG8Pump.speed = getByteToInt(bufferData) // bolus speed (1~8)
+
+        // 7. Tempbasal status
+        diaconnG8Pump.tbStatus = getByteToInt(bufferData) // tempbasal status
+        diaconnG8Pump.tbTime = getByteToInt(bufferData)    // tempbasal durationn
+        diaconnG8Pump.tbInjectRateRatio = getShortToInt(bufferData) //rate/percent
+        diaconnG8Pump.tbElapsedTime = getShortToInt(bufferData) // tempbasal elapsed time(0~1425 min)
+
+        // 8. Basal status
+        diaconnG8Pump.baseStatus = getByteToInt(bufferData) // 기저주입 상태
+        diaconnG8Pump.baseHour = getByteToInt(bufferData) // 현재 주입시간
+        diaconnG8Pump.baseAmount = getShortToInt(bufferData) / 100.0 // 주입설정량
+        diaconnG8Pump.baseInjAmount = getShortToInt(bufferData) / 100.0 // 현재 주입량
+
+        // 9. snack bolus status
+        diaconnG8Pump.snackStatus = getByteToInt(bufferData) //주입상태
+        diaconnG8Pump.snackAmount = getShortToInt(bufferData) / 100.0 // 주입설정량
+        diaconnG8Pump.snackInjAmount = getShortToInt(bufferData) / 100.0 // 현재주입량
+        diaconnG8Pump.snackSpeed = getByteToInt(bufferData) //주입속도
+
+        // 10. square(extended) bolus status
+        diaconnG8Pump.squareStatus = getByteToInt(bufferData) // 주입상태
+        diaconnG8Pump.squareTime = getShortToInt(bufferData) // 설정 주입시간(10~300분)
+        diaconnG8Pump.squareInjTime = getShortToInt(bufferData) // 경과 주입시간(10~300분)
+        diaconnG8Pump.squareAmount = getShortToInt(bufferData) / 100.0  // 주입 설정량
+        diaconnG8Pump.squareInjAmount = getShortToInt(bufferData) / 100.0 // 현재 주입량
+
+        // 11. daul bolus status
+        diaconnG8Pump.dualStatus = getByteToInt(bufferData) // 주입상태
+        diaconnG8Pump.dualAmount = getShortToInt(bufferData) / 100.0 // 일반주입 설정량
+        diaconnG8Pump.dualInjAmount = getShortToInt(bufferData) / 100.0 // 일반주입량
+        diaconnG8Pump.dualSquareTime = getShortToInt(bufferData) // 스퀘어주입 설정시간(10~300분)
+        diaconnG8Pump.dualInjSquareTime = getShortToInt(bufferData) // 스퀘어주입 경과시간(10~300분)
+        diaconnG8Pump.dualSquareAmount = getShortToInt(bufferData) / 100.0 // 스퀘어주입 설정량
+        diaconnG8Pump.dualInjSquareAmount = getShortToInt(bufferData) / 100.0 // 스퀘어주입량
+
+        // 12. last injection  status
+        diaconnG8Pump.recentKind1 = getByteToInt(bufferData) // 최근-1 주입 종류(1=식사, 2=일반간식, 3=스퀘어회식, 4=더블회식)
+        diaconnG8Pump.recentTime1 = getIntToInt(bufferData) // 최근-1 주입 시간
+        diaconnG8Pump.recentAmount1 = getShortToInt(bufferData) / 100.0 // 최근-1 주입량
+        diaconnG8Pump.recentKind2 = getByteToInt(bufferData) // 최근-2 주입 종류(1=식사, 2=일반간식, 3=스퀘어회식, 4=더블회식)
+        diaconnG8Pump.recentTime2 = getIntToInt(bufferData) // 최근-2 주입 시간
+        diaconnG8Pump.recentAmount2 = getShortToInt(bufferData) / 100.0 // 최근-2 주입량
+
+        // 13. daily injection status
+        diaconnG8Pump.todayBaseAmount = getShortToInt(bufferData) / 100.0 // 기저주입 총량
+        diaconnG8Pump.todayMealAmount = getShortToInt(bufferData) / 100.0 // 식사주입 총량
+        diaconnG8Pump.todaySnackAmount = getShortToInt(bufferData) / 100.0  // 회식주입 총량
+
+        // 14. basal injection status at this hour
+        diaconnG8Pump.currentBasePattern = getByteToInt(bufferData) // 패턴 종류 (1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2)
+        diaconnG8Pump.currentBaseHour = getByteToInt(bufferData) // 현재주입시간(0~23)
+        diaconnG8Pump.currentBaseTbBeforeAmount = getShortToInt(bufferData) / 100.0 // 해당시간의 임시기저 계산 전 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+        diaconnG8Pump.currentBaseTbAfterAmount = getShortToInt(bufferData)/ 100.0 // 해당시간의 임시기저 계산 후 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+
+        // 15. saved basal pattern status
+        diaconnG8Pump.baseAmount1  = getShortToInt(bufferData) / 100.0  // 주입량 1(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount2  = getShortToInt(bufferData) / 100.0  // 주입량 2(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount3  = getShortToInt(bufferData) / 100.0  // 주입량 3(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount4  = getShortToInt(bufferData) / 100.0  // 주입량 4(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount5  = getShortToInt(bufferData) / 100.0  // 주입량 5(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount6  = getShortToInt(bufferData) / 100.0  // 주입량 6(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount7  = getShortToInt(bufferData) / 100.0  // 주입량 7(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount8  = getShortToInt(bufferData) / 100.0  // 주입량 8(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount9  = getShortToInt(bufferData) / 100.0  // 주입량 9(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount10 = getShortToInt(bufferData) / 100.0  // 주입량 10(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount11 = getShortToInt(bufferData) / 100.0  // 주입량 11(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount12 = getShortToInt(bufferData) / 100.0  // 주입량 12(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount13 = getShortToInt(bufferData) / 100.0  // 주입량 13(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount14 = getShortToInt(bufferData) / 100.0  // 주입량 14(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount15 = getShortToInt(bufferData) / 100.0  // 주입량 15(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount16 = getShortToInt(bufferData) / 100.0  // 주입량 16(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount17 = getShortToInt(bufferData) / 100.0  // 주입량 17(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount18 = getShortToInt(bufferData) / 100.0  // 주입량 18(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount19 = getShortToInt(bufferData) / 100.0  // 주입량 19(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount20 = getShortToInt(bufferData) / 100.0  // 주입량 20(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount21 = getShortToInt(bufferData) / 100.0  // 주입량 21(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount22 = getShortToInt(bufferData) / 100.0  // 주입량 22(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount23 = getShortToInt(bufferData) / 100.0  // 주입량 23(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount24 = getShortToInt(bufferData) / 100.0  // 주입량 24(량*100, 23.25->2325, 15.2->1520)
+
+        // 16. 1hour basal limit
+        diaconnG8Pump.maxBasalPerHours = getShortToInt(bufferData).toDouble() / 100.0  // not include tempbasal limit
+        diaconnG8Pump.maxBasal =  diaconnG8Pump.maxBasalPerHours * 2 // include tempbasal
+
+        // 17. snack limit
+        diaconnG8Pump.maxBolus =  getShortToInt(bufferData).toDouble() / 100
+        diaconnG8Pump.maxBolusePerDay =  getShortToInt(bufferData).toDouble() / 100
+
+        // 18. pump sound
+        diaconnG8Pump.beepAndAlarm =  getByteToInt(bufferData) -1
+        diaconnG8Pump.alarmIntesity =  getByteToInt(bufferData) -1
+
+        // 19. pump light time
+        diaconnG8Pump.lcdOnTimeSec =  getByteToInt(bufferData) // kind (1=30 sec, 2=40 sec, 3=50 sec)
+
+        // 20. language
+        diaconnG8Pump.selectedLanguage =  getByteToInt(bufferData) // language (1=Chiness, 2=Korean, 3=English)
+
+        // pump time setting 'yyyy-MM-dd'T'HH:mm:ssZ'	“2019-07-04T12:30:30+0530”
+        val time  = DateTime(diaconnG8Pump.year, diaconnG8Pump.month, diaconnG8Pump.day, diaconnG8Pump.hour, diaconnG8Pump.minute, diaconnG8Pump.second)
+        diaconnG8Pump.setPumpTime(time.millis)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time " + dateUtil.dateAndTimeString(time.millis))
+
+        // basal pattern from pump
+        diaconnG8Pump.pumpProfiles = Array(4) { Array(24) { 0.0 } }
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][0]  = diaconnG8Pump.baseAmount1
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][1]  = diaconnG8Pump.baseAmount2
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][2]  = diaconnG8Pump.baseAmount3
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][3]  = diaconnG8Pump.baseAmount4
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][4]  = diaconnG8Pump.baseAmount5
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][5]  = diaconnG8Pump.baseAmount6
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][6]  = diaconnG8Pump.baseAmount7
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][7]  = diaconnG8Pump.baseAmount8
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][8]  = diaconnG8Pump.baseAmount9
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][9]  = diaconnG8Pump.baseAmount10
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][10] = diaconnG8Pump.baseAmount11
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][11] = diaconnG8Pump.baseAmount12
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][12] = diaconnG8Pump.baseAmount13
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][13] = diaconnG8Pump.baseAmount14
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][14] = diaconnG8Pump.baseAmount15
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][15] = diaconnG8Pump.baseAmount16
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][16] = diaconnG8Pump.baseAmount17
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][17] = diaconnG8Pump.baseAmount18
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][18] = diaconnG8Pump.baseAmount19
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][19] = diaconnG8Pump.baseAmount20
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][20] = diaconnG8Pump.baseAmount21
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][21] = diaconnG8Pump.baseAmount22
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][22] = diaconnG8Pump.baseAmount23
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][23] = diaconnG8Pump.baseAmount24
+
+        //incarnation no 처리
+        diaconnG8Pump.isPumpVersionGe2_63 = PumplogUtil.isPumpVersionGe(sp.getString(resourceHelper.gs(R.string.pumpversion), ""),2, 63)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "result > " + diaconnG8Pump.result)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemRemainInsulin > " + diaconnG8Pump.systemRemainInsulin)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemRemainBattery > " + diaconnG8Pump.systemRemainBattery)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemBasePattern > " + diaconnG8Pump.systemBasePattern)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemTbStatus > " + diaconnG8Pump.systemTbStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionMealStatus > " + diaconnG8Pump.systemInjectionMealStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionSnackStatus > " + diaconnG8Pump.systemInjectionSnackStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionSquareStatue > " + diaconnG8Pump.systemInjectionSquareStatue)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionDualStatus > " + diaconnG8Pump.systemInjectionDualStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "basePauseStatus > " + diaconnG8Pump.basePauseStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "year > " + diaconnG8Pump.year)
+        aapsLogger.debug(LTag.PUMPCOMM, "month > " + diaconnG8Pump.month)
+        aapsLogger.debug(LTag.PUMPCOMM, "day > " + diaconnG8Pump.day)
+        aapsLogger.debug(LTag.PUMPCOMM, "hour > " + diaconnG8Pump.hour)
+        aapsLogger.debug(LTag.PUMPCOMM, "minute > " + diaconnG8Pump.minute)
+        aapsLogger.debug(LTag.PUMPCOMM, "second > " + diaconnG8Pump.second)
+        aapsLogger.debug(LTag.PUMPCOMM, "country > " + diaconnG8Pump.country)
+        aapsLogger.debug(LTag.PUMPCOMM, "productType > " + diaconnG8Pump.productType)
+        aapsLogger.debug(LTag.PUMPCOMM, "makeYear > " + diaconnG8Pump.makeYear)
+        aapsLogger.debug(LTag.PUMPCOMM, "makeMonth > " + diaconnG8Pump.makeMonth)
+        aapsLogger.debug(LTag.PUMPCOMM, "makeDay > " + diaconnG8Pump.makeDay)
+        aapsLogger.debug(LTag.PUMPCOMM, "lotNo > " + diaconnG8Pump.lotNo)
+        aapsLogger.debug(LTag.PUMPCOMM, "serialNo > " + diaconnG8Pump.serialNo)
+        aapsLogger.debug(LTag.PUMPCOMM, "majorVersion > " + diaconnG8Pump.majorVersion)
+        aapsLogger.debug(LTag.PUMPCOMM, "minorVersion > " + diaconnG8Pump.minorVersion)
+        aapsLogger.debug(LTag.PUMPCOMM, "lastNum  > " + diaconnG8Pump.pumpLastLogNum)
+        aapsLogger.debug(LTag.PUMPCOMM, "wrappingCount > " + diaconnG8Pump.pumpWrappingCount)
+        aapsLogger.debug(LTag.PUMPCOMM, "speed > " + diaconnG8Pump.speed)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbStatus > " + diaconnG8Pump.tbStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbTime> " + diaconnG8Pump.tbTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbInjectRateRatio > " + diaconnG8Pump.tbInjectRateRatio)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbElapsedTime > " + diaconnG8Pump.tbElapsedTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseStatus > " + diaconnG8Pump.baseStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseHour > " + diaconnG8Pump.baseHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount > " + diaconnG8Pump.baseAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseInjAmount > " + diaconnG8Pump.baseInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealKind > " + diaconnG8Pump.mealKind)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealStartTime > " + diaconnG8Pump.mealStartTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealStatus > " + diaconnG8Pump.mealStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealAmount > " + diaconnG8Pump.mealAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealInjAmount > " + diaconnG8Pump.mealInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealSpeed > " + diaconnG8Pump.mealSpeed)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackStatus > " + diaconnG8Pump.snackStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackAmount > " + diaconnG8Pump.snackAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackInjAmount > " + diaconnG8Pump.snackInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackSpeed > " + diaconnG8Pump.snackSpeed)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareStatus > " + diaconnG8Pump.squareStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareTime > " + diaconnG8Pump.squareTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareInjTime > " + diaconnG8Pump.squareInjTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareAmount > " + diaconnG8Pump.squareAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareInjAmount > " + diaconnG8Pump.squareInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualStatus > " + diaconnG8Pump.dualStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualAmount > " + diaconnG8Pump.dualAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualInjAmount > " + diaconnG8Pump.dualInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualSquareTime > " + diaconnG8Pump.dualSquareTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualInjSquareTime > " + diaconnG8Pump.dualInjSquareTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualSquareAmount > " + diaconnG8Pump.dualSquareAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualInjSquareAmount> " + diaconnG8Pump.dualInjSquareAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentKind1  > " + diaconnG8Pump.recentKind1)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentTime1  > " + diaconnG8Pump.recentTime1)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentAmount1 > " + diaconnG8Pump.recentAmount1)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentKind2  	> " + diaconnG8Pump.recentKind2)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentTime2  	> " + diaconnG8Pump.recentTime2)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentAmount2 > " + diaconnG8Pump.recentAmount2)
+        aapsLogger.debug(LTag.PUMPCOMM, "todayBaseAmount > " + diaconnG8Pump.todayBaseAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "todayMealAmount > " + diaconnG8Pump.todayMealAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "todaySnackAmount > " + diaconnG8Pump.todaySnackAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "morningHour  > " + diaconnG8Pump.morningHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "morningAmount > " + diaconnG8Pump.morningAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "lunchHour  > " + diaconnG8Pump.lunchHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "lunchAmount > " + diaconnG8Pump.lunchAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dinnerHour  > " + diaconnG8Pump.dinnerHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "dinnerAmount > " + diaconnG8Pump.dinnerAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBasePattern > " + diaconnG8Pump.currentBasePattern)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBaseHour  > " + diaconnG8Pump.currentBaseHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBaseTbBeforeAmount > " + diaconnG8Pump.currentBaseTbBeforeAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBaseTbAfterAmount > " + diaconnG8Pump.currentBaseTbAfterAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount1  > " + diaconnG8Pump.baseAmount1)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount2  > " + diaconnG8Pump.baseAmount2)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount3  > " + diaconnG8Pump.baseAmount3)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount4  > " + diaconnG8Pump.baseAmount4)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount5  > " + diaconnG8Pump.baseAmount5)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount6  > " + diaconnG8Pump.baseAmount6)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount7  > " + diaconnG8Pump.baseAmount7)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount8  > " + diaconnG8Pump.baseAmount8)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount9  > " + diaconnG8Pump.baseAmount9)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount10 > " + diaconnG8Pump.baseAmount10)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount11 > " + diaconnG8Pump.baseAmount11)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount12 > " + diaconnG8Pump.baseAmount12)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount13 > " + diaconnG8Pump.baseAmount13)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount14 > " + diaconnG8Pump.baseAmount14)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount15 > " + diaconnG8Pump.baseAmount15)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount16 > " + diaconnG8Pump.baseAmount16)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount17 > " + diaconnG8Pump.baseAmount17)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount18 > " + diaconnG8Pump.baseAmount18)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount19 > " + diaconnG8Pump.baseAmount19)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount20 > " + diaconnG8Pump.baseAmount20)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount21 > " + diaconnG8Pump.baseAmount21)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount22 > " + diaconnG8Pump.baseAmount22)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount23 > " + diaconnG8Pump.baseAmount23)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount24 > " + diaconnG8Pump.baseAmount24)
+        aapsLogger.debug(LTag.PUMPCOMM, "maxBasalPerHours > " + diaconnG8Pump.maxBasalPerHours)
+        aapsLogger.debug(LTag.PUMPCOMM, "maxBasal > " + diaconnG8Pump.maxBasal)
+        aapsLogger.debug(LTag.PUMPCOMM, "maxBolus > " + diaconnG8Pump.maxBolus)
+        aapsLogger.debug(LTag.PUMPCOMM, "maxBolusePerDay > " + diaconnG8Pump.maxBolusePerDay)
+        aapsLogger.debug(LTag.PUMPCOMM, "beepAndAlarm > " + diaconnG8Pump.beepAndAlarm)
+        aapsLogger.debug(LTag.PUMPCOMM, "alarmIntesity > " + diaconnG8Pump.alarmIntesity)
+        aapsLogger.debug(LTag.PUMPCOMM, "lcdOnTimeSec > " + diaconnG8Pump.lcdOnTimeSec)
+        aapsLogger.debug(LTag.PUMPCOMM, "selectedLanguage > " + diaconnG8Pump.selectedLanguage)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BIG_APS_MAIN_INFO_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquirePacket.kt
new file mode 100644
index 0000000000..6a0bc9e4cb
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquirePacket.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+
+ * BigLogInquirePacket
+ */
+class BigLogInquirePacket(
+    injector: HasAndroidInjector,
+    private val start: Int,
+    private val end:Int,
+    private val delay:Int
+) : DiaconnG8Packet(injector ) {
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x72
+        aapsLogger.debug(LTag.PUMPCOMM, "BigLogInquirePacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.putShort(start.toShort())
+        buffer.putShort(end.toShort())
+        buffer.put(delay.toByte())
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BIG_LOG_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt
new file mode 100644
index 0000000000..e75008d66c
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigLogInquireResponsePacket.kt
@@ -0,0 +1,767 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.data.DetailedBolusInfo
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.common.RecordTypes
+import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecord
+import info.nightscout.androidaps.diaconn.database.DiaconnHistoryRecordDao
+import info.nightscout.androidaps.diaconn.pumplog.*
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.interfaces.PumpSync
+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.plugins.pump.common.bolusInfo.TemporaryBasalStorage
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.utils.T
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.apache.commons.lang3.time.DateUtils
+import org.joda.time.DateTime
+import javax.inject.Inject
+
+/**
+ * BigLogInquireResponsePacket
+ */
+class BigLogInquireResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector) {
+
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    @Inject lateinit var temporaryBasalStorage: TemporaryBasalStorage
+    @Inject lateinit var sp: SP
+    @Inject lateinit var pumpSync: PumpSync
+    @Inject lateinit var diaconnHistoryRecordDao: DiaconnHistoryRecordDao
+    var result = 0// 조회결과
+    private var pumpDesc = PumpDescription(PumpType.DIACONN_G8)
+    init {
+        msgType = 0xb2.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BigLogInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BigLogInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data) // 데이타 영역 15바이트 버퍼
+        val result2 =  getByteToInt(bufferData)  // 조회결과 1 byte
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+        val logLength = getByteToInt(bufferData) // 로그의 갯수. 1byte
+
+        // initalize
+        val dailyMaxvalInfo = mutableMapOf<String, MutableMap<String, Double>>()
+        dailyMaxvalInfo[""] = mutableMapOf()
+
+        // 15 byte를 로그갯수만큼 돌기.
+        for(i in 0 until logLength) {
+            val wrapingCount = getByteToInt(bufferData) // 1byte
+            val logNum =  getShortToInt(bufferData)  // 2byte
+            // log Data Parsing
+            val logdata = byteArrayOf(
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData),
+                PumplogUtil.getByte(bufferData)
+            )
+
+            diaconnG8Pump.apsWrappingCount = wrapingCount
+            diaconnG8Pump.apslastLogNum  = logNum
+            sp.putInt(resourceHelper.gs(R.string.apslastLogNum), logNum)
+            sp.putInt(resourceHelper.gs(R.string.apsWrappingCount), wrapingCount)
+
+            // process Log to DB
+            val logDataToHexString = toNarrowHex(logdata)
+            val pumplogKind: Byte = PumplogUtil.getKind(logDataToHexString)
+            var status: String
+            val diaconnG8HistoryRecord = DiaconnHistoryRecord(0)
+            when(pumplogKind) {
+
+                LOG_INJECT_MEAL_SUCCESS.LOG_KIND -> {
+                    val logItem = LOG_INJECT_MEAL_SUCCESS.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(logDateTime, logItem.injectAmount / 100.0)
+                    val newRecord = pumpSync.syncBolusWithPumpId(
+                        timestamp = logDateTime,
+                        amount = logItem.injectAmount / 100.0,
+                        type = detailedBolusInfo?.bolusType,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT MEALBOLUS (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Bolus: " + logItem.injectAmount / 100.0 + "U ")
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.injectAmount / 100.0
+                    diaconnG8HistoryRecord.duration =  logItem.getInjectTime()
+                    diaconnG8HistoryRecord.bolusType = "M" // meal bolus
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logmealsuccess)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "MEALBOLUSSUCCESS" + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECT_MEAL_FAIL.LOG_KIND -> {
+                    val logItem = LOG_INJECT_MEAL_FAIL.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(logDateTime, logItem.injectAmount / 100.0)
+                    val newRecord = pumpSync.syncBolusWithPumpId(
+                        timestamp = logDateTime,
+                        amount = logItem.injectAmount / 100.0,
+                        type = detailedBolusInfo?.bolusType,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT MEALBOLUS (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Bolus: " + logItem.injectAmount / 100.0 + "U ")
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = if ((logItem.injectAmount / 100.0) < 0) 0.0 else (logItem.injectAmount / 100.0)
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.bolusType = "M" // Meal bolus
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logmealfail)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "MEALBOLUSFAIL " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECT_NORMAL_SUCCESS.LOG_KIND -> {
+                    val logItem = LOG_INJECT_NORMAL_SUCCESS.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(logDateTime, logItem.injectAmount / 100.0)
+                    val newRecord = pumpSync.syncBolusWithPumpId(
+                        timestamp = logDateTime,
+                        amount = logItem.injectAmount / 100.0,
+                        type = detailedBolusInfo?.bolusType,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Bolus: " + logItem.injectAmount / 100.0 + "U ")
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.injectAmount / 100.0
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.bolusType = "B" // bolus
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logsuccess)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "BOLUSSUCCESS" + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECT_NORMAL_FAIL.LOG_KIND -> {
+                    val logItem = LOG_INJECT_NORMAL_FAIL.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    // APS DB process
+                    val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(logDateTime, logItem.injectAmount / 100.0)
+                    val newRecord = pumpSync.syncBolusWithPumpId(
+                        timestamp = logDateTime,
+                        amount = logItem.injectAmount / 100.0,
+                        type = detailedBolusInfo?.bolusType,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT BOLUS (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Bolus: " + logItem.injectAmount / 100.0 + "U ")
+                    // Diaconn History Process
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = if ((logItem.injectAmount / 100.0) < 0) 0.0 else (logItem.injectAmount / 100.0)
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.bolusType = "B" // bolus
+                    diaconnG8HistoryRecord.stringValue = getReasonName(pumplogKind, logItem.reason)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "BOLUSFAIL " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_SET_SQUARE_INJECTION.LOG_KIND -> {
+                    val logItem = LOG_SET_SQUARE_INJECTION.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    val newRecord = pumpSync.syncExtendedBolusWithPumpId(
+                        timestamp = logDateTime,
+                        amount = logItem.setAmount / 100.0,
+                        duration = T.mins((logItem.getInjectTime() * 10).toLong()).msecs(),
+                        isEmulatingTB = false,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTART (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Amount: " + logItem.setAmount / 100.0 + "U Duration: " + logItem.getInjectTime() * 10 + "min")
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.setAmount / 100.0
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logsquarestart)
+                    diaconnG8HistoryRecord.bolusType = "E" // Extended
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "EXTENDEDBOLUSSTART " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECT_SQUARE_SUCCESS.LOG_KIND -> {
+                    val logItem = LOG_INJECT_SQUARE_SUCCESS.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logsquaresuccess)
+                    diaconnG8HistoryRecord.bolusType = "E" // Extended
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "EXTENDEDBOLUSEND " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECT_SQUARE_FAIL.LOG_KIND -> {
+                    val logItem = LOG_INJECT_SQUARE_FAIL.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
+                        timestamp = logDateTime,
+                        endPumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTOP (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Delivered: " + logItem.injectAmount / 100.0 + "U RealDuration: " + logItem.getInjectTime() + "min")
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.injectAmount / 100.0
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.stringValue = getReasonName(pumplogKind, logItem.reason)
+                    diaconnG8HistoryRecord.bolusType = "E"
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "EXTENDEDBOLUSFAIL " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_SET_DUAL_INJECTION.LOG_KIND -> {
+                    val logItem = LOG_SET_DUAL_INJECTION.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    // dual square 처리.
+                    val newRecord = pumpSync.syncExtendedBolusWithPumpId(
+                        timestamp = logDateTime,
+                        amount = logItem.setSquareAmount / 100.0,
+                        duration = T.mins((logItem.getInjectTime() * 10).toLong()).msecs(),
+                        isEmulatingTB = false,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTART (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Amount: " + logItem.setSquareAmount / 100.0 + "U Duration: " + logItem.getInjectTime() * 10 + "min")
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.setSquareAmount / 100.0
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime() * 10 // (1~30) 1:10min 30:300min
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logdualsquarestart)
+                    diaconnG8HistoryRecord.bolusType = "D" // Extended
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+
+                    status = "DUALEXTENTEDSTART " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECTION_DUAL_NORMAL.LOG_KIND -> {
+                    val logItem = LOG_INJECTION_DUAL_NORMAL.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    val detailedBolusInfo = detailedBolusInfoStorage.findDetailedBolusInfo(logDateTime, logItem.injectAmount / 100.0)
+                    val newRecord = pumpSync.syncBolusWithPumpId(
+                        timestamp = logDateTime,
+                        amount = logItem.injectAmount / 100.0,
+                        type = detailedBolusInfo?.bolusType,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT DUALBOLUS (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Bolus: " + logItem.injectAmount / 100.0 + "U Duration: " + logItem.getInjectTime() + "min")
+
+                    diaconnG8Pump.lastBolusAmount = logItem.injectAmount / 100.0
+                    diaconnG8Pump.lastBolusTime = logDateTime
+
+                    //Diaconn History
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.injectAmount / 100.0
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.bolusType = "D" // bolus
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logdualnormalsuccess)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "DUALBOLUS" + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECT_DUAL_SUCCESS.LOG_KIND -> {
+                    val logItem = LOG_INJECT_DUAL_SUCCESS.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.injectSquareAmount / 100.0
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.bolusType = "D"
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logdualsquaresuccess)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "DUALBOLUS SQUARESUCCESS " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECT_DUAL_FAIL.LOG_KIND -> {
+                    val logItem = LOG_INJECT_DUAL_FAIL.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    val newRecord = pumpSync.syncStopExtendedBolusWithPumpId(
+                        timestamp = logDateTime,
+                        endPumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT EXTENDEDSTOP (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Delivered: " + logItem.injectSquareAmount / 100.0 + "U RealDuration: " + logItem.getInjectTime() + "min")
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BOLUS
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.injectNormAmount / 100.0 + logItem.injectSquareAmount / 100.0
+                    diaconnG8HistoryRecord.duration = logItem.getInjectTime()
+                    diaconnG8HistoryRecord.bolusType = "D"
+                    diaconnG8HistoryRecord.stringValue = getReasonName(pumplogKind, logItem.reason)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "DUALBOLUS FAIL " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECTION_1HOUR_BASAL.LOG_KIND -> {
+                    val logItem = LOG_INJECTION_1HOUR_BASAL.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_BASALHOUR
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.beforeAmount / 100.0
+                    diaconnG8HistoryRecord.stringValue = "TB before: ${logItem.beforeAmount / 100.0} / TB after: ${logItem.afterAmount / 100.0}"
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "1HOUR BASAL " + dateUtil.dateAndTimeString(logDateTime)
+                }
+
+                LOG_SUSPEND_V2.LOG_KIND -> {
+                    val logItem = LOG_SUSPEND_V2.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_SUSPEND
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_lgosuspend, logItem.getBasalPattern())
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "SUSPEND " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_SUSPEND_RELEASE_V2.LOG_KIND -> {
+                    val logItem = LOG_SUSPEND_RELEASE_V2.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_SUSPEND
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_lgorelease, logItem.getBasalPattern())
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "SUSPENDRELEASE " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_CHANGE_INJECTOR_SUCCESS.LOG_KIND -> {
+                    val logItem = LOG_CHANGE_INJECTOR_SUCCESS.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    if (sp.getBoolean(R.string.key_diaconn_g8_loginsulinchange, true)) {
+                        val newRecord = pumpSync.insertTherapyEventIfNewWithTimestamp(
+                            timestamp = logDateTime,
+                            type = DetailedBolusInfo.EventType.INSULIN_CHANGE,
+                            pumpId = logDateTime,
+                            pumpType = PumpType.DIACONN_G8,
+                            pumpSerial = diaconnG8Pump.serialNo.toString()
+                        )
+                        aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT INSULINCHANGE(" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Amount: " + logItem.remainAmount / 100.0 + "U")
+                    }
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_REFILL
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.remainAmount / 100.0
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_loginjectorprime, logItem.primeAmount / 100.0)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "INSULINCHANGE " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_CHANGE_TUBE_SUCCESS.LOG_KIND -> {
+                    val logItem = LOG_CHANGE_TUBE_SUCCESS.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    if (sp.getBoolean(R.string.key_diaconn_g8_logtubechange, true)) {
+                        val newRecord = pumpSync.insertTherapyEventIfNewWithTimestamp(
+                            timestamp = logDateTime,
+                            type = DetailedBolusInfo.EventType.NOTE,
+                            note = resourceHelper.gs(R.string.diaconn_g8_logtubeprime, logItem.primeAmount / 100.0),
+                            pumpId = logDateTime,
+                            pumpType = PumpType.DIACONN_G8,
+                            pumpSerial = diaconnG8Pump.serialNo.toString()
+                        )
+                        aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT TUBECHANGE(" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Amount: " + logItem.primeAmount / 100.0 + "U")
+                    }
+
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_REFILL
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.remainAmount / 100.0
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logtubeprime, logItem.primeAmount / 100.0)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "TUBECHANGE " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECTION_1DAY.LOG_KIND -> { // Daily Bolus Log
+                    val logItem = LOG_INJECTION_1DAY.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_DAILY
+                    diaconnG8HistoryRecord.timestamp = DateTime(logDateTime).withTimeAtStartOfDay().millis
+                    diaconnG8HistoryRecord.dailyBolus = logItem.extAmount / 100.0 + logItem.mealAmount / 100.0
+
+                    val recordDateStr = "" + diaconnG8HistoryRecord.timestamp
+                    var recordMap: MutableMap<String, Double> = mutableMapOf("dummy" to 0.0)
+
+                    if (dailyMaxvalInfo.containsKey(recordDateStr)) {
+                        recordMap = dailyMaxvalInfo[recordDateStr]!!
+                    } else {
+                        recordMap["bolus"] = 0.0
+                        recordMap["basal"] = 0.0
+                        dailyMaxvalInfo[recordDateStr] = recordMap
+                    }
+
+                    if (diaconnG8HistoryRecord.dailyBolus > recordMap["bolus"]!!) {
+                        recordMap["bolus"] = diaconnG8HistoryRecord.dailyBolus
+                    } else {
+                        diaconnG8HistoryRecord.dailyBolus = recordMap["bolus"]!!
+                    }
+
+                    if (recordMap["basal"]!! > 0.0) {
+                        diaconnG8HistoryRecord.dailyBasal = recordMap["basal"]!!
+                    }
+
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+
+                    //If it is a TDD, store it for stats also.
+                    pumpSync.createOrUpdateTotalDailyDose(
+                        timestamp = diaconnG8HistoryRecord.timestamp,
+                        bolusAmount = diaconnG8HistoryRecord.dailyBolus,
+                        basalAmount = diaconnG8HistoryRecord.dailyBasal,
+                        totalAmount = 0.0,
+                        pumpId = null,
+                        pumpType = PumpType.DIACONN_G8,
+                        diaconnG8Pump.serialNo.toString()
+                    )
+
+                    status = "DAILYBOLUS " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_INJECTION_1DAY_BASAL.LOG_KIND -> { // Daily Basal Log
+                    val logItem = LOG_INJECTION_1DAY_BASAL.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_DAILY
+                    diaconnG8HistoryRecord.timestamp = DateTime(logDateTime).withTimeAtStartOfDay().millis
+                    diaconnG8HistoryRecord.dailyBasal = logItem.amount / 100.0
+
+                    val recordDateStr = "" + diaconnG8HistoryRecord.timestamp
+                    var recordMap: MutableMap<String, Double> = mutableMapOf("dummy" to 0.0)
+
+                    if (dailyMaxvalInfo.containsKey(recordDateStr)) {
+                        recordMap = dailyMaxvalInfo[recordDateStr]!!
+                    } else {
+                        recordMap["bolus"] = 0.0
+                        recordMap["basal"] = 0.0
+                        dailyMaxvalInfo[recordDateStr] = recordMap
+                    }
+
+                    if (diaconnG8HistoryRecord.dailyBasal > recordMap["basal"]!!) {
+                        recordMap["basal"] = diaconnG8HistoryRecord.dailyBasal
+                    } else {
+                        diaconnG8HistoryRecord.dailyBasal = recordMap["basal"]!!
+                    }
+
+                    if (recordMap["bolus"]!! > 0.0) {
+                        diaconnG8HistoryRecord.dailyBolus = recordMap["bolus"]!!
+                    }
+
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+
+                    //If it is a TDD, store it for stats also.
+                    // pumpSync.createOrUpdateTotalDailyDose(
+                    //     timestamp = diaconnG8HistoryRecord.timestamp,
+                    //     bolusAmount = diaconnG8HistoryRecord.dailyBolus,
+                    //     basalAmount = diaconnG8HistoryRecord.dailyBasal,
+                    //     totalAmount = 0.0,
+                    //     pumpId = null,
+                    //     pumpType = PumpType.DIACONN_G8,
+                    //     diaconnG8Pump.serialNo.toString()
+                    // )
+
+
+                    status = "DAILYBASAL " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_CHANGE_NEEDLE_SUCCESS.LOG_KIND -> {
+                    val logItem = LOG_CHANGE_NEEDLE_SUCCESS.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    if (sp.getBoolean(R.string.key_diaconn_g8_logneedlechange, true)) {
+                        val newRecord = pumpSync.insertTherapyEventIfNewWithTimestamp(
+                            timestamp = logDateTime,
+                            type = DetailedBolusInfo.EventType.CANNULA_CHANGE,
+                            pumpId = logDateTime,
+                            pumpType = PumpType.DIACONN_G8,
+                            pumpSerial = diaconnG8Pump.serialNo.toString()
+                        )
+                        aapsLogger.debug(LTag.PUMPCOMM,  (if (newRecord) "**NEW** " else "") + "EVENT NEEDLECHANGE(" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Amount: " + logItem.remainAmount / 100.0 + "U")
+                    }
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_REFILL
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.remainAmount / 100.0
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logneedleprime, logItem.primeAmount / 100.0)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "NEEDLECHANGE " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_TB_START_V3.LOG_KIND -> {
+                    val logItem = LOG_TB_START_V3.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    var absoluteRate = 0.0
+                    if (logItem.getTbInjectRateRatio() >= 50000) {
+                        val tempBasalPercent = logItem.getTbInjectRateRatio() - 50000
+                        absoluteRate = pumpDesc.pumpType.determineCorrectBasalSize(diaconnG8Pump.baseAmount * (tempBasalPercent / 100.0))
+                    }
+
+                    if (logItem.getTbInjectRateRatio() in 1000..1600) {
+                        absoluteRate = (logItem.getTbInjectRateRatio() - 1000) / 100.0
+                    }
+
+                    val temporaryBasalInfo = temporaryBasalStorage.findTemporaryBasal(logDateTime, absoluteRate)
+                    val newRecord = pumpSync.syncTemporaryBasalWithPumpId(
+                        timestamp = logDateTime,
+                        rate = absoluteRate,
+                        duration = T.mins((logItem.tbTime * 15).toLong()).msecs(),
+                        isAbsolute = true,
+                        type = temporaryBasalInfo?.type,
+                        pumpId = logDateTime,
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                   aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT TEMPSTART (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " Ratio: " + absoluteRate + "U Duration: " + logItem.tbTime * 15 + "min")
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_TB
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.duration = logItem.tbTime * 15
+                    diaconnG8HistoryRecord.value = absoluteRate
+                    diaconnG8HistoryRecord.stringValue =  resourceHelper.gs(R.string.diaconn_g8_logtempstart)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "TEMPSTART " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_TB_STOP_V3.LOG_KIND -> {
+                    val logItem = LOG_TB_STOP_V3.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+                    var absoluteRate = 0.0
+                    if (logItem.getTbInjectRateRatio() >= 50000) {
+                        val tempBasalPercent = logItem.getTbInjectRateRatio() - 50000
+                        absoluteRate = diaconnG8Pump.baseAmount * (tempBasalPercent / 100.0)
+                    }
+                    if (logItem.getTbInjectRateRatio() in 1000..1600) {
+                        absoluteRate = (logItem.getTbInjectRateRatio() - 1000) / 100.0
+                    }
+
+                    val newRecord = pumpSync.syncStopTemporaryBasalWithPumpId(
+                        timestamp = logDateTime,
+                        endPumpId = dateUtil.now(),
+                        pumpType = PumpType.DIACONN_G8,
+                        pumpSerial = diaconnG8Pump.serialNo.toString())
+                    aapsLogger.debug(LTag.PUMPCOMM, (if (newRecord) "**NEW** " else "") + "EVENT TEMPSTOP (" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")")
+
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_TB
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = absoluteRate
+                    diaconnG8HistoryRecord.stringValue = getReasonName(pumplogKind, logItem.reason)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "TEMPSTOP " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_ALARM_BATTERY.LOG_KIND -> { // BATTERY SHORTAGE ALARM
+                    val logItem = LOG_ALARM_BATTERY.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_ALARM
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logbatteryshorage)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "BATTERYALARM " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_ALARM_BLOCK.LOG_KIND -> { // INJECTION BLOCKED ALARM
+                    val logItem = LOG_ALARM_BLOCK.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_ALARM
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.amount / 100.0
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_logalarmblock, getReasonName(pumplogKind, logItem.reason))
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "BLOCKALARM " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_ALARM_SHORTAGE.LOG_KIND -> { // INSULIN SHORTAGE ALARM
+                    val logItem = LOG_ALARM_SHORTAGE.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_ALARM
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.value = logItem.remain.toDouble()
+                    diaconnG8HistoryRecord.stringValue = resourceHelper.gs(R.string.diaconn_g8_loginsulinshorage)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    status = "SHORTAGEALARM " + dateUtil.timeString(logDateTime)
+                }
+
+                LOG_RESET_SYS_V3.LOG_KIND -> {
+                    val logItem = LOG_RESET_SYS_V3.parse(logDataToHexString)
+                    aapsLogger.debug(LTag.PUMPCOMM, "$logItem ")
+
+                    val logStartDate = DateUtils.parseDate(logItem.dttm, "yyyy-MM-dd HH:mm:ss")
+                    val logDateTime = logStartDate.time
+
+                    diaconnG8HistoryRecord.code = RecordTypes.RECORD_TYPE_ALARM
+                    diaconnG8HistoryRecord.timestamp = logDateTime
+                    diaconnG8HistoryRecord.stringValue = getReasonName(pumplogKind, logItem.reason)
+                    diaconnHistoryRecordDao.createOrUpdate(diaconnG8HistoryRecord)
+                    if (logItem.reason == 3.toByte()) {
+                        if (sp.getBoolean(R.string.key_diaconn_g8_logbatterychange, true)) {
+                            val newRecord = pumpSync.insertTherapyEventIfNewWithTimestamp(
+                                timestamp = logDateTime,
+                                type = DetailedBolusInfo.EventType.PUMP_BATTERY_CHANGE,
+                                pumpId = logDateTime,
+                                pumpType = PumpType.DIACONN_G8,
+                                pumpSerial = diaconnG8Pump.serialNo.toString()
+                            )
+                            aapsLogger.debug(LTag.PUMPCOMM,  (if (newRecord) "**NEW** " else "") + "EVENT BATTERYCHANGE(" + pumplogKind + ") " + dateUtil.dateAndTimeString(logDateTime) + " (" + logDateTime + ")" + " remainAmount: " + logItem.batteryRemain.toInt() + "%")
+                        }
+                    }
+                    status = "RESET " + dateUtil.timeString(logDateTime)
+                }
+
+                else       -> {
+                    status = resourceHelper.gs(R.string.diaconn_g8_logsyncinprogress)
+                    rxBus.send(EventPumpStatusChanged(status))
+                    continue
+                }
+            }
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.processinghistory) + ": " + status))
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "BIG_LOG_INQUIRE_RESPONSE"
+    }
+
+    private fun getReasonName(logKind: Byte, reason: Byte): String{
+        val logInjectNormalFail: Byte = 0x0B
+        val logInjectSquareFail: Byte = 0x0E
+        val logInjectDualFail: Byte = 0x11
+        val logTBStopV3: Byte = 0x13
+        val logResetSysV3: Byte = 0x01
+        val logALarmBlock: Byte = 0x29
+
+        return when (logKind) {
+            logInjectNormalFail, logInjectSquareFail, logInjectDualFail, logTBStopV3 -> failLog(reason)
+            logResetSysV3 -> resetLog(reason)
+            logALarmBlock -> blockLog(reason)
+            else    -> ""
+        }
+    }
+
+    private fun failLog(reason: Byte): String {
+        return when (reason) {
+            //1=Injection blockage, 2=Battery shortage, 3=Drug shortage, 4=User shutdown, 5=System reset, 6=Other, 7=Emergency shutdown
+            0.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasoncomplete)
+            1.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasoninjectonblock)
+            2.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonbatteryshortage)
+            3.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasoninsulinshortage)
+            4.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonuserstop)
+            5.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonsystemreset)
+            6.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonother)
+            7.toByte() -> resourceHelper.gs(R.string.diaconn_g8_reasonemergencystop)
+            else       -> "No Reason"
+        }
+    }
+
+    private fun resetLog(reason: Byte): String {
+        return when (reason.toInt()) {
+            1 -> resourceHelper.gs(R.string.diaconn_g8_resetfactoryreset)
+            2 -> resourceHelper.gs(R.string.diaconn_g8_resetemergencyoff)
+            3 -> resourceHelper.gs(R.string.diaconn_g8_resetbatteryreplacement)
+            4 -> resourceHelper.gs(R.string.diaconn_g8_resetaftercalibration)
+            5 -> resourceHelper.gs(R.string.diaconn_g8_resetpreshipment)
+            9 -> resourceHelper.gs(R.string.diaconn_g8_resetunexpected)
+            else -> ""
+        }
+    }
+
+    private fun blockLog(reason: Byte): String {
+        return when (reason.toInt()) {
+            1 -> resourceHelper.gs(R.string.diacon_g8_blockbasal)
+            2 -> resourceHelper.gs(R.string.diacon_g8_blockmealbolus)
+            3 -> resourceHelper.gs(R.string.diacon_g8_blocknormalbolus)
+            4 -> resourceHelper.gs(R.string.diacon_g8_blocksquarebolus)
+            5 -> resourceHelper.gs(R.string.diacon_g8_blockdualbolus)
+            6 -> resourceHelper.gs(R.string.diacon_g8_blockreplacetube)
+            7 -> resourceHelper.gs(R.string.diacon_g8_blockreplaceneedle)
+            8 -> resourceHelper.gs(R.string.diacon_g8_blockreplacesyringe)
+            else -> ""
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquirePacket.kt
new file mode 100644
index 0000000000..ddf9a2f465
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquirePacket.kt
@@ -0,0 +1,33 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+
+ * BigMainInfoInquirePacket
+ */
+class BigMainInfoInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x73
+        aapsLogger.debug(LTag.PUMPCOMM, "BigMainInfoInquirePacket init")
+
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BIG_MAIN_INFO_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt
new file mode 100644
index 0000000000..e93d32e973
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BigMainInfoInquireResponsePacket.kt
@@ -0,0 +1,324 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
+import info.nightscout.androidaps.interfaces.PumpDescription
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import org.joda.time.DateTime
+import javax.inject.Inject
+import kotlin.math.floor
+
+/**
+ * BigMainInfoInquireResponsePacket
+ */
+class BigMainInfoInquireResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+    private var pumpDesc = PumpDescription(PumpType.DIACONN_G8)
+
+    init {
+        msgType = 0xb3.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BigMainInfoInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BigMainInfoInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)  // 결과비트 상위 4비트 제거
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+        // 1. pump system setting info
+        diaconnG8Pump.systemRemainInsulin = floor(getShortToInt(bufferData) / 100.0)  // 인슐린 잔량
+        diaconnG8Pump.systemRemainBattery = getByteToInt(bufferData) // 베터리잔량(1~100%)
+        diaconnG8Pump.systemBasePattern = getByteToInt(bufferData) // 기저주입 패턴(0=없음, 1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2)
+        diaconnG8Pump.systemTbStatus = getByteToInt(bufferData)    // 임시기저 상태(1=임시기저 중, 2=임시기저 해제)
+        diaconnG8Pump.systemInjectionMealStatus = getByteToInt(bufferData) // 식사주입 상태(1=주입중, 2=주입상태아님)
+        diaconnG8Pump.systemInjectionSnackStatus = getByteToInt(bufferData) // 일반간식 주입 상태(1=주입중, 2=주입상태아님)
+        diaconnG8Pump.systemInjectionSquareStatue = getByteToInt(bufferData) // 스퀘어회식 주입 상태(1=주입중, 2=주입상태아님)
+        diaconnG8Pump.systemInjectionDualStatus = getByteToInt(bufferData) // 더블회식 주입 상태(1=주입중, 2=주입상태아님)
+
+        // 2. basal injection suspend status (1:stop, 2:release)
+        diaconnG8Pump.basePauseStatus = getByteToInt(bufferData) // 상태(1=정지,2=해제)
+
+        // 3. Pump time
+        diaconnG8Pump.year = getByteToInt(bufferData) + 2000   // 년 (18~99)
+        diaconnG8Pump.month = getByteToInt(bufferData)  // 월 (1~12)
+        diaconnG8Pump.day = getByteToInt(bufferData)    // 일 (1~31)
+        diaconnG8Pump.hour = getByteToInt(bufferData)   // 시 (0~23)
+        diaconnG8Pump.minute = getByteToInt(bufferData) // 분 (0~59)
+        diaconnG8Pump.second = getByteToInt(bufferData) // 초 (0~59)
+
+        //4. pump system info
+        diaconnG8Pump.country = getByteToInt(bufferData).toChar().toString().toInt() // ASCII
+        diaconnG8Pump.productType = getByteToInt(bufferData).toChar().toString().toInt() // ASCII
+        diaconnG8Pump.makeYear = getByteToInt(bufferData)
+        diaconnG8Pump.makeMonth = getByteToInt(bufferData)
+        diaconnG8Pump.makeDay = getByteToInt(bufferData)
+        diaconnG8Pump.lotNo = getByteToInt(bufferData)// LOT NO
+        diaconnG8Pump.serialNo = getShortToInt(bufferData)
+        diaconnG8Pump.majorVersion = getByteToInt(bufferData)
+        diaconnG8Pump.minorVersion = getByteToInt(bufferData)
+
+        sp.putString(resourceHelper.gs(R.string.pumpversion), diaconnG8Pump.majorVersion.toString() + "." + diaconnG8Pump.minorVersion.toString())
+
+        // 5. pump log status
+        diaconnG8Pump.pumpLastLogNum = getShortToInt(bufferData) // last saved log no
+        diaconnG8Pump.pumpWrappingCount = getByteToInt(bufferData) // wrapping count
+
+        // 6. bolus speed status.
+        diaconnG8Pump.speed = getByteToInt(bufferData) // 식사주입속도
+
+        // 7. Tempbasal status
+        diaconnG8Pump.tbStatus = getByteToInt(bufferData) // 임시기저 상태
+        diaconnG8Pump.tbTime = getByteToInt(bufferData)    // 임시기저시간
+        diaconnG8Pump.tbInjectRateRatio = getShortToInt(bufferData) //임시기저 주입량/률
+        diaconnG8Pump.tbElapsedTime = getShortToInt(bufferData) // 임시기저 경과시간
+
+        // 8. Basal status
+        diaconnG8Pump.baseStatus = getByteToInt(bufferData) // 기저주입 상태
+        diaconnG8Pump.baseHour = getByteToInt(bufferData) // 현재 주입시간
+        diaconnG8Pump.baseAmount = getShortToInt(bufferData) / 100.0 // 주입설정량
+        diaconnG8Pump.baseInjAmount = getShortToInt(bufferData) / 100.0 // 현재 주입량
+
+        // 9. meal bolus status
+        diaconnG8Pump.mealKind = getByteToInt(bufferData) //식사주입 종류
+        diaconnG8Pump.mealStartTime = getIntToInt(bufferData) // 주입시작시간
+        diaconnG8Pump.mealStatus = getByteToInt(bufferData)  // 주입상태
+        diaconnG8Pump.mealAmount = getShortToInt(bufferData) / 100.0 // 주입설정량
+        diaconnG8Pump.mealInjAmount = getShortToInt(bufferData) / 100.0 // 주입량
+        diaconnG8Pump.mealSpeed = getByteToInt(bufferData) // 주입속도
+
+        // 10. snack bolus status
+        diaconnG8Pump.snackStatus = getByteToInt(bufferData) //주입상태
+        diaconnG8Pump.snackAmount = getShortToInt(bufferData) / 100.0 // 주입설정량
+        diaconnG8Pump.snackInjAmount = getShortToInt(bufferData) / 100.0 // 현재주입량
+        diaconnG8Pump.snackSpeed = getByteToInt(bufferData) //주입속도
+
+        // 11. square(extended) bolus status
+        diaconnG8Pump.squareStatus = getByteToInt(bufferData) // 주입상태
+        diaconnG8Pump.squareTime = getShortToInt(bufferData) // 설정 주입시간(10~300분)
+        diaconnG8Pump.squareInjTime = getShortToInt(bufferData) // 경과 주입시간(10~300분)
+        diaconnG8Pump.squareAmount = getShortToInt(bufferData) / 100.0  // 주입 설정량
+        diaconnG8Pump.squareInjAmount = getShortToInt(bufferData) / 100.0 // 현재 주입량
+
+        // 12. daul bolus status
+        diaconnG8Pump.dualStatus = getByteToInt(bufferData) // 주입상태
+        diaconnG8Pump.dualAmount = getShortToInt(bufferData) / 100.0 // 일반주입 설정량
+        diaconnG8Pump.dualInjAmount = getShortToInt(bufferData) / 100.0 // 일반주입량
+        diaconnG8Pump.dualSquareTime = getShortToInt(bufferData) // 스퀘어주입 설정시간(10~300분)
+        diaconnG8Pump.dualInjSquareTime = getShortToInt(bufferData) // 스퀘어주입 경과시간(10~300분)
+        diaconnG8Pump.dualSquareAmount = getShortToInt(bufferData) / 100.0 // 스퀘어주입 설정량
+        diaconnG8Pump.dualInjSquareAmount = getShortToInt(bufferData) / 100.0 // 스퀘어주입량
+
+        // 13. last injection  status
+        diaconnG8Pump.recentKind1 = getByteToInt(bufferData) // 최근-1 주입 종류(1=식사, 2=일반간식, 3=스퀘어회식, 4=더블회식)
+        diaconnG8Pump.recentTime1 = getIntToInt(bufferData) // 최근-1 주입 시간
+        diaconnG8Pump.recentAmount1 = getShortToInt(bufferData) / 100.0 // 최근-1 주입량
+        diaconnG8Pump.recentKind2 = getByteToInt(bufferData) // 최근-2 주입 종류(1=식사, 2=일반간식, 3=스퀘어회식, 4=더블회식)
+        diaconnG8Pump.recentTime2 = getIntToInt(bufferData) // 최근-2 주입 시간
+        diaconnG8Pump.recentAmount2 = getShortToInt(bufferData) / 100.0 // 최근-2 주입량
+
+        // 14. daily injection status
+        diaconnG8Pump.todayBaseAmount = getShortToInt(bufferData) / 100.0 // 기저주입 총량
+        diaconnG8Pump.todayMealAmount = getShortToInt(bufferData) / 100.0 // 식사주입 총량
+        diaconnG8Pump.todaySnackAmount = getShortToInt(bufferData) / 100.0  // 회식주입 총량
+
+        // 15. meat setting status
+        diaconnG8Pump.morningHour = getByteToInt(bufferData) // 아침 개시 시간(0~23)
+        diaconnG8Pump.morningAmount = getShortToInt(bufferData) / 100.0 // 아침 식전량
+        diaconnG8Pump.lunchHour = getByteToInt(bufferData) // 점심 개시 시간(0~23)
+        diaconnG8Pump.lunchAmount = getShortToInt(bufferData) / 100.0 // 점심 식전량
+        diaconnG8Pump.dinnerHour = getByteToInt(bufferData) // 저녁 개시 시간(0~23)
+        diaconnG8Pump.dinnerAmount = getShortToInt(bufferData) / 100.0 // 저녁 식전량
+
+        // 16. basal injection status at this hour
+        diaconnG8Pump.currentBasePattern = getByteToInt(bufferData) // 패턴 종류 (1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2)
+        diaconnG8Pump.currentBaseHour = getByteToInt(bufferData) // 현재주입시간(0~23)
+        diaconnG8Pump.currentBaseTbBeforeAmount = getShortToInt(bufferData) / 100.0 // 해당시간의 임시기저 계산 전 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+        diaconnG8Pump.currentBaseTbAfterAmount = getShortToInt(bufferData)/ 100.0 // 해당시간의 임시기저 계산 후 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+
+        // 17. saved basal pattern status
+        diaconnG8Pump.baseAmount1  = getShortToInt(bufferData) / 100.0  // 주입량 1(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount2  = getShortToInt(bufferData) / 100.0  // 주입량 2(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount3  = getShortToInt(bufferData) / 100.0  // 주입량 3(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount4  = getShortToInt(bufferData) / 100.0  // 주입량 4(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount5  = getShortToInt(bufferData) / 100.0  // 주입량 5(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount6  = getShortToInt(bufferData) / 100.0  // 주입량 6(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount7  = getShortToInt(bufferData) / 100.0  // 주입량 7(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount8  = getShortToInt(bufferData) / 100.0  // 주입량 8(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount9  = getShortToInt(bufferData) / 100.0  // 주입량 9(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount10 = getShortToInt(bufferData) / 100.0  // 주입량 10(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount11 = getShortToInt(bufferData) / 100.0  // 주입량 11(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount12 = getShortToInt(bufferData) / 100.0  // 주입량 12(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount13 = getShortToInt(bufferData) / 100.0  // 주입량 13(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount14 = getShortToInt(bufferData) / 100.0  // 주입량 14(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount15 = getShortToInt(bufferData) / 100.0  // 주입량 15(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount16 = getShortToInt(bufferData) / 100.0  // 주입량 16(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount17 = getShortToInt(bufferData) / 100.0  // 주입량 17(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount18 = getShortToInt(bufferData) / 100.0  // 주입량 18(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount19 = getShortToInt(bufferData) / 100.0  // 주입량 19(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount20 = getShortToInt(bufferData) / 100.0  // 주입량 20(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount21 = getShortToInt(bufferData) / 100.0  // 주입량 21(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount22 = getShortToInt(bufferData) / 100.0  // 주입량 22(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount23 = getShortToInt(bufferData) / 100.0  // 주입량 23(량*100, 23.25->2325, 15.2->1520)
+        diaconnG8Pump.baseAmount24 = getShortToInt(bufferData) / 100.0  // 주입량 24(량*100, 23.25->2325, 15.2->1520)
+
+        // pump time setting 'yyyy-MM-dd'T'HH:mm:ssZ'	“2019-07-04T12:30:30+0530”
+        val time  = DateTime(diaconnG8Pump.year, diaconnG8Pump.month, diaconnG8Pump.day, diaconnG8Pump.hour, diaconnG8Pump.minute, diaconnG8Pump.second)
+        diaconnG8Pump.setPumpTime(time.millis)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump time " + dateUtil.dateAndTimeString(time.millis))
+
+        // basal pattern from pump
+        diaconnG8Pump.pumpProfiles = Array(4) { Array(24) { 0.0 } }
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][0]  = diaconnG8Pump.baseAmount1
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][1]  = diaconnG8Pump.baseAmount2
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][2]  = diaconnG8Pump.baseAmount3
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][3]  = diaconnG8Pump.baseAmount4
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][4]  = diaconnG8Pump.baseAmount5
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][5]  = diaconnG8Pump.baseAmount6
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][6]  = diaconnG8Pump.baseAmount7
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][7]  = diaconnG8Pump.baseAmount8
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][8]  = diaconnG8Pump.baseAmount9
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][9]  = diaconnG8Pump.baseAmount10
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][10] = diaconnG8Pump.baseAmount11
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][11] = diaconnG8Pump.baseAmount12
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][12] = diaconnG8Pump.baseAmount13
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][13] = diaconnG8Pump.baseAmount14
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][14] = diaconnG8Pump.baseAmount15
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][15] = diaconnG8Pump.baseAmount16
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][16] = diaconnG8Pump.baseAmount17
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][17] = diaconnG8Pump.baseAmount18
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][18] = diaconnG8Pump.baseAmount19
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][19] = diaconnG8Pump.baseAmount20
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][20] = diaconnG8Pump.baseAmount21
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][21] = diaconnG8Pump.baseAmount22
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][22] = diaconnG8Pump.baseAmount23
+        diaconnG8Pump.pumpProfiles!![diaconnG8Pump.activeProfile][23] = diaconnG8Pump.baseAmount24
+
+        //incarnation no 처리
+        diaconnG8Pump.isPumpVersionGe2_63 = PumplogUtil.isPumpVersionGe(sp.getString(resourceHelper.gs(R.string.pumpversion), ""),2, 63)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "result > " + diaconnG8Pump.result)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemRemainInsulin > " + diaconnG8Pump.systemRemainInsulin)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemRemainBattery > " + diaconnG8Pump.systemRemainBattery)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemBasePattern > " + diaconnG8Pump.systemBasePattern)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemTbStatus > " + diaconnG8Pump.systemTbStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionMealStatus > " + diaconnG8Pump.systemInjectionMealStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionSnackStatus > " + diaconnG8Pump.systemInjectionSnackStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionSquareStatue > " + diaconnG8Pump.systemInjectionSquareStatue)
+        aapsLogger.debug(LTag.PUMPCOMM, "systemInjectionDualStatus > " + diaconnG8Pump.systemInjectionDualStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "basePauseStatus > " + diaconnG8Pump.basePauseStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "year > " + diaconnG8Pump.year)
+        aapsLogger.debug(LTag.PUMPCOMM, "month > " + diaconnG8Pump.month)
+        aapsLogger.debug(LTag.PUMPCOMM, "day > " + diaconnG8Pump.day)
+        aapsLogger.debug(LTag.PUMPCOMM, "hour > " + diaconnG8Pump.hour)
+        aapsLogger.debug(LTag.PUMPCOMM, "minute > " + diaconnG8Pump.minute)
+        aapsLogger.debug(LTag.PUMPCOMM, "second > " + diaconnG8Pump.second)
+        aapsLogger.debug(LTag.PUMPCOMM, "country > " + diaconnG8Pump.country)
+        aapsLogger.debug(LTag.PUMPCOMM, "productType > " + diaconnG8Pump.productType)
+        aapsLogger.debug(LTag.PUMPCOMM, "makeYear > " + diaconnG8Pump.makeYear)
+        aapsLogger.debug(LTag.PUMPCOMM, "makeMonth > " + diaconnG8Pump.makeMonth)
+        aapsLogger.debug(LTag.PUMPCOMM, "makeDay > " + diaconnG8Pump.makeDay)
+        aapsLogger.debug(LTag.PUMPCOMM, "lotNo > " + diaconnG8Pump.lotNo)
+        aapsLogger.debug(LTag.PUMPCOMM, "serialNo > " + diaconnG8Pump.serialNo)
+        aapsLogger.debug(LTag.PUMPCOMM, "majorVersion > " + diaconnG8Pump.majorVersion)
+        aapsLogger.debug(LTag.PUMPCOMM, "minorVersion > " + diaconnG8Pump.minorVersion)
+        aapsLogger.debug(LTag.PUMPCOMM, "lastNum  > " + diaconnG8Pump.pumpLastLogNum)
+        aapsLogger.debug(LTag.PUMPCOMM, "wrappingCount > " + diaconnG8Pump.pumpWrappingCount)
+        aapsLogger.debug(LTag.PUMPCOMM, "speed > " + diaconnG8Pump.speed)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbStatus > " + diaconnG8Pump.tbStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbTime> " + diaconnG8Pump.tbTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbInjectRateRatio > " + diaconnG8Pump.tbInjectRateRatio)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbElapsedTime > " + diaconnG8Pump.tbElapsedTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseStatus > " + diaconnG8Pump.baseStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseHour > " + diaconnG8Pump.baseHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount > " + diaconnG8Pump.baseAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseInjAmount > " + diaconnG8Pump.baseInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealKind > " + diaconnG8Pump.mealKind)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealStartTime > " + diaconnG8Pump.mealStartTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealStatus > " + diaconnG8Pump.mealStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealAmount > " + diaconnG8Pump.mealAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealInjAmount > " + diaconnG8Pump.mealInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "mealSpeed > " + diaconnG8Pump.mealSpeed)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackStatus > " + diaconnG8Pump.snackStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackAmount > " + diaconnG8Pump.snackAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackInjAmount > " + diaconnG8Pump.snackInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackSpeed > " + diaconnG8Pump.snackSpeed)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareStatus > " + diaconnG8Pump.squareStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareTime > " + diaconnG8Pump.squareTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareInjTime > " + diaconnG8Pump.squareInjTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareAmount > " + diaconnG8Pump.squareAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "squareInjAmount > " + diaconnG8Pump.squareInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualStatus > " + diaconnG8Pump.dualStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualAmount > " + diaconnG8Pump.dualAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualInjAmount > " + diaconnG8Pump.dualInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualSquareTime > " + diaconnG8Pump.dualSquareTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualInjSquareTime > " + diaconnG8Pump.dualInjSquareTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualSquareAmount > " + diaconnG8Pump.dualSquareAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dualInjSquareAmount> " + diaconnG8Pump.dualInjSquareAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentKind1  > " + diaconnG8Pump.recentKind1)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentTime1  > " + diaconnG8Pump.recentTime1)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentAmount1 > " + diaconnG8Pump.recentAmount1)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentKind2  	> " + diaconnG8Pump.recentKind2)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentTime2  	> " + diaconnG8Pump.recentTime2)
+        aapsLogger.debug(LTag.PUMPCOMM, "recentAmount2 > " + diaconnG8Pump.recentAmount2)
+        aapsLogger.debug(LTag.PUMPCOMM, "todayBaseAmount > " + diaconnG8Pump.todayBaseAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "todayMealAmount > " + diaconnG8Pump.todayMealAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "todaySnackAmount > " + diaconnG8Pump.todaySnackAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "morningHour  > " + diaconnG8Pump.morningHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "morningAmount > " + diaconnG8Pump.morningAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "lunchHour  > " + diaconnG8Pump.lunchHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "lunchAmount > " + diaconnG8Pump.lunchAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "dinnerHour  > " + diaconnG8Pump.dinnerHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "dinnerAmount > " + diaconnG8Pump.dinnerAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBasePattern > " + diaconnG8Pump.currentBasePattern)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBaseHour  > " + diaconnG8Pump.currentBaseHour)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBaseTbBeforeAmount > " + diaconnG8Pump.currentBaseTbBeforeAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "currentBaseTbAfterAmount > " + diaconnG8Pump.currentBaseTbAfterAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount1  > " + diaconnG8Pump.baseAmount1)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount2  > " + diaconnG8Pump.baseAmount2)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount3  > " + diaconnG8Pump.baseAmount3)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount4  > " + diaconnG8Pump.baseAmount4)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount5  > " + diaconnG8Pump.baseAmount5)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount6  > " + diaconnG8Pump.baseAmount6)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount7  > " + diaconnG8Pump.baseAmount7)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount8  > " + diaconnG8Pump.baseAmount8)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount9  > " + diaconnG8Pump.baseAmount9)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount10 > " + diaconnG8Pump.baseAmount10)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount11 > " + diaconnG8Pump.baseAmount11)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount12 > " + diaconnG8Pump.baseAmount12)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount13 > " + diaconnG8Pump.baseAmount13)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount14 > " + diaconnG8Pump.baseAmount14)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount15 > " + diaconnG8Pump.baseAmount15)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount16 > " + diaconnG8Pump.baseAmount16)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount17 > " + diaconnG8Pump.baseAmount17)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount18 > " + diaconnG8Pump.baseAmount18)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount19 > " + diaconnG8Pump.baseAmount19)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount20 > " + diaconnG8Pump.baseAmount20)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount21 > " + diaconnG8Pump.baseAmount21)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount22 > " + diaconnG8Pump.baseAmount22)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount23 > " + diaconnG8Pump.baseAmount23)
+        aapsLogger.debug(LTag.PUMPCOMM, "baseAmount24 > " + diaconnG8Pump.baseAmount24)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BIG_MAIN_INFO_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquirePacket.kt
new file mode 100644
index 0000000000..085bc5c294
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquirePacket.kt
@@ -0,0 +1,27 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BolusSpeedInquirePacket
+ */
+class BolusSpeedInquirePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x45.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedInquirePacket init ")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        return suffixEncode(prefixEncode(msgType, msgSeq, MSG_CON_END))
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BOLUS_SPEED_INQUIRE"
+
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquireResponsePacket.kt
new file mode 100644
index 0000000000..ccf9be256a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedInquireResponsePacket.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+
+/**
+ * BolusSpeedInquireResponsePacket
+ */
+class BolusSpeedInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var sp: SP
+
+    init {
+        msgType = 0x85.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectResult = defect(data)
+        if (defectResult != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result =  getByteToInt(bufferData)
+
+        if(!isSuccInquireResponseResult(result)) {
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.speed = getByteToInt(bufferData) //주입속도
+        sp.putString("g8_bolusspeed", diaconnG8Pump.speed.toString())
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${diaconnG8Pump.result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "bolusSpeed > " + diaconnG8Pump.speed)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BOLUS_SPEED_INQUIRE_RESPONSE"
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingPacket.kt
new file mode 100644
index 0000000000..ff4005a937
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingPacket.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BolusSpeedSettingPacket
+ */
+class BolusSpeedSettingPacket(
+    injector: HasAndroidInjector,
+    private var type: Int
+) : DiaconnG8Packet(injector) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x05
+        aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedSettingPacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.put(type.toByte()) // 명령코드
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BOLUS_SPEED_SETTING_PACKET"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingReportPacket.kt
new file mode 100644
index 0000000000..6008c76d12
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingReportPacket.kt
@@ -0,0 +1,40 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+
+/**
+ * BolusSpeedSettingReportPacket
+ */
+class BolusSpeedSettingReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var sp: SP
+    init {
+        msgType = 0xC5.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedSettingReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedSettingReportPacket Report Packet Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        diaconnG8Pump.speed   = getByteToInt(bufferData) // speed result
+        sp.putBoolean("diaconn_g8_isbolusspeedsync", true)
+        aapsLogger.debug(LTag.PUMPCOMM, "bolusSpeed   --> ${diaconnG8Pump.speed  }")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BOLUS_SPEED_SETTING_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingResponsePacket.kt
new file mode 100644
index 0000000000..8a5b22f5da
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/BolusSpeedSettingResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * BolusSpeedSettingResponsePacket
+ */
+class BolusSpeedSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x85.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedSettingResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "BolusSpeedSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_BOLUS_SPEED_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/ConfirmReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/ConfirmReportPacket.kt
new file mode 100644
index 0000000000..cb516e30fa
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/ConfirmReportPacket.kt
@@ -0,0 +1,38 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * ConfirmReportPacket
+ */
+class ConfirmReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var reqMsgType:Int? = null
+    init {
+        msgType = 0xE8.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "ConfirmReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "ConfirmReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        reqMsgType =  getByteToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump Report Confirm reqMsgType --> ${reqMsgType}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_CONFIRM_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8Packet.java b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8Packet.java
new file mode 100644
index 0000000000..922335e612
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8Packet.java
@@ -0,0 +1,320 @@
+package info.nightscout.androidaps.diaconn.packet;
+
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+
+import javax.inject.Inject;
+
+import dagger.android.HasAndroidInjector;
+import info.nightscout.androidaps.logging.AAPSLogger;
+import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.utils.DateUtil;
+
+public class DiaconnG8Packet {
+
+    @Inject AAPSLogger aapsLogger;
+    @Inject DateUtil dateUtil;
+
+    protected HasAndroidInjector injector;
+    private boolean received;
+    public boolean failed;
+    public byte msgType;
+
+    public static final int MSG_LEN = 20; // 메시지 길이(20바이트 패킷)
+    public static final int MSG_LEN_BIG = 182; // 메시지 길이(182바이트 대량패킷)
+    public static final byte SOP = (byte) 0xef; // 패킷 시작 바이트(20바이트 패킷)
+    public static final byte SOP_BIG =  (byte) 0xed; // 대량 패킷 시작 바이트(182바이트 대량패킷)
+    public static final byte MSG_TYPE_LOC = 1; // 메시지 종류 위치
+    public static final byte MSG_SEQ_LOC = 2; // 메시지 시퀀스번호 위치
+    public static final byte BT_MSG_DATA_LOC = 4; // 데이터 위치
+    public static final byte MSG_PAD =  (byte) 0xff; // 메시지 뒷부분 빈공간을 채우는 값
+    public static final byte MSG_CON_END =  (byte) 0x00; // 패킷 내용 끝
+    public static final byte MSG_CON_CONTINUE =  (byte) 0x01; // 패킷 내용 계속
+
+    /**
+     *  CRC 정보
+     */
+    private static final byte[] crc_table = {
+        (byte) 0x00, (byte) 0x25, (byte) 0x4A, (byte) 0x6F, (byte) 0x94, (byte) 0xB1, (byte) 0xDE, (byte) 0xFB,
+        (byte) 0x0D, (byte) 0x28, (byte) 0x47, (byte) 0x62, (byte) 0x99, (byte) 0xBC, (byte) 0xD3, (byte) 0xF6,
+        (byte) 0x1A, (byte) 0x3F, (byte) 0x50, (byte) 0x75, (byte) 0x8E, (byte) 0xAB, (byte) 0xC4, (byte) 0xE1,
+        (byte) 0x17, (byte) 0x32, (byte) 0x5D, (byte) 0x78, (byte) 0x83, (byte) 0xA6, (byte) 0xC9, (byte) 0xEC,
+        (byte) 0x34, (byte) 0x11, (byte) 0x7E, (byte) 0x5B, (byte) 0xA0, (byte) 0x85, (byte) 0xEA, (byte) 0xCF,
+        (byte) 0x39, (byte) 0x1C, (byte) 0x73, (byte) 0x56, (byte) 0xAD, (byte) 0x88, (byte) 0xE7, (byte) 0xC2,
+        (byte) 0x2E, (byte) 0x0B, (byte) 0x64, (byte) 0x41, (byte) 0xBA, (byte) 0x9F, (byte) 0xF0, (byte) 0xD5,
+        (byte) 0x23, (byte) 0x06, (byte) 0x69, (byte) 0x4C, (byte) 0xB7, (byte) 0x92, (byte) 0xFD, (byte) 0xD8,
+        (byte) 0x68, (byte) 0x4D, (byte) 0x22, (byte) 0x07, (byte) 0xFC, (byte) 0xD9, (byte) 0xB6, (byte) 0x93,
+        (byte) 0x65, (byte) 0x40, (byte) 0x2F, (byte) 0x0A, (byte) 0xF1, (byte) 0xD4, (byte) 0xBB, (byte) 0x9E,
+        (byte) 0x72, (byte) 0x57, (byte) 0x38, (byte) 0x1D, (byte) 0xE6, (byte) 0xC3, (byte) 0xAC, (byte) 0x89,
+        (byte) 0x7F, (byte) 0x5A, (byte) 0x35, (byte) 0x10, (byte) 0xEB, (byte) 0xCE, (byte) 0xA1, (byte) 0x84,
+        (byte) 0x5C, (byte) 0x79, (byte) 0x16, (byte) 0x33, (byte) 0xC8, (byte) 0xED, (byte) 0x82, (byte) 0xA7,
+        (byte) 0x51, (byte) 0x74, (byte) 0x1B, (byte) 0x3E, (byte) 0xC5, (byte) 0xE0, (byte) 0x8F, (byte) 0xAA,
+        (byte) 0x46, (byte) 0x63, (byte) 0x0C, (byte) 0x29, (byte) 0xD2, (byte) 0xF7, (byte) 0x98, (byte) 0xBD,
+        (byte) 0x4B, (byte) 0x6E, (byte) 0x01, (byte) 0x24, (byte) 0xDF, (byte) 0xFA, (byte) 0x95, (byte) 0xB0,
+        (byte) 0xD0, (byte) 0xF5, (byte) 0x9A, (byte) 0xBF, (byte) 0x44, (byte) 0x61, (byte) 0x0E, (byte) 0x2B,
+        (byte) 0xDD, (byte) 0xF8, (byte) 0x97, (byte) 0xB2, (byte) 0x49, (byte) 0x6C, (byte) 0x03, (byte) 0x26,
+        (byte) 0xCA, (byte) 0xEF, (byte) 0x80, (byte) 0xA5, (byte) 0x5E, (byte) 0x7B, (byte) 0x14, (byte) 0x31,
+        (byte) 0xC7, (byte) 0xE2, (byte) 0x8D, (byte) 0xA8, (byte) 0x53, (byte) 0x76, (byte) 0x19, (byte) 0x3C,
+        (byte) 0xE4, (byte) 0xC1, (byte) 0xAE, (byte) 0x8B, (byte) 0x70, (byte) 0x55, (byte) 0x3A, (byte) 0x1F,
+        (byte) 0xE9, (byte) 0xCC, (byte) 0xA3, (byte) 0x86, (byte) 0x7D, (byte) 0x58, (byte) 0x37, (byte) 0x12,
+        (byte) 0xFE, (byte) 0xDB, (byte) 0xB4, (byte) 0x91, (byte) 0x6A, (byte) 0x4F, (byte) 0x20, (byte) 0x05,
+        (byte) 0xF3, (byte) 0xD6, (byte) 0xB9, (byte) 0x9C, (byte) 0x67, (byte) 0x42, (byte) 0x2D, (byte) 0x08,
+        (byte) 0xB8, (byte) 0x9D, (byte) 0xF2, (byte) 0xD7, (byte) 0x2C, (byte) 0x09, (byte) 0x66, (byte) 0x43,
+        (byte) 0xB5, (byte) 0x90, (byte) 0xFF, (byte) 0xDA, (byte) 0x21, (byte) 0x04, (byte) 0x6B, (byte) 0x4E,
+        (byte) 0xA2, (byte) 0x87, (byte) 0xE8, (byte) 0xCD, (byte) 0x36, (byte) 0x13, (byte) 0x7C, (byte) 0x59,
+        (byte) 0xAF, (byte) 0x8A, (byte) 0xE5, (byte) 0xC0, (byte) 0x3B, (byte) 0x1E, (byte) 0x71, (byte) 0x54,
+        (byte) 0x8C, (byte) 0xA9, (byte) 0xC6, (byte) 0xE3, (byte) 0x18, (byte) 0x3D, (byte) 0x52, (byte) 0x77,
+        (byte) 0x81, (byte) 0xA4, (byte) 0xCB, (byte) 0xEE, (byte) 0x15, (byte) 0x30, (byte) 0x5F, (byte) 0x7A,
+        (byte) 0x96, (byte) 0xB3, (byte) 0xDC, (byte) 0xF9, (byte) 0x02, (byte) 0x27, (byte) 0x48, (byte) 0x6D,
+        (byte) 0x9B, (byte) 0xBE, (byte) 0xD1, (byte) 0xF4, (byte) 0x0F, (byte) 0x2A, (byte) 0x45, (byte) 0x60
+    };
+
+    public DiaconnG8Packet(HasAndroidInjector injector) {
+        this.received = false;
+        this.failed = false;
+        this.injector = injector;
+        injector.androidInjector().inject(this);
+    }
+
+    public boolean success() {
+        return !failed;
+    }
+    public void setReceived() {
+        received = true;
+    }
+
+    public boolean isReceived() {
+        return received;
+    }
+
+    // 패킷 인코딩 앞부분
+    public ByteBuffer prefixEncode(byte msgType, int msgSeq, byte msgConEnd) {
+        ByteBuffer buffer = ByteBuffer.allocate(MSG_LEN);
+        buffer.order(ByteOrder.LITTLE_ENDIAN);
+        buffer.put(SOP);
+        buffer.put(msgType);
+        buffer.put((byte) msgSeq);
+        buffer.put(msgConEnd);
+        return buffer;
+    }
+
+    // 패킷 인코딩 뒷부분
+    public byte[] suffixEncode(ByteBuffer buffer) {
+        int remainSize = MSG_LEN - buffer.position() - 1;
+        for (int i = 0; i < remainSize; i++) {
+            buffer.put(MSG_PAD);
+        }
+        byte crc = getCRC(buffer.array(), MSG_LEN - 1);
+        buffer.put(crc);
+        return buffer.array();
+    }
+
+    // 패킷 디코딩 앞부분
+    protected static ByteBuffer prefixDecode(byte[] bytes) {
+        ByteBuffer buffer = ByteBuffer.wrap(bytes);
+        buffer.order(ByteOrder.LITTLE_ENDIAN);
+        buffer.position(BT_MSG_DATA_LOC);
+        return buffer;
+    }
+
+    public int getType(byte[] bytes) {
+        return (bytes[MSG_TYPE_LOC] & 0xC0) >> 6;
+    } //상위 2비트 획득
+
+    public int getCmd(byte[] bytes) {
+        return bytes[MSG_TYPE_LOC];
+    }
+
+    public int getSeq(byte[] bytes) {
+        return bytes[MSG_SEQ_LOC];
+    }
+
+    public static int getByteToInt(ByteBuffer buffer) {
+        return buffer.get() & 0xff;
+    }
+
+    public static int getShortToInt(ByteBuffer buffer) {
+        return buffer.getShort() & 0xffff;
+    }
+
+    public static int getIntToInt(ByteBuffer buffer) {
+        return buffer.getInt();
+    }
+
+    public static byte[] getBytes(ByteBuffer buffer, int limit) {
+        ByteBuffer data = ByteBuffer.allocate(MSG_LEN);
+        int orgPos = buffer.position();
+        int orgLimit = buffer.limit();
+        buffer.limit(buffer.position() + limit);
+        data.put(buffer);
+        buffer.position(orgPos);
+        buffer.limit(orgLimit);
+        return data.array();
+    }
+
+    // CRC 체크
+    static byte getCRC(byte[] data, int length) {
+        int i = 0;
+        byte crc = 0;
+        while (length-- != 0) {
+            crc = crc_table[(crc ^ data[i]) & 0xFF];
+            i++;
+        }
+        return crc;
+    }
+
+    // 패킷 결함 체크
+    public static int defect(byte[] bytes) {
+        int result = 0;
+        if (bytes[0] != SOP && bytes[0] != SOP_BIG) {
+            // Start Code Check
+            result = 98;
+        } else if ((bytes[0] == SOP && bytes.length != MSG_LEN) ||
+            (bytes[0] == SOP_BIG && bytes.length != MSG_LEN_BIG)) {
+            // 패킷 길이 체크
+            result = 97;
+        } else if (bytes[bytes.length - 1] != getCRC(bytes, bytes.length - 1)) {
+            // CRC 체크
+            result = 99;
+        }
+        return result;
+    }
+
+    public byte[] encode(int msgSeq) { return new byte[0]; }
+
+
+    public static String toHex(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (final byte b : bytes)
+            sb.append(String.format("%02x ", b & 0xff));
+        return sb.toString();
+    }
+
+    public static String toNarrowHex(byte[] packet) {
+        StringBuilder sb = new StringBuilder();
+        for (final byte b : packet)
+            sb.append(String.format("%02x", b & 0xff));
+        return sb.toString();
+    }
+
+    public void handleMessage(byte[] data) { }
+
+    public String getFriendlyName() {
+        return "UNKNOWN_PACKET";
+    }
+
+    public Boolean isSuccInquireResponseResult(int result) {
+        boolean isSuccess = false;
+        switch (result) {
+            case 16 :
+                isSuccess =  true;
+                break;
+            case 17 :
+                aapsLogger.error(LTag.PUMPCOMM, "Packet CRC error");
+                break;
+
+            case 18 :
+                aapsLogger.error(LTag.PUMPCOMM, "Parameter error.");
+                break;
+
+            case 19 :
+                aapsLogger.error(LTag.PUMPCOMM, "Protocol specification error.");
+                break;
+
+            default:
+                aapsLogger.error(LTag.PUMPCOMM, "System error.");
+                break;
+        }
+        return isSuccess;
+    }
+
+    public Boolean isSuccSettingResponseResult(int result) {
+        boolean isSuccess = false;
+        switch (result) {
+            case 0:
+                isSuccess = true;
+                break;
+            case 1:
+                aapsLogger.error(LTag.PUMPCOMM, "Packet CRC error");
+                break;
+
+            case 2:
+                aapsLogger.error(LTag.PUMPCOMM, "Parameter error.");
+                break;
+
+            case 3:
+                aapsLogger.error(LTag.PUMPCOMM, "Protocol specification error.");
+                break;
+
+            case 4:
+                aapsLogger.error(LTag.PUMPCOMM, "Eating timeout, not injectable.");
+                break;
+
+            case 6:
+                aapsLogger.error(LTag.PUMPCOMM, "Pump canceled it.");
+                break;
+
+            case 7:
+                aapsLogger.error(LTag.PUMPCOMM, "In the midst of other operations, limited app setup capabilities");
+                break;
+
+            case 8:
+                aapsLogger.error(LTag.PUMPCOMM, "During another bolus injection, injection is restricted");
+                break;
+
+            case 9:
+                aapsLogger.error(LTag.PUMPCOMM, "Basal release is required.");
+                break;
+
+            case 10:
+                aapsLogger.error(LTag.PUMPCOMM, "Canceled due to the opt number did not match.");
+                break;
+
+            case 11:
+                aapsLogger.error(LTag.PUMPCOMM, "Injection is not possible due to low battery.");
+                break;
+
+            case 12:
+                aapsLogger.error(LTag.PUMPCOMM, "Injection is not possible due to low insulin. ");
+                break;
+
+            case 13:
+                aapsLogger.error(LTag.PUMPCOMM, "Can't inject due to 1 time limit exceeded.");
+                break;
+
+            case 14:
+                aapsLogger.error(LTag.PUMPCOMM, "It cannot be injected due to an excess of injection volume today");
+                break;
+
+            case 15:
+                aapsLogger.error(LTag.PUMPCOMM, "After base setting is completed, base injection can be made.");
+                break;
+
+            case 32:
+                aapsLogger.error(LTag.PUMPCOMM, "During LGS running, injection is restricted");
+                break;
+
+            case 33:
+                aapsLogger.error(LTag.PUMPCOMM, "LGS status is ON, ON Command is declined.");
+                break;
+
+            case 34:
+                aapsLogger.error(LTag.PUMPCOMM, "LGS status is OFF, OFF Command is declined.");
+                break;
+
+            case 35:
+                aapsLogger.error(LTag.PUMPCOMM, "Tempbasal start is rejected  when tempbasal is running");
+                break;
+
+            case 36:
+                aapsLogger.error(LTag.PUMPCOMM, "Tempbasal stop is rejected  when tempbasal is not running");
+                break;
+
+            default:
+                aapsLogger.error(LTag.PUMPCOMM, "It cannot be set to a system error.");
+                break;
+
+        }
+        return isSuccess;
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt
new file mode 100644
index 0000000000..5c6c984e14
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8ResponseMessageHashTable.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class DiaconnG8ResponseMessageHashTable @Inject constructor(val injector: HasAndroidInjector) {
+    var messages: HashMap<Int, DiaconnG8Packet> = HashMap()
+
+    fun put(message: DiaconnG8Packet) {
+        messages[message.msgType.toInt()] = message
+    }
+
+    fun findMessage(command: Int): DiaconnG8Packet {
+        return messages[command] ?: DiaconnG8Packet(injector)
+    }
+
+    init {
+        put(BigMainInfoInquireResponsePacket(injector))
+        put(BigAPSMainInfoInquireResponsePacket(injector))
+        put(BigLogInquireResponsePacket(injector))
+        put(InjectionSnackInquireResponsePacket(injector))
+        put(SneckLimitInquireResponsePacket(injector))
+        put(BasalLimitInquireResponsePacket(injector))
+        put(TempBasalInquireResponsePacket(injector))
+        put(TimeInquirePacket(injector))
+        put(TimeInquireResponsePacket(injector))
+        put(TimeReportPacket(injector))
+        put(LogStatusInquireResponsePacket(injector))
+        put(IncarnationInquireResponsePacket(injector))
+        put(BolusSpeedInquireResponsePacket(injector))
+        put(SoundInquireResponsePacket(injector))
+        put(DisplayTimeInquireResponsePacket(injector))
+        put(LanguageInquireResponsePacket(injector))
+
+
+        // Report Packet
+        put(BasalPauseReportPacket(injector))
+        put(BasalSettingReportPacket(injector))
+        put(ConfirmReportPacket(injector))
+        put(InjectionBasalReportPacket(injector))
+        put(RejectReportPacket(injector))
+        put(TempBasalReportPacket(injector))
+        put(InjectionSnackResultReportPacket(injector))
+        put(InjectionExtendedBolusResultReportPacket(injector))
+        put(InsulinLackReportPacket(injector))
+        put(BatteryWarningReportPacket(injector))
+        put(InjectionBlockReportPacket(injector))
+        put(BolusSpeedSettingReportPacket(injector))
+    }
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8SettingResponseMessageHashTable.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8SettingResponseMessageHashTable.kt
new file mode 100644
index 0000000000..cd2d32a293
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DiaconnG8SettingResponseMessageHashTable.kt
@@ -0,0 +1,36 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class DiaconnG8SettingResponseMessageHashTable @Inject constructor(val injector: HasAndroidInjector) {
+    var messages: HashMap<Int, DiaconnG8Packet> = HashMap()
+
+    fun put(message: DiaconnG8Packet) {
+        messages[message.msgType.toInt()] = message
+    }
+
+    fun findMessage(command: Int): DiaconnG8Packet {
+        return messages[command] ?: DiaconnG8Packet(injector)
+    }
+
+    init {
+        put(AppCancelSettingResponsePacket(injector))
+        put(AppConfirmSettingResponsePacket(injector))
+        put(BasalPauseSettingResponsePacket(injector))
+        put(BasalSettingResponsePacket(injector))
+        put(TempBasalSettingResponsePacket(injector))
+        put(TimeSettingResponsePacket(injector))
+        put(InjectionBasalSettingResponsePacket(injector))
+        put(InjectionSnackSettingResponsePacket(injector))
+        put(InjectionExtendedBolusSettingResponsePacket(injector))
+        put(InjectionCancelSettingResponsePacket(injector))
+        put(SoundSettingResponsePacket(injector))
+        put(DisplayTimeoutSettingResponsePacket(injector))
+        put(LanguageSettingResponsePacket(injector))
+        put(BolusSpeedSettingResponsePacket(injector))
+    }
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquirePacket.kt
new file mode 100644
index 0000000000..9c0692ab45
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquirePacket.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * DisplayTimeInquirePacket
+ */
+class DisplayTimeInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x4E.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "DisplayTimeInquirePacket request")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_DISPLAY_TIME_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquireResponsePacket.kt
new file mode 100644
index 0000000000..5d1b7df047
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeInquireResponsePacket.kt
@@ -0,0 +1,45 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * DisplayTimeInquireResponsePacket
+ */
+class DisplayTimeInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x8E.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "DisplayTimeInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "DisplayTimeInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.lcdOnTimeSec =  getByteToInt(bufferData)
+
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${diaconnG8Pump.result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "lcdOnTimeSec --> ${diaconnG8Pump.lcdOnTimeSec}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_DISPLAY_TIME_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingPacket.kt
new file mode 100644
index 0000000000..bbd462cc0c
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingPacket.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * DisplayTimeoutSettingPacket
+ */
+class DisplayTimeoutSettingPacket(
+    injector: HasAndroidInjector,
+    private var type: Int
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x0E
+        aapsLogger.debug(LTag.PUMPCOMM, "DisplayTimeoutSettingPacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.put(type.toByte()) // cmd
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_DISPLAY_TIMEOUT_SETTING_PACKET"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt
new file mode 100644
index 0000000000..d3a1aff191
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/DisplayTimeoutSettingResponsePacket.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * DisplayTimeoutSettingResponsePacket
+ */
+class DisplayTimeoutSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x8E.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "DisplayTimeoutSettingResponsePacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "DisplayTimeoutSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result = getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_DISPLAY_TIMEOUT_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquirePacket.kt
new file mode 100644
index 0000000000..34f99c6ff6
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquirePacket.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+
+ * IncarnationInquirePacket
+ */
+class IncarnationInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x7A
+        aapsLogger.debug(LTag.PUMPCOMM, "IncarnationInquirePacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INCARNATION_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt
new file mode 100644
index 0000000000..55aedbcf05
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/IncarnationInquireResponsePacket.kt
@@ -0,0 +1,50 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import javax.inject.Inject
+
+/**
+ * IncarnationInquireResponsePacket
+ */
+open class IncarnationInquireResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    var result = 0
+    init {
+        msgType = 0xBA.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "IncarnationInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "IncarnationInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result)) {
+            failed = true
+            return
+        }
+        // 5. 로그상태 조회
+        diaconnG8Pump.pumpIncarnationNum = getShortToInt(bufferData) // 펌프 Incarnation 번호
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "pumpIncarnationNum > " + diaconnG8Pump.pumpIncarnationNum)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INCARNATION_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalReportPacket.kt
new file mode 100644
index 0000000000..503c5bacb1
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalReportPacket.kt
@@ -0,0 +1,37 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionBasalReportPacket
+ */
+class InjectionBasalReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0xCC.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionBasalReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionBasalReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        diaconnG8Pump.systemBasePattern =  getByteToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump Report BasalPattern --> ${diaconnG8Pump.systemBasePattern} (1:basic, 2: life1 , 3: life2 , 4: life3 , 5:dr1, 6:dr2) ")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_BASAL_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingPacket.kt
new file mode 100644
index 0000000000..4e9cbf546b
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingPacket.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionBasalSettingPacket
+ */
+class InjectionBasalSettingPacket(
+    injector: HasAndroidInjector,
+    private val pattern:Int
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x0C.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionBasalSettingPacket init ")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        buffer.put(pattern.toByte())
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_BASAL_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingResponsePacket.kt
new file mode 100644
index 0000000000..921b7cfdf8
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBasalSettingResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionBasalSettingResponsePacket
+ */
+class InjectionBasalSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x8C.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionBasalSettingResponsePacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionBasalSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result = getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_BASAL_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBlockReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBlockReportPacket.kt
new file mode 100644
index 0000000000..0ff1cd6181
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionBlockReportPacket.kt
@@ -0,0 +1,45 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionBlockReportPacket
+ */
+class InjectionBlockReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0xD8.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionBlockReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionBasalReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        diaconnG8Pump.injectionBlockGrade = getByteToInt(bufferData)
+        diaconnG8Pump.injectionBlockProcess = getByteToInt(bufferData)
+        diaconnG8Pump.injectionBlockRemainAmount = getShortToInt(bufferData) / 100.0
+        diaconnG8Pump.injectionBlockType =  getByteToInt(bufferData)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "injectionBlockGrade --> ${diaconnG8Pump.injectionBlockGrade} (1:info, 2: warning , 3: major , 4: critical)")
+        aapsLogger.debug(LTag.PUMPCOMM, "injectionBlockProcess --> ${diaconnG8Pump.injectionBlockProcess} (1:skip, 2: stop , 3: ignore ) ")
+        aapsLogger.debug(LTag.PUMPCOMM, "injectionBlockReaminAmount --> ${diaconnG8Pump.injectionBlockRemainAmount}  ")
+        aapsLogger.debug(LTag.PUMPCOMM, "injectionBlockType --> ${diaconnG8Pump.injectionBlockType} (1:basal, 2: meal , 3: normal , 4: square , 5:dual, 6:tube, 7:needle) ")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_BLOCK_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingPacket.kt
new file mode 100644
index 0000000000..b883154ad9
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingPacket.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionCancelSettingPacket
+ */
+class InjectionCancelSettingPacket(
+    injector: HasAndroidInjector,
+    private var reqMsgType: Byte, // 명령코드
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x2B
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionCancelSettingPacket INIT")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.put(reqMsgType)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_CANCEL_SETTING_REQUEST"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingResponsePacket.kt
new file mode 100644
index 0000000000..922198207d
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionCancelSettingResponsePacket.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionCancelSettingResponsePacket
+ */
+class InjectionCancelSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0xAB.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionCancelSettingResponsePacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionCancelSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result = getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_CANCEL_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt
new file mode 100644
index 0000000000..53f2f6e96e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusResultReportPacket.kt
@@ -0,0 +1,56 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+/**
+ * InjectionExtendedBolusResultReportPacket
+ */
+class InjectionExtendedBolusResultReportPacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    init {
+        msgType = 0xe5.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionExtendedBolusResultReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionExtendedBolusResultReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+
+        val result = getByteToInt(bufferData) // 0: success , 1: user stop, 2:fail
+        val settingMinutes = getShortToInt(bufferData)
+        val elapsedTime = getShortToInt(bufferData)
+        val bolusAmountToBeDelivered  = getShortToInt(bufferData) / 100.0
+        val deliveredBolusAmount = getShortToInt(bufferData) / 100.0
+
+        diaconnG8Pump.isExtendedInProgress = result == 0
+        diaconnG8Pump.squareTime = settingMinutes
+        diaconnG8Pump.squareInjTime = elapsedTime
+        diaconnG8Pump.squareAmount = bolusAmountToBeDelivered
+        diaconnG8Pump.squareInjAmount = deliveredBolusAmount
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result: $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus running: " + diaconnG8Pump.squareAmount + " U/h")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus duration: " + diaconnG8Pump.squareTime + " min")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus so far: " + diaconnG8Pump.squareInjTime + " min")
+        aapsLogger.debug(LTag.PUMPCOMM, "Extended bolus delivered so far: " + diaconnG8Pump.squareInjAmount + " U")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_EXTENDED_BOLUS_RESULT_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingPacket.kt
new file mode 100644
index 0000000000..e9f119862a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingPacket.kt
@@ -0,0 +1,35 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionExtendedBolusSettingPacket
+ */
+class InjectionExtendedBolusSettingPacket(
+    injector: HasAndroidInjector,
+    private val amount: Int,
+    private val minutes: Int,
+    private val bcDttm:Long
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x08.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionExtendedBolusSettingPacket init ")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.putShort(minutes.toShort())
+        buffer.putShort(amount.toShort())
+        buffer.putInt(bcDttm.toInt())
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_EXTENDED_BOLUS_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt
new file mode 100644
index 0000000000..051612ba2c
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionExtendedBolusSettingResponsePacket.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionExtendedBolusSettingResponsePacket
+ */
+class InjectionExtendedBolusSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x88.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionExtendedBolusSettingResponsePacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionExtendedBolusSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result = getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_EXTENDED_BOLUS_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingPacket.kt
new file mode 100644
index 0000000000..ed901b9187
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingPacket.kt
@@ -0,0 +1,33 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionMealSettingPacket
+ */
+class InjectionMealSettingPacket(
+    injector: HasAndroidInjector,
+    private val amount:Int,
+    private val bcDttm:Long
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x06.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionMealSettingPacket init ")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        buffer.putShort(amount.toShort())
+        buffer.putLong(bcDttm)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_MEAL_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingResponsePacket.kt
new file mode 100644
index 0000000000..802e95985e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionMealSettingResponsePacket.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionMealSettingResponsePacket
+ */
+class InjectionMealSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x86.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionMealSettingResponsePacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionMealSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result = getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_MEAL_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquirePacket.kt
new file mode 100644
index 0000000000..a9e82f1953
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquirePacket.kt
@@ -0,0 +1,26 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionSneckInquirePacket
+ */
+class InjectionSnackInquirePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x47.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackInquirePacket init ")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        return suffixEncode(prefixEncode(msgType, msgSeq, MSG_CON_END))
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_SNACK_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquireResponsePacket.kt
new file mode 100644
index 0000000000..4ff2b27c9e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackInquireResponsePacket.kt
@@ -0,0 +1,51 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionSnackInquireResponsePacket
+ */
+class InjectionSnackInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x87.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.snackStatus = getByteToInt(bufferData) //주입상태
+        diaconnG8Pump.snackAmount = getShortToInt(bufferData) / 100.0 // 주입설정량
+        diaconnG8Pump.snackInjAmount = getShortToInt(bufferData) / 100.0 // 현재주입량
+        diaconnG8Pump.snackSpeed = getByteToInt(bufferData) //주입속도
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result2")
+        aapsLogger.debug(LTag.PUMPCOMM, "snackStatus > " + diaconnG8Pump.snackStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackAmount > " + diaconnG8Pump.snackAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackInjAmount > " + diaconnG8Pump.snackInjAmount)
+        aapsLogger.debug(LTag.PUMPCOMM, "snackSpeed > " + diaconnG8Pump.snackSpeed)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_SNACK_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt
new file mode 100644
index 0000000000..a85c35002b
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackResultReportPacket.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import javax.inject.Inject
+
+/**
+ * InjectionSnackResultReportPacket
+ */
+class InjectionSnackResultReportPacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var resourceHelper: ResourceHelper
+
+    init {
+        msgType = 0xe4.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackResultReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackResultReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result = getByteToInt(bufferData)
+        val bolusAmountToBeDelivered = getShortToInt(bufferData)/100.0
+        val deliveredBolusAmount  = getShortToInt(bufferData)/100.0
+
+        diaconnG8Pump.bolusAmountToBeDelivered = bolusAmountToBeDelivered
+        diaconnG8Pump.lastBolusAmount = deliveredBolusAmount
+        diaconnG8Pump.lastBolusTime = dateUtil.now()
+        diaconnG8Pump.bolusingTreatment?.insulin = deliveredBolusAmount
+
+        if(result == 1) {
+            diaconnG8Pump.bolusStopped = true // 주입 중 취소 처리!
+        }
+        diaconnG8Pump.bolusDone = true // 주입완료 처리!
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "bolusAmountToBeDelivered --> ${diaconnG8Pump.bolusAmountToBeDelivered}")
+        aapsLogger.debug(LTag.PUMPCOMM, "lastBolusAmount --> ${diaconnG8Pump.lastBolusAmount}")
+        aapsLogger.debug(LTag.PUMPCOMM, "lastBolusTime --> ${diaconnG8Pump.lastBolusTime}")
+        aapsLogger.debug(LTag.PUMPCOMM, "diaconnG8Pump.bolusingTreatment?.insulin --> ${diaconnG8Pump.bolusingTreatment?.insulin}")
+        aapsLogger.debug(LTag.PUMPCOMM, "bolusDone --> ${diaconnG8Pump.bolusDone}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_SNACK_REPORT"
+
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingPacket.kt
new file mode 100644
index 0000000000..5312aa348e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingPacket.kt
@@ -0,0 +1,31 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionSnackSettingPacket
+ */
+class InjectionSnackSettingPacket(
+    injector: HasAndroidInjector,
+    private val amount:Int
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x07.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackSettingPacket init ")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        buffer.putShort(amount.toShort())
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_SNACK_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingResponsePacket.kt
new file mode 100644
index 0000000000..aa60b70c1a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InjectionSnackSettingResponsePacket.kt
@@ -0,0 +1,46 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InjectionSnackSettingResponsePacket
+ */
+class InjectionSnackSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x87.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackSettingResponsePacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InjectionSnackSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result = getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_SNACK_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InsulinLackReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InsulinLackReportPacket.kt
new file mode 100644
index 0000000000..8fd6da5981
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/InsulinLackReportPacket.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * InsulinLackReportPacket
+ */
+class InsulinLackReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0xD8.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "InsulinLackReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "InsulinLackReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        diaconnG8Pump.insulinWarningGrade = getByteToInt(bufferData)
+        diaconnG8Pump.insulinWarningProcess = getByteToInt(bufferData)
+        diaconnG8Pump.insulinWarningRemain = getByteToInt(bufferData)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "insulinWarningGrade --> ${diaconnG8Pump.insulinWarningGrade} (1:info, 2: warning , 3: major , 4: critical)")
+        aapsLogger.debug(LTag.PUMPCOMM, "insulinWarningProcess --> ${diaconnG8Pump.insulinWarningProcess} (1:skip, 2: stop , 3: ignore ) ")
+        aapsLogger.debug(LTag.PUMPCOMM, "insulinWarningRemain --> ${diaconnG8Pump.insulinWarningRemain} (0~100%) ")
+
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_INJECTION_LACK_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquirePacket.kt
new file mode 100644
index 0000000000..7bca3e499b
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquirePacket.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * LanguageInquirePacket
+ */
+class LanguageInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x60.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "LanguageInquirePacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_LANGUAGE_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquireResponsePacket.kt
new file mode 100644
index 0000000000..6c493ca145
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageInquireResponsePacket.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * LanguageInquireResponsePacket
+ */
+class LanguageInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0xA0.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "LanguageInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "LanguageInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+        diaconnG8Pump.selectedLanguage =  getByteToInt(bufferData)
+
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${diaconnG8Pump.result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "selectedLanguage --> ${diaconnG8Pump.selectedLanguage}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_LANGUAGE_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingPacket.kt
new file mode 100644
index 0000000000..fd0f35f1cc
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingPacket.kt
@@ -0,0 +1,32 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * LanguageSettingPacket
+ */
+class LanguageSettingPacket(
+    injector: HasAndroidInjector,
+    private var type: Int
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x20
+        aapsLogger.debug(LTag.PUMPCOMM, "LanguageSettingPacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.put(type.toByte()) // 명령코드
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_LANGUAGE_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingResponsePacket.kt
new file mode 100644
index 0000000000..4a560dd979
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LanguageSettingResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * LanguageSettingResponsePacket
+ */
+class LanguageSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0xA0.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "LanguageSettingResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "LanguageSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_LANGUAGE_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquirePacket.kt
new file mode 100644
index 0000000000..29f5823037
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquirePacket.kt
@@ -0,0 +1,28 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * LogStatusInquirePacket
+ */
+class LogStatusInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    init {
+        msgType = 0x56
+        aapsLogger.debug(LTag.PUMPCOMM, "LogStatusInquirePacket INIT")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_LOG_STATUS_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquireResponsePacket.kt
new file mode 100644
index 0000000000..441afe753e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/LogStatusInquireResponsePacket.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * LogStatusInquireResponsePacket
+ */
+open class LogStatusInquireResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    var result = 0
+    init {
+        msgType = 0x96.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "LogStatusInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "LogStatusInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result)) {
+            failed = true
+            return
+        }
+        // 5. 로그상태 조회
+        diaconnG8Pump.pumpLastLogNum = getShortToInt(bufferData) // 마지막 저장로그번호
+        diaconnG8Pump.pumpWrappingCount = getByteToInt(bufferData) // wrapping 카운트
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "pumpLastLogNum > " + diaconnG8Pump.pumpLastLogNum)
+        aapsLogger.debug(LTag.PUMPCOMM, "pumpWrappingCount> " + diaconnG8Pump.pumpWrappingCount)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_LOG_STATUS_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/RejectReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/RejectReportPacket.kt
new file mode 100644
index 0000000000..7c8871b0f6
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/RejectReportPacket.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * RejectReportPacket
+ */
+class RejectReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var reqMsgType:Int? = null
+    var reason:Int? = null
+    init {
+        msgType = 0xE2.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "RejectReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "RejectReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        reqMsgType =  getByteToInt(bufferData)
+        reason =  getByteToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "reqMsgType --> $reqMsgType")
+        aapsLogger.debug(LTag.PUMPCOMM, "Reject Reason --> $reason (6:cancel, 10:timeout) ")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_REJECT_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquirePacket.kt
new file mode 100644
index 0000000000..983887eccb
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquirePacket.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * SneckLimitInquirePacket
+ */
+class SneckLimitInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x50.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "SneckLimitInquirePacket limit request")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_SNECK_LIMIT_REQUEST"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquireResponsePacket.kt
new file mode 100644
index 0000000000..4dccca9ab1
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SneckLimitInquireResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * SneckLimitInquireResponsePacket
+ */
+class SneckLimitInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x90.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "SneckLimitInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "SneckLimitInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.maxBolus =  getShortToInt(bufferData).toDouble() / 100
+        diaconnG8Pump.maxBolusePerDay =  getShortToInt(bufferData).toDouble() / 100
+
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${diaconnG8Pump.result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "maxBolusePerDay --> ${diaconnG8Pump.maxBolusePerDay}")
+        aapsLogger.debug(LTag.PUMPCOMM, "maxBolus --> ${diaconnG8Pump.maxBolus}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_SNACK_LIMIT_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquirePacket.kt
new file mode 100644
index 0000000000..790523aff9
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquirePacket.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * SoundInquirePacket
+ */
+class SoundInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x4D.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "SoundInquirePacket request")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_SOUND_INQUIRE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquireResponsePacket.kt
new file mode 100644
index 0000000000..c42a20e835
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundInquireResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * SoundInquireResponsePacket
+ */
+class SoundInquireResponsePacket(injector: HasAndroidInjector) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x8D.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "SoundInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "SoundInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.beepAndAlarm =  getByteToInt(bufferData) -1
+        diaconnG8Pump.alarmIntesity =  getByteToInt(bufferData) -1
+
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> ${diaconnG8Pump.result}")
+        aapsLogger.debug(LTag.PUMPCOMM, "beepAndAlarm --> ${diaconnG8Pump.beepAndAlarm}")
+        aapsLogger.debug(LTag.PUMPCOMM, "alarmIntesity --> ${diaconnG8Pump.alarmIntesity}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_SOUND_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingPacket.kt
new file mode 100644
index 0000000000..cadb110435
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingPacket.kt
@@ -0,0 +1,34 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * SoundSettingPacket
+ */
+class SoundSettingPacket(
+    injector: HasAndroidInjector,
+    private var type: Int, //
+    private var intensity: Int //
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x0D
+        aapsLogger.debug(LTag.PUMPCOMM, "SoundSettingPacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END)
+        buffer.put(type.toByte()) // 명령코드
+        buffer.put(intensity.toByte()) // 명령코드
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_SOUND_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingResponsePacket.kt
new file mode 100644
index 0000000000..fba733ee8c
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/SoundSettingResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * SoundSettingResponsePacket
+ */
+class SoundSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x8D.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "SoundSettingResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "SoundSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_SOUND_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquirePacket.kt
new file mode 100644
index 0000000000..db1da7fc5a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquirePacket.kt
@@ -0,0 +1,29 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TempBasalInquirePacket
+ */
+class TempBasalInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x4A
+        aapsLogger.debug(LTag.PUMPCOMM, "TempBasalInquirePacket Init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        return suffixEncode(prefixEncode(msgType, msgSeq, MSG_CON_END))
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TEMP_BASAL_INQUIRE_REQUEST"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquireResponsePacket.kt
new file mode 100644
index 0000000000..2b6d5db384
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalInquireResponsePacket.kt
@@ -0,0 +1,55 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TempBasalInquireResponsePacket
+ */
+open class TempBasalInquireResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    var result = 0
+    init {
+        msgType = 0x8A.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "TempBasalInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "TempBasalInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result)) {
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.tbStatus = getByteToInt(bufferData) // 임시기저 상태
+        diaconnG8Pump.tbTime = getByteToInt(bufferData)    // 임시기저시간
+        diaconnG8Pump.tbInjectRateRatio = getShortToInt(bufferData) //임시기저 주입량/률
+        diaconnG8Pump.tbElapsedTime = getShortToInt(bufferData) // 임시기저 경과시간
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "tbStatus > " + diaconnG8Pump.tbStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbTime> " + diaconnG8Pump.tbTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbInjectRateRatio > " + diaconnG8Pump.tbInjectRateRatio)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbElapsedTime > " + diaconnG8Pump.tbElapsedTime)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TEMP_BASAL_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalReportPacket.kt
new file mode 100644
index 0000000000..d2eec42bcd
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalReportPacket.kt
@@ -0,0 +1,58 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TempBasalReportPacket
+ */
+class TempBasalReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0xCA.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "TempBasalReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "TempBasalReportPacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        diaconnG8Pump.tbStatus = getByteToInt(bufferData)
+        //diaconnG8Pump.isTempBasalInProgress = diaconnG8Pump.tbStatus == 1
+
+        // 응답받은 임시기저 상태가 주입중이면, pump객체에 정보를 갱신.
+        // if(diaconnG8Pump.isTempBasalInProgress) {
+        //     diaconnG8Pump.tbTime =  getByteToInt(bufferData)
+        //     diaconnG8Pump.tbInjectRateRatio =  getShortToInt(bufferData)
+        //     if (diaconnG8Pump.tbInjectRateRatio >= 50000) {
+        //         diaconnG8Pump.tempBasalPercent = diaconnG8Pump.tbInjectRateRatio - 50000
+        //     }
+        //
+        //     if(diaconnG8Pump.tbInjectRateRatio in 1000..1600) {
+        //         diaconnG8Pump.tbInjectAbsoluteValue = (diaconnG8Pump.tbInjectRateRatio -1000) / 100.0
+        //         diaconnG8Pump.tempBasalAbsoluteRate = diaconnG8Pump.tbInjectAbsoluteValue
+        //     }
+        // }
+        aapsLogger.debug(LTag.PUMPCOMM, "tbStatus > " + diaconnG8Pump.tbStatus)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbTime> " + diaconnG8Pump.tbTime)
+        aapsLogger.debug(LTag.PUMPCOMM, "tbInjectRateRatio > " + diaconnG8Pump.tbInjectRateRatio)
+
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TEMP_BASAL_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingPacket.kt
new file mode 100644
index 0000000000..b935ce2a94
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingPacket.kt
@@ -0,0 +1,44 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TempBasalSettingPacket
+ */
+class TempBasalSettingPacket(
+    injector: HasAndroidInjector,
+    private var status: Int, // (1:tempbasal running, 2:tempbasal dismissed)
+    private var time: Int,  //hour group (1=00~05, 2=06~11, 3=12~17, 4=18~23)
+    private var injectRateRatio: Int
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x0A
+        aapsLogger.debug(LTag.PUMPCOMM, "TempBasalSettingPacket Init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer =  prefixEncode(msgType, msgSeq, MSG_CON_END)
+        val apsSecond = 946652400L //fixed value 2000-01-01 00:00:00 (second)
+        buffer.put(status.toByte()) // status
+        buffer.put(time.toByte())
+        buffer.putShort(injectRateRatio.toShort()) // 임시기저 주입량/률  1000(0.00U)~1600(6.00U), 50000(0%)~50200(200%), 50000이상이면 주입률로 판정
+        buffer.putLong(apsSecond) // TB_DTTM
+
+        aapsLogger.debug(LTag.PUMPCOMM, "         status --> ${status.toByte()} (1:tempbasal running, 2:tempbasal dismissed)")
+        aapsLogger.debug(LTag.PUMPCOMM, "           time --> ${time.toByte()} ( value : 2~96 ( 2:30min, 3:45min....96:1440min )  30min ~ 24 hour, step 15min ) ")
+        aapsLogger.debug(LTag.PUMPCOMM, "injectRateRatio --> $injectRateRatio , toShort = ${injectRateRatio.toShort()}")
+        aapsLogger.debug(LTag.PUMPCOMM, "         tbDttm --> $apsSecond ")
+
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TEMP_BASAL_SETTING"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingResponsePacket.kt
new file mode 100644
index 0000000000..3ef1cf5668
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TempBasalSettingResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TempBasalSettingResponsePacket
+ */
+class TempBasalSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x8A.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "TempBasalSettingResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "TempBasalSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result =  getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TEMP_BASAL_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquirePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquirePacket.kt
new file mode 100644
index 0000000000..722e2030d2
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquirePacket.kt
@@ -0,0 +1,30 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TimeInquirePacket
+ */
+class TimeInquirePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x4F.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "TimeInquirePacket init")
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TIME_REQUEST"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt
new file mode 100644
index 0000000000..86b1f3befd
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeInquireResponsePacket.kt
@@ -0,0 +1,41 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TimeInquireResponsePacket
+ */
+class TimeInquireResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x50.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "TimeInquireResponsePacket init")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val result = defect(data)
+        if (result != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "TimeInquireResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        val result2 =  getByteToInt(bufferData)
+        if(!isSuccInquireResponseResult(result2)) {
+            failed = true
+            return;
+        }
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TIME_INQUIRE_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeReportPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeReportPacket.kt
new file mode 100644
index 0000000000..2a284defe8
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeReportPacket.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TimeReportPacket
+ */
+class TimeReportPacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result =0
+    init {
+        msgType = 0xCF.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "TimeReportPacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "TimeReportPacket Report Packet Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        diaconnG8Pump.year   = getByteToInt(bufferData) // yyyy
+        diaconnG8Pump.month  = getByteToInt(bufferData) // month
+        diaconnG8Pump.day    = getByteToInt(bufferData) // day
+        diaconnG8Pump.hour   = getByteToInt(bufferData) // hour
+        diaconnG8Pump.minute = getByteToInt(bufferData) // min
+        diaconnG8Pump.second = getByteToInt(bufferData) // second
+
+        aapsLogger.debug(LTag.PUMPCOMM, "year   --> ${diaconnG8Pump.year  }")
+        aapsLogger.debug(LTag.PUMPCOMM, "month  --> ${diaconnG8Pump.month }")
+        aapsLogger.debug(LTag.PUMPCOMM, "day    --> ${diaconnG8Pump.day   }")
+        aapsLogger.debug(LTag.PUMPCOMM, "hour   --> ${diaconnG8Pump.hour  }")
+        aapsLogger.debug(LTag.PUMPCOMM, "minute --> ${diaconnG8Pump.minute}")
+        aapsLogger.debug(LTag.PUMPCOMM, "second --> ${diaconnG8Pump.second}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TIME_REPORT"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingPacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingPacket.kt
new file mode 100644
index 0000000000..ad158bb211
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingPacket.kt
@@ -0,0 +1,43 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
+import javax.inject.Inject
+
+/**
+ * TimeSettingPacket Request Packet
+ */
+class TimeSettingPacket(
+    injector: HasAndroidInjector,
+    private var time: Long = 0,
+    private var offset:Int = 0
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+
+    init {
+        msgType = 0x0F
+        aapsLogger.debug(LTag.PUMPCOMM, "Time Sync between Phone and Pump")
+
+    }
+
+    override fun encode(msgSeq:Int): ByteArray {
+        val buffer = prefixEncode(msgType, msgSeq, MSG_CON_END);
+        val date = DateTime(time).withZone(DateTimeZone.UTC)
+        buffer.put((date.year - 2000 and 0xff).toByte())
+        buffer.put((date.monthOfYear and 0xff).toByte())
+        buffer.put((date.dayOfMonth and 0xff).toByte())
+        buffer.put((date.hourOfDay + offset and 0xff).toByte())
+        buffer.put((date.minuteOfHour and 0xff).toByte())
+        buffer.put((date.secondOfMinute and 0xff).toByte())
+
+        return suffixEncode(buffer)
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TIME_SETTING_REQUEST"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingResponsePacket.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingResponsePacket.kt
new file mode 100644
index 0000000000..75523537f8
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/packet/TimeSettingResponsePacket.kt
@@ -0,0 +1,47 @@
+package info.nightscout.androidaps.diaconn.packet
+
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.logging.LTag
+import javax.inject.Inject
+
+/**
+ * TimeSettingResponsePacket
+ */
+class TimeSettingResponsePacket(
+    injector: HasAndroidInjector
+) : DiaconnG8Packet(injector ) {
+
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    var result = 0
+    init {
+        msgType = 0x8F.toByte()
+        aapsLogger.debug(LTag.PUMPCOMM, "TimeSettingResponsePacket init ")
+    }
+
+    override fun handleMessage(data: ByteArray?) {
+        val defectCheck = defect(data)
+        if (defectCheck != 0) {
+            aapsLogger.debug(LTag.PUMPCOMM, "TimeSettingResponsePacket Got some Error")
+            failed = true
+            return
+        } else failed = false
+
+        val bufferData = prefixDecode(data)
+        result = getByteToInt(bufferData)
+
+        if(!isSuccSettingResponseResult(result)) {
+            diaconnG8Pump.resultErrorCode = result
+            failed = true
+            return
+        }
+        diaconnG8Pump.otpNumber =  getIntToInt(bufferData)
+
+        aapsLogger.debug(LTag.PUMPCOMM, "Result --> $result")
+        aapsLogger.debug(LTag.PUMPCOMM, "otpNumber --> ${diaconnG8Pump.otpNumber}")
+    }
+
+    override fun getFriendlyName(): String {
+        return "PUMP_TIME_SETTING_RESPONSE"
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BATTERY.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BATTERY.kt
new file mode 100644
index 0000000000..db44c69fb3
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BATTERY.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* Battery Shortage Alarm Log
+*/
+class LOG_ALARM_BATTERY private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 1=INFO, 2=WARNING, 3=MAJOR, 4=CRITICAL
+    private val alarmLevel: Byte,    // 1=OCCUR, 2=STOP
+    private val ack: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_ALARM_BATTERY{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", alarmLevel=").append(alarmLevel.toInt())
+        sb.append(", ack=").append(ack.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x28
+        fun parse(data: String): LOG_ALARM_BATTERY {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_ALARM_BATTERY(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BLOCK.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BLOCK.kt
new file mode 100644
index 0000000000..29b827e01e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_BLOCK.kt
@@ -0,0 +1,59 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* Injection Blocked Alarm Log
+*/
+class LOG_ALARM_BLOCK private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte, // 1=INFO, 2=WARNING, 3=MAJOR, 4=CRITICAL
+    val alarmLevel: Byte,     // 1=OCCUR
+    val ack: Byte,
+    val amount: Short, // 1=BASE, 2=Meal, 3=snack , 4=square, 5=dual, 6=tube change, 7=needle change, 8=insulin change
+    val reason: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_ALARM_BLOCK{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", alarmLevel=").append(alarmLevel.toInt())
+        sb.append(", ack=").append(ack.toInt())
+        sb.append(", amount=").append(amount.toInt())
+        sb.append(", reason=").append(reason.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x29
+        fun parse(data: String): LOG_ALARM_BLOCK {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_ALARM_BLOCK(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_SHORTAGE.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_SHORTAGE.kt
new file mode 100644
index 0000000000..4d3acfbab4
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_ALARM_SHORTAGE.kt
@@ -0,0 +1,56 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* Insulin shortage alarm
+*/
+class LOG_ALARM_SHORTAGE private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte, // 1=INFO, 2=WARNING, 3=MAJOR, 4=CRITICAL
+    val alarmLevel: Byte, // 1=OCCUR, 2=STOP
+    val ack: Byte,     // (1~100U)
+    val remain: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_ALARM_SHORTAGE{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", alarmLevel=").append(alarmLevel.toInt())
+        sb.append(", ack=").append(ack.toInt())
+        sb.append(", remain=").append(remain.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x2A
+        fun parse(data: String): LOG_ALARM_SHORTAGE {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_ALARM_SHORTAGE(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_INJECTOR_SUCCESS.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_INJECTOR_SUCCESS.kt
new file mode 100644
index 0000000000..d5702c0e5b
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_INJECTOR_SUCCESS.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 주사기 교체 성공
+*/
+class LOG_CHANGE_INJECTOR_SUCCESS private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    val primeAmount: Short,    // 47.5=4750
+    val remainAmount: Short,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_CHANGE_INJECTOR_SUCCESS{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", primeAmount=").append(primeAmount.toInt())
+        sb.append(", remainAmount=").append(remainAmount.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x1A
+        fun parse(data: String): LOG_CHANGE_INJECTOR_SUCCESS {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_CHANGE_INJECTOR_SUCCESS(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_NEEDLE_SUCCESS.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_NEEDLE_SUCCESS.kt
new file mode 100644
index 0000000000..556b5d33d9
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_NEEDLE_SUCCESS.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 바늘 공기빼기 성공
+*/
+class LOG_CHANGE_NEEDLE_SUCCESS private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    //  47.5=4750
+    val primeAmount: Short,    //  47.5=4750
+    val remainAmount: Short,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_CHANGE_NEEDLE_SUCCESS{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", primeAmount=").append(primeAmount.toInt())
+        sb.append(", remainAmount=").append(remainAmount.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x1C
+        fun parse(data: String): LOG_CHANGE_NEEDLE_SUCCESS {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_CHANGE_NEEDLE_SUCCESS(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_TUBE_SUCCESS.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_TUBE_SUCCESS.kt
new file mode 100644
index 0000000000..ae97bddcce
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_CHANGE_TUBE_SUCCESS.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 튜브 공기빼기 성공
+*/
+class LOG_CHANGE_TUBE_SUCCESS private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    //  47.5=4750
+    val primeAmount: Short,    //  47.5=4750
+    val remainAmount: Short,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_CHANGE_TUBE_SUCCESS{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", primeAmount=").append(primeAmount.toInt())
+        sb.append(", remainAmount=").append(remainAmount.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x18
+        fun parse(data: String): LOG_CHANGE_TUBE_SUCCESS {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_CHANGE_TUBE_SUCCESS(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY.kt
new file mode 100644
index 0000000000..e7768b2e00
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY.kt
@@ -0,0 +1,53 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 당일 주입 총량 (식사, 추가)
+*/
+class LOG_INJECTION_1DAY private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 당일 식사주입 총량 47.5=4750
+    val mealAmount: Short,    // 당일 추가주입 총량 47.5=4750
+    val extAmount: Short,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECTION_1DAY{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", mealAmount=").append(mealAmount.toInt())
+        sb.append(", extAmount=").append(extAmount.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x2F
+        fun parse(data: String): LOG_INJECTION_1DAY {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECTION_1DAY(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY_BASAL.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY_BASAL.kt
new file mode 100644
index 0000000000..1740d54276
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1DAY_BASAL.kt
@@ -0,0 +1,49 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 당일 주입 총량 (기저)
+*/
+class LOG_INJECTION_1DAY_BASAL private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,
+    // 당일 기저주입 총량 47.5=4750
+    val amount: Short,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECTION_1DAY_BASAL{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", amount=").append(amount.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+        const val LOG_KIND: Byte = 0x2E
+        fun parse(data: String): LOG_INJECTION_1DAY_BASAL {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECTION_1DAY_BASAL(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1HOUR_BASAL.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1HOUR_BASAL.kt
new file mode 100644
index 0000000000..f8acab887f
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_1HOUR_BASAL.kt
@@ -0,0 +1,61 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 1시간 단위 기저 주입량
+*/
+class LOG_INJECTION_1HOUR_BASAL private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,
+    tbBeforeAmount: Short,
+    tbAfterAmount: Short,
+    val batteryRemain: Byte,
+    // 남은 전체 인슐린 량(47.5=4750)
+    private val remainTotalAmount: Short
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    val beforeAmount // 해당시간의 임시기저 계산 전 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+        : Short = tbBeforeAmount
+    val afterAmount // 해당시간의 임시기저 계산 후 기저주입량: 기저주입막힘 발생 시 기저주입 막힘량 제외, 기저정지로 인해 주입되지 않은 량 제외, 리셋으로 인해 주입되지 않은 량 제외(47.5=4750)
+        : Short = tbAfterAmount
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECTION_1HOUR_BASAL{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", tbBeforeAmount=").append(beforeAmount.toInt())
+        sb.append(", tbAfterAmount=").append(afterAmount.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append(", remainTotalAmount=").append(remainTotalAmount.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x2C
+        fun parse(data: String): LOG_INJECTION_1HOUR_BASAL {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECTION_1HOUR_BASAL(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_DUAL_NORMAL.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_DUAL_NORMAL.kt
new file mode 100644
index 0000000000..d46ee4790a
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECTION_DUAL_NORMAL.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 듀얼(일반) 주입량: 듀얼(일반) 주입 완료 시 기록하는 방식
+*/
+class LOG_INJECTION_DUAL_NORMAL private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 설정량 47.5=4750
+    val setAmount: Short,    // 주입량 47.5=4750
+    val injectAmount: Short,    // 1분 단위 주입 시간 Ex) 124 = 124분 = 2시간 4분
+    private val injectTime: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECTION_DUAL_NORMAL{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", setAmount=").append(setAmount.toInt())
+        sb.append(", injectAmount=").append(injectAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x35
+        fun parse(data: String): LOG_INJECTION_DUAL_NORMAL {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECTION_DUAL_NORMAL(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_FAIL.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_FAIL.kt
new file mode 100644
index 0000000000..bafaea8de9
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_FAIL.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* Dual Injection Fail Log
+*/
+class LOG_INJECT_DUAL_FAIL private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    val injectNormAmount: Short,    // 47.5=4750
+    val injectSquareAmount: Short,    // 1분단위 주입시간(124=124분=2시간4분)
+    private val injectTime: Byte,    // 1=주입막힘, 2=배터리잔량부족, 3=약물부족, 4=사용자중지, 5=시스템리셋, 6=기타, 7=긴급정지
+    val reason: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_DUAL_FAIL{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", injectNormAmount=").append(injectNormAmount.toInt())
+        sb.append(", injectSquareAmount=").append(injectSquareAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", reason=").append(reason.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x11
+        fun parse(data: String): LOG_INJECT_DUAL_FAIL {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_DUAL_FAIL(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_SUCCESS.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_SUCCESS.kt
new file mode 100644
index 0000000000..c6738c38b2
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_DUAL_SUCCESS.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 듀얼주입 성공
+*/
+class LOG_INJECT_DUAL_SUCCESS private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte, // 47.5=4750
+    val injectNormAmount: Short, // 47.5=4750
+    val injectSquareAmount: Short, // 1분단위 주입시간(124=124분=2시간4분)
+    private val injectTime: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_DUAL_SUCCESS{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", injectNormAmount=").append(injectNormAmount.toInt())
+        sb.append(", injectSquareAmount=").append(injectSquareAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x10
+        fun parse(data: String): LOG_INJECT_DUAL_SUCCESS {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_DUAL_SUCCESS(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_FAIL.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_FAIL.kt
new file mode 100644
index 0000000000..bc667b28e9
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_FAIL.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 식사주입 실패
+*/
+class LOG_INJECT_MEAL_FAIL private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,     // 47.5=4750
+    private val setAmount: Short,     // 47.5=4750
+    val injectAmount: Short,     // 1분단위 주입시간(124=124분=2시간4분)
+    private val injectTime: Byte,     // 아침=1, 점심=2, 저녁=3
+    val time: Byte,     // 1=주입막힘, 2=배터리잔량부족, 3=약물부족, 4=사용자중지, 5=시스템리셋, 6=기타, 7=긴급정지
+    val reason: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_MEAL_FAIL{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", setAmount=").append(setAmount.toInt())
+        sb.append(", injectAmount=").append(injectAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", time=").append(time.toInt())
+        sb.append(", reason=").append(reason.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x09
+        fun parse(data: String): LOG_INJECT_MEAL_FAIL {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_MEAL_FAIL(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_SUCCESS.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_SUCCESS.kt
new file mode 100644
index 0000000000..23e7f27b57
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_MEAL_SUCCESS.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 식사주입 성공
+*/
+class LOG_INJECT_MEAL_SUCCESS private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    private val setAmount: Short,    // 47.5=4750
+    val injectAmount: Short,    // 1분단위 주입시간(124=124분=2시간4분)
+    private val injectTime: Byte,    // 아침=1, 점심=2, 저녁=3
+    val time: Byte,
+    batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    val batteryRemain: Byte = batteryRemain
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_MEAL_SUCCESS{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", setAmount=").append(setAmount.toInt())
+        sb.append(", injectAmount=").append(injectAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", time=").append(time.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x08
+        fun parse(data: String): LOG_INJECT_MEAL_SUCCESS {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_MEAL_SUCCESS(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_FAIL.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_FAIL.kt
new file mode 100644
index 0000000000..2e9eb5fe0d
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_FAIL.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 일반주입 실패
+*/
+class LOG_INJECT_NORMAL_FAIL private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    val setAmount: Short,    // 47.5=4750
+    val injectAmount: Short,    // 1분단위 주입시간(124=124분=2시간4분)
+    val injectTime: Byte,    // 1=주입막힘, 2=배터리잔량부족, 3=약물부족, 4=사용자중지, 5=시스템리셋, 6=기타, 7=긴급정지
+    val reason: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_NORMAL_FAIL{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", setAmount=").append(setAmount.toInt())
+        sb.append(", injectAmount=").append(injectAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", reason=").append(reason.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x0B
+        fun parse(data: String): LOG_INJECT_NORMAL_FAIL {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_NORMAL_FAIL(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_SUCCESS.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_SUCCESS.kt
new file mode 100644
index 0000000000..be3804eb00
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_NORMAL_SUCCESS.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 일반주입 성공
+*/
+class LOG_INJECT_NORMAL_SUCCESS private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    val setAmount: Short,    // 47.5=4750
+    val injectAmount: Short,    // 1분단위 주입시간(124=124분=2시간4분)
+    val injectTime: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_NORMAL_SUCCESS{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", setAmount=").append(setAmount.toInt())
+        sb.append(", injectAmount=").append(injectAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x0A
+        fun parse(data: String): LOG_INJECT_NORMAL_SUCCESS {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_NORMAL_SUCCESS(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_FAIL.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_FAIL.kt
new file mode 100644
index 0000000000..b6a4d990f1
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_FAIL.kt
@@ -0,0 +1,61 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 스퀘어주입 실패
+*/
+class LOG_INJECT_SQUARE_FAIL private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    val injectAmount: Short,    // 1분단위 주입시간(124=124분=2시간4분)
+    private val injectTime: Byte,    // 1=주입막힘, 2=배터리잔량부족, 3=약물부족, 4=사용자중지, 5=시스템리셋, 6=기타, 7=긴급정지
+    val reason: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_SQUARE_FAIL{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", injectAmount=").append(injectAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", reason=").append(reason.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x0E
+        fun parse(data: String): LOG_INJECT_SQUARE_FAIL {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_SQUARE_FAIL(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_SUCCESS.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_SUCCESS.kt
new file mode 100644
index 0000000000..168903de2b
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_INJECT_SQUARE_SUCCESS.kt
@@ -0,0 +1,57 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 스퀘어주입 성공
+*/
+class LOG_INJECT_SQUARE_SUCCESS private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    val injectAmount: Short,    // 1분단위 주입시간(124=124분=2시간4분)
+    private val injectTime: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_INJECT_SQUARE_SUCCESS{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", injectAmount=").append(injectAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x0D
+        fun parse(data: String): LOG_INJECT_SQUARE_SUCCESS {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_INJECT_SQUARE_SUCCESS(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_RESET_SYS_V3.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_RESET_SYS_V3.kt
new file mode 100644
index 0000000000..bc7a688382
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_RESET_SYS_V3.kt
@@ -0,0 +1,56 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+ * System Reset Log
+ */
+class LOG_RESET_SYS_V3 private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,
+    val batteryRemain: Byte,
+    val reason: Byte,  // 사유(1:공장초기화 후 리셋, 2:긴급정지 해제 후 리셋, 3:사용자 배터리 교체 후 리셋, 4:캘리브레이션 후 리셋, 9:예상치 못한 시스템 리셋)
+    val rcon1: Short,  // PIC 데이터 시트 내 정의된 2바이트 값
+    val rcon2: Short   // PIC 데이터 시트 내 정의된 2바이트 값
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_RESET_SYS_V3{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append(", reason=").append(reason.toInt())
+        sb.append(", rcon1=").append(rcon1.toInt())
+        sb.append(", rcon2=").append(rcon2.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x01
+        fun parse(data: String): LOG_RESET_SYS_V3 {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_RESET_SYS_V3(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_DUAL_INJECTION.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_DUAL_INJECTION.kt
new file mode 100644
index 0000000000..2ff5212bfc
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_DUAL_INJECTION.kt
@@ -0,0 +1,60 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 듀얼주입 설정(시작)
+*/
+class LOG_SET_DUAL_INJECTION private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,
+    val setNormAmount: Short, // 47.5=4750
+    val setSquareAmount: Short, // 47.5=4750
+    private val injectTime: Byte, // 1~30( 1: 10min )
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_SET_DUAL_INJECTION{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", setNormAmount=").append(setNormAmount.toInt())
+        sb.append(", setSquareAmount=").append(setSquareAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x0F
+        fun parse(data: String): LOG_SET_DUAL_INJECTION {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_SET_DUAL_INJECTION(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_SQUARE_INJECTION.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_SQUARE_INJECTION.kt
new file mode 100644
index 0000000000..562172146e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SET_SQUARE_INJECTION.kt
@@ -0,0 +1,57 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 스퀘어주입 설정(시작)
+*/
+class LOG_SET_SQUARE_INJECTION private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,    // 47.5=4750
+    val setAmount: Short,    // 1~30(10분 단위 값 의미)
+    private val injectTime: Byte,
+    val batteryRemain: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+    fun getInjectTime(): Int {
+        return injectTime and 0xff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_SET_SQUARE_INJECTION{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", setAmount=").append(setAmount.toInt())
+        sb.append(", injectTime=").append(injectTime and 0xff)
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x0C
+        fun parse(data: String): LOG_SET_SQUARE_INJECTION {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_SET_SQUARE_INJECTION(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_RELEASE_V2.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_RELEASE_V2.kt
new file mode 100644
index 0000000000..d27625fe8d
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_RELEASE_V2.kt
@@ -0,0 +1,71 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 일시정지 중지 (기저정지 해제)
+*/
+class LOG_SUSPEND_RELEASE_V2 private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,
+    batteryRemain: Byte,
+    patternType: Byte
+) {
+
+    val type: Byte
+    val kind: Byte
+    val batteryRemain: Byte
+    val patternType // 1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2
+        : Byte
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_SUSPEND_RELEASE_V2{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append(", patternType=").append(patternType.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    fun getBasalPattern():String {
+        //1=Injection blockage, 2=Battery shortage, 3=Drug shortage, 4=User shutdown, 5=System reset, 6=Other, 7=Emergency shutdown
+        return when(patternType) {
+            1.toByte() -> "Base"
+            2.toByte() -> "Life1"
+            3.toByte() -> "Life2"
+            4.toByte() -> "Life3"
+            5.toByte() -> "Dr1"
+            6.toByte() -> "Dr2"
+            else -> "No Pattern"
+        }
+    }
+    companion object {
+
+        const val LOG_KIND: Byte = 0x04
+        fun parse(data: String): LOG_SUSPEND_RELEASE_V2 {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_SUSPEND_RELEASE_V2(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+    init {
+        type = PumplogUtil.getType(typeAndKind)
+        kind = PumplogUtil.getKind(typeAndKind)
+        this.batteryRemain = batteryRemain
+        this.patternType = patternType
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_V2.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_V2.kt
new file mode 100644
index 0000000000..4f69dc4c89
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_SUSPEND_V2.kt
@@ -0,0 +1,63 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 일시정지 시작 (기저정지)
+*/
+class LOG_SUSPEND_V2 private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,
+    val batteryRemain: Byte,    // 1=기본, 2=생활1, 3=생활2, 4=생활3, 5=닥터1, 6=닥터2
+    val patternType: Byte
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_SUSPEND_V2{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", batteryRemain=").append(batteryRemain.toInt())
+        sb.append(", patternType=").append(patternType.toInt())
+        sb.append('}')
+        return sb.toString()
+    }
+
+    fun getBasalPattern(): String {
+        //1=Injection blockage, 2=Battery shortage, 3=Drug shortage, 4=User shutdown, 5=System reset, 6=Other, 7=Emergency shutdown
+        return when(patternType) {
+            1.toByte() -> "Base"
+            2.toByte() -> "Life1"
+            3.toByte() -> "Life2"
+            4.toByte() -> "Life3"
+            5.toByte() -> "Dr1"
+            6.toByte() -> "Dr2"
+            else -> "No Pattern"
+        }
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x03
+        fun parse(data: String): LOG_SUSPEND_V2 {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_SUSPEND_V2(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_START_V3.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_START_V3.kt
new file mode 100644
index 0000000000..029fe115e0
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_START_V3.kt
@@ -0,0 +1,61 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import org.apache.commons.lang3.StringUtils
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 임시기저 설정(시작)
+*/
+class LOG_TB_START_V3 private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte, // 임시기저 시간(30분 ~ 24시간, 2 ~ 96, 1당 15분 단위 증감)
+    val tbTime: Byte,  // 임시기저 주입량/률, Rate: 1000(0.00U) ~ 1600(6.00U), Ratio: 50000(0%) ~ 50200(200%), 50000이상이면 주입률로 판정, 별도 계산/역산식 참조
+    private val tbInjectRateRatio: Short,
+    private val tbDttm: String // 앱에서 생성 전달한 임시기저 시작(요청) 시간
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    fun getTbInjectRateRatio(): Int {
+        return tbInjectRateRatio and 0xffff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_TB_START_V3{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", tbTime=").append(tbTime.toInt())
+        sb.append(", tbInjectRateRatio=").append(tbInjectRateRatio and 0xffff)
+        if (!StringUtils.equals(tbDttm, PumplogUtil.getDttm("ffffffff"))) {
+            sb.append(", tbDttm=").append(tbDttm)
+        }
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x12
+        fun parse(data: String): LOG_TB_START_V3 {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_TB_START_V3(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getDttm(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_STOP_V3.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_STOP_V3.kt
new file mode 100644
index 0000000000..f1dc88fb61
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/LOG_TB_STOP_V3.kt
@@ -0,0 +1,64 @@
+package info.nightscout.androidaps.diaconn.pumplog
+
+import okhttp3.internal.and
+import org.apache.commons.lang3.StringUtils
+import java.nio.ByteBuffer
+import java.nio.ByteOrder
+
+/*
+* 임시기저 중지(완료)
+*/
+class LOG_TB_STOP_V3 private constructor(
+    val data: String,
+    val dttm: String,
+    typeAndKind: Byte,
+    // 임시기저 주입량/률, Rate: 1000(0.00U) ~ 1600(6.00U), Ratio: 50000(0%) ~ 50200(200%), 50000이상이면 주입률로 판정, 별도 계산/역산식 참조
+    private val tbInjectRateRatio: Short,
+    // 0=완료, 4=사용자중단, 6=기타, 7=긴급정지
+    val reason: Byte,
+    // 앱에서 생성 전달한 임시기저 시작(요청) 시간
+    private val tbDttm: String
+) {
+
+    val type: Byte = PumplogUtil.getType(typeAndKind)
+    val kind: Byte = PumplogUtil.getKind(typeAndKind)
+
+    fun getTbInjectRateRatio(): Int {
+        return tbInjectRateRatio and 0xffff
+    }
+
+    override fun toString(): String {
+        val sb = StringBuilder("LOG_TB_STOP_V3{")
+        sb.append("LOG_KIND=").append(LOG_KIND.toInt())
+        sb.append(", data='").append(data).append('\'')
+        sb.append(", dttm='").append(dttm).append('\'')
+        sb.append(", type=").append(type.toInt())
+        sb.append(", kind=").append(kind.toInt())
+        sb.append(", tbInjectRateRatio=").append(tbInjectRateRatio and 0xffff)
+        sb.append(", reason=").append(reason.toInt())
+        if (!StringUtils.equals(tbDttm, PumplogUtil.getDttm("ffffffff"))) {
+            sb.append(", tbDttm=").append(tbDttm)
+        }
+        sb.append('}')
+        return sb.toString()
+    }
+
+    companion object {
+
+        const val LOG_KIND: Byte = 0x13
+        fun parse(data: String): LOG_TB_STOP_V3 {
+            val bytes = PumplogUtil.hexStringToByteArray(data)
+            val buffer = ByteBuffer.wrap(bytes)
+            buffer.order(ByteOrder.LITTLE_ENDIAN)
+            return LOG_TB_STOP_V3(
+                data,
+                PumplogUtil.getDttm(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getShort(buffer),
+                PumplogUtil.getByte(buffer),
+                PumplogUtil.getDttm(buffer)
+            )
+        }
+    }
+
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/PumplogUtil.java b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/PumplogUtil.java
new file mode 100644
index 0000000000..0f2568f832
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/pumplog/PumplogUtil.java
@@ -0,0 +1,161 @@
+package info.nightscout.androidaps.diaconn.pumplog;
+
+import android.annotation.SuppressLint;
+
+import org.apache.commons.lang3.RegExUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.nio.ByteBuffer;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.TimeZone;
+
+/*
+ * 디아콘 G8 펌프 로그 유틸리티 클래스
+ */
+public class PumplogUtil {
+	/*
+	 * 바이트버퍼에서 4바이트 날짜를 구한다.
+	 * @param buffer 바이트버퍼
+	 * @return GMT 날짜 문자열
+	 */
+    @SuppressLint("SimpleDateFormat")
+	public static String getDttm(ByteBuffer buffer) {
+		byte b0 = buffer.get();
+		byte b1 = buffer.get();
+		byte b2 = buffer.get();
+		byte b3 = buffer.get();
+		long pumpTime = Long.parseLong(String.format("%02x%02x%02x%02x", b3, b2, b1, b0), 16);
+		long epochTime = new Date(0).getTime(); // 1970-01-01
+		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		sdf.setTimeZone(TimeZone.getTimeZone("UCT"));
+		return sdf.format(new Date(epochTime + pumpTime * 1000));
+	}
+
+	/*
+	 * 바이트버퍼에서 4바이트 날짜를 구한다.
+	 * @param data 로그데이터
+	 * @return GMT 날짜 문자열
+	 */
+    @SuppressLint("SimpleDateFormat")
+	public static String getDttm(String data) {
+		byte[] bytes = PumplogUtil.hexStringToByteArray(data);
+		byte b0 = bytes[0];
+		byte b1 = bytes[1];
+		byte b2 = bytes[2];
+		byte b3 = bytes[3];
+		long pumpTime = Long.parseLong(String.format("%02x%02x%02x%02x", b3, b2, b1, b0), 16);
+		long epochTime = new Date(0).getTime(); // 1970-01-01
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+		sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
+		return sdf.format(new Date(epochTime + pumpTime * 1000));
+	}
+
+	/*
+	 * 바이트버퍼에서 1바이트를 구한다.
+	 * @param buffer 바이트버퍼
+	 * @return byte
+	 */
+	public static byte getByte(ByteBuffer buffer) {
+		return buffer.get();
+	}
+
+	/*
+	 * 바이트버퍼에서 2바이트를 구한다.
+	 * @param buffer 바이트버퍼
+	 * @return short
+	 */
+	public static short getShort(ByteBuffer buffer) {
+		return buffer.getShort();
+	}
+
+	/*
+	 * 바이트버퍼에서 4바이트를 구한다.
+	 * @param buffer 바이트버퍼
+	 * @return int
+	 */
+	public static int getInt(ByteBuffer buffer) {
+		return buffer.getInt();
+	}
+
+	/*
+	 * 로그데이터에서 로그 타입 바이트를 구한다.
+	 * @param data 로그데이터
+	 * @return byte
+	 */
+	public static byte getType(String data) {
+		byte[] bytes = hexStringToByteArray(data);
+		return getType(bytes[4]);
+	}
+
+	/*
+	 * 로그데이터에서 로그 종류 바이트를 구한다.
+	 * @param data 로그데이터
+	 * @return byte
+	 */
+	public static byte getKind(String data) {
+		byte[] bytes = hexStringToByteArray(data);
+		//System.out.println("byte=" + Arrays.toString(bytes));
+		return getKind(bytes[4]);
+	}
+
+	/*
+	 * 바이트 데이터에서 로그 타입 부분을 추출 한다.
+	 * @param b 바이트
+	 * @return byte
+	 */
+	public static byte getType(byte b) {
+		return (byte) ((b >> 6) & 0b00000011); // 상위 2비트 추출
+	}
+
+	/*
+	 * 바이트 데이터에서 로그 종류 부분을 추출 한다.
+	 * @param b 바이트
+	 * @return byte
+	 */
+	public static byte getKind(byte b) {
+		return (byte) (b & 0b00111111); // 하위 6비트 추출
+	}
+
+	/*
+	 * 16진수 표기 문자열을 바이트 배열로 변환한다.
+	 * @param s 16진수 표기 문자열
+	 * @return byte[]
+	 */
+	public static byte[] hexStringToByteArray(String s) {
+		int len = s.length();
+		byte[] data = new byte[len / 2];
+		for (int i = 0; i < len; i += 2) {
+			data[i / 2] = (byte) ((Character.digit(s.charAt(i), 16) << 4) + Character.digit(s.charAt(i + 1), 16));
+		}
+		return data;
+	}
+
+	/*
+	 * 펌프 시간을 날짜 타입으로 변환한다.(펌프에서 GMT기준으로 초를 구하므로, Date 변환시 GMT 기준으로 구해야 한다.
+	 * @param data 1970.1.1이후 경과한 초
+	 * @return 날짜(GMT기준)
+	 */
+	public static Date pumpTimeToGMTDate(Integer data) {
+		long epochTime = new Date(0).getTime(); // 1970-01-01
+		long pumpTime = data.longValue() * 1000; // 초를 밀리초 단위로 변환
+		int timeZoneOffset = TimeZone.getDefault().getRawOffset(); // GMT와 로컬 타임존 사이의 차이
+		return new Date(epochTime + pumpTime - timeZoneOffset);
+	}
+
+    /*
+     * 펌프 버전이 해당 버전보다 크거나 같은지 여부 확인(새로운 기능이 추가된 버전을 체크하기 위함)
+     */
+    public static boolean isPumpVersionGe(String pump_version, int major, int minor) {
+        String version = RegExUtils.replaceAll(pump_version, "[^\\d\\.]", "");
+        int pump_major = Integer.parseInt(StringUtils.split(version, ".")[0]);
+        int pump_minor = Integer.parseInt(StringUtils.split(version, ".")[1]);
+        if (pump_major > major) { // 메이저 버전이 클 때
+            return true;
+        } else if (pump_major < major) { // 메이저 버전이 작을 때
+            return false;
+        } else { // 메이저 버전이 같다면 마이너 버전이 같거나 클 때
+            return pump_minor >= minor;
+        }
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt
new file mode 100644
index 0000000000..83b8475b9e
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/BLECommonService.kt
@@ -0,0 +1,367 @@
+package info.nightscout.androidaps.diaconn.service
+
+import android.bluetooth.*
+import android.content.Context
+import android.content.Intent
+import android.os.SystemClock
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.packet.*
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.extensions.notify
+import info.nightscout.androidaps.extensions.waitMillis
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import java.util.*
+import java.util.concurrent.ScheduledFuture
+import javax.inject.Inject
+import javax.inject.Singleton
+
+@Singleton
+class BLECommonService @Inject internal constructor(
+    private val injector: HasAndroidInjector,
+    private val aapsLogger: AAPSLogger,
+    private val resourceHelper: ResourceHelper,
+    private val context: Context,
+    private val rxBus: RxBusWrapper,
+    private val diaconnG8ResponseMessageHashTable: DiaconnG8ResponseMessageHashTable,
+    private val diaconnG8SettingResponseMessageHashTable: DiaconnG8SettingResponseMessageHashTable,
+    private val diaconnG8Pump: DiaconnG8Pump,
+){
+
+    companion object {
+        private const val WRITE_DELAY_MILLIS: Long = 50
+        private const val INDICATION_UUID = "6e400003-b5a3-f393-e0a9-e50e24dcca9e"
+        private const val WRITE_UUID = "6e400002-b5a3-f393-e0a9-e50e24dcca9e"
+        private const val CHARACTERISTIC_CONFIG_UUID = "00002902-0000-1000-8000-00805f9b34fb"
+    }
+
+    private var scheduledDisconnection: ScheduledFuture<*>? = null
+    private var processedMessage: DiaconnG8Packet? = null
+    private var processedMessageByte: ByteArray? = null
+    private val mSendQueue = ArrayList<ByteArray>()
+    private var bluetoothManager: BluetoothManager? = null
+    private var bluetoothAdapter: BluetoothAdapter? = null
+    private var connectDeviceName: String? = null
+    private var bluetoothGatt: BluetoothGatt? = null
+
+
+    var isConnected = false
+    var isConnecting = false
+    private var uartIndicate: BluetoothGattCharacteristic? = null
+    private var uartWrite: BluetoothGattCharacteristic? = null
+
+    private var mSequence : Int = 0
+
+    private fun getMsgSequence(): Int {
+        val seq = mSequence % 255
+        mSequence++
+        if (mSequence == 255) {
+            mSequence = 0
+        }
+        return seq
+    }
+
+    @Synchronized
+    fun connect(from: String, address: String?): Boolean {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Initializing Bluetooth ")
+        if (bluetoothManager == null) {
+            bluetoothManager = context.getSystemService(Context.BLUETOOTH_SERVICE) as BluetoothManager
+            if (bluetoothManager == null) {
+                aapsLogger.error("Unable to initialize BluetoothManager.")
+                return false
+            }
+        }
+        bluetoothAdapter = bluetoothManager?.adapter
+        if (bluetoothAdapter == null) {
+            aapsLogger.error("Unable to obtain a BluetoothAdapter.")
+            return false
+        }
+
+        if (address == null) {
+            aapsLogger.error("unspecified address.")
+            return false
+        }
+
+        val device = bluetoothAdapter?.getRemoteDevice(address)
+        if (device == null) {
+            aapsLogger.error("Device not found.  Unable to connect from: $from")
+            return false
+        }
+        aapsLogger.debug(LTag.PUMPBTCOMM, "Trying to create a new connection from: $from")
+        connectDeviceName = device.name
+        bluetoothGatt = device.connectGatt(context, false, mGattCallback)
+
+        isConnected = false
+        isConnecting = true
+        return true
+    }
+
+    @Synchronized
+    fun stopConnecting() {
+        isConnecting = false
+    }
+
+    @Synchronized
+    fun disconnect(from: String) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "disconnect from: $from")
+
+        // cancel previous scheduled disconnection to prevent closing upcoming connection
+        scheduledDisconnection?.cancel(false)
+        scheduledDisconnection = null
+
+        if (bluetoothAdapter == null || bluetoothGatt == null) {
+            aapsLogger.error("disconnect is not possible: (mBluetoothAdapter == null) " + (bluetoothAdapter == null))
+            aapsLogger.error("disconnect is not possible: (mBluetoothGatt == null) " + (bluetoothGatt == null))
+            return
+        }
+        bluetoothGatt?.setCharacteristicNotification(uartIndicate, false)
+        bluetoothGatt?.disconnect()
+        isConnected = false
+        SystemClock.sleep(2000)
+    }
+
+    @Synchronized
+    fun close() {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "BluetoothAdapter close")
+        bluetoothGatt?.close()
+        bluetoothGatt = null
+    }
+
+    private val mGattCallback: BluetoothGattCallback = object : BluetoothGattCallback() {
+        override fun onConnectionStateChange(gatt: BluetoothGatt, status: Int, newState: Int) {
+            onConnectionStateChangeSynchronized(gatt, newState) // call it synchronized
+        }
+
+        override fun onServicesDiscovered(gatt: BluetoothGatt, status: Int) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "onServicesDiscovered")
+            if (status == BluetoothGatt.GATT_SUCCESS) {
+                findCharacteristic()
+            }
+        }
+
+        override fun onCharacteristicChanged(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "(응답) onCharacteristicChanged: " + DiaconnG8Packet.toHex(characteristic.value))
+            // 대량로그응답 처리.
+            if(characteristic.value[1] == 0xb2.toByte()) {
+                aapsLogger.debug(LTag.PUMPBTCOMM, "(대량 로그 처리 응답) onCharacteristicChanged: " + DiaconnG8Packet.toHex(characteristic.value))
+                val message = BigLogInquireResponsePacket(injector)
+                message.handleMessage(characteristic.value)
+
+                // 초기화
+                mSendQueue.clear()
+            } else {
+                processResponseMessage(characteristic.value)
+            }
+        }
+
+        override fun onCharacteristicWrite(gatt: BluetoothGatt, characteristic: BluetoothGattCharacteristic, status: Int) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "(요청) onCharacteristicWrite: " + DiaconnG8Packet.toHex(characteristic.value))
+        }
+    }
+
+    @Synchronized
+    private fun writeCharacteristicNoResponse(characteristic: BluetoothGattCharacteristic, data: ByteArray) {
+        Thread(Runnable {
+            SystemClock.sleep(WRITE_DELAY_MILLIS)
+            if (bluetoothAdapter == null || bluetoothGatt == null) {
+                aapsLogger.error("BluetoothAdapter not initialized_ERROR")
+                isConnecting = false
+                isConnected = false
+                return@Runnable
+            }
+            characteristic.value = data
+            characteristic.writeType = BluetoothGattCharacteristic.WRITE_TYPE_NO_RESPONSE
+            bluetoothGatt?.writeCharacteristic(characteristic)
+        }).start()
+        SystemClock.sleep(50)
+    }
+
+    // private val uartIndicateBTGattChar: BluetoothGattCharacteristic
+    //     get() = uartIndicate
+    //         ?: BluetoothGattCharacteristic(UUID.fromString(INDICATION_UUID), BluetoothGattCharacteristic.PROPERTY_NOTIFY, 0).also { uartIndicate = it }
+
+    private val uartWriteBTGattChar: BluetoothGattCharacteristic
+        get() = uartWrite
+            ?: BluetoothGattCharacteristic(UUID.fromString(WRITE_UUID), BluetoothGattCharacteristic.PROPERTY_WRITE or BluetoothGattCharacteristic.PROPERTY_WRITE_NO_RESPONSE, 0).also { uartWrite = it }
+
+    private fun getSupportedGattServices(): List<BluetoothGattService>? {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "getSupportedGattServices")
+        if (bluetoothAdapter == null || bluetoothGatt == null) {
+            aapsLogger.error("BluetoothAdapter not initialized_ERROR")
+            isConnecting = false
+            isConnected = false
+            return null
+        }
+        return bluetoothGatt?.services
+    }
+
+    private fun findCharacteristic() {
+        val gattServices = getSupportedGattServices() ?: return
+        var uuid: String
+        for (gattService in gattServices) {
+            val gattCharacteristics = gattService.characteristics
+            for (gattCharacteristic in gattCharacteristics) {
+                uuid = gattCharacteristic.uuid.toString()
+                if (INDICATION_UUID == uuid) {
+                    uartIndicate = gattCharacteristic
+                    //setCharacteristicNotification(uartIndicate, true)
+                    bluetoothGatt?.setCharacteristicNotification(uartIndicate, true)
+                    // nRF Connect 참고하여 추가함
+                    val descriptor: BluetoothGattDescriptor = uartIndicate!!.getDescriptor(UUID.fromString(CHARACTERISTIC_CONFIG_UUID))
+                    descriptor.value = BluetoothGattDescriptor.ENABLE_NOTIFICATION_VALUE
+                    bluetoothGatt!!.writeDescriptor(descriptor)
+                }
+                if (WRITE_UUID == uuid) {
+                    uartWrite = gattCharacteristic
+                }
+            }
+        }
+    }
+
+    @Synchronized
+    private fun onConnectionStateChangeSynchronized(gatt: BluetoothGatt, newState: Int) {
+        aapsLogger.debug(LTag.PUMPBTCOMM, "onConnectionStateChange newState : $newState")
+        if (newState == BluetoothProfile.STATE_CONNECTED) {
+            gatt.discoverServices()
+            isConnected = true
+            isConnecting = false
+            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.CONNECTED))
+        } else if (newState == BluetoothProfile.STATE_DISCONNECTED) {
+            close()
+            isConnected = false
+            isConnecting = false
+            rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTED))
+            aapsLogger.debug(LTag.PUMPBTCOMM, "Device was disconnected " + gatt.device.name) //Device was disconnected
+        }
+    }
+
+    // the rest of packets
+    fun sendMessage(message: DiaconnG8Packet, waitMillis: Long) {
+        // 펌프로 요청하기전 변수에 담기. 마지막 요청정보 확인용.
+        processedMessage = message
+        val sequence = getMsgSequence()
+        aapsLogger.debug(LTag.PUMPBTCOMM, ">>>>> " + message.friendlyName + "  Sequence >>" + sequence)
+        // 요청
+        val bytes = message.encode(sequence)
+        processedMessageByte = bytes
+
+        aapsLogger.debug(LTag.PUMPBTCOMM, "sendMessage() before mSendQueue.size :: ${mSendQueue.size}")
+        // 펌프에 요청 보내기.
+        writeCharacteristicNoResponse(uartWriteBTGattChar, bytes)
+        // 요청 큐에 요청할 바이트 정보 담기.
+        synchronized(mSendQueue) {
+            if(mSendQueue.size > 10) mSendQueue.clear()
+            mSendQueue.add(bytes)
+        }
+        aapsLogger.debug(LTag.PUMPBTCOMM, "sendMessage() after mSendQueue.size :: ${mSendQueue.size}")
+
+        // 메시지동기화
+        synchronized(message) {
+            try {
+                message.waitMillis(waitMillis) //0.5초 대기.
+            } catch (e: InterruptedException) {
+                aapsLogger.error("sendMessage InterruptedException", e)
+            }
+        }
+    }
+
+    // process common packet response
+    private fun processResponseMessage(data: ByteArray) {
+        isConnected = true
+
+        //요청정보
+        val originalMessageSeq = processedMessage?.getSeq(processedMessageByte)
+
+        // 응답정보
+        val receivedCommand = DiaconnG8Packet(injector).getCmd(data)
+        val receivedSeq = DiaconnG8Packet(injector).getSeq(data)
+        val receivedType = DiaconnG8Packet(injector).getType(data)
+
+        aapsLogger.debug(LTag.PUMPBTCOMM, "originalMessageSeq :: $originalMessageSeq, receivedSeq :: $receivedSeq")
+        aapsLogger.debug(LTag.PUMPBTCOMM, "receivedCommand :: $receivedCommand")
+
+        // 응답메시지가 조회응답인지. 설정응답인지 구분해야됨.
+        var message:DiaconnG8Packet? = null
+        // 요청시퀀스와 응답의 시퀀스가 동일한 경우에만 처리.
+        // 펌프로부터 받은 보고응답의 경우 처리
+        if(receivedType == 3) {
+            message = diaconnG8ResponseMessageHashTable.findMessage(receivedCommand)
+            // injection Blocked Report
+            if(message is InjectionBlockReportPacket ) {
+                message.handleMessage(data)
+                diaconnG8Pump.bolusBlocked = true
+                val i = Intent(context, ErrorHelperActivity::class.java)
+                i.putExtra("soundid", R.raw.boluserror)
+                i.putExtra("status", resourceHelper.gs(R.string.injectionblocked))
+                i.putExtra("title", resourceHelper.gs(R.string.injectionblocked))
+                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                context.startActivity(i)
+                return
+            }
+            // battery warning report
+            if(message is BatteryWarningReportPacket ) {
+                message.handleMessage(data)
+                val i = Intent(context, ErrorHelperActivity::class.java)
+                i.putExtra("soundid", R.raw.boluserror)
+                i.putExtra("status", resourceHelper.gs(R.string.needbatteryreplace))
+                i.putExtra("title", resourceHelper.gs(R.string.batterywarning))
+                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                context.startActivity(i)
+                return
+            }
+
+            // insulin lack warning report
+            if(message is InsulinLackReportPacket ) {
+                message.handleMessage(data)
+                val i = Intent(context, ErrorHelperActivity::class.java)
+                i.putExtra("soundid", R.raw.boluserror)
+                i.putExtra("status", resourceHelper.gs(R.string.needinsullinreplace))
+                i.putExtra("title", resourceHelper.gs(R.string.insulinlackwarning))
+                i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                context.startActivity(i)
+                return
+            }
+
+        } else {
+            // 큐에 담긴 명령 대기중에 있는 것 조회 처리.
+            synchronized(mSendQueue) {
+                val sendQueueSize = mSendQueue.size
+                if (sendQueueSize > 0) {
+                    for (i in sendQueueSize-1 downTo 0 ) {
+                        val sendQueueSeq = DiaconnG8Packet(injector).getSeq(mSendQueue[i])
+                        val sendQueueType = DiaconnG8Packet(injector).getType(mSendQueue[i])
+                        if (sendQueueSeq == receivedSeq) {
+                            // 설정명령에 대한 응답
+                            if (sendQueueType == 0) {
+                                message = diaconnG8SettingResponseMessageHashTable.findMessage(receivedCommand)
+
+                                // 조회명령에 대한 응답
+                            } else if (sendQueueType == 1) {
+                                message = diaconnG8ResponseMessageHashTable.findMessage(receivedCommand)
+                            }
+                            // 처리 후 큐에서 삭제.
+                            mSendQueue.removeAt(i)
+                            break
+                        }
+                    }
+                }
+            }
+        }
+
+        if (message != null) {
+            aapsLogger.debug(LTag.PUMPBTCOMM, "<<<<< " + message!!.friendlyName + " " + DiaconnG8Packet.toHex(data))
+            // process received data
+            message!!.handleMessage(data)
+            message!!.setReceived()
+            synchronized(message!!) {
+                // notify to sendMessage
+                message!!.notify()
+            }
+        } else aapsLogger.error("Unknown message received " + DiaconnG8Packet.toHex(data))
+    }
+}
diff --git a/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt
new file mode 100644
index 0000000000..d6196efb78
--- /dev/null
+++ b/diaconn/src/main/java/info/nightscout/androidaps/diaconn/service/DiaconnG8Service.kt
@@ -0,0 +1,660 @@
+package info.nightscout.androidaps.diaconn.service
+
+import android.app.Service
+import android.content.Context
+import android.content.Intent
+import android.os.Binder
+import android.os.IBinder
+import android.os.SystemClock
+import dagger.android.DaggerService
+import dagger.android.HasAndroidInjector
+import info.nightscout.androidaps.Constants
+import info.nightscout.androidaps.activities.ErrorHelperActivity
+import info.nightscout.androidaps.data.PumpEnactResult
+import info.nightscout.androidaps.diaconn.DiaconnG8Plugin
+import info.nightscout.androidaps.diaconn.DiaconnG8Pump
+import info.nightscout.androidaps.diaconn.R
+import info.nightscout.androidaps.diaconn.events.EventDiaconnG8NewStatus
+import info.nightscout.androidaps.diaconn.packet.*
+import info.nightscout.androidaps.diaconn.pumplog.PumplogUtil
+import info.nightscout.androidaps.dialogs.BolusProgressDialog
+import info.nightscout.androidaps.events.EventAppExit
+import info.nightscout.androidaps.events.EventInitializationChanged
+import info.nightscout.androidaps.events.EventProfileSwitchChanged
+import info.nightscout.androidaps.events.EventPumpStatusChanged
+import info.nightscout.androidaps.interfaces.ActivePlugin
+import info.nightscout.androidaps.interfaces.CommandQueueProvider
+import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.interfaces.ProfileFunction
+import info.nightscout.androidaps.interfaces.PumpSync
+import info.nightscout.androidaps.logging.AAPSLogger
+import info.nightscout.androidaps.logging.LTag
+import info.nightscout.androidaps.plugins.bus.RxBusWrapper
+import info.nightscout.androidaps.plugins.configBuilder.ConstraintChecker
+import info.nightscout.androidaps.plugins.general.overview.events.EventNewNotification
+import info.nightscout.androidaps.plugins.general.overview.events.EventOverviewBolusProgress
+import info.nightscout.androidaps.plugins.general.overview.notifications.Notification
+import info.nightscout.androidaps.plugins.pump.common.bolusInfo.DetailedBolusInfoStorage
+import info.nightscout.androidaps.plugins.pump.common.defs.PumpType
+import info.nightscout.androidaps.queue.Callback
+import info.nightscout.androidaps.queue.commands.Command
+import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.utils.FabricPrivacy
+import info.nightscout.androidaps.utils.StringUtils
+import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.androidaps.utils.sharedPreferences.SP
+import io.reactivex.disposables.CompositeDisposable
+import io.reactivex.schedulers.Schedulers
+import org.joda.time.DateTime
+import org.joda.time.DateTimeZone
+import java.util.concurrent.TimeUnit
+import javax.inject.Inject
+import kotlin.math.abs
+import kotlin.math.ceil
+import kotlin.math.min
+
+class DiaconnG8Service : DaggerService() {
+    @Inject lateinit var injector: HasAndroidInjector
+    @Inject lateinit var aapsLogger: AAPSLogger
+    @Inject lateinit var rxBus: RxBusWrapper
+    @Inject lateinit var sp: SP
+    @Inject lateinit var resourceHelper: ResourceHelper
+    @Inject lateinit var profileFunction: ProfileFunction
+    @Inject lateinit var commandQueue: CommandQueueProvider
+    @Inject lateinit var context: Context
+    @Inject lateinit var diaconnG8Plugin : DiaconnG8Plugin
+    @Inject lateinit var diaconnG8Pump: DiaconnG8Pump
+    @Inject lateinit var diaconnG8ResponseMessageHashTable: DiaconnG8ResponseMessageHashTable
+    @Inject lateinit var activePlugin: ActivePlugin
+    @Inject lateinit var constraintChecker: ConstraintChecker
+    @Inject lateinit var detailedBolusInfoStorage: DetailedBolusInfoStorage
+    @Inject lateinit var bleCommonService: BLECommonService
+    @Inject lateinit var fabricPrivacy: FabricPrivacy
+    @Inject lateinit var pumpSync: PumpSync
+    @Inject lateinit var dateUtil: DateUtil
+
+    private val disposable = CompositeDisposable()
+    private val mBinder: IBinder = LocalBinder()
+    private var lastApproachingDailyLimit: Long = 0
+
+    override fun onCreate() {
+        super.onCreate()
+        disposable.add(rxBus
+            .toObservable(EventAppExit::class.java)
+            .observeOn(Schedulers.io())
+            .subscribe({ stopSelf() }) { fabricPrivacy.logException(it) }
+        )
+    }
+
+    inner class LocalBinder : Binder() {
+        val serviceInstance: DiaconnG8Service
+            get() = this@DiaconnG8Service
+    }
+
+    override fun onBind(intent: Intent): IBinder {
+        return mBinder
+    }
+
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        return Service.START_STICKY
+    }
+
+    override fun onDestroy() {
+        disposable.clear()
+        super.onDestroy()
+    }
+
+    val isConnected: Boolean
+        get() = bleCommonService.isConnected
+
+    val isConnecting: Boolean
+        get() = bleCommonService.isConnecting
+
+    fun connect(from: String, address: String): Boolean {
+        return bleCommonService.connect(from, address)
+    }
+
+    fun stopConnecting() {
+        bleCommonService.stopConnecting()
+    }
+
+    fun disconnect(from: String) {
+        bleCommonService.disconnect(from)
+    }
+
+    fun sendMessage(message: DiaconnG8Packet, waitMillis: Long) {
+        bleCommonService.sendMessage(message, waitMillis)
+    }
+
+    private fun sendMessage(message: DiaconnG8Packet) {
+        bleCommonService.sendMessage(message, 500)
+    }
+
+    fun readPumpStatus() {
+        try {
+            val pump = activePlugin.activePump
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
+
+            val pumpFirmwareVersion = sp.getString(resourceHelper.gs(R.string.pumpversion),"")
+
+            if(!StringUtils.emptyString(pumpFirmwareVersion) && PumplogUtil.isPumpVersionGe(pumpFirmwareVersion, 2, 83)) {
+                sendMessage(BigAPSMainInfoInquirePacket(injector)) // APS Pump Main Info
+            } else {
+                sendMessage(BasalLimitInquirePacket(injector)) // basal Limit
+                sendMessage(SneckLimitInquirePacket(injector)) // bolus Limit
+                sendMessage(BigMainInfoInquirePacket(injector)) // Pump Main Info
+                sendMessage(SoundInquirePacket(injector)) // sounds
+                sendMessage(DisplayTimeInquirePacket(injector)) // display
+                sendMessage(LanguageInquirePacket(injector)) // language
+            }
+
+            diaconnG8Pump.lastConnection = System.currentTimeMillis()
+
+            val profile = profileFunction.getProfile()
+            if (profile != null && abs(diaconnG8Pump.baseAmount - profile.getBasal()) >= pump.pumpDescription.basalStep) {
+                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumpsettings)))
+
+                if (!pump.isThisProfileSet(profile) && !commandQueue.isRunning(Command.CommandType.BASAL_PROFILE)) {
+                    rxBus.send(EventProfileSwitchChanged())
+                }
+            }
+
+            // 시간 설정
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingpumptime)))
+            var timeDiff = (diaconnG8Pump.getPumpTime() - System.currentTimeMillis()) / 1000L
+            if (diaconnG8Pump.getPumpTime() == 0L) {
+                 // initial handshake was not successful
+                 // de-initialize pump
+                 diaconnG8Pump.reset()
+                 rxBus.send(EventDiaconnG8NewStatus())
+                 rxBus.send(EventInitializationChanged())
+                 return
+            }
+            aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
+             // phone timezone
+            val tz = DateTimeZone.getDefault()
+            val instant = DateTime.now().millis
+            val offsetInMilliseconds = tz.getOffset(instant).toLong()
+            val offset = TimeUnit.MILLISECONDS.toHours(offsetInMilliseconds).toInt()
+            if (abs(timeDiff) > 60) {
+                if (abs(timeDiff) > 60 * 60 * 1.5) {
+                    aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds - large difference")
+                    //If time-diff is very large, warn user until we can synchronize history readings properly
+                    ErrorHelperActivity.runAlarm(context, resourceHelper.gs(R.string.largetimediff), resourceHelper.gs(R.string.largetimedifftitle), R.raw.error)
+
+
+                    //de-initialize pump
+                    diaconnG8Pump.reset()
+                    rxBus.send(EventDiaconnG8NewStatus())
+                    rxBus.send(EventInitializationChanged())
+                    return
+                } else {
+
+                    if(!diaconnG8Pump.isTempBasalInProgress) {
+                        val msgPacket = TimeSettingPacket(injector, dateUtil.now(), offset)
+                        sendMessage(msgPacket)
+
+                        // otp process
+                        if(!processConfirm(msgPacket.msgType)) return
+
+                        timeDiff = (diaconnG8Pump.getPumpTime() - System.currentTimeMillis()) / 1000L
+                        aapsLogger.debug(LTag.PUMPCOMM, "Pump time difference: $timeDiff seconds")
+                    }
+                }
+            }
+            loadHistory()
+            val eb = pumpSync.expectedPumpState().extendedBolus
+            diaconnG8Pump.fromExtendedBolus(eb)
+            val tbr = pumpSync.expectedPumpState().temporaryBasal
+            diaconnG8Pump.fromTemporaryBasal(tbr)
+            rxBus.send(EventDiaconnG8NewStatus())
+            rxBus.send(EventInitializationChanged())
+            //NSUpload.uploadDeviceStatus();
+            if (diaconnG8Pump.dailyTotalUnits > diaconnG8Pump.maxDailyTotalUnits * Constants.dailyLimitWarning) {
+                aapsLogger.debug(LTag.PUMPCOMM, "Approaching daily limit: " + diaconnG8Pump.dailyTotalUnits + "/" + diaconnG8Pump.maxDailyTotalUnits)
+                if (System.currentTimeMillis() > lastApproachingDailyLimit + 30 * 60 * 1000) {
+                    val reportFail = Notification(Notification.APPROACHING_DAILY_LIMIT, resourceHelper.gs(R.string.approachingdailylimit), Notification.URGENT)
+                    rxBus.send(EventNewNotification(reportFail))
+                    pumpSync.insertAnnouncement(resourceHelper.gs(R.string.approachingdailylimit) + ": " + diaconnG8Pump.dailyTotalUnits + "/" + diaconnG8Pump.maxDailyTotalUnits + "U", null, PumpType.DIACONN_G8, diaconnG8Pump.serialNo.toString())
+                    lastApproachingDailyLimit = System.currentTimeMillis()
+                }
+            }
+        } catch (e: Exception) {
+            aapsLogger.error(LTag.PUMPCOMM, "Unhandled exception", e)
+        }
+        aapsLogger.debug(LTag.PUMPCOMM, "Pump status loaded")
+    }
+
+    fun loadHistory(): PumpEnactResult {
+        if (!diaconnG8Plugin.isInitialized()) {
+            val result = PumpEnactResult(injector).success(false)
+            result.comment = "pump not initialized"
+            return result
+        }
+        sendMessage(LogStatusInquirePacket(injector))
+
+        // pump version check
+        if(diaconnG8Pump.isPumpVersionGe2_63) {
+            sendMessage(IncarnationInquirePacket(injector))
+        }
+
+        val result = PumpEnactResult(injector)
+
+        // pump log status
+        val pumpLastNum = diaconnG8Pump.pumpLastLogNum
+        val pumpWrappingCount = diaconnG8Pump.pumpWrappingCount
+        val apsIncarnationNum = sp.getInt(resourceHelper.gs(R.string.apsIncarnationNo), 65536)
+        // aps last log num
+        val pumpSerialNo      = sp.getInt(resourceHelper.gs(R.string.pumpserialno), 0)
+        val apsWrappingCount  = sp.getInt(resourceHelper.gs(R.string.apsWrappingCount), 0)
+        val apsLastLogNum     = sp.getInt(resourceHelper.gs(R.string.apslastLogNum), 0)
+
+        // if first install app
+        if(apsWrappingCount == 0 && apsLastLogNum == 0 ) {
+            pumpLogDefaultSetting()
+        }
+
+        // if pump reset
+        if(apsIncarnationNum != diaconnG8Pump.pumpIncarnationNum) {
+            pumpLogDefaultSetting()
+            sp.putInt(resourceHelper.gs(R.string.apsIncarnationNo), diaconnG8Pump.pumpIncarnationNum)
+        }
+
+        // if another pump
+        if(pumpSerialNo != diaconnG8Pump.serialNo) {
+            pumpLogDefaultSetting()
+            sp.putInt(resourceHelper.gs(R.string.pumpserialno), diaconnG8Pump.serialNo)
+        }
+
+        val apsLastNum = apsWrappingCount * 10000 + apsLastLogNum
+        if((pumpWrappingCount * 10000 + pumpLastNum) < apsLastLogNum ) {
+            pumpLogDefaultSetting()
+        }
+
+        val start:Int? // log sync startNo
+        val end:Int? // log sync endNo
+        if (((pumpWrappingCount * 10000 + pumpLastNum) - apsLastNum) > 10000) {
+            start = pumpLastNum
+            end = 10000
+        } else if (pumpWrappingCount > apsWrappingCount && apsLastLogNum < 9999) {
+            start = apsLastLogNum + 1
+            end = 10000
+        } else if (pumpWrappingCount > apsWrappingCount && apsLastLogNum >= 9999) {
+            start = 0
+            end = pumpLastNum
+        } else {
+            start = apsLastLogNum + 1
+            end = pumpLastNum
+        }
+
+        // pump log loop size
+        val pumpLogPageSize = 11
+        val loopCount: Int = ceil (((end - start) / 11.0)).toInt()
+
+        // log sync start!
+        if (loopCount > 0) {
+            diaconnG8Pump.isProgressPumpLogSync = true
+
+            for (i in 0 until loopCount) {
+                val startLogNo: Int = start + i * pumpLogPageSize
+                val endLogNo: Int = startLogNo + min(end - startLogNo, pumpLogPageSize)
+                val msg = BigLogInquirePacket(injector, startLogNo, endLogNo, 100)
+                sendMessage(msg)
+            }
+            diaconnG8Pump.historyDoneReceived = true
+            while (!diaconnG8Pump.historyDoneReceived && bleCommonService.isConnected) {
+                SystemClock.sleep(100)
+            }
+            result.success(true)
+            diaconnG8Pump.lastConnection = System.currentTimeMillis()
+        }
+        return result
+    }
+
+    fun setUserSettings(): PumpEnactResult {
+        val result = PumpEnactResult(injector)
+
+        val msg: DiaconnG8Packet = when(diaconnG8Pump.setUserOptionType) {
+            DiaconnG8Pump.ALARM -> SoundSettingPacket(injector, diaconnG8Pump.beepAndAlarm, diaconnG8Pump.alarmIntesity)
+            DiaconnG8Pump.LCD -> DisplayTimeoutSettingPacket(injector, diaconnG8Pump.lcdOnTimeSec)
+            DiaconnG8Pump.LANG -> LanguageSettingPacket(injector, diaconnG8Pump.selectedLanguage)
+            DiaconnG8Pump.BOLUS_SPEED -> BolusSpeedSettingPacket(injector, diaconnG8Pump.bolusSpeed)
+            else -> null
+        } ?: return result.success(false)
+
+        sendMessage(msg )
+        // pump confirm
+        if(diaconnG8Pump.otpNumber == 0) {
+            aapsLogger.error(LTag.PUMPCOMM, "otp is not received yet")
+            result.success(false)
+            result.comment("펌프와 연결 상태를 확인해주세요.")
+            return result
+        }
+        sendMessage(AppConfirmSettingPacket(injector, msg.msgType, diaconnG8Pump.otpNumber))
+        diaconnG8Pump.otpNumber = 0
+        SystemClock.sleep(100)
+        return result.success(true)
+    }
+
+    fun bolus(insulin: Double, carbs: Int, carbTime: Long, t: EventOverviewBolusProgress.Treatment): Boolean {
+        if (!isConnected) return false
+        if (BolusProgressDialog.stopPressed) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.startingbolus)))
+
+        // bolus speed setting
+        val apsPrefBolusSpeed = sp.getInt("g8_bolusspeed", 5)
+        val isSpeedSyncToPump = sp.getBoolean("diaconn_g8_isbolusspeedsync", false)
+
+        // aps speed check
+        if(!isSpeedSyncToPump) {
+            val msg = BolusSpeedSettingPacket(injector, apsPrefBolusSpeed)
+            sendMessage(msg)
+            sendMessage(AppConfirmSettingPacket(injector, msg.msgType, diaconnG8Pump.otpNumber))
+            diaconnG8Pump.otpNumber = 0
+        }
+
+        // pump bolus speed inquire
+        sendMessage(BolusSpeedInquirePacket(injector))
+        diaconnG8Pump.bolusDone = false
+        diaconnG8Pump.bolusingTreatment = t
+        diaconnG8Pump.bolusAmountToBeDelivered = insulin
+        diaconnG8Pump.bolusStopped = false
+        diaconnG8Pump.bolusStopForced = false
+        diaconnG8Pump.bolusProgressLastTimeStamp = dateUtil.now()
+        val start = InjectionSnackSettingPacket(injector, (insulin * 100).toInt())
+        if (carbs > 0) {
+            pumpSync.syncCarbsWithTimestamp(carbTime, carbs.toDouble(), null, PumpType.DIACONN_G8, diaconnG8Pump.serialNo.toString())
+        }
+        val bolusStart = System.currentTimeMillis()
+        if (insulin > 0) {
+            if (!diaconnG8Pump.bolusStopped) {
+                sendMessage(start)
+                // otp process
+                if(!processConfirm(start.msgType)) return false
+            } else {
+                t.insulin = 0.0
+                return false
+            }
+        }
+        val bolusingEvent = EventOverviewBolusProgress
+        bolusingEvent.t = t
+        bolusingEvent.percent = 99
+        //diaconnG8Pump.bolusingTreatment = null
+        var speed = 12
+        when (diaconnG8Pump.speed) {
+            1 -> speed = 60
+            2 -> speed = 30
+            3 -> speed = 20
+            4 -> speed = 15
+            5 -> speed = 12
+            6 -> speed = 10
+            7 -> speed = 9
+            8 -> speed = 8
+        }
+
+        val bolusDurationInMSec = (insulin * speed * 1000).toLong()
+        val expectedEnd = bolusStart + bolusDurationInMSec + 7500L
+        val totalwaitTime = (expectedEnd - System.currentTimeMillis()) /1000
+        while (!diaconnG8Pump.bolusDone) {
+            val waitTime = (expectedEnd - System.currentTimeMillis()) / 1000
+            bolusingEvent.status = String.format(resourceHelper.gs(R.string.waitingforestimatedbolusend), if(waitTime < 0) 0 else waitTime)
+            var progressPecent = 0
+            if(totalwaitTime > waitTime) {
+                progressPecent = ((totalwaitTime - waitTime) * 100 / totalwaitTime).toInt()
+            }
+            bolusingEvent.percent = min(progressPecent, 100)
+            rxBus.send(bolusingEvent)
+            SystemClock.sleep(200)
+        }
+
+        // do not call loadHistory() directly, reconnection may be needed
+        commandQueue.loadEvents(object : Callback() {
+            override fun run() {
+                // reread bolus status
+                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.gettingbolusstatus)))
+                sendMessage(InjectionSnackInquirePacket(injector), 1000) // last bolus
+                // 볼러스 결과 보고패킷에서 처리함.
+                bolusingEvent.percent = 100
+                rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.disconnecting)))
+            }
+        })
+       return !start.failed
+    }
+
+    fun bolusStop() {
+        val stop = InjectionCancelSettingPacket(injector, 0x07.toByte())
+        diaconnG8Pump.bolusStopForced = true
+        if (isConnected) {
+            sendMessage(stop)
+            // otp process
+            if(!processConfirm(stop.msgType)) return
+            while (!diaconnG8Pump.bolusStopped) {
+                SystemClock.sleep(200)
+            }
+        } else {
+            diaconnG8Pump.bolusStopped = true
+        }
+    }
+
+    fun tempBasal(absoluteRate: Double, durationInHours: Double): Boolean {
+        if (!isConnected) return false
+
+        // temp state check
+        sendMessage(TempBasalInquirePacket(injector))
+
+        if (diaconnG8Pump.tbStatus ==1 ) {
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+            val msgPacket = TempBasalSettingPacket(injector, 2, diaconnG8Pump.tbTime, diaconnG8Pump.tbInjectRateRatio)
+            // tempbasal stop
+            sendMessage(msgPacket)
+            // otp process
+            if(!processConfirm(msgPacket.msgType)) return false
+            diaconnG8Pump.tempBasalStart= dateUtil.now()
+        }
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
+        val tbInjectRate = ((absoluteRate*100) + 1000).toInt()
+        val msgTBR = TempBasalSettingPacket(injector, 1, ((durationInHours * 60) / 15).toInt(), tbInjectRate)
+        sendMessage(msgTBR)
+        // otp process
+        if(!processConfirm(msgTBR.msgType)) return false
+        // pump tempbasal status inquire
+        sendMessage(TempBasalInquirePacket(injector))
+        loadHistory()
+        val tbr = pumpSync.expectedPumpState().temporaryBasal
+        diaconnG8Pump.fromTemporaryBasal(tbr)
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return msgTBR.success()
+    }
+
+    fun highTempBasal(absoluteRate: Double): Boolean {
+        // temp state check
+        sendMessage(TempBasalInquirePacket(injector))
+
+        if (diaconnG8Pump.tbStatus ==1 ) {
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+            val msgPacket = TempBasalSettingPacket(injector, 2, diaconnG8Pump.tbTime, diaconnG8Pump.tbInjectRateRatio)
+            // tempbasal stop
+            sendMessage(msgPacket)
+            // otp process
+            if(!processConfirm(msgPacket.msgType)) return false
+            diaconnG8Pump.tempBasalStart= dateUtil.now()
+            // SystemClock.sleep(500)
+        }
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
+
+        val tbTime = 2 // 2: 30min, 3:45min, 4:60min
+        var newAbsoluteRate = absoluteRate
+        if (absoluteRate < 0.0)  newAbsoluteRate = 0.0
+        if (absoluteRate > 6.0) newAbsoluteRate = 6.0 // pump Temp Max percent = 200
+
+        aapsLogger.debug(LTag.PUMPCOMM, "APS Temp basal start absoluteRate: $newAbsoluteRate duration 30 min")
+        val tbInjectRate = absoluteRate * 100 + 1000
+        val msgTBR = TempBasalSettingPacket(injector, 1, tbTime, tbInjectRate.toInt())
+        sendMessage(msgTBR)
+        // otp process
+        if(!processConfirm(msgTBR.msgType)) return false
+        sendMessage(TempBasalInquirePacket(injector))
+        SystemClock.sleep(500)
+        loadHistory()
+        val tbr = pumpSync.expectedPumpState().temporaryBasal
+        diaconnG8Pump.fromTemporaryBasal(tbr)
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return true
+    }
+
+    fun tempBasalShortDuration(absoluteRate: Double, durationInMinutes: Int): Boolean {
+        if (durationInMinutes != 15 && durationInMinutes != 30) {
+            aapsLogger.error(LTag.PUMPCOMM, "Wrong duration param")
+            return false
+        }
+
+        // temp state check
+        sendMessage(TempBasalInquirePacket(injector))
+        if (diaconnG8Pump.tbStatus ==1 ) {
+            rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+            val msgPacket = TempBasalSettingPacket(injector, 2, diaconnG8Pump.tbTime, diaconnG8Pump.tbInjectRateRatio)
+            // tempbasal stop
+            sendMessage(msgPacket)
+            // otp process
+            if(!processConfirm(msgPacket.msgType)) return false
+            SystemClock.sleep(500)
+        }
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingtempbasal)))
+        val tbInjectRate = absoluteRate * 100 + 1000
+        val msgTBR = TempBasalSettingPacket(injector, 1, 2, tbInjectRate.toInt())
+        sendMessage(msgTBR)
+        // otp process
+        if(!processConfirm(msgTBR.msgType)) return false
+        sendMessage(TempBasalInquirePacket(injector))
+        loadHistory()
+        val tbr = pumpSync.expectedPumpState().temporaryBasal
+        diaconnG8Pump.fromTemporaryBasal(tbr)
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return msgTBR.success()
+    }
+
+    fun tempBasalStop(): Boolean {
+        if (!isConnected) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingtempbasal)))
+        // temp state check
+        sendMessage(TempBasalInquirePacket(injector))
+        if(diaconnG8Pump.tbStatus == 1) {
+            val msgPacket = TempBasalSettingPacket(
+                injector,
+                2,
+                diaconnG8Pump.tbTime,
+                diaconnG8Pump.tbInjectRateRatio
+            )
+            // tempbasal stop
+            sendMessage(msgPacket)
+            // otp process
+            if (!processConfirm(msgPacket.msgType)) return false
+            SystemClock.sleep(500)
+        }
+
+        loadHistory()
+        val tbr = pumpSync.expectedPumpState().temporaryBasal
+        diaconnG8Pump.fromTemporaryBasal(tbr)
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return true
+    }
+
+    fun extendedBolus(insulin: Double, durationInMinutes: Int): Boolean {
+        if (!isConnected) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.settingextendedbolus)))
+        aapsLogger.error(LTag.PUMPCOMM, "insulin: $insulin durationInMinutes: $durationInMinutes")
+
+        val msgExtended = InjectionExtendedBolusSettingPacket(injector, (insulin * 100).toInt(), durationInMinutes, dateUtil.now())
+        sendMessage(msgExtended)
+        // otp process
+        if(!processConfirm(msgExtended.msgType)) return false
+        //diaconnG8Pump.isExtendedInProgress = true
+        loadHistory()
+        val eb = pumpSync.expectedPumpState().extendedBolus
+        diaconnG8Pump.fromExtendedBolus(eb)
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return msgExtended.success()
+    }
+
+    fun extendedBolusStop(): Boolean {
+        if (!isConnected) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.stoppingextendedbolus)))
+        val msgType  = if(diaconnG8Pump.dualStatus == 1) 0x09.toByte() else 0x08.toByte()
+        val msgStop = InjectionCancelSettingPacket(injector, msgType)
+        sendMessage(msgStop)
+        // otp process
+        if(!processConfirm(msgStop.msgType)) return false
+        loadHistory() // pump log sync( db update)
+        val eb = pumpSync.expectedPumpState().extendedBolus
+        diaconnG8Pump.fromExtendedBolus(eb)
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return  msgStop.success()
+    }
+
+    fun updateBasalsInPump(profile: Profile): Boolean {
+        if (!isConnected) return false
+        rxBus.send(EventPumpStatusChanged(resourceHelper.gs(R.string.updatingbasalrates)))
+        val basalList = diaconnG8Pump.buildDiaconnG8ProfileRecord(profile)
+
+        val requestReqPacket1 = BasalSettingPacket(
+            injector, 1, 1, (basalList[0] * 100).toInt(), (basalList[1] * 100).toInt(), (basalList[2] * 100).toInt(), (basalList[3] * 100).toInt(), (basalList[4] * 100).toInt(), (basalList[5] * 100).toInt()
+        )
+        val requestReqPacket2= BasalSettingPacket(
+            injector, 1, 2, (basalList[6] * 100).toInt(), (basalList[7] * 100).toInt(), (basalList[8] * 100).toInt(), (basalList[9] * 100).toInt(), (basalList[10] * 100).toInt(), (basalList[11] * 100).toInt()
+        )
+        val requestReqPacket3= BasalSettingPacket(
+            injector, 1, 3, (basalList[12] * 100).toInt(), (basalList[13] * 100).toInt(), (basalList[14] * 100).toInt(), (basalList[15] * 100).toInt(), (basalList[16] * 100).toInt(), (basalList[17] * 100).toInt()
+        )
+        val requestReqPacket4= BasalSettingPacket(
+            injector, 1, 4, (basalList[18] * 100).toInt(), (basalList[19] * 100).toInt(), (basalList[20] * 100).toInt(), (basalList[21] * 100).toInt(), (basalList[22] * 100).toInt(), (basalList[23] * 100).toInt()
+        )
+        // setting basal pattern 1,2,3,4
+        sendMessage(requestReqPacket1)
+        sendMessage(requestReqPacket2)
+        sendMessage(requestReqPacket3)
+        sendMessage(requestReqPacket4)
+
+        // otp process
+        if(!processConfirm(requestReqPacket4.msgType)) return false
+        // pump saving time about 30 second
+        aapsLogger.debug(LTag.PUMPCOMM, "30 seconds Waiting!!")
+        SystemClock.sleep(30000)
+
+        val msgPacket = InjectionBasalSettingPacket(injector, 1)
+        sendMessage(msgPacket)
+        // otp process
+        if(!processConfirm(msgPacket.msgType)) return false
+        readPumpStatus()
+        rxBus.send(EventPumpStatusChanged(EventPumpStatusChanged.Status.DISCONNECTING))
+        return requestReqPacket4.success()
+    }
+
+    private fun pumpLogDefaultSetting() {
+        val apsWrappingCount = diaconnG8Pump.pumpWrappingCount
+        val apsLastLogNum = if(diaconnG8Pump.pumpLastLogNum - 1 < 0 ) 0 else  diaconnG8Pump.pumpLastLogNum - 1
+        sp.putInt(resourceHelper.gs(R.string.apslastLogNum), apsLastLogNum)
+        sp.putInt(resourceHelper.gs(R.string.apsWrappingCount), apsWrappingCount)
+    }
+
+    private fun processConfirm(msgType:Byte) : Boolean {
+        // pump confirm
+        if(diaconnG8Pump.otpNumber == 0) {
+            aapsLogger.error(LTag.PUMPCOMM, "otp is not received yet")
+
+            // Comments are made as dialogs are exposed twice each in the event of an error.
+            // Thread {
+            //     val i = Intent(context, ErrorHelperActivity::class.java)
+            //     i.putExtra("soundid", R.raw.boluserror)
+            //     i.putExtra("status", resourceHelper.gs(R.string.diaconn_g8_errotpreceivedyet))
+            //     i.putExtra("title", resourceHelper.gs(R.string.pumperror))
+            //     i.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+            //     context.startActivity(i)
+            // }.start()
+
+            return false
+        }
+        sendMessage(AppConfirmSettingPacket(injector, msgType, diaconnG8Pump.otpNumber), 2000)
+        diaconnG8Pump.otpNumber = 0
+        return true
+    }
+}
\ No newline at end of file
diff --git a/diaconn/src/main/res/drawable/ic_diaconn_g8.xml b/diaconn/src/main/res/drawable/ic_diaconn_g8.xml
new file mode 100644
index 0000000000..d98c6c2109
--- /dev/null
+++ b/diaconn/src/main/res/drawable/ic_diaconn_g8.xml
@@ -0,0 +1,6100 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:aapt="http://schemas.android.com/aapt"
+    android:viewportWidth="1000"
+    android:viewportHeight="580"
+    android:width="150dp"
+    android:height="80dp">
+    <path
+        android:pathData="M94.5 1L96.5 2L562 2.5L95.5 3L94.5 1Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M750.5 2L791 2.5L750.5 3L750.5 2Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M792.5 2L793.5 4L792.5 2Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 2L800 2.5L797.5 3L797.5 2Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M826.5 2L842 2.5L826.5 3L826.5 2Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M565.5 3L569 3.5L565.5 4L565.5 3Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M574.5 4L579 4.5L574.5 5L574.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M615.5 4L619 4.5L615.5 5L615.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M620.5 4L625 4.5L620.5 5L620.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M667.5 4L679 4.5L667.5 5L667.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M680.5 4L684 4.5L680.5 5L680.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M719.5 4L730 4.5L719.5 5L719.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M731.5 4L734 4.5L731.5 5L731.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M735.5 4L738 4.5L735.5 5L735.5 4Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 89L801 114.5L800 115.5L799.5 133L799.5 89Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M1.5 90L2 100.5L1 100.5L1.5 90Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M147.5 111L150 111.5L147.5 112L147.5 111Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M142.5 112Q146.9 110.5 146 113.5L144.5 113Q141.5 113.5 142.5 112Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M151.5 112L154 112.5L151.5 113L151.5 112Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M138.5 113L141 113.5L136.5 115L136.5 114L138.5 113Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M129.5 117L129.5 120Q126.5 118.5 129.5 117Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M723.5 122L724.5 124L723.5 122Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M730.5 129L731.5 131L730.5 129Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 137L800 163.5L799 163.5L799.5 137Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M742.5 156L743 158.5L742 158.5L742.5 156Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 165L800 167.5L799 167.5L799.5 165Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 170L800 191.5L799 191.5L799.5 170Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 193L800 195.5L799 195.5L799.5 193Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 197L800 199.5L799 199.5L799.5 197Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M648.5 199L652.5 204L648.5 199Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 201L800 206.5L799 206.5L799.5 201Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 208L800 311.5L799 311.5L799.5 208Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M193.5 210L194.5 212L193.5 210Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M661.5 212L667.5 219L661.5 212Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M505.5 213L511 213.5L505.5 214L505.5 213Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M418.5 215L419 217.5L418 217.5L418.5 215Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M511.5 217L512 230.5L511 230.5L511.5 217Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M522.5 217L523 221.5L522 221.5L522.5 217Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M322.5 219L323 231.5L322 231.5L322.5 219Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M432.5 226L433 229.5L432 229.5L432.5 226Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M533.5 226L534 233.5L533 233.5L533.5 226Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M440.5 235L441.5 237L440.5 235Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M378.5 237L386 237.5L378.5 238L378.5 237Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M387.5 237L390 237.5L387.5 238L387.5 237Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M391.5 237L395 237.5L391.5 238L391.5 237Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M400.5 237L404 237.5L400.5 238L400.5 237Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M405.5 237L411 237.5L405.5 238L405.5 237Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M508.5 242L511 242.5L508.5 243L508.5 242Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M520.5 242L528 242.5L520.5 243L520.5 242Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M529.5 242L534 242.5L529.5 243L529.5 242Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M535.5 242L540 242.5L535.5 243L535.5 242Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M442.5 247L446 247.5L442.5 248L442.5 247Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M434.5 251L435 258.5L434 258.5L434.5 251Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M418.5 252L419 254.5L418 254.5L418.5 252Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M425.5 252L426 262.5L425 262.5L425.5 252Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M441.5 262L446 262.5L441.5 263L441.5 262Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M396.5 265L397.5 267L396.5 265Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M400.5 265L399.5 267L400.5 265Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M374.5 269L397 269.5L374.5 270L374.5 269Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M376.5 273L379 273.5L376.5 274L376.5 273Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M389.5 273L395 273.5L389.5 274L389.5 273Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M499.5 283L500.5 285L499.5 283Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M531.5 283L541 283.5L531.5 284L531.5 283Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M281.5 286L282 294.5L281 294.5L281.5 286Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M290.5 287L295 287.5L290.5 288L290.5 287Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M345.5 290L346.5 292L345.5 290Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M371.5 293L372.5 295L371.5 293Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M489.5 295L490 297.5L489 297.5L489.5 295Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M297.5 296L298 307.5L297 307.5L297.5 296Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M303.5 296L304 303.5L303 303.5L303.5 296Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M374.5 296L376.5 299L374.5 296Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M482.5 302L483 303.5L481 304.5L482.5 302Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M375.5 307L374.5 309L375.5 307Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M281.5 309L282 311.5L281 311.5L281.5 309Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M371.5 309L372.5 311L370 310.5L371.5 309Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 313L800 368.5L799 368.5L799.5 313Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M330.5 317L335 317.5L330.5 318L330.5 317Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M336.5 317L363 317.5L336.5 318L336.5 317Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M181.5 331L182.5 333L181.5 331Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M651.5 338L652.5 340L651.5 338Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 370L800 426.5L799 426.5L799.5 370Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M742.5 383L743 385.5L740.5 395L740 390.5L742.5 383Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 435L3 443.5L2 443.5L2.5 435Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M801.5 442L802.5 446L803.5 445L838.5 445L852 462.5L858 474.5L861 484.5L861 489.5L863 491.5L861.5 492Q860.3 489.8 855.5 491L851 496.5L847 507.5L840.5 515L834.5 519L800.5 519L799 518.5L798.5 520L798 516.5L800.5 504L801 507L835.5 507L838 504.5Q839.1 496.5 845.5 494L851 489.5L848 476.5L839 460L803.5 460L803 461.5L802 461.5Q799.3 453.5 801.5 442Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 443L797 445.5L797 462.5L796 462.5L795.5 458L795 460L47.5 460L43.5 459L38.5 460L32.5 459L28.5 460L26.5 459L24.5 460L22.5 460L19.5 459L17.5 459L6.5 459L5 460.5L4.5 462Q1.9 456.1 3 446.5L4.5 445L795 445L795.5 443Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M798.5 473L799 477.5L798 477.5L798.5 473Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796.5 484L797 489.5L796 489.5L796.5 484Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 498L796 504.5L795 504.5L795.5 498Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 498L798 500.5L797 500.5L797.5 498Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M23.5 505L25.5 507L793.5 507L795 508.5L794 519L120.5 519L118.5 518L116.5 518L109.5 519L105.5 519L102.5 518L100.5 519L99.5 518L37.5 518L38.5 521L32 517L23.5 505Z"
+        android:fillColor="#BEC0C0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#BEC0C0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M36.5 22L35.5 24L36.5 22Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M28.5 29L27.5 31L28.5 29Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M21.5 37L20.5 39L21.5 37Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M18.5 41L17.5 43L18.5 41Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M997.5 65L998 68.5L997 68.5L997.5 65Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M998.5 77L999 83.5L998 83.5L998.5 77Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M999.5 98L1000 137.5L999 137.5L999.5 98Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M998.5 155L999 161.5L998 161.5L998.5 155Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M997.5 170L998 175.5L997 175.5L997.5 170Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M996.5 180L997 184.5L996 184.5L996.5 180Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M995.5 187L996 190.5L995 190.5L995.5 187Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M994.5 192L995 194.5L994 194.5L994.5 192Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M993.5 196L994 198.5L993 198.5L993.5 196Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M991.5 202L989.5 205L991.5 202Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M981.5 208L980.5 210L981.5 208Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M976.5 211L975.5 213L976.5 211Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M973.5 213L972.5 215L973.5 213Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M970.5 215L968.5 218L970.5 215Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M965.5 219L951.5 234L965.5 219Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M950.5 235L948.5 238L950.5 235Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M947.5 239L946 241.5L942.5 247L943 245.5L947.5 239Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M940.5 250L940 251.5L937.5 257L937 255.5L940.5 250Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M935.5 260L936 261.5L934.5 264L934 262.5L935.5 260Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M930.5 275L931 277.5L930 277.5L930.5 275Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M929.5 280L930 282.5L929 282.5L929.5 280Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M927.5 393L928 402.5L927 402.5L927.5 393Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M927.5 404L928 441.5L927 441.5L927.5 404Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M926.5 448L927 453.5L926 453.5L926.5 448Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M925.5 457L926 460.5L925 460.5L925.5 457Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M924.5 463L925 465.5L924 465.5L924.5 463Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M919.5 481L920 482.5L918.5 485L918 483.5L919.5 481Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M913.5 494L913 495.5L909.5 501L910 499.5L913.5 494Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M908.5 502L906.5 505L908.5 502Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M905.5 506L901.5 511L905.5 506Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M32.5 517L34.5 520L32.5 517Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M894.5 517L890.5 522L894.5 517Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M37.5 521L38.5 523L37.5 521Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M887.5 523L886.5 525L887.5 523Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M884.5 525L883.5 527L884.5 525Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M46.5 527L47.5 529L46.5 527Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M881.5 527L880.5 529L881.5 527Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M876.5 530L875.5 532L868.5 535L868.5 534L876.5 530Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M57.5 533L61 534.5L59.5 535L57.5 533Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M71.5 538L74 538.5L71.5 539L71.5 538Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M75.5 539L78 539.5L75.5 540L75.5 539Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M853.5 539L856 539.5L853.5 540L853.5 539Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M79.5 540L83 540.5L79.5 541L79.5 540Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M848.5 540L852 540.5L848.5 541L848.5 540Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M85.5 541L91 541.5L85.5 542L85.5 541Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M842.5 541L847 541.5L842.5 542L842.5 541Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M96.5 542L840 542.5L96.5 543L96.5 542Z"
+        android:fillColor="#FBFBFB"
+        android:fillAlpha="0.4941176"
+        android:strokeColor="#FBFBFB"
+        android:strokeAlpha="0.4941176"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M573.5 2L593.5 3L595.5 3L713.5 3L714.5 2L715.5 3L728.5 3L729.5 2L742.5 2L742.5 3L737.5 4L577.5 4L573.5 3L573.5 2Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M77.5 5L78.5 6L569.5 6Q570.8 3.7 575.5 5L576.5 6L737.5 6L742.5 5L743.5 6L791.5 6Q792.8 3.7 794 6.5L796 16.5L796 25.5L797 26.5L798 73.5L799 74.5L799 431.5L798 431.5L798 107.5L797 106.5L797 91.5L795.5 88L794.5 89L5 89L3.5 92L3 82.5Q9.4 45.4 33.5 26Q50.5 10.5 77.5 5Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796 6L856.5 6L857.5 7L880.5 8L881.5 9L905.5 12L927.5 17L953.5 25L983.5 37L992 42.5L997 60.5L998 83.5L999 84.5L999 154.5L997 155.5L997 120.5L995.5 119L987.5 118L958.5 110L941.5 116L935.5 113L837.5 89L803 89L802.5 91L801 89.5L798 22.5L797 21.5L797 11.5L796 6Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M122.5 123L114 132.5Q106.8 141.3 104 154.5L104 388.5Q108.9 410.1 124.5 421L137.5 428L151.5 431L693.5 431L704.5 429L712.5 426L722.5 419L719.5 423Q710.6 429.6 697.5 432L145.5 432Q124 427.5 113 412.5L106 400.5L102 384.5L102 160.5Q104.5 159 103 153.5L109 138.5L122.5 123Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M414.5 147L430.5 147L431 148.5L432 153.5L428.5 156L415.5 156Q411.5 155.5 412 150.5L414.5 147Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M997.5 160L998 169.5L997 169.5L997.5 160Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M996.5 174L997 179.5L996 179.5L996.5 174Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M995.5 181L996 186.5L993 199.5L988.5 205Q965.5 215 951 233.5Q940.5 246 934 262.5L929 280.5L927 299.5L928 300.5L928 383.5L927 385.5Q929.5 387 928 392.5L927 393.5L927 402.5L927 404.5L927 447.5L926 448.5L926 456.5L923 471.5Q914.7 499.7 895.5 517Q882.8 528.8 865.5 536L841.5 542L91.5 542L70.5 538Q57 534.5 47 527.5L48.5 528L65.5 535L66.5 534L793 534L794.5 525L795.5 537L797.5 534L835.5 534L840.5 533L859.5 526L875 515L882 506.5L887.5 496Q902.3 493.3 910 483.5L914 476.5L912 477.5Q912.9 480.5 908.5 479L906 476.5L901 459.5L895 446.5L879 425.5L879 190L918.5 221L938.5 231L941 233.5L942 236.5L937 247.5L938 247.5L955 215.5L959.5 203L961.5 203L987.5 190L993 189L995.5 181ZM937 248L933 255L925 282L925 406L924 407L924 440L923 441L923 448L921 458L917 468L918 470L923 455L924 444L925 443L925 433L926 432L926 290L927 289L927 282L929 272L937 251L937 248ZM917 470L914 475L915 476L917 473L917 470Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M649.5 195L660.5 204L670.5 195L672 198.5L664 206.5L664 209L666 209Q664.9 211.7 667.5 211Q673 212.6 672 219L668.5 219L659.5 211L651.5 219L648 219L648 216.5L656 208.5L656 206.5L648 198.5L648 196.5L649.5 195Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M183.5 199L188.5 199L202 211.5L203 214.5L199.5 216L185.5 203L171.5 216L169 216L169 212.5L181.5 200L183.5 199ZM178 206L175 208L179 208L178 206ZM193 207L193 208L196 208L193 207Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M500.5 210Q506 208.5 507.5 211L509.5 210L511.5 211L513.5 211L559.5 211L560 215L563.5 215L565 217.5L564 218.5L564 238L560 238L559.5 242L500.5 242Q497.7 240.8 500 239.5L500 213.5L499 211.5L500.5 210ZM503 213L504 215L511 215L511 237L504 237L503 239L505 240L556 240L557 237Q558 234 562 235L562 219L559 218L557 215L556 213L503 213Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M283.5 211L306.5 211L311 212L311 219.5L309.5 221L299.5 221L299 223L309.5 223L311 224.5L307.5 226L306.5 225L285.5 225L283.5 226L282 223L292.5 223L293 221L283.5 221L282 219.5Q280.3 212.8 283.5 211ZM290 214L288 218L305 218L305 215L303 214L300 215L296 214L294 215L290 214Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 212L337.5 212L338 213.5L342 217.5L342 231.5L336.5 237L328.5 237L323 231.5L323 217.5L328.5 212ZM332 217L328 222L329 225L328 227L330 230Q332 229 331 232Q336 233 337 229L336 227L337 221Q337 216 332 217Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M350 212Q362.2 209.5 365 217.5L364 218.5L364 231.5L358.5 237L350 237L350 235Q347.3 236.1 348 233.5L345 231.5L346 230.5L346 216L348 216L350 212ZM355 217L351 219L351 230Q354 229 353 232L357 232Q356 229 359 230L359 219Q356 220 357 217L355 217Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M382.5 212L390.5 212L396 215.5L396 222.5L388.5 230Q385.9 229.3 387 232L394.5 232L396 233.5L394.5 237L377.5 237L377 232L380.5 232L391 221.5Q391.8 217.8 389.5 217L385.5 217L380.5 222L378.5 222L377 219Q380.3 220.3 379 215.5L382.5 212Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M404 212L412.5 212L415.5 215Q416.8 212.8 418 215.5L418 224L416 224L416 226L414 226Q415.1 228.7 412.5 228L409 231.5L410.5 233Q411.7 230.8 416.5 232Q419 233.2 418 237L399.5 237L399 233.5Q400.2 231 404 232L404 230L406 230L406 228L408 228Q406.9 225.3 409.5 226L411 223Q414.7 224.3 413 218.5Q412.3 216.3 408.5 217L403.5 222L400.5 222L399 220.5L402 217.5L402 215.5Q401.3 212.9 404 214L404 212Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M444.5 215L447 215.5L447 240Q443.2 241.5 444 238.5L436.5 231L433 231L433 224.5L434.5 223L435.5 224L444.5 215Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M514.5 215L522 215L522 237L513 237L513 216.5L514.5 215Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M525.5 215L533 215L533 237L524 237L524 216.5L525.5 215Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M536.5 215Q543.3 213.3 545 216.5L544 221.5L545 222.5L545 231.5L543.5 238L542.5 237L535 237L535 216.5L536.5 215Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M369.5 216Q375.2 214.2 373 220.5L369.5 222Q367.3 221.3 368 217.5L369.5 216Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M456.5 219L458 219.5L458 235L455 234.5L455 220.5L456.5 219Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M451 224L454 225.5L453 227.5L454 229.5L451 231L451 224Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M368 228L373 228L373 231.5L369.5 233Q367 231.8 368 228Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M283.5 229L305.5 229L306.5 230L308.5 230L311 230.5L308.5 237Q303.3 238.8 305 233.5L303.5 232L282 232L283.5 229Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M384.5 248Q390 247 391 250.5Q389.5 254.9 392.5 254Q397 255.4 396 261Q398.7 259.9 398 262.5L400 266L392 264Q393 261 390 262L390 258.5L384.5 254L376.5 264Q371.1 265.9 372 262.5L377 257.5L377 254L379 254L379 252L381 252Q379.9 249.3 382.5 250L384.5 248Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M404.5 248L418 248L418 259Q413 260.3 411.5 257L403 256.5L405.5 254L413 254L411.5 251Q404.8 252.7 403 249.5L404.5 248Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M420 248L425 248L425 250.5L424 251.5L424 269.5L425 271.5Q423.6 274.3 419 273L419 269Q413.4 270.9 415 266L419 264.5L420 248Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M426 248Q430.6 246.8 432 249.5L431 250.5L431 273L426 272.5L426 248Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M440.5 248L446.5 248Q445.5 251 450.5 250Q453.3 251.3 451 252.5L451 260Q445.7 258.8 446.5 262L440.5 262Q439.3 259 435 260L435 250L438.5 250L440.5 248ZM443 252L440 256L444 258Q447 257 446 253L443 252Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M457 248Q461.6 246.8 463 249.5L463 272.5L459.5 273Q458.3 275.3 457 272.5L457 256.5L455.5 255Q452.2 256.1 453 253.5L457 252L457 248Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M402.5 261L414.5 261L416 262.5L411 265.5Q409.8 270.3 412 271.5Q410.6 274.3 406 273L406 265.5L404.5 264L401 262.5L402.5 261Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M372 270L399.5 270L400 273L372.5 273L372 270Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M298.5 279L368.5 279L369 281L370.5 281L374 286L376 286L376 288L378 288L378 290Q380.7 288.9 380 291.5L387 297L387.5 299L394.5 299L396 302.5Q394.5 306.5 387.5 305L372.5 320L372 318.5Q376.3 316.3 371.5 314L368.5 316L376.5 306L374.5 306L365.5 315L365 313.5L365.5 312Q358.7 311.8 356.5 307L347.5 305L339.5 299L329 297L329 293L330.5 293L334 292Q332.8 287.4 335.5 286L344 286L344 292L350 292L350 286L360 286L360 291.5L361.5 292L363.5 292L366 292Q364.9 289.3 367.5 290L377 299.5Q375.8 304.8 378.5 306L379 298.5Q373.1 289.9 364 286Q365 289.8 362.5 291L359.5 284L350.5 284L349 285.5Q350.9 290.9 347.5 290Q346.3 292.3 345 289.5L346 287.5L343.5 284L334.5 284L333 285.5Q334.9 290.9 331.5 290Q330.3 292.3 329 289.5Q331.1 283.6 326.5 285Q325 282.5 319.5 284L317 285Q318.3 289.6 315.5 291Q312.1 291.9 314 286.5L311.5 284Q302.3 285.7 299.5 281L298.5 283L297 280.5L298.5 279Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M460.5 283Q462.3 285.8 468.5 284L470.5 283L473.5 284Q474.8 281.8 476 284.5L476 325.5L474.5 327Q468.3 327.8 468 326.5L468 291L459 291L459 284.5L460.5 283Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M490.5 283L491.5 284L499.5 284L509 291.5Q511 300 506.5 302Q503.9 301.3 505 304Q508.3 302.7 507 307.5L509 309.5L509 318Q505.7 316.7 507 321.5Q505.6 326 500 325L499.5 327L488 327L488 325L484 325Q485.1 322.3 482.5 323L479 316.5L479 309.5Q482.6 307.6 483 302.5L479 300L479 291.5L484.5 286L488 286Q486.9 283.3 489.5 284L490.5 283ZM492 291L492 293L489 295Q487 300 491 299L493 302L498 302L502 298Q503 293 499 293L499 291L492 291ZM489 307Q490 310 487 309L487 315Q490 314 489 317L493 319L497 319Q496 316 501 317L502 312L501 310L499 307L489 307Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M513.5 284L541.5 284Q542.8 284.3 542 290.5Q539 291.8 540 296L538 296L538 300L536.5 300L535 302.5Q537.3 303.8 534.5 305Q531.5 304.1 533 308.5L529 314.5L529 318L527 318Q528.3 323.3 525 322.5L525 325.5L523.5 327L515 327L515 324.5L519 318.5L519 315L522 313.5L522 311.5Q521.3 308.9 524 310L524 306L526 306L526 302L528 302L528 298.5L532 292.5L531.5 291L513.5 291Q512.5 291 513 286.5Q510.7 285.3 513.5 284Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M407.5 294L411 295.5L409.5 298Q404.7 299.7 406 295.5L407.5 294Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M413 295L418 295Q417 298 420 297L420 305.5L416 308L417.5 311Q418.8 308.8 420 311.5Q420.8 314.1 417.5 313Q416.3 316 412 315L412 311L408 311L408 309.5L417 306L415 298Q411.7 299.1 413 295Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M402.5 297Q405.5 296.2 404 300Q401 298.8 402 302.5L407 306L405.5 309L399 303.5Q398.3 297.8 402.5 297Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M424 310L429 313.5L429 320L426 320L426 314.5Q423.3 313.4 424 310Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M656.5 315Q669.9 314.1 674 322.5Q677.5 326.5 676 335.5L672 343L664.5 347L655.5 347L646 339.5Q643 335.5 644 327.5Q645.8 320.3 651.5 317L656.5 315ZM659 319L653 322L648 330L650 338L658 343Q664 344 667 341L672 334Q673 327 670 325Q667 319 659 319Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M413.5 317L416 318.5L414.5 322Q410.3 323.3 412 318.5L413.5 317Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M425.5 321L427 323.5L421.5 329L417.5 329L414 325.5L415.5 324Q419.3 323 418 326L421 326L422.5 323L425.5 321Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M169 323L172.5 323L184.5 335L186.5 335L199.5 323L193.5 330L186.5 336L184.5 336L172.5 324L170 324L170 325.5L182.5 338L184 338.5L182.5 339L169 326.5L169 323Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M201.5 323L203 325.5L190.5 338L187.5 339L187.5 338L202 325.5L201.5 323Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 517L796 523.5L795 523.5L795.5 517Z"
+        android:fillColor="#E8F0F0"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#E8F0F0"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M88.5 3L564 3.5L88.5 4L88.5 3Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M749.5 3L792 3.5L749.5 4L749.5 3Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795 3L850 3.5L796 4L795.5 6L795 3Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M857.5 4L865 4.5L857.5 5L857.5 4Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M589.5 5L609 5.5L589.5 6L589.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M623.5 5L633 5.5L623.5 6L623.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M634.5 5L641 5.5L634.5 6L634.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M646.5 5L667 5.5L646.5 6L646.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M672.5 5L681 5.5L672.5 6L672.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M684.5 5L693 5.5L684.5 6L684.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M695.5 5L712 5.5L695.5 6L695.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M713.5 5L717 5.5L713.5 6L713.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M869.5 5L874 5.5L869.5 6L869.5 5Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M879.5 6L882 6.5L879.5 7L879.5 6Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M886.5 7L889 7.5L886.5 8L886.5 7Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M892.5 8L895 8.5L892.5 9L892.5 8Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M59.5 9L58.5 11L57 10.5L59.5 9Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796.5 15L797 20.5L796 20.5L796.5 15Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 27L798 34.5L797 34.5L797.5 27Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M798.5 44L799 59.5L798 59.5L798.5 44Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 62L800 65.5L799 65.5L799.5 62Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 87L3 109.5L2 109.5L2.5 87Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M800.5 87L801 92.5L800 92.5L800.5 87Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M145.5 110L149 110.5L145.5 111L145.5 110Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M695.5 110L699 110.5L695.5 111L695.5 110Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M801.5 110L802.5 113L803 111L838.5 111L882.5 123L909.5 128L926.5 123L928.5 125L946.5 129L994.5 143L995.5 141L996 169.5L995 169.5L994.5 158L993.5 161L971.5 150L924.5 135Q914.5 134 907.5 130L903.5 130Q900.2 132.7 893.5 132L862.5 126L860.5 127L857.5 125L851 124Q849.9 126.7 852.5 126L873 146.5L873 151L919.5 184L938.5 193L958 196L959 201.5L956.5 208L956 206L940.5 205L921.5 197Q895.4 181.1 873.5 161L869 159L871 151L869.5 151L845.5 129L845 425.5L854.5 433L856.5 433L860.5 430L878 453.5L885 468.5L888 483.5L888 485.5L888 493.5L889.5 494L889.5 495L874 496.5L875 498.5L873 502.5Q868.3 512.8 859.5 519L853.5 523L851 523Q852.1 525.7 849.5 525L837.5 530L798.5 530L797.5 531L797 529.5L798.5 528L835.5 528Q849.8 523.3 859 513.5L861 510.5L868 499.5L868 495L881 494.5L880 493.5L880 485.5L878 481.5L879 479.5L871 458.5L854.5 437L852.5 438L837.5 427L802 427L802 171.5L801 170.5L802 168.5L801 167.5L801.5 110Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M4 111L136 111.5L134 112.5L136 113.5Q120.4 118.4 112 130.5L109 136.5L109.5 138Q106.9 137.2 108 140.5L102 154.5L100.5 192L82.5 183L77.5 182L67.5 176L61.5 175Q54.8 168.7 43.5 167L38.5 163L30.5 161L22.5 156L14.5 154L6.5 149L4 149L3 145.5L3 113.5L4 111Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M709.5 111L796.5 111L797 111.5L797 427.5L795.5 427L716 426.5L722 423L725 418.5L724.5 417L725.5 418L729 414.5L728.5 413L730 413.5Q729.3 411.3 731.5 412L732.5 409L734 409.5L733 407.5L736 406.5L735 404.5L738 403.5L744 386.5L744 157.5Q739.9 133.1 723.5 121L712 115L711.5 113L709.5 114L709.5 113L711 112.5L709.5 111Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M119.5 125L118.5 127L119.5 125Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M994.5 175L995 178L992 177.5L994 177L994.5 175Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M987.5 178L990 178.5L987.5 179L987.5 178Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M982.5 179L986 179.5L978.5 181L978.5 180L982.5 179Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M973.5 181Q977.3 180.3 978 182.5Q972.7 189.7 961.5 191L960 190.5L959.5 197L959 184.5L960.5 183L966.5 183L973.5 181Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M195.5 205L196.5 207L195.5 205Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M561.5 223L562 229.5L561 229.5L561.5 223Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M286.5 225L289 225.5L286.5 226L286.5 225Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M297.5 225L303 225.5L297.5 226L297.5 225Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M412.5 228L411.5 230L412.5 228Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M537.5 239L540 239.5L537.5 240L537.5 239Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M431.5 259L432 261.5L431 261.5L431.5 259Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M926.5 282L927 284.5L926 284.5L926.5 282Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M514.5 283L518 283.5L514.5 284L514.5 283Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M282.5 285L283 311.5L282 311.5L282.5 285Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M303.5 286L304 288.5L303 289.5L302.5 316L302 289L297.5 288L296 288.5L299.5 287L302.5 289L303.5 286Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M360.5 286L361 288.5L360 288.5L360.5 286Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M925.5 289L926 291.5L925 291.5L925.5 289Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M523.5 291L526 291.5L523.5 292L523.5 291Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 292L297 292.5L289.5 293L289.5 292Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M382.5 293L383.5 295L382.5 293Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M375.5 295L376.5 297L375.5 295Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M298.5 296L299 307.5L298 307.5L298.5 296Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M286.5 299L287 309.5L286 309.5L286.5 299Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M329.5 301L342 307.5L338.5 308L333 304.5Q333.7 301.9 331 303L329.5 312L329 307.5L330 302.5L329.5 301Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M346.5 309L348.5 309L352.5 313L361 315.5Q360 318 355.5 317L355.5 316L357 315.5L350.5 314L346.5 309Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M282.5 313L283 315.5L282 315.5L282.5 313Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M290.5 315L294 315.5L290.5 316L290.5 315Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M298.5 316L299 318.5L298 318.5L298.5 316Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M330.5 316L353 316.5L330.5 317L330.5 316Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M286.5 317L287 319.5L286 319.5L286.5 317Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M326 319L329 319.5L326 321L326 319Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M366.5 319L369 320L368.5 322L367.5 321L359 320.5L366.5 319Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M282.5 321L286 321.5L282.5 322L282.5 321Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M322.5 324L328 324.5L322.5 325L322.5 324Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M332.5 324L336 324.5L332.5 325L332.5 324Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M337.5 324L352 324.5L337.5 325L337.5 324Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M176.5 333L177.5 335L176.5 333Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M101.5 341L102 387.5L101 387.5L101.5 341Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M107.5 405L108.5 407L107.5 405Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M111.5 411L112.5 413L111.5 411Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M114.5 415L118.5 420L114.5 415Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M122.5 422L123.5 424L122.5 422Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M125.5 424L126.5 426L125.5 424Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M696.5 432L699 432.5L696.5 433L696.5 432Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 432L798 439.5L797 439.5L797.5 432Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M798.5 455L799 462.5L798 463.5L797.5 491L797 463.5L798.5 455Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796.5 496L797 499.5L796 499.5L796.5 496Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 511L797 514.5L796 514.5L795.5 511Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M793.5 527L794 528.5L792.5 531L791.5 530L58 530L57.5 532L53.5 529L52 529.5L52.5 528L792.5 528L793.5 527Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 533L796 535.5L795 535.5L795.5 533Z"
+        android:fillColor="#D4D6D6"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#D4D6D6"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M571.5 1L572 3.5L571 3.5L571.5 1Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M579.5 1L737 1.5L579.5 2L579.5 1Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M148.5 113L152 113.5L148.5 114L148.5 113Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M694.5 113L697 113.5L694.5 114L694.5 113Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M718.5 121L719.5 123L718.5 121Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M722.5 124L730.5 133L722.5 124Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M121.5 125L117.5 130L121.5 125Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M732.5 135L733.5 137L732.5 135Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M413.5 147L412.5 149L413.5 147Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M275.5 193L569.5 193L577 198.5L578 200.5L578 342.5L575.5 346L570.5 348L499.5 348L499.5 347L564 346.5L558.5 344Q557.2 346.3 556 343.5L575 343L575 327.5L573 327Q574.3 330 570.5 329L569 328.5Q569.8 330.8 567.5 330Q566 332.5 564.5 329L557 327Q555.9 324.3 558.5 325L558.5 324L554 325Q555.1 321.7 551 323L550.5 326L549 323L547 323Q548.1 325.7 545.5 325L545.5 323L542 321.5L541.5 320L539 321L537.5 318Q533.1 316.5 534 319.5L534.5 321L533 321L533 325Q529.3 323.5 530 326.5L530.5 328L528 327.5L528 324Q530.7 325.1 530 322.5L529 320.5L529.5 319Q526.5 318.1 528 322.5L527 322.5Q526.3 317.8 529.5 317L530.5 319L532 315.5L531.5 314L529 315.5L534 308.5L534 305L536 305L536 301Q538.7 302.1 538 299.5L540 299.5L539 296.5L542 295.5L541 292.5Q544.5 291 543 284.5L542.5 282L540.5 283L514.5 283L512.5 282L512 284.5Q510.5 290.5 513.5 292L529.5 292L530 295.5Q527.3 296.8 527.5 301L526.5 297L525 300.5L525.5 302L524 301.5L522 306.5L522.5 308L521 307.5Q518.4 308.9 519 313.5L520 313.5L520.5 311L521 313.5Q519 317.2 517 315.5L518 318.5L514 320.5L515 323.5L512 324.5L511.5 326L507 322.5Q506.3 317.8 509.5 317L510.5 319Q513.1 316.6 512 310.5L510.5 308Q509.3 310.3 508 307.5L509 306.5L509 300Q512.3 301.3 511 296.5L510 292L512 291.5L510.5 285L509 289.5L509.5 291L504 285.5L504.5 284L501.5 285L499.5 281L489 281.5L499 282.5L489.5 283L488 282.5L487.5 285L487 283L483 284.5L483.5 286Q482.3 283.8 481 286.5L483 287.5L481.5 288L480.5 287L478 288.5L477.5 283L476.5 285L476 283.5Q478.3 282.3 475.5 281L459.5 281L455.5 285L455 283.5Q457.5 282 454 280.5L451.5 275L449 275L448.5 273L441.5 273Q440 270.5 438.5 274Q436.3 274.8 437 272.5L434 268.5L433.5 259L433 272.5L430.5 275L424.5 274L419.5 275L417.5 275Q413.1 276.5 414 273.5L415 271L417.5 270L417 271.5L417.5 274L419.5 274L425.5 273L430.5 274L432 272.5L432 248.5L430.5 245L429 245.5L429.5 247L425.5 248L420.5 247L418.5 248L417.5 247L404.5 247L403 251L406 251.5L403 252L403.5 254L411 252.5L410.5 251L412 254L404.5 254L403 255.5L403.5 258L411.5 258L412.5 260L402.5 258L401 261.5Q401.8 263.8 399.5 263L396.5 259L399.5 262L401 260.5L399 260L397.5 256L396.5 258L396 256.5Q398.5 255 395 253.5L394 251.5L395 250.5L391.5 247L389.5 248L390 246.5Q390.6 243.8 384.5 245L384.5 246L388 246.5L384.5 247L376 255.5L376 257.5L371.5 262Q368.3 260.3 372 258.5L373.5 256Q375.8 256.8 375 254.5L374 253.5L377 250.5L376 246.5L377 244L374.5 245L373 241L375.5 240L378.5 241L380.5 240L382.5 240L385.5 241L386.5 240L395.5 240L397 238.5L395.5 238L394.5 239L377.5 239L375 237.5Q375.8 240.1 372.5 239L370.5 239L368.5 238L367 238.5Q366.4 235.8 372.5 237Q373.7 239.3 375 236.5L375.5 234L377.5 238L394.5 238L396 236.5Q397.9 231.1 394.5 232L394.5 231L396 230.5L393 229.5L394 227.5L390 230.5Q390.7 233.1 388 232Q386.9 229.3 389.5 230L396.5 223L398 223.5L397.5 214L395.5 214Q391.5 214.5 391 211.5L391.5 210L382.5 211L378 215.5L376.5 219L375.5 217L375 221.5L377.5 222Q384.5 223 385.5 218L390 218L390 221.5L380.5 231L376 230Q376.8 226.2 373.5 225L372 224.5L374 223.5Q368.6 224.4 367 221.5L368.5 222Q376.3 224.7 374 217.5L375 215L367.5 217L366 216.5L367 219.5L366 220.5L366 229.5L366 231.5Q366.8 233.8 364.5 233L359 237.5L365 231.5L365 216.5L366 215.5Q364.2 211.3 362.5 214L361 213.5L363 212.5L360 211.5L358.5 209L357 209L356.5 211L351.5 211L350 210.5L349 214L347 214Q347.8 217.1 345 216.5L345 233L347 233L347 235Q349.7 233.9 349 236.5L349.5 238Q347.3 238.8 348 236.5L346 236.5Q346.7 233.9 344 235L344 232.5L337.5 238L336 237.5L343 231.5L343 217.5L337 211.5L339 210.5Q337.5 207.5 331.5 209L331.5 210L336 210.5L328.5 211L322 216L322 231.5L328 237.5L326 238L326 236L324 236Q325.1 233.3 322.5 234L320 230.5L319 216.5L317 213L325 211Q323.3 206.9 327.5 208L332.5 207L336 208Q337.5 204.3 334.5 205L333.5 204L274.5 204L273.5 203L272 204.5L272 213L269.5 212L268.5 225L268 203.5L267 200.5L271.5 195L275.5 193ZM413 210L405 212Q402 211 403 214L401 214L399 222Q407 224 409 218Q414 216 412 223Q410 227 409 224L408 227L403 232L399 232L399 238L400 238L418 238L420 238Q422 237 421 234Q420 231 419 233L410 232L419 224Q420 226 421 224L421 215L420 223L419 216L416 214Q411 212 414 211L413 210ZM499 210L499 242L501 243L560 243L561 242Q563 243 562 240L564 240L565 238L565 216L561 215L561 212L560 210L499 210ZM340 211L339 213L343 216L340 211ZM394 212L394 213L396 213L394 212ZM416 212L416 213L418 213L416 212ZM445 213L444 215L442 215Q443 218 441 217L441 219L439 219L439 221Q436 220 437 223Q433 222 432 225Q430 231 434 231L433 233L436 233L436 231L443 239L442 240L447 240L450 239Q448 237 449 233L449 231L448 229L449 226L448 224L449 215L448 215L445 213ZM369 214L369 215L373 215L369 214ZM456 217L456 219L453 220L454 223L450 225L450 231L455 231L455 233L452 232L452 233Q454 232 453 235L458 236L460 236L459 234L459 221L460 220L458 219L458 218L456 217ZM409 219L409 220L411 220L409 219ZM385 220L383 223L386 221L385 220ZM461 221L460 224L461 224L461 221ZM378 223L378 224L382 224L378 223ZM400 223L400 224L405 224L400 223ZM397 224L395 226L397 226L397 224ZM417 225L417 227L419 226L417 225ZM415 227L415 229L417 228L415 227ZM461 228L460 234L461 234L461 228ZM414 229L413 231L418 231L414 229ZM400 230L400 231L403 231L400 230ZM398 232L397 238L398 238L398 232ZM456 237L456 238L458 238L456 237ZM400 239L400 240L418 240L400 239ZM445 241L445 242L447 242L445 241ZM405 245L405 246L412 246L405 245ZM447 246Q445 248 441 247L439 249L436 248L436 250Q433 251 434 249L433 249L434 254L433 257L434 259L438 262Q439 259 441 263Q446 264 448 261L449 263L452 262L451 261L453 255L456 256L456 257Q452 256 453 260L454 260Q453 257 456 258L456 271L454 274L456 273L462 274L462 275L457 274L456 276L461 277L464 275L463 274L463 249L463 246L461 247L458 246L458 248L453 251L456 251L456 252Q451 253 452 251L452 249L450 248L448 248L447 246ZM402 248L401 251L402 251L402 248ZM465 248L465 274L466 267L465 266L465 248ZM442 264L442 265L446 265L442 264ZM515 281L515 282L519 282L515 281ZM538 302L537 305L538 305L538 302ZM536 306L535 309L536 309L536 306ZM534 310L533 313L534 313L534 310ZM508 319Q506 324 510 323Q512 318 508 319Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M184.5 204L181.5 208L184.5 204Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M282.5 210L310 210.5L282.5 211L281 212.5Q279.6 219.9 283 222.5L281 223.5Q278.1 219.9 279 212.5L282.5 210Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M311.5 214L312 220.5L311 222.5L312 225.5L311 225.5L310 221.5L311.5 214Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M510.5 214L514 214.5Q512.8 217.3 511.5 215L510.5 214Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M522.5 214L525 214.5Q522.9 217.8 522.5 214Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M532.5 214L536 214.5Q534.7 217.3 533.5 215L532.5 214Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M544.5 214L555.5 214L557 215.5L558.5 219L561 219.5L561 235L555 236L555.5 238L557 237.5L555.5 239L504.5 239L504.5 238L512.5 237L513.5 238L521.5 238L524 236.5L524.5 238L532.5 238L534 236.5L534.5 217L535 238L545 238L545 215.5L544.5 214Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 215L303.5 215L304 218L289.5 218L288 216.5L289.5 215ZM290 216L290 217L302 217L290 216Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M331.5 218Q335.5 217.5 336 220.5Q338 229 333.5 231L332.5 229L331.5 231Q327 229 329 220.5L331.5 218ZM330 220L330 229L333 228L332 224L332 222Q333 219 330 220Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M354.5 218L358 220.5L358 228.5L356.5 230L354.5 229L353 229.5L354 228.5L354 220.5L352 220.5L354.5 218Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M647.5 218L648.5 220L647.5 218Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M672.5 218L671.5 220L672.5 218Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M352.5 222L353 226.5L352 226.5L352.5 222Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M367 224L371 224.5L367.5 226L367 224Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M281.5 225L282.5 226L310 226.5L282.5 227L281.5 225Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M369.5 226Q374.3 225.3 375 228.5Q376 233 373.5 234Q366.5 235.5 367 232.5L368.5 233Q376.3 235.7 374 228.5Q373.3 226.3 369.5 227L369.5 226Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M283.5 228L310 228.5L283.5 229L283.5 228Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M281.5 229L281 230.5L282 232.5L280 233L281.5 229Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M311.5 229L312 237L309.5 238L311 235.5L311.5 229Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M377.5 231L376.5 233L377.5 231Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M294.5 233L304 233.5L294.5 234L294.5 233Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M303.5 235L304 237L306 237.5L304.5 238L303.5 235Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M351.5 238L356 238.5L351.5 239L351.5 238Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M391.5 249Q393.8 249.8 393 253.5L392 253.5L391.5 249Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M442.5 253L445 254.5L443.5 255L442 254.5Q441.3 256.8 443.5 256L443.5 257L441 255.5L442.5 253Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M384.5 255L389 258.5L388 259.5L392.5 265L387 266L386.5 264L383.5 265L384.5 263Q386.8 263.8 386 261.5L386 259.5L387 257.5L384 256L384 258.5L377.5 265L383 258.5L384.5 255ZM390 263L391 265Q392 262 390 263Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M415.5 260L418 260.5L417 263.5L419 263.5L413 266.5L413 268.5Q414 273 411.5 274L412 272.5L412 265.5L414.5 265L416 261.5L415.5 260Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M394.5 265L399.5 267L401 266.5L397.5 268L394.5 265Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M403.5 265L405 265.5L405 272.5L410 274.5L406.5 275L404 274Q404.8 270.6 402 269.5L404 266.5L403.5 265Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M372.5 269L371.5 271L372.5 269Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M301.5 277L309 277.5L301.5 278L301.5 277Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M312.5 277L317 277.5L312.5 278L312.5 277Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M318.5 277L324 277.5L318.5 278L318.5 277Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M296.5 279L297 284.5L296 284.5L296.5 279Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M288.5 282L289 284.5L288 284.5L288.5 282Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M460.5 282L475 282.5L460.5 283L460.5 282Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M374.5 284L384.5 295L374.5 284Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M307.5 285Q312 284 313 286.5L312.5 290L312 286L307.5 286L307.5 285Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M318.5 285L327.5 285L329 286.5L326 288.5Q325.3 286.3 327.5 287L327.5 286L318.5 286L318.5 285Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M365.5 287L367 289.5L364.5 291L365 289.5L365.5 287Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M458.5 287L459 292L457 291.5L458.5 287Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M317.5 290L316.5 292L317.5 290Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 290L329.5 292L328.5 290Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M478.5 291L479 299.5L482 303.5L479 308.5L478.5 316L478 308.5L478 306.5L478.5 291Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M460.5 292L467 292.5L460.5 293L460.5 292Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M476.5 292L477 326.5L475 327.5L476 326.5L476.5 292Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M492 292Q499.2 290.5 501 295.5L501 299Q498 298 499 301L492.5 301Q488.8 299.5 490 294Q493 295 492 292ZM492 295L491 298L492 298L492 295ZM500 295L499 298L500 298L500 295ZM493 298L492 300L498 300L493 298Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M407.5 293L410 293.5L407.5 294L407.5 293Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M414.5 293L417 293.5L414.5 294L414.5 293Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M460.5 294L466 294L466 301.5L464.5 304L464 302.5L465 299.5L463 299.5L464 297.5L462 296.5L462.5 295Q459.5 295.5 460.5 294Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 296L329 301.5L328 301.5L328.5 296Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M386.5 296L387.5 298L386.5 296Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M401.5 296L398.5 300L401.5 296Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M411.5 297L414 298.5L412.5 299L410.5 299L409 298.5L411.5 297Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M467.5 297L468 300.5L467 300.5L467.5 297Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M395.5 298Q398 299 397 303.5Q395.3 307.8 387.5 306L387.5 305Q394.3 306.8 396 303.5L395.5 298Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M507.5 301L508 304.5L506 303.5L507.5 301Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M406.5 305Q411.5 307.5 406.5 310L407 308.5L406.5 305Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 307L329 316.5L328 316.5L328.5 307Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M490.5 307Q491.8 309.3 496.5 308L497.5 307L501 310.5L500.5 316L499.5 310L499 315L497 315.5Q499.8 317.3 495.5 319L492 318.5L497 316.5L495.5 316L493.5 317L491 316.5L491.5 315L489.5 316L489 314.5L490 311.5Q490.7 308.9 488 310L487.5 313L487 310.5L490.5 307ZM491 309L491 310L495 310L491 309Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M373.5 308L367.5 315L373.5 308Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M290.5 309L296 309.5L290.5 310L290.5 309Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M417.5 309L421 310.5L419.5 310Q416.5 310.5 417.5 309Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M424.5 309L428 310.5L426.5 310Q423.5 310.5 424.5 309Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M381.5 311L372.5 321L381.5 311Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M411.5 312L413 316.5L411.5 319L411 317.5L411 315.5L411.5 312Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M416.5 314L419 314.5L416 315L417 320.5L416 320.5L415 315.5L416.5 314Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M280.5 316L281 320.5L280 320.5L280.5 316Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M363.5 317L364 319L337 318.5L362.5 318L363.5 317Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M478.5 317Q482 318 481 323.5L480 323.5Q480.6 318 478.5 317Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M308.5 318L324 318.5L308.5 319L308.5 318Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M296.5 319L297 323.5L296 323.5L296.5 319Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M424.5 320L426 320.5L420.5 325L424.5 320Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M172.5 322L174.5 325L172.5 322Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M415.5 322L414.5 324L415.5 322Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M525.5 323L526 326.5L524 327.5L525.5 323Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M413.5 325L415 327.5L413 326.5L413.5 325Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M501.5 325L505 325.5L501.5 326L501.5 325Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M202.5 326L197.5 332L202.5 326Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M546.5 327L551 327.5L550 331L546 331Q547.7 336.2 544 335L542 329L544.5 330L546.5 327Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M489.5 328L496 328.5L489.5 329L489.5 328Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M517.5 328L523 328.5L517.5 329L517.5 328Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M191.5 329L187.5 334L191.5 329Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M416.5 329L421 330.5L417.5 331L416.5 329Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M554 332L557 333.5L555.5 336L554 332Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M14.5 494L15.5 496L14.5 494Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M798.5 498L799 502.5L798 502.5L798.5 498Z"
+        android:fillColor="#7F8188"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#7F8188"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M146.5 114L699.5 114Q720.2 118.8 731 133.5L737 144.5L736.5 146L738 146.5L737 149L739 149.5L738 153.5L739 153.5L739.5 152L740 153.5L739 154.5L739 387.5L737 395.5L737.5 397L736 396.5L732 405.5L719.5 418Q711.6 424.6 699.5 427L597.5 427L535.5 396L530.5 395L525.5 391Q514.3 388.3 506.5 382L501.5 381L494.5 376L489.5 375L479.5 369L446.5 354L275.5 354Q268.3 352.2 265 346.5L263 341.5L263 268.5L262 266L253.5 264L245.5 259L240.5 258Q233.9 252.1 223.5 250L220.5 247L219 247.5L229 232.5L222 228.5L221.5 227L219.5 228L217.5 226L214 229.5L206.5 238L202.5 240L153.5 217Q152.3 219.3 151 216.5L150 205.5L152 199.5L152 194.5L158 183.5L153 177L147 181.5L138 195.5L136 208.5L134.5 210L129.5 206L117.5 202L107 195.5L107 155.5L109 145.5L113 137.5L112.5 136Q113.7 138.3 115 135.5L114 133.5Q116 135.2 118 131.5L122.5 126L125 124.5L124.5 123L126.5 123L128 122.5L127.5 121L129.5 121L131 120.5L130.5 119L132 119.5Q131.2 116.9 134.5 118L146.5 114ZM416 144L414 145L411 149L412 153L412 155Q411 157 414 156L416 156L429 156L430 157L434 154L433 152L435 152L435 149L430 144L416 144ZM417 157L417 158L428 158L417 157ZM275 190L272 191Q266 193 265 200L265 342L267 345Q270 349 277 351L433 351L435 350L427 348Q421 342 411 340L407 336L398 334L394 330L386 328L375 322L373 322L376 318L384 320L391 325L397 326L406 332L416 335L421 339L429 341L430 344L437 347L451 348L452 349L531 350L452 350L452 351L570 351L574 348L576 349L582 340L582 316L581 315L581 201L579 197Q576 192 570 190L275 190ZM617 190L613 197L610 209Q611 230 621 242Q631 255 652 259Q664 261 672 258L690 249Q701 240 705 223L704 221L695 220Q694 226 690 231Q681 241 666 245L650 244L636 236Q627 228 624 215L624 200L625 194L617 190ZM650 194L647 197L647 199L655 207Q653 214 647 217L649 220L652 220L660 212L669 220Q672 221 673 219L673 216L666 208L665 207L673 199Q673 195 671 194L661 203L653 195L650 194ZM184 198L168 213Q167 216 170 217L172 217L181 210L186 204L200 217Q204 217 204 215L203 212L189 198L184 198ZM616 313L612 321L610 329L611 346Q615 358 622 367Q633 379 653 383Q677 384 690 373L699 363L705 348L706 341L696 340L693 350L678 364L668 368Q661 366 660 369L646 366L638 361L629 352L624 337L625 320L626 317L616 313ZM657 314L652 316Q645 320 643 328L643 336L647 343L656 348L665 348L672 344L677 336L677 327L673 319L664 314L657 314Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M430.5 146L432.5 149L430.5 146Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M740.5 158L741 384.5L740 384.5L740.5 158Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M104.5 160L105 382.5L104 382.5L104.5 160Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M275.5 192L569 192.5L275.5 193L275.5 192Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M272.5 193L274 193.5L267.5 199L272.5 193Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M573.5 194L577.5 199L573.5 194Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M267.5 249L268 263.5L269 267.5L271.5 270L281.5 272L286.5 276L295 279.5L296 287L290 286.5L294 285.5L287.5 280L280.5 279L275.5 275L269.5 274L267.5 272L266 272.5L267.5 249Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M178.5 284L192.5 284L203.5 287Q213.8 291.2 221 298.5Q235.5 311 235 338.5L232 349.5L229.5 352L225.5 350L223.5 350L219 347.5L220 327.5Q216.6 312.4 205.5 305L192.5 299L178.5 299Q163.4 302.4 156 313.5L153.5 317L154 315.5L154 313.5L159 307.5L152.5 300L142.5 311L143 309.5Q147.3 298.8 156.5 293Q165.4 286.4 178.5 284Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M305 286L310 286Q309 289 312 288L312 290.5Q312.8 292.8 316.5 292L320.5 291L326 294.5Q328.8 296.2 328 301.5L325.5 300Q320.2 293.8 309.5 293L305 288.5L305 286Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M280.5 290L281 293.5L280 293.5L280.5 290Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M304.5 290L305 303.5L304 303.5L304.5 290Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M294.5 294L297 294.5L297 304.5L296 304.5L296 295.5L294.5 295L294.5 294Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M280.5 295L281 310.5L280 310.5L280.5 295Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M288.5 295L289 307.5L288 307.5L288.5 295Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M296.5 306L297 308.5L296 308.5L296.5 306Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 316L289 317.5L288.5 321L288 317.5L289.5 316Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M659.5 320Q666.1 320.4 669 324.5Q671.6 327.4 671 333.5L666.5 340Q664.2 342.7 658.5 342L651 337.5L649 329.5L652.5 323L659.5 320Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M198.5 322L195.5 326L198.5 322Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M282.5 323L286 323.5L282.5 324L282.5 323Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M296.5 324L297.5 326L296.5 324Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M365.5 325L368 325.5L365.5 326L365.5 325Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M168.5 326L176.5 335L168.5 326Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M192.5 336L190.5 339L192.5 336Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M184.5 340L187 340.5L184.5 341L184.5 340Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M116.5 412L121.5 418L116.5 412Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M728.5 412L723.5 418L728.5 412Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M148.5 429L151 429.5L148.5 430L148.5 429Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M694.5 429L697 429.5L694.5 430L694.5 429Z"
+        android:fillColor="#5A5A5B"
+        android:strokeColor="#5A5A5B"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M847.5 1L846.5 3L845 2.5L847.5 1Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M86.5 2L89 2.5L86.5 3L86.5 2Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M862.5 2L861.5 4L860 3.5L862.5 2Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M585.5 4L602 4.5L585.5 5L585.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M603.5 4L610 4.5L603.5 5L603.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M628.5 4L632 4.5L628.5 5L628.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M634.5 4L652 4.5L634.5 5L634.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M653.5 4L656 4.5L653.5 5L653.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M657.5 4L665 4.5L657.5 5L657.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M684.5 4L701 4.5L684.5 5L684.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M702.5 4L716 4.5L702.5 5L702.5 4Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M937.5 17L938.5 19L937.5 17Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M949.5 21L950.5 23L949.5 21Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M971.5 30L974 31.5L972.5 31L971.5 30Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M979.5 33L983 35.5L981.5 35L979.5 33Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M989.5 38L990.5 40L989.5 38Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M1.5 101L2 104.5L1 104.5L1.5 101Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M150.5 111L696.5 111L699 112.5L427.5 113L425.5 112L422.5 113L420.5 113L414.5 112L413.5 113L154.5 113L150.5 112L150.5 111Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M701 112Q704 111 703 114Q700 115 701 112Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M800.5 115L801 433.5L799.5 438L799 427.5L800 426.5L800 370.5L800 368.5L800 313.5L799 312.5L800 311.5L800 208.5L800 206.5Q801.3 201.8 799 200.5L800 197.5L800 195.5L799 192.5L800 191.5L800 170.5L799 168.5L800 165.5L800 163.5L800 137.5L799 136.5L800 134.5L800 132.5L800.5 115Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M725.5 124L729.5 129L725.5 124Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M732.5 132L733.5 134L732.5 132Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M742.5 159L743 382.5L741.5 385L741 383.5L742 382.5L742.5 159Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M653.5 204L654.5 206L653.5 204Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M173.5 207L172.5 209L173.5 207Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M195.5 212L196.5 214L195.5 212Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M418.5 218L419 220.5L418 220.5L418.5 218Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M447.5 218L448 221.5L447 221.5L447.5 218Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M300.5 221L301.5 223L300.5 221Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M522.5 222L523 233.5L522 233.5L522.5 222Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M511.5 231L512 234.5L511 234.5L511.5 231Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M503.5 242L508 242.5L503.5 243L503.5 242Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M513.5 242L517 242.5L513.5 243L513.5 242Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M386.5 255L387.5 257L386.5 255Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M456.5 264L457 270.5L456 270.5L456.5 264Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M509.5 293L510 295.5L509 295.5L509.5 293Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M420.5 299L421 303.5L420 303.5L420.5 299Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M303.5 304L304 307.5L303 307.5L303.5 304Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M410.5 307L414 307.5L410.5 308L410.5 307Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M471.5 327L474 327.5L471.5 328L471.5 327Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M490.5 327L495 327.5L490.5 328L490.5 327Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M517.5 327L521 327.5L517.5 328L517.5 327Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 444L3 450.5L2 450.5L2.5 444Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M3.5 457L4 460.5L3 460.5L3.5 457Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 458L797 463.5L797 483.5L796 483.5L795.5 476L795 479L10 479.5L11 481.5L10 481.5Q5.2 473.8 4 462.5L6.5 459L17.5 459L18.5 460L20.5 459L22.5 460L24.5 460L27.5 459L31.5 460L33.5 459L38.5 460L43.5 459L47.5 460L795 460L795.5 458Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M801.5 458L802.5 462L803 460L838.5 460L839 461.5Q848.8 471.8 851 489.5L839 500.5Q838.8 505.3 835.5 507L801.5 507L801 504.5L800 504.5L799.5 508L799 503.5Q802.5 502 800 500.5L801.5 498L837.5 498L841 495.5L840 485.5L836.5 479L802.5 479L802 482.5L801 482.5L801.5 458Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M798.5 478L799 481.5L798 481.5L798.5 478Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 495L796 497.5L795 497.5L795.5 495Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M589.5 499L794.5 499L795 499.5L795 507.5L793 508.5L793.5 507L25.5 507L21 503.5L20 501.5L21.5 502L588.5 500L589.5 499Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 501L798 503.5L797 503.5L797.5 501Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M25.5 508L26.5 510L25.5 508Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M798.5 513L799 515.5L798 515.5L798.5 513Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M30.5 514L31.5 516L30.5 514Z"
+        android:fillColor="#B9B9BA"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B9B9BA"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M571.5 0L742.5 0L744 1.5L743.5 3L743 1L571.5 1L571.5 0Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M90.5 1L94 1.5L90.5 2L90.5 1Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M848.5 1L855 1.5L848.5 2L848.5 1Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M83.5 2L86 2.5L83.5 3L83.5 2Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M863.5 2L867 2.5L863.5 3L863.5 2Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M872.5 3L876 3.5L872.5 4L872.5 3Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M880.5 4L883 4.5L880.5 5L880.5 4Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M990.5 38L991.5 40L990.5 38Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M1.5 82L2 84.5L1 84.5L1.5 82Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M0.5 98L1 100.5L0 100.5L0.5 98Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M0.5 102L1 445.5L0 445.5L0.5 102Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M1.5 459L2 461.5L1 461.5L1.5 459Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M19.5 503L20.5 505L19.5 503Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M23.5 508L31.5 517L23.5 508Z"
+        android:fillColor="#CBCBCB"
+        android:fillAlpha="0.5333333"
+        android:strokeColor="#CBCBCB"
+        android:strokeAlpha="0.5333333"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M587.5 2L594 2.5L587.5 3L587.5 2Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M595.5 2L714 2.5L595.5 3L595.5 2Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M715.5 2L729 2.5L715.5 3L715.5 2Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M748.5 3L749.5 4L791.5 4L793 3.5L794 5.5L791.5 6L743.5 6L743 4L748.5 3Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M80.5 4L568.5 4L570 5.5L78.5 6L78.5 5L80.5 4Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796 4L856.5 4L857.5 5L868.5 5L869.5 6L878.5 6L892.5 9L898.5 9L935.5 18L964.5 28L983 36.5L981.5 37L964.5 29L944.5 22L919.5 15L894.5 10L872.5 8L871.5 7L857.5 7L856.5 6L796 6L796 4Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M576.5 5L586 5.5L576.5 6L576.5 5Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M609.5 5L623 5.5L609.5 6L609.5 5Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M667.5 5L670 5.5L667.5 6L667.5 5Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M681.5 5L684 5.5L681.5 6L681.5 5Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M717.5 5L727 5.5L717.5 6L717.5 5Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M729.5 5L738 5.5L729.5 6L729.5 5Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796.5 11L797 14.5L795 15.5L796.5 11Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M49.5 14L51 14.5Q34.9 22.4 24 35.5L17.5 44L19 41.5L34.5 24L49.5 14Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796.5 21Q799 22 798 26.5L796 25.5L796.5 21Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 35Q799.8 37.8 799 43.5L797 42.5L797.5 35Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M16.5 45L16 46.5L9.5 58L10 56.5L16.5 45Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M994.5 48L995 50.5L994 50.5L994.5 48Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M995.5 52L996 54.5L995 54.5L995.5 52Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 55L800 61.5L799 62.5L798.5 74L798 60.5L799.5 55Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M8.5 61L7.5 63L8.5 61Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M4.5 70Q6.8 69.3 6 71.5L4.5 70Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M3.5 74L4 76.5L3 76.5L3.5 74Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M800.5 77L801 86.5L800 86.5L800.5 77Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M3.5 79L4 81.5L3 81.5L3.5 79Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 88L797 91.5L797 106.5L798 107.5L798 431.5L799 432.5L799 454.5L798 454.5L798 432.5L797 431.5L797 111L709 111.5L712 113.5L710.5 113L698.5 110L145.5 110L134.5 113L134.5 112L136 111.5L4 111L3.5 113L3 92.5L5 89L794.5 89L795.5 88Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M803 89L837.5 89L935.5 113L942.5 116L960.5 110L963.5 112L995.5 119L997 120.5L997 155.5L998 159.5L997 160.5L996 180.5L993 189L987.5 190L960.5 204L959 203.5L955 215.5L937 248.5L931 264.5L928 280.5L926 284.5L927 289L925 288.5L925 281.5L933 254.5L942 236.5L938.5 231L918.5 221L879 190L879 425.5L895 446.5L901 459.5L906 476.5L908.5 479Q912.9 480.5 912 477.5L917 469.5L921 457.5L923 447.5L923 440.5L924 439.5L925.5 292L926 431.5L925 432.5L924 449.5L920 465.5L913 479.5L905.5 488L893.5 495L887.5 496L886 497.5L882 506.5L875 515L859.5 526L844.5 532L835.5 534L797.5 534L796.5 535L796 533.5L798.5 530L837.5 530L851 525Q849.8 522 853.5 523L869 509.5L874 501.5Q871.5 500 875 498.5L874 496.5Q883.5 497 890 494.5L888 494L888 485.5L887 484.5L888 481.5L885 468.5L878 453.5L860.5 430L854.5 433L845 425.5L845.5 129L869.5 151L871 151L869 159L873.5 161Q895.4 181.1 921.5 197L940.5 205L956 206L956.5 208L959 201.5L960.5 190L962.5 191Q972.8 189.3 978 182.5L977.5 181L995 178L995 170.5L996 169.5L996 141.5L995 141.5L994.5 143L979.5 138L928.5 125L925.5 123L907.5 128L902.5 126L882.5 123L838.5 111L803 111L802.5 113L801 109.5L801 90.5L803 90.5L803 89Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M131.5 117L133 117.5L129.5 119L129.5 118L131.5 117Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M117.5 127L116.5 129L117.5 127Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M102.5 154L103 159.5L102 159.5L102.5 154Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M101.5 161L102 340.5L101 340.5L101.5 161Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M652.5 196L659.5 204L652.5 196Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M667.5 196L661.5 203L667.5 196Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M186.5 203L188.5 206L186.5 203Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M177.5 206L180 206.5Q179.3 208.8 175.5 208L175.5 207L177.5 206Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M192.5 207L196 207.5L192.5 208L192.5 207Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M197.5 207L199.5 210L197.5 207Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M654.5 209L648.5 216L654.5 209Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M513.5 210L559 210.5L513.5 211L513.5 210Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M176.5 211L174.5 214L176.5 211Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M307.5 211L310 211.5L307.5 212L307.5 211Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M545.5 213L556 213.5L545.5 214L545.5 213Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M300.5 214L303 214.5L300.5 215L300.5 214Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M345.5 217L346 222.5L345 222.5L345.5 217Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M390.5 218L391 221.5L390 221.5L390.5 218Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M564.5 218L565 234.5L564 234.5L564.5 218Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M336.5 220L337 223.5L336 223.5L336.5 220Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M364.5 221L365 226.5L364 226.5L364.5 221Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M410.5 224L409.5 226L410.5 224Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 226L329 228.5L328 228.5L328.5 226Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M310.5 231L311 234.5L310 234.5L310.5 231Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M544.5 232L545 236.5L544 236.5L544.5 232Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M499.5 237L500 239.5L499 239.5L499.5 237Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M504.5 239L525 239.5L504.5 240L504.5 239Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M527.5 239L537 239.5L527.5 240L527.5 239Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M545.5 239L554 239.5L545.5 240L545.5 239Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M383.5 248L382.5 250L383.5 248Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M419.5 248L420 258.5L419 258.5L419.5 248Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M424.5 251L425 269.5L424 269.5L424.5 251Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M404.5 254L403.5 256L404.5 254Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M451.5 256L452 258.5L451 258.5L451.5 256Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M406.5 257L410 257.5L406.5 258L406.5 257Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M411.5 257L412.5 259L411.5 257Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M431.5 265L432 271.5L431 271.5L431.5 265Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M283.5 281L286 281.5L282.5 283L283.5 281Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M287.5 281L288 286.5L287 286.5L287.5 281Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M297.5 281L298.5 283L299.5 281L305 284.5L302.5 289L298 287L297.5 281Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M461.5 283L469 283.5L461.5 284L461.5 283Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M471.5 283L474 283.5L471.5 284L471.5 283Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M491.5 283L499 283.5L491.5 284L491.5 283Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M306.5 284L312 284.5L306.5 285L306.5 284Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M319.5 284L322 284.5L319.5 285L319.5 284Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M323.5 284L326 284.5L323.5 285L323.5 284Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M336 284L344 284.5L342.5 286L336 286L336 284Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M352.5 284Q359.2 282.3 361 285.5L358.5 286L351 285.5L352.5 284Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M313.5 286L314 289.5L313 289.5L313.5 286Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M334.5 286L334 287.5L333.5 290L333 287.5L334.5 286Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M344.5 286Q347.5 287.5 344.5 289L344.5 286Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M349.5 287L350 289.5L349 289.5L349.5 287Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 288L296 288.5L289.5 289L289.5 288Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M462.5 291L465 291.5L462.5 292L462.5 291Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M514.5 291L517 291.5L514.5 292L514.5 291Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M927.5 293L928 299.5L927 299.5L927.5 293Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M414.5 294L417 294.5L414.5 295L414.5 294Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M501.5 295L502 297.5L501 297.5L501.5 295Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M329 297L339.5 299L345.5 304L356.5 307Q359.1 311.9 366 312.5L363.5 317L360 316.5L360.5 315L352.5 313L348.5 309L339.5 307L329 300.5L329 297Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M377.5 300L379 305.5L377 304.5L377.5 300Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M491.5 300L492.5 302L491.5 300Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M494.5 301L498 301.5L494.5 302L494.5 301Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M374.5 306L377 306.5L374.5 307L374.5 306Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 310L297 310.5L289.5 311L289.5 310Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M423.5 311L425 313.5L423 312.5L423.5 311Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M329.5 312L330 316.5L329 316.5L329.5 312Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M371.5 314Q376.3 316.3 372 318.5Q373.1 321.8 370.5 321L366 324.5L369 320L366.5 319L364.5 320L367.5 316L371.5 314Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M304.5 319L326 319.5L304.5 320L304.5 319Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M658.5 319L662 319.5L658.5 320L658.5 319Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M671.5 319L672.5 321L671.5 319Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M424.5 321L423.5 323L424.5 321Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M200.5 322L202 325.5L187 338Q188.1 341.3 184 340Q185.1 337.3 182.5 338L176.5 332Q174.8 334.8 173 330.5L174 329.5L170 325.5Q169.2 322.9 172.5 324L184.5 336L186.5 336L199 324.5L198.5 323L200 323.5L200.5 322Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M297.5 323L298.5 324L322 324.5L298.5 325L297.5 323Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 324L332 324.5L328.5 325L328.5 324Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M355.5 324L359 324.5L355.5 325L355.5 324Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M361.5 324L364 324.5L361.5 325L361.5 324Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M417.5 329L421 329.5L417.5 330L417.5 329Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M647.5 341L649.5 344L647.5 341Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M102.5 385L103 389.5L102 389.5L102.5 385Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M103.5 391L106 399.5L105 399.5Q102 396.1 103.5 391Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M106.5 401L109 405.5L107 404.5L106.5 401Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M109.5 407L113 411.5L110 409.5L109.5 407Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M731.5 410L730 412.5L726.5 417L729 413.5L731.5 410Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M113.5 413L125 423.5L122.5 422L113.5 413Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M723 418L725 418.5L722 423Q714.9 428.7 703.5 431L703.5 430L713 426.5L712.5 425L714.5 426L714.5 424L716.5 425L720 422.5L719.5 421Q721.2 423.7 723 419.5L723 418Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M126.5 424L130 426.5L128.5 426L126.5 424Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M142.5 431L145 431.5L142.5 432L142.5 431Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M698.5 431L702 431.5L698.5 432L698.5 431Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M148.5 432L696 432.5L148.5 433L148.5 432Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796.5 500L797 512.5L795.5 517L795 513.5L796 512.5L796.5 500Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M794.5 523L796 526.5L795 526.5L794.5 523Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M793.5 529L794 530.5L793 534L66.5 534L65.5 535L58 531.5L58.5 530L791.5 530L793 530.5L793.5 529Z"
+        android:fillColor="#D8D8D8"
+        android:strokeColor="#D8D8D8"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M152.5 113L694 113.5L152.5 114L152.5 113Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M652.5 195L659.5 203L652.5 195Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M266.5 202L268 203.5L268.5 225L269.5 212L272 213L272 204.5L273.5 203L274.5 204L333.5 204L336 205Q337.7 209.1 333.5 208L328.5 207L325 208Q326.5 211.8 323.5 211L317 213L319 216.5L320 230.5L322.5 234L324 234L324 236Q327.1 235.3 326.5 238L337.5 238L344 232.5L344 235Q346.7 233.9 346 236.5L348 236.5Q347.2 239.1 350.5 238L355.5 239L359.5 238L366 233L366.5 231L367 234Q373.1 235.8 375 232.5Q376 227 372.5 226L367 227L366.5 230L366 220.5L367 220.5L368.5 223Q373.8 224.3 375 221.5Q376 216 372.5 215L368 214.5L372.5 214L375 215L376 221.5L377.5 223L381.5 223L386.5 219L383.5 223L377.5 224Q375.5 220 373.5 224L372 224.5L376 227.5Q374.7 231.7 379.5 230L379.5 231L376 232.5L375 236.5L377.5 239L394.5 239L397 238Q398.5 232.6 395.5 231L390 230.5L397 223.5L397 214.5L393 212.5L395.5 212L398 214.5L398 223.5L397 226L394 227.5L393 229.5L397.5 232Q398.3 229.3 402.5 230L402.5 231Q398.8 230.3 398 232.5Q396.8 237.8 399.5 239L417.5 239L419 237.5L420 234.5L419 232.5L421 233.5Q421.8 239.3 417.5 240L399.5 240L397.5 238L395.5 240L386.5 240L385.5 241L382.5 240L380.5 240L376.5 241L374.5 241Q372.3 240.3 373 242.5L374.5 245L377 244L376 247.5L377 250.5L374 253.5L375 254.5Q375.8 256.8 373.5 256L372 258.5L375 257.5Q370 259 371 265L377.5 265L384 258.5Q382.9 255.2 385.5 256Q388.3 257.3 386 258.5L387 260.5L386 263L383 264.5L385.5 265L387 264.5Q386.1 267.5 390.5 266L389.5 263Q392.1 262.3 391 265L393.5 265L399.5 268L401 265L404 266.5L402 269.5Q404.8 270.6 404 274L409.5 275L413 272.5L413.5 268L414 270L418 271.5L419.5 275L425.5 274L430.5 275L433 272.5L433.5 259L434 268.5L437 274L440.5 272L441.5 273L449 273Q447.8 276 451.5 275L456 282.5L455 284.5L459.5 281L475.5 281L478 283.5L478.5 289L484.5 283L487 283L487 285L483 285L483 287Q480.3 285.9 481 288.5L478 291.5L478 306.5L479 306.5L479.5 305L480 306.5L478 308.5L478 317.5Q481.1 319 480.5 324Q481.8 321.8 483 324.5L483 326L487 326Q485.9 328.7 488.5 328Q490 330.5 495.5 329L501 328L501 326L505 326L505 324.5L508 323Q506.7 317.7 510 318.5L510 308.5Q506.7 307.3 508 301.5L509 301.5L509 306.5L512 310.5L512 316.5Q509.2 318.5 510 323L508 323.5L511.5 326L517 317.5L519 310.5L523 305.5L526.5 297L527 301Q523.7 299.7 525 304.5L520 311.5L516 319.5L516 323Q513.3 321.9 514 324.5L514 326.5Q513.2 329.1 516.5 328Q517.8 330.2 522.5 329L526 326.5L526 323L528 323Q526.8 317.7 530 318.5L530 315.5L533.5 310L534 312.5L531 316.5L532 317.5L530.5 320L532 320.5L530.5 321L529 320.5L530 324Q526.7 322.7 528 327.5L530 326.5Q529.2 323.5 533 325L533 321L534.5 321L534 319.5Q533.1 316.5 537.5 318L539 321L541.5 320L543.5 323L546 323.5L545.5 325Q548.1 325.7 547 323L549 323L550.5 326L551 323L554 323Q552.9 325.7 555.5 325L558.5 324L558.5 325Q555.9 324.3 557 327L564.5 329L566.5 331L569 330L569.5 328L573 329Q572 326 575 327L575 343L556.5 343L557.5 345L559.5 345L564 346.5L499 347.5L570.5 348L576.5 345L574.5 348L569.5 351L451.5 351L451.5 350L531 349.5L451.5 349L450.5 348L436.5 347L430 343.5L428.5 341L420.5 339L413.5 334L405.5 332L396.5 326L390.5 325L385.5 321L376 317.5L387.5 306Q395.3 307.7 397 303.5Q398 299 395.5 298L388.5 298L385 296L385 294.5L368.5 278L324.5 278Q323.2 275.7 318.5 277L316.5 277L309.5 278Q307.8 275.3 301.5 277L296 279L295.5 281L293.5 278L290.5 278L281.5 272L271.5 270L269 267.5L267.5 249L266.5 263L266.5 202ZM283 210L279 213L279 219L283 227L310 227L312 226L311 223L312 221L312 211L310 210L283 210ZM367 224L368 226L371 225L367 224ZM284 228L282 229L280 233L285 234L292 233L294 233L295 234L304 234L303 236L305 238Q309 239 311 237L312 237L312 229L310 228L284 228ZM367 237L367 239L369 238L371 239L373 239Q376 240 375 238L374 238L367 237ZM373 269Q370 270 371 274L378 275L380 275L382 274L384 275L386 274L397 274L398 275L401 274L401 269L373 269ZM415 271L414 274Q413 277 418 275L417 274Q418 270 415 271ZM461 282L458 285Q460 290 457 292L461 293Q467 292 467 294L467 328L476 328L477 327L477 283L475 282L461 282ZM408 293L407 294Q404 293 405 296Q399 295 398 300L398 305Q401 304 400 307L403 309L403 310L407 310L407 312L411 312L411 316L411 318Q409 325 414 323L413 327L416 328L418 331L423 330L428 324L427 322L430 320L430 313L428 312L427 309Q423 309 422 312L425 318L425 320L420 325L416 323L417 321L416 315L420 314Q422 315 421 311L418 309L421 307L421 297Q418 297 419 294L417 293L414 294L408 293ZM461 294Q460 296 463 295L462 297L464 298L463 300L465 299L465 302L466 302L466 294L461 294ZM547 327L545 330L542 329L544 335Q548 336 546 331L550 331L551 328L547 327ZM554 332L556 336L557 334L554 332Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M578.5 202L579 340.5L578 340.5L578.5 202Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M198.5 207L202.5 212L198.5 207Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M655.5 207L654.5 209L655.5 207Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M664.5 207L672.5 216L664.5 207Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M180.5 208L176.5 213L180.5 208Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M331.5 209L337.5 209L343 214.5L344 216.5L339 212.5Q339.8 209.9 336.5 211L331.5 210L331.5 209Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M351.5 209L350.5 211L351.5 209Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M357 209L360 210.5L357 211L357 209Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M389.5 210L392 210.5L389.5 211L389.5 210Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M361.5 211L367 217.5L366 217.5Q366.8 215.3 364.5 216L363 213Q359.8 214 361.5 211Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M415.5 212Q420.5 211.5 421 215.5L421 223.5L415 229.5L418 230.5L412.5 231L413.5 229L415 229L415 227L417 227L417 225Q419.7 226.1 419 223.5Q421.8 221.8 420 215.5Q419.5 212.5 415.5 213L415.5 212Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M445.5 212L444.5 214L445.5 212Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M447.5 213L449 215.5L448 215.5L447.5 213Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M168.5 215L169.5 217L168.5 215Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 216L302 216.5L289.5 217L289.5 216Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M455.5 217L458 217.5L455.5 218L455.5 217Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M408.5 219L411 219.5L406.5 222L408.5 219Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M453.5 219L454 220.5L452 221.5L453.5 219Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M330 220Q332.7 218.9 332 221.5L332 223.5L333 227.5L333 229.5L332.5 231L332 229L330 228.5L330 220Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M353.5 220L354 228.5L356 230.5L354 231L354 229Q351.3 230.1 352 227.5L353 222.5Q350.8 221.2 353.5 220Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M460.5 221L461 223.5L460 223.5L460.5 221Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M399.5 223L405 223.5L399.5 224L399.5 223Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M409.5 223L408.5 225L409.5 223Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M449.5 223L449 224.5L448.5 226L448 224.5L449.5 223Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M384.5 225L381.5 229L384.5 225Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M460.5 228L461 233.5L459.5 236L459 234.5L460.5 228Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M433.5 232L436 232.5L433.5 233L433.5 232Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M448.5 232L450 238.5L448 239.5L448.5 232Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M451.5 232Q455.3 230.8 454 234.5L453 234.5Q453.8 232.3 451.5 233L451.5 232Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M455.5 237L458 237.5L455.5 238L455.5 237Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M561 239L564 239.5L562 240L561.5 242L561 239Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M444.5 241L447 241.5L444.5 242L444.5 241Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M384.5 245L389.5 245L390 247L391.5 247L395 250.5L395 252.5L399 257.5L399 260L402.5 258L411 259.5L401.5 260L399.5 262Q396 260.7 397 256L393 253.5Q393.8 249.8 391.5 249L388.5 247L384.5 246L381 248.5L384.5 245Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M404.5 245L412 245.5L404.5 246L402 248.5L403.5 252L411 252.5L404.5 253L402 255.5L401.5 257L401 255.5L403 252.5L401 248.5L404.5 245Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M429.5 245L434 248.5L433.5 251L431.5 247L429.5 245Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M461.5 246L465 248.5L465 265.5L466 266.5Q463.5 268 465 273.5L462.5 276L460.5 277L456 276L456.5 274L461.5 275L464 274L464 248.5L462.5 247L461.5 246Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M448.5 247L452 248.5L448 249L448.5 247Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M435.5 248L438 248.5L435.5 249L435.5 248Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M379.5 250L376.5 254L379.5 250Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M453.5 250L456 250.5L453.5 251L453.5 250Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M442.5 254L445 255.5L442 256L442.5 254Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M453 257L456 257.5L454 258L451.5 262L445.5 265L441.5 265L441.5 264L448 263Q446.7 259.7 451.5 261L453 257Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M417.5 261L418 263.5L417 263.5L417.5 261Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M455.5 271L456 272.5L454 273.5L455.5 271Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M489.5 281L499.5 281L507 286.5L504.5 285L498.5 282L489.5 282L488 282.5L489.5 281Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M514.5 281L519 281.5Q513.8 281.3 511.5 284L512.5 282L514.5 281Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M541.5 282L545 284.5L544.5 286L542.5 283L541.5 282Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M280.5 283L281 285.5L280 285.5L280.5 283Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M305.5 285L307 285.5L305 286L304.5 290L304 286.5L305.5 285Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M510.5 285L512 291.5L510 292L508 288.5L510 288.5L510.5 285Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M310 286Q313 285 312 288Q309 289 310 286Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M318 286L328 286.5L326 287L326.5 289L328 288.5L329 292.5L327.5 297L324.5 293L318 291L318 286Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M312.5 290L313.5 292L312.5 290Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M491.5 295L493.5 299L498 299.5L492 300L491.5 295Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M499.5 295L500 297.5L499 297.5L499.5 295Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M511.5 295L511 296.5L510.5 300L510 296.5L511.5 295Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M539.5 297L540 299.5L539 299.5L539.5 297Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M411.5 298L414 299.5L414 301.5Q413.3 304.1 416 303L416 305Q412.9 304.3 413.5 307L408.5 307L405 305L405 303Q402.3 304.1 403 301.5L405.5 299Q410.2 300.3 411.5 298Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 302L329 306.5L328 306.5L328.5 302Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M537.5 302L538 304.5L537 304.5L537.5 302Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M535.5 306L536 308.5L535 308.5L535.5 306Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M490.5 309L495 309.5L490 310L489 312.5L489.5 314L488 314L488 310L490.5 309Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M499.5 310L500 316L492 318Q493.1 315.3 490.5 316L490.5 315L494.5 317L499 315L499.5 310Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M280.5 311L281 315.5L280 315.5L280.5 311Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M366.5 315L364.5 318L366.5 315Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M290.5 316L296 316.5L290.5 317L290.5 316Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M305.5 318L308 318.5L305.5 319L305.5 318Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M324.5 318L328 318.5L324.5 319L324.5 318Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M371.5 321L370.5 323L371.5 321Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M301.5 325L365 325.5L301.5 326L301.5 325Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M194.5 326L192.5 329L194.5 326Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M196.5 332L193.5 336L196.5 332Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M647.5 342L648.5 344L647.5 342Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M672.5 342L671.5 344L672.5 342Z"
+        android:fillColor="#78787D"
+        android:strokeColor="#78787D"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M131.5 119L130.5 121L118 130.5L109 145.5L107 155.5L107 195.5L117.5 202L129.5 206L134.5 210L136 208.5Q135.8 197.8 140 191.5L151.5 177Q153.8 176.3 153 178.5L158 184.5L152 194.5L150 211.5L152.5 218L154.5 218L166.5 224L171.5 225L179.5 230L189.5 233L202.5 240Q210 237 214 230.5L217.5 226L220.5 228L222 227.5L223.5 230L229 232.5L219 247.5Q221.2 245.7 223.5 250L230.5 252L253.5 264L262 266L263 268.5L263 341.5Q264.8 348.7 270.5 352L275.5 354L446.5 354L479.5 369L489.5 375L494.5 376L501.5 381L506.5 382Q514.3 388.3 525.5 391L530.5 395L535.5 396L597.5 427L699.5 427L713.5 422Q724.5 415.5 732 405.5L737 395.5L739 387.5L739 154.5L738 150.5L739 150.5L740 154.5L740 388.5Q735.4 409.4 720.5 420L707.5 427L693.5 430L151.5 430L140.5 428L130.5 424L114 409.5Q107.2 401.3 105 388.5L105 155.5Q109.2 134.7 123.5 124L131.5 119ZM179 284Q165 286 157 293Q148 299 143 309L144 310L153 300L159 308L154 314L155 316L156 314Q163 302 179 299L193 299L206 305Q217 312 220 328L219 348L224 350L226 350L230 352L232 350L235 339Q235 311 221 299Q214 291 204 287L193 284L179 284ZM171 321Q167 322 168 327L185 341L191 339L204 326L203 322L201 321L187 334L185 334L171 321Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M415.5 144L429.5 144L435 148.5Q434.9 154.9 430.5 157L429 156.5L433 153.5L434 151.5L430.5 146L414.5 146L412 148.5L411.5 150L411 148.5L413.5 145L415.5 144Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M411.5 153L414.5 157L412 156L411.5 153Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M416.5 157L428 157.5L416.5 158L416.5 157Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M274.5 190L569.5 190Q576 191.5 579 196.5L581 200.5L581 314.5L582 315.5L582 339.5L575.5 349L574 348.5L579 342.5L579 200.5L573.5 194L568.5 192L275.5 192Q269.4 193.4 267 198.5L266 200.5L266 272.5Q267.8 270.9 269.5 274L273.5 274L283 279.5L281 280L280 282.5L280 316.5L279 317.5L280 323L285.5 324L288 323L289 317L296 317L296 319.5L296 321.5Q295.3 325.3 297.5 326L367.5 326L373.5 321L385.5 328L393.5 330L397.5 334L406.5 336L410.5 340Q420.6 341.9 426.5 348L435 349.5L432.5 351L276.5 351Q270 349.5 267 344.5L265 341.5L265 199.5Q266.4 193.4 271.5 191L274.5 190Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M616.5 190L625 194L624 199.5L624 214.5Q626.6 228.4 635.5 236L649.5 244L665.5 245Q681.2 241.2 690 230.5Q694.4 226.4 695 220L703.5 221L705 222.5Q701 239.5 689.5 249L671.5 258Q663.6 260.6 651.5 259Q631.5 255 621 241.5Q610.5 230 610 208.5L613 196.5L616.5 190Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M181.5 208L180.5 210L181.5 208Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289 282L294 285.5L289.5 287L289 282Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M305.5 289L309.5 293L318.5 295L328 302.5L328 318L304 318L305.5 289Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289 294L292.5 295L294.5 295L296 295.5L296 309L288 308.5L289 307.5L289 294Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M616 313L626 317L625 319.5L624 336.5L629 351.5L637.5 361L645.5 366L659.5 369Q661.3 366.3 667.5 368L677.5 364L693 349.5L696 340L706 341L705 347.5L699 362.5L689.5 373Q677.2 384.2 652.5 383Q632.9 379.1 622 366.5Q614.6 357.9 611 345.5L610 328.5L612 320.5L616 313Z"
+        android:fillColor="#292929"
+        android:strokeColor="#292929"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M85.5 3L88 3.5L85.5 4L85.5 3Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M573.5 3L572.5 5L573.5 3Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M850.5 3L856 3.5L850.5 4L850.5 3Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M865.5 4L868 4.5L865.5 5L865.5 4Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M72.5 5L75 5.5L72.5 6L72.5 5Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M874.5 5L877 5.5L874.5 6L874.5 5Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 6L796 11.5L795 11.5L795.5 6Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 66L800 71.5L799 71.5L799.5 66Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 78L3 80.5L2 80.5L2.5 78Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 84L3 86.5L1 85.5L2.5 84Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M800.5 93L801 99.5L800 99.5L800.5 93Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 110L3 116.5L2 116.5L2.5 110Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M149.5 110L695 110.5L149.5 111L149.5 110Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M133.5 114L136 115.5L134.5 115L133.5 114Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M138.5 114L137.5 116L138.5 114Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M127.5 117L127.5 120L125.5 119L120 123.5L120.5 125L119.5 124L115 128.5L115 130.5L109.5 137L109 135.5Q113.9 125.9 122.5 120L127.5 117Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M723.5 121L732.5 131L723.5 121Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M851 124L861.5 127L863.5 126L869.5 128L898.5 132Q901.4 129.4 907.5 130L971.5 150L993.5 161L994.5 158L995 174.5L994 177L972.5 182L960.5 183L959 184.5L958.5 198L958 196L938.5 193L919.5 184L873 151L873 146.5L852.5 126Q849.9 126.7 851 124ZM870 134L872 137L892 152L919 170L937 179L949 183L957 184L958 186L958 183L966 182L962 181Q963 175 960 172Q951 161 937 156L886 138L870 134Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M733.5 132L734.5 134L733.5 132Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M735.5 135L736.5 137L735.5 135Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M3.5 146L4 149L6.5 149L14.5 154L22.5 156L30.5 161L38.5 163L43.5 167Q54.8 168.7 61.5 175L67.5 176L90.5 188L98.5 190L101 192.5L101 387.5L107 405.5L118.5 420Q126 427.5 138 430.5L136 431.5L138 432.5L4 433L3.5 435L3.5 146Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M742.5 151L743 153.5L742 153.5L742.5 151Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M743.5 157L744 386.5L743 386.5L743.5 157Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M801.5 171L802 427L837.5 427L852.5 438L854.5 437L871 458.5Q876.7 467.8 879 480.5L879 482.5L880 493.5L881 494.5L868 495L868 499.5L861 512Q858.3 510.9 859 513.5Q849.8 523.3 835.5 528L798.5 528L797.5 529L797 527.5L799.5 523L800.5 524L834.5 524Q847.1 519.6 854 509.5Q859.3 502.8 860.5 492L870.5 494L870 492.5L869 480.5L860 459.5Q850.9 445.1 838.5 434L803.5 434L802.5 435L801 430.5L801.5 171Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M671.5 199L665.5 206L671.5 199Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M193.5 203L194.5 205L193.5 203Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M351.5 211L356 211.5L351.5 212L351.5 211Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M658.5 212L654.5 217L658.5 212Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M326.5 213L324.5 216L326.5 213Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M513.5 213L523 213.5L513.5 214L513.5 213Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M524.5 213L534 213.5L524.5 214L524.5 213Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M535.5 213L544 213.5L535.5 214L535.5 213Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M499.5 215L500 232.5L499 232.5L499.5 215Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M409.5 217L412 217.5L409.5 218L409.5 217Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M533.5 217L534 223.5L533 223.5L533.5 217Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M458.5 220L459 223.5L458 223.5L458.5 220Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M561.5 220L562 222.5L561 222.5L561.5 220Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M284.5 222L290 222.5L284.5 223L284.5 222Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M451.5 223L451 224.5L450.5 230L450 224.5L451.5 223Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 225L297 225.5L289.5 226L289.5 225Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M364.5 228L365 230.5L364 230.5L364.5 228Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M561.5 230L562 233.5L561 233.5L561.5 230Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M458.5 231L459 233.5L458 233.5L458.5 231Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M284.5 232L287 232.5L284.5 233L284.5 232Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M291.5 232L294 232.5L291.5 233L291.5 232Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M295.5 232L303 232.5L295.5 233L295.5 232Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M360.5 235L359.5 237L360.5 235Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M442.5 237L443.5 239L442.5 237Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M504.5 237L509 237.5L504.5 238L504.5 237Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M514.5 237L520 237.5L514.5 238L514.5 237Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M545.5 242L548 242.5L545.5 243L545.5 242Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M549.5 242L558 242.5L549.5 243L549.5 242Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M406.5 247L417 247.5L406.5 248L406.5 247Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M431.5 252L432 258.5L431 258.5L431.5 252Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M453.5 252L452 254.5L451.5 256L451 254.5L453.5 252Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M381.5 259L380.5 261L381.5 259Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M411.5 266L412 269.5L411 269.5L411.5 266Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M380.5 273L386 273.5L380.5 274L380.5 273Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M396.5 273L399 273.5L396.5 274L396.5 273Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M299.5 278L303 278.5L299.5 279L299.5 278Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M305.5 278L350 278.5L305.5 279L305.5 278Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M358.5 278L361 278.5L358.5 279L358.5 278Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M282.5 281L287 283.5L288 289L297 288.5L297 286.5L297.5 285L298 286.5L297.5 288L302 289L302 318.5L303.5 319L304.5 320L325.5 320L327.5 321L329.5 319L363.5 319L363.5 320L359 320.5L368 321L368.5 323L370 322.5Q368.2 326.7 366.5 324L298.5 324L298 322.5L297 318.5L299 318.5L298.5 316L296.5 316L290.5 315L286 317L286.5 320L287.5 318L288 321L282 321.5L285 322.5L282.5 323Q279.3 321.3 281 314.5L282 314.5L282.5 316L283 313L281 312.5L283 312L283 285.5L281 285L281 283.5L283 283.5L282.5 281ZM290 292L288 294L288 302L287 299L286 310L289 311L297 311Q296 308 299 309L299 294Q296 295 297 292L290 292Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M521.5 283L527 283.5L521.5 284L521.5 283Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M542.5 286L543 290.5L541 291.5L542.5 286Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M303.5 289L304 295.5L303 295.5L303.5 289Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M360.5 289L361.5 291L360.5 289Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M512.5 290L513.5 292L512.5 290Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M518.5 291L523 291.5L518.5 292L518.5 291Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M526.5 291Q532.6 289.8 532 292.5L530.5 292Q525.5 293 526.5 291Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M413.5 294L412.5 296L413.5 294Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M384.5 295L385.5 297L384.5 295Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M377.5 297L379 300.5L378.5 303L377 299.5L377.5 297Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M414.5 299L415 301.5L414 301.5L414.5 299Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M480.5 300L481.5 302L480.5 300Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M329.5 302L330.5 307L331 303Q333.7 301.9 333 304.5L335.5 307L345.5 309L350.5 314L357 315.5L353.5 317L352.5 316L330 316L329.5 302Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M403.5 303L404.5 305L403.5 303Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M373.5 307L372.5 309L373.5 307Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M178.5 335L179.5 337L178.5 335Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M742.5 389L743 391.5L742 391.5L742.5 389Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M740.5 396L741 397.5L731.5 412L732.5 408L735 406.5L734.5 405L736 405Q734.5 401.3 737.5 402L737.5 400Q739.8 400.8 739 398.5L740.5 396Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M727.5 414L725.5 417L727.5 414Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M715.5 427L795.5 427L797 428.5L796.5 435L795.5 432L795 434L704 433.5L706 432.5L704 431.5L715.5 427Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M154.5 430L691 430.5L154.5 431L154.5 430Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M143.5 432L146 432.5L143.5 433L143.5 432Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M699.5 432L703 432.5L699.5 433L699.5 432Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M149.5 433L696 433.5L149.5 434L149.5 433Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 440L798 462.5L799 466.5L798 466.5L797 462.5L797.5 440Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M797.5 491L798 496Q795.3 497.1 796 494.5L797.5 491Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M794.5 519L795 521.5L794 521.5L794.5 519Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M45.5 523L92.5 523L96.5 524L100.5 523L103.5 524L107.5 523L108.5 524L794 524L792.5 528L52.5 528L51.5 529L47 527L46.5 525L45 525.5L45.5 523Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 529L797 533Q793.2 534.2 795.5 529Z"
+        android:fillColor="#C8CDCE"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C8CDCE"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M99.5 1L147 1.5L99.5 2L99.5 1Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M148.5 1L562.5 1L565 2.5L563.5 3L562.5 2L148.5 2L148.5 1Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M575.5 1L579 1.5L575.5 2L575.5 1Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M737.5 1L741 1.5L737.5 2L737.5 1Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M750.5 1L792 1.5L750.5 2L750.5 1Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M794.5 1L846.5 1L847.5 2L861.5 2L862.5 3L871.5 3L886 5.5L880.5 6L871.5 4L847.5 3L846.5 2L795.5 2L793.5 3L794.5 1Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M887.5 6L892 6.5L887.5 7L887.5 6Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M893.5 7L903 8.5L898.5 9L893.5 8L893.5 7Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M904.5 9L907 9.5L904.5 10L904.5 9Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M908.5 10L912 10.5L908.5 11L908.5 10Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M913.5 11L916 11.5L913.5 12L913.5 11Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M917.5 12L920 12.5L917.5 13L917.5 12Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M921.5 13L924 13.5L921.5 14L921.5 13Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M928.5 15L931 15.5L928.5 16L928.5 15Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M1.5 105L2 450.5L3 451.5L4 465.5L9.5 480L10.5 479L795 479L795.5 476L796 494.5L795 499L21 502L30 513.5L21 505.5L18 501.5L18.5 500L16 498.5L16.5 497L14 495.5L14.5 494L13 493.5L13.5 492L12 491.5L12.5 490L11 489.5L11.5 488L10 487.5L10.5 486L9 485.5L9.5 484L8 483.5L9 481L7 480.5L7.5 479L6 478.5L7 476L5 475.5L6 473Q3.3 474.1 4 471.5L5 469L3 468.5L4 466Q0.7 467.3 2 462.5L2 460.5L1 457.5L1.5 105Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M699.5 112Q702.1 111.3 701 114L697 113.5L699.5 112Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M703 113Q721.9 117.3 732 131.5Q739.2 140.3 742 153.5L742 382.5L741 382.5L741 155.5Q737 134.5 722.5 124L708.5 116L703 115L703 113Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M116.5 130L115.5 132L116.5 130Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M180.5 200L174.5 207L180.5 200Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M310.5 211L312 213.5L311 213.5L310.5 211Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M350.5 211L349.5 213L350.5 211Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M359.5 211L360.5 213L359.5 211Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M405.5 211L413 211.5L405.5 212L405.5 211Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M197.5 214L198.5 216L197.5 214Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M504.5 214L510 214.5L504.5 215L504.5 214Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M514.5 214Q522.3 212.3 524 216.5L524 235.5L522.5 237L523 235.5L523 216.5L521.5 215L514.5 215L514.5 214Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M525.5 214L532 214.5L525.5 215L525.5 214Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M536.5 214L544 214.5L536.5 215L536.5 214Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M378.5 215L379 217.5L376 219.5L378.5 215Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M396.5 215L397 222.5L396 222.5L396.5 215Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M443.5 215L441.5 218L443.5 215Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M511.5 215L513 216.5L513 230.5L512 230.5L512 216.5L511.5 215Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M533.5 215L534.5 217L533.5 215Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M281.5 216L282 219.5L281 219.5L281.5 216Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M354.5 217L359 220.5L358.5 222L355.5 218L352 220.5L351.5 226L351 220.5L354.5 217Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M407.5 218L404.5 222L407.5 218Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M558.5 218L561 218.5L558.5 219L558.5 218Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M342.5 219L343 231.5L337 236.5L342 231.5L342.5 219Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M454.5 220L455 224.5L453 223.5L454.5 220Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M283.5 221L292 221.5L283.5 222L283.5 221Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M301.5 221L309.5 221L310 223L306.5 222L304.5 223L302.5 223L301.5 221Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M447.5 222L448 238.5L447 238.5L447.5 222Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M454.5 226L455 230.5L454 230.5L454.5 226Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M351.5 227L354.5 231L358 228.5L358.5 227L359 228.5L354.5 232L351 228.5L351.5 227Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M368.5 227L368 228.5L367.5 232L367 228.5L368.5 227Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M390.5 228L389.5 230L390.5 228Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M281.5 230L283 232.5L281 231.5L281.5 230Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M378.5 231L381 231.5L378.5 232L378.5 231Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M390.5 231L394 231.5L390.5 232L390.5 231Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M418.5 233L419 236.5L417 237.5L418.5 233Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M454.5 233L456 235.5L454 234.5L454.5 233Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M512.5 233L514 237.5L512.5 237L511 236.5L512.5 233Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M349.5 236L350.5 238L349.5 236Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M376.5 236L377.5 238L376.5 236Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M306.5 237L309 237.5L306.5 238L306.5 237Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 237L336 237.5L328.5 238L328.5 237Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M352.5 237L359 237.5L352.5 238L352.5 237Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M560.5 239L561 241.5L560 241.5L560.5 239Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M424.5 247L427 247.5Q424.9 250.8 424.5 247Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M446.5 247L451 249.5L448.5 250L446.5 247Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M443.5 252L446 255.5L443 257.5L445 254.5L443.5 252Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M456.5 256L457 263.5L456 263.5L456.5 256Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M389.5 258L390 260.5L389 260.5L389.5 258Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M417.5 259Q420.5 258.1 419 262.5L418 262.5L417.5 259Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M451.5 259L450.5 261L448 260.5L451.5 259Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M402.5 260L415 260.5L402.5 261L402.5 260Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M371.5 262L373 264.5L371 263.5L371.5 262Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M398.5 269L401 270.5L399.5 270L398.5 269Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M416.5 269L419 270.5L418.5 273L418 270L416.5 269Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M371.5 272L372.5 274L371.5 272Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M400.5 272L399.5 274L400.5 272Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M425.5 272L426.5 274L425.5 272Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M368.5 278L369.5 280L368.5 278Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M283.5 280L287 280.5L283.5 281L283.5 280Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M476.5 285L477 291.5L476 291.5L476.5 285Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M484.5 285L483.5 287L484.5 285Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M501.5 285L504 285.5L501.5 286L501.5 285Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M328.5 287L329 289.5L328 289.5L328.5 287Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M366.5 287L377.5 299L368.5 290L367 290L366.5 287Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M365.5 290L364.5 292L363 291.5L365.5 290Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M330.5 291L333 291.5L329.5 293L330.5 291Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M467.5 292L468 296.5L467 296.5L467.5 292Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M289.5 293L292 293.5L289.5 294L289.5 293Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M281.5 295L282 306.5L281 306.5L281.5 295Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M418.5 295L420.5 298L418.5 295Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M388.5 298L395 298.5L388.5 299L388.5 298Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M404.5 299L403.5 301L404.5 299Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M509.5 299L508.5 301L509.5 299Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M398.5 300L399 303.5L398 303.5L398.5 300Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M526.5 301L526 302.5L525.5 305L525 302.5L526.5 301Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M416.5 303L417 304.5L414 306.5L416.5 303Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M467.5 305L468 317.5L467 317.5L467.5 305Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M418.5 307L417.5 309L418.5 307Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M491.5 307L497 307.5L491.5 308L491.5 307Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M509.5 309L510 316.5L509 316.5L509.5 309Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M303.5 312L304 317.5L303 317.5L303.5 312Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M367.5 313L370 313.5L364 318.5L364 316.5L367.5 313Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M487.5 313L488.5 315L487.5 313Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M658.5 314L662 314.5L658.5 315L658.5 314Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M412.5 315L415 316.5L413.5 317L412.5 315Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M429.5 315L430 317.5L429 317.5L429.5 315Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M490.5 316L491.5 318L490.5 316Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M329.5 317L337 318.5L330.5 319L329.5 317Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M429.5 319L428.5 321L429.5 319Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M467.5 320L468 323.5L467 323.5L467.5 320Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M287.5 321L286.5 323L287.5 321Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M169.5 322L168.5 324L169.5 322Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M515.5 323L514.5 325L515.5 323Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M426.5 324L425.5 326L426.5 324Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M175.5 325L179.5 330L175.5 325Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M467.5 326L468.5 328L467.5 326Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M487.5 326L488.5 328L487.5 326Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M500.5 326L499.5 328L500.5 326Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M643.5 328L644 333.5L643 333.5L643.5 328Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M668.5 338L667.5 340L668.5 338Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M800.5 434L801.5 483L802 479L836.5 479L838 480.5Q841.3 486.2 841 495.5L837.5 498L801.5 498L800 499.5L796.5 529L796 521.5L797 520.5L797 504.5Q800 503.5 799 498.5L798 497.5L798 482.5L799 481.5L799 440.5L800 439.5L800 437.5L800.5 434Z"
+        android:fillColor="#B1B3B4"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#B1B3B4"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M79.5 0L80 2.5L79 2.5L79.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M85.5 0L86.5 2Q83.7 2.7 85.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M89.5 0L90 2L88 1.5L89.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M564.5 0L563.5 2L564.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M569 0Q572 -1 571 2Q568 3 569 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M743.5 0Q747.3 -1.3 746 2.5L745 2.5Q745.8 0.3 743.5 1L743.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M792.5 0L838 0.5L792.5 1L792.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M844.5 0L848 0.5L844.5 1L844.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M854.5 0L858 1.5L855.5 2L854.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M861 0L863 0.5L861 1.5L861 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M866 0Q868.7 -1.1 868 1.5L868.5 3L866 1.5L866 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M871.5 0L872 2.5L871 2.5L871.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M875 0Q878.3 -1.3 877 3.5L875 2.5L875 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M879.5 0L880 3.5L879 3.5L879.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M883.5 0L884 4.5L883 4.5L883.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M886.5 0L887 4.5L886 4.5L886.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M889.5 0L890 5.5L889 5.5L889.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M892.5 0L893 5.5L892 5.5L892.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M895.5 0L896 6.5L895 6.5L895.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M898.5 0L899 5.5L898 5.5L898.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M900.5 0L901 7.5L900 7.5L900.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M903.5 0L904 6.5L903 6.5L903.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M907.5 0L908 8.5L907 8.5L907.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M912.5 0L913 8.5L912 8.5L912.5 0Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M0.5 91L1 97.5L0 97.5L0.5 91Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M928 289L1000 289.5L929 290L928.5 292L928 289Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M928 295L999.5 295L1000 300L928.5 300L928 295Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M928.5 309L929.5 310L1000 310L999.5 312L929.5 312L929 314L999.5 314L1000 314.5L1000 323L929.5 323L929 325L999.5 325L1000 325.5L1000 333L929 333.5L1000 334L999.5 338L929.5 338L929.5 339L999.5 339L1000 341L929.5 341L929 343L999.5 343L1000 347L929.5 347L929 349L999.5 349L1000 354L929 354.5L1000 355.5L929 356L929.5 360L999.5 360L999.5 361L929.5 361L929 361.5L929 376.5L928 376.5L928.5 309Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M928.5 378L929 383.5L928 383.5L928.5 378Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M0.5 446L1 452.5L0 452.5L0.5 446Z"
+        android:fillColor="#CECECE"
+        android:fillAlpha="0.1294118"
+        android:strokeColor="#CECECE"
+        android:strokeAlpha="0.1294118"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M800.5 2L826 2.5L800.5 3L800.5 2Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M76.5 4L79 4.5L76.5 5L76.5 4Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M738.5 4L742 4.5L738.5 5L738.5 4Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M799.5 72L800 85.5L799 85.5L799.5 72Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 81L3 83.5L2 83.5L2.5 81Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M1.5 86L2 89.5L1 89.5L1.5 86Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M800.5 100L801 106.5L800 106.5L800.5 100Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M145.5 111L151 112.5L146.5 113L145.5 111Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M2.5 117L3.5 435L4 433L138 432.5L136 431.5L138.5 431L149.5 434L695.5 434L705.5 432L705.5 433L704 433.5L795 434L795.5 432Q798.4 436.2 797 444.5L796 444.5L795.5 443L795 445L4.5 445L3.5 446L3 435.5L2 434.5L2.5 117Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M128.5 117L127.5 119L128.5 117Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M125.5 119L126 121L115.5 129L121.5 122L125.5 119Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M721.5 120L722.5 122L721.5 120Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M869.5 134L885.5 138L936.5 156Q950.6 161.4 960 171.5Q963 174.8 962 181L966 181.5L958 183L957.5 186L957 184L948.5 183L936.5 179L918.5 170L891.5 152L871.5 137L869.5 134Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M416.5 146L428 146.5L416.5 147L416.5 146Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M191.5 201L192.5 203L191.5 201Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M191.5 208L192.5 210L191.5 208Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M653.5 217L652.5 219L653.5 217Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M458.5 224L459 230.5L458 230.5L458.5 224Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M287.5 232L291 232.5L287.5 233L287.5 232Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M411.5 237L416 237.5L411.5 238L411.5 237Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M427.5 247L430 247.5L427.5 248L427.5 247Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M425.5 266L426 268.5L425 268.5L425.5 266Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M386.5 273L389 273.5L386.5 274L386.5 273Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M350.5 278L358 278.5L350.5 279L350.5 278Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M361.5 278L365 278.5L361.5 279L361.5 278Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M183.5 333L184.5 335L183.5 333Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M742.5 386L743 388.5L742 388.5L742.5 386Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M739.5 394Q742.3 395.3 740 396.5L739 400L737 399.5L739.5 394Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M801.5 431L802.5 435L803.5 434L838.5 434Q850.9 445.1 860 459.5L869 480.5L870 492.5L871 493.5L867.5 494L860.5 492Q857.7 510.7 844.5 519L834.5 524L800.5 524L798 523.5L799.5 518L800.5 519L834.5 519L845 510.5Q849.9 505.4 851 496.5L855.5 491L862.5 492L861 489.5L860 480.5L852 462.5L838.5 445L803.5 445L802.5 446Q799.5 440.2 801.5 431Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M798.5 467L799 472.5L798 472.5L798.5 467Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M796.5 490L797 493.5L796 493.5L796.5 490Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M795.5 505L796 508.5L795 508.5L795.5 505Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+    <path
+        android:pathData="M794.5 515L795 518.5L794 524L108.5 524L104.5 523L101.5 524L97.5 523L93.5 524L92.5 523L45.5 523L46.5 526L39 521.5L38.5 520L37 520.5L37.5 518L99.5 518L101.5 519L103.5 518L105.5 519L109.5 519L116.5 518L118.5 518L120.5 519L794 519L794.5 515Z"
+        android:fillColor="#C6C7C7"
+        android:fillAlpha="0.9960784"
+        android:strokeColor="#C6C7C7"
+        android:strokeAlpha="0.9960784"
+        android:strokeWidth="1" />
+</vector>
\ No newline at end of file
diff --git a/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml b/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml
new file mode 100644
index 0000000000..86b6406ee1
--- /dev/null
+++ b/diaconn/src/main/res/layout/diaconn_g8_blescanner_activity.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    tools:context=".activities.DiaconnG8BLEScanActivity">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:background="@color/activity_title_background"
+        android:orientation="horizontal"
+        android:padding="5dp">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/diaconn_pairing"
+            app:srcCompat="@drawable/ic_bluetooth_white_48dp" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:text="@string/diaconn_pairing"
+            android:textAlignment="center"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    </RelativeLayout>
+
+    <ListView
+        android:id="@+id/blescanner_listview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+
+    <TextView
+        android:id="@+id/blescanner_nodevice"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:gravity="center"
+        android:text="@string/diaconn_nodeviceavailable"
+        android:textColor="#FF7F8288" />
+
+</LinearLayout>
diff --git a/diaconn/src/main/res/layout/diaconn_g8_blescanner_item.xml b/diaconn/src/main/res/layout/diaconn_g8_blescanner_item.xml
new file mode 100644
index 0000000000..9a39302163
--- /dev/null
+++ b/diaconn/src/main/res/layout/diaconn_g8_blescanner_item.xml
@@ -0,0 +1,27 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="52dp"
+    android:layout_marginLeft="15.67dp"
+    android:layout_marginRight="15.67dp">
+
+    <TextView
+        android:id="@+id/ble_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentStart="true"
+        android:layout_centerVertical="true"
+        android:layout_toStartOf="@+id/ble_address"
+        android:textColor="#ffffff"
+        android:textSize="20sp" />
+
+    <TextView
+        android:id="@+id/ble_address"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignParentEnd="true"
+        android:layout_centerVertical="true"
+        android:layout_marginStart="6.5dp"
+        android:textColor="#FF00A0E9"
+        android:textSize="20sp" />
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/diaconn/src/main/res/layout/diaconn_g8_fragment.xml b/diaconn/src/main/res/layout/diaconn_g8_fragment.xml
new file mode 100644
index 0000000000..43b11361ec
--- /dev/null
+++ b/diaconn/src/main/res/layout/diaconn_g8_fragment.xml
@@ -0,0 +1,714 @@
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:paddingTop="5dp"
+    tools:context="info.nightscout.androidaps.diaconn.DiaconnG8Fragment">
+
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <ScrollView
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_above="@+id/buttons"
+            android:fillViewport="true">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="vertical">
+
+                <LinearLayout
+                    android:id="@+id/diaconn_g8_pumpstatuslayout"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:paddingBottom="5dp"
+                    android:paddingTop="2dp"
+                    android:visibility="gone">
+
+                    <TextView
+                        android:id="@+id/diaconn_g8_pumpstatus"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginRight="5dp"
+                        android:gravity="center_vertical|center_horizontal"
+                        android:text="@string/initializing"
+                        android:textAppearance="?android:attr/textAppearanceSmall" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/serialnumber"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/serial_number"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/diaconn_g8_bluetooth_status"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <com.joanzapata.iconify.widget.IconTextView
+                        android:id="@+id/btconnection"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:text="{fa-bluetooth-b}"
+                        android:textColor="@android:color/white"
+                        android:textSize="20dp" />
+
+
+                </LinearLayout>
+
+                <TextView
+                    android:id="@+id/queue"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="content"
+                    android:textAlignment="center" />
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/battery_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <com.joanzapata.iconify.widget.IconTextView
+                        android:id="@+id/battery"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="20dp" />
+
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/lastconnection_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/lastconnection"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/lastbolus_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/lastbolus"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/dailyunits"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/dailyunits"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/basebasalrate_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/basabasalrate"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/tempbasal_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/tempbasal"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/virtualpump_extendedbolus_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/extendedbolus"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/reservoir_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/reservoir"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/basal_step"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/basalstep"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/bolus_step"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/bolusstep"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal">
+
+                    <TextView
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="end"
+                        android:paddingRight="5dp"
+                        android:text="@string/pump_firmware_label"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:layout_width="5dp"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:gravity="center_horizontal"
+                        android:paddingEnd="2dp"
+                        android:paddingStart="2dp"
+                        android:text=":"
+                        android:textSize="14sp" />
+
+                    <TextView
+                        android:id="@+id/firmware"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:gravity="start"
+                        android:paddingLeft="5dp"
+                        android:textColor="@android:color/white"
+                        android:textSize="14sp" />
+
+                </LinearLayout>
+
+                <View
+                    android:layout_width="fill_parent"
+                    android:layout_height="2dip"
+                    android:layout_marginBottom="5dp"
+                    android:layout_marginLeft="20dp"
+                    android:layout_marginRight="20dp"
+                    android:layout_marginTop="5dp"
+                    android:background="@color/list_delimiter" />
+
+                <TextView
+                    android:layout_width="150dp"
+                    android:layout_height="100dp"
+                    android:layout_gravity="center"
+                    android:drawableTop="@drawable/ic_diaconn_g8"
+                    android:paddingTop="10dp" />
+
+            </LinearLayout>
+
+        </ScrollView>
+
+        <LinearLayout
+            android:id="@+id/buttons"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentBottom="true"
+            android:orientation="vertical">
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+<!--                <Button-->
+<!--                    android:id="@+id/viewprofile"-->
+<!--                    style="@style/ButtonSmallFontStyle"-->
+<!--                    android:layout_width="match_parent"-->
+<!--                    android:layout_height="match_parent"-->
+<!--                    android:layout_weight="1"-->
+<!--                    android:drawableTop="@drawable/ic_danarprofile"-->
+<!--                    android:paddingLeft="0dp"-->
+<!--                    android:paddingRight="0dp"-->
+<!--                    android:text="@string/viewprofile" />-->
+
+
+                <Button
+                    android:id="@+id/history"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:drawableTop="@drawable/ic_danarhistory"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/pumphistory" />
+
+                <Button
+                    android:id="@+id/stats"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:drawableTop="@drawable/ic_danarstats"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/stats" />
+
+                <Button
+                    android:id="@+id/user_options"
+                    style="@style/ButtonSmallFontStyle"
+                    android:layout_width="match_parent"
+                    android:layout_height="match_parent"
+                    android:layout_weight="1"
+                    android:drawableTop="@drawable/ic_danar_useropt"
+                    android:paddingLeft="0dp"
+                    android:paddingRight="0dp"
+                    android:text="@string/diagonn_g8_useroptions" />
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+    </RelativeLayout>
+
+</FrameLayout>
diff --git a/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml b/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
new file mode 100644
index 0000000000..e8c0d99923
--- /dev/null
+++ b/diaconn/src/main/res/layout/diaconn_g8_history_activity.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    tools:context="info.nightscout.androidaps.diaconn.activities.DiaconnG8HistoryActivity">
+
+
+    <RelativeLayout
+        android:id="@+id/header"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentTop="true"
+        android:layout_gravity="center"
+        android:background="@color/activity_title_background"
+        android:orientation="horizontal"
+        android:padding="5dp">
+
+        <ImageView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/pumphistory"
+            app:srcCompat="@drawable/ic_danarhistory" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_gravity="center"
+            android:layout_marginLeft="10dp"
+            android:layout_marginRight="10dp"
+            android:text="@string/pumphistory"
+            android:textAlignment="center"
+            android:textAppearance="?android:attr/textAppearanceLarge" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:id="@+id/spacer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/header"
+        android:orientation="horizontal"
+        android:padding="5dp" />
+
+    <LinearLayout
+        android:id="@+id/spinner_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/spacer"
+        android:orientation="horizontal">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="20dp"
+            android:text="@string/eventtype"
+            android:textAppearance="?android:attr/textAppearanceSmall" />
+
+        <Spinner
+            android:id="@+id/spinner"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="20dp" />
+
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/status"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/spinner_layout"
+        android:layout_gravity="center_horizontal"
+        android:gravity="center_horizontal" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recyclerview"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_above="@id/reload"
+        android:layout_below="@+id/status" />
+
+    <Button
+        android:id="@+id/reload"
+        style="@style/Widget.AppCompat.Button"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true"
+        android:drawableStart="@drawable/ic_actions_refill"
+        android:text="@string/reload" />
+
+</RelativeLayout>
diff --git a/diaconn/src/main/res/layout/diaconn_g8_history_item.xml b/diaconn/src/main/res/layout/diaconn_g8_history_item.xml
new file mode 100644
index 0000000000..66ee8536db
--- /dev/null
+++ b/diaconn/src/main/res/layout/diaconn_g8_history_item.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:card_view="http://schemas.android.com/apk/res-auto"
+    android:id="@+id/danar_history_cardview"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    card_view:cardBackgroundColor="@color/cardColorBackground"
+    card_view:cardCornerRadius="6dp"
+    card_view:cardUseCompatPadding="true"
+    card_view:contentPadding="6dp">
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:baselineAligned="true"
+        android:orientation="horizontal">
+
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_time"
+            android:layout_width="120dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:text="27.06.2016 18:00" />
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_value"
+            android:layout_width="50dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:text="0.25"
+            android:gravity="right" />
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_bolustype"
+            android:layout_width="20dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:text="E"
+/>
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_stringvalue"
+            android:layout_width="150dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:text="XXXXXXX"
+/>
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_duration"
+            android:layout_width="30dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:text="30"
+            android:gravity="right" />
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_dailybasal"
+            android:layout_width="50dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:gravity="right" />
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_dailybolus"
+            android:layout_width="50dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp"
+            android:gravity="right" />
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_dailytotal"
+            android:layout_width="56dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="10dp"
+            android:gravity="right"
+            android:visibility="gone"/>
+
+        <TextView
+            android:id="@+id/diaconn_g8_history_alarm"
+            android:layout_width="100dp"
+            android:layout_height="wrap_content"
+            android:paddingLeft="5dp" />
+
+    </LinearLayout>
+
+</androidx.cardview.widget.CardView>
diff --git a/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml b/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml
new file mode 100644
index 0000000000..c652b6516f
--- /dev/null
+++ b/diaconn/src/main/res/layout/diaconn_g8_user_options_activity.xml
@@ -0,0 +1,336 @@
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:fillViewport="true"
+    android:focusable="true"
+    android:focusableInTouchMode="true"
+    tools:context="info.nightscout.androidaps.diaconn.activities.DiaconnG8UserOptionsActivity">
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+
+        <RelativeLayout
+            android:id="@+id/header"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:background="@color/activity_title_background"
+            android:orientation="horizontal"
+            android:padding="5dp">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:contentDescription="@string/diaconng8_pump_settings"
+                app:srcCompat="@drawable/ic_danar_useropt" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:layout_gravity="center"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:text="@string/diaconng8_pump_settings"
+                android:textAlignment="center"
+                android:textAppearance="?android:attr/textAppearanceLarge" />
+
+        </RelativeLayout>
+
+        <LinearLayout
+            android:id="@+id/spacer"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:padding="5dp"></LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="start"
+                android:text="@string/diaconn_g8_pumpalarm"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="2dip"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/list_delimiter" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:orientation="horizontal">
+
+            <Spinner
+                android:id="@+id/beep_and_alarm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:minWidth="120dp" />
+
+            <Spinner
+                android:id="@+id/alarm_intesity"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="right"
+                android:minWidth="120dp" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/save_alarm"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Save" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:orientation="horizontal"
+            android:padding="5dp"></LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="top"
+                android:text="@string/diaconn_g8_screentimeout"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="2dip"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/list_delimiter" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:orientation="horizontal">
+
+            <RadioGroup
+                android:id="@+id/pumpscreentimeout"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checkedButton="@+id/pumpalarm_sound"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/pumpscreentimeout_10"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/diaconn_g8_pumpscreentimeout_10" />
+
+                <RadioButton
+                    android:id="@+id/pumpscreentimeout_20"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/diaconn_g8_pumpscreentimeout_20" />
+
+                <RadioButton
+                    android:id="@+id/pumpscreentimeout_30"
+                    android:layout_width="171dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/diaconn_g8_pumpscreentimeout_30" />
+
+            </RadioGroup>
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/save_lcd_on_time"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Save" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:orientation="horizontal"
+            android:padding="5dp"></LinearLayout>
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="start"
+                android:text="@string/diaconn_g8_language"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="2dip"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/list_delimiter" />
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:orientation="horizontal">
+
+            <RadioGroup
+                android:id="@+id/pumplang"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:checkedButton="@+id/pumpalarm_sound"
+                android:orientation="horizontal">
+
+                <RadioButton
+                    android:id="@+id/pumplang_english"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/diaconn_g8_pumplang_english" />
+
+                <RadioButton
+                    android:id="@+id/pumplang_korean"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/diaconn_g8_pumplang_korean" />
+
+                <RadioButton
+                    android:id="@+id/pumplang_chiness"
+                    android:layout_width="106dp"
+                    android:layout_height="wrap_content"
+                    android:text="@string/diaconn_g8_pumplang_chiness" />
+
+            </RadioGroup>
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/save_lang"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Save" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:orientation="horizontal"
+            android:padding="5dp"></LinearLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <TextView
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:gravity="start"
+                android:text="@string/diaconn_g8_bolus_speed"
+                android:textSize="14sp" />
+
+        </LinearLayout>
+
+        <View
+            android:layout_width="fill_parent"
+            android:layout_height="2dip"
+            android:layout_marginLeft="20dp"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginBottom="5dp"
+            android:background="@color/list_delimiter" />
+
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:orientation="horizontal">
+
+            <info.nightscout.androidaps.utils.ui.NumberPicker
+                android:id="@+id/bolus_speed"
+                android:layout_width="wrap_content"
+                android:layout_height="40dp"
+                android:layout_marginTop="5dp"
+                android:paddingRight="5dp" />
+
+            <View
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <Button
+                android:id="@+id/save_bolus_speed"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Save" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</ScrollView>
diff --git a/diaconn/src/main/res/values-ko-rKR/strings.xml b/diaconn/src/main/res/values-ko-rKR/strings.xml
new file mode 100644
index 0000000000..f6673736a2
--- /dev/null
+++ b/diaconn/src/main/res/values-ko-rKR/strings.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="resetpairing" >페어링 초기화</string>
+    <string name="diaconn_nodeviceavailable" >장비가 존재하지 않습니다.</string>
+    <string name="diaconn_pairing" >디아콘 펌프 페어링</string>
+    <string name="pumperror" >펌프 에러</string>
+    <string name="diaconn_g8_history_alarm" >알람</string>
+    <string name="diaconn_g8_history_basalhours" >시간당 Basal 주입량</string>
+    <string name="diaconn_g8_history_bolus" >Boluses</string>
+    <string name="diaconn_g8_history_dailyinsulin" >하루 주입량</string>
+    <string name="diaconn_g8_history_refill">교체</string>
+    <string name="diaconn_g8_history_suspend">중지</string>
+    <string name="gettingpumpsettings" >펌프상태조회</string>
+    <string name="gettingpumptime" >펌프시간정보 조회</string>
+    <string name="largetimediff" >Large time difference:\nTime in pump is off by more than 1.5 hours.\nPlease adjust the time manually on the pump and make sure that reading the history from the pump does not cause unexpected behaviour.\nIf possible, remove the history from the pump before changing the time or disable the closed loop for one DIA after the last wrong history entry but minimum one DIA from now.</string>
+    <string name="largetimedifftitle" >Large time difference Title</string>
+    <string name="approachingdailylimit" >Approaching insulin daily limit</string>
+    <string name="startingbolus" >Bolus 주입 시작</string>
+    <string name="waitingforestimatedbolusend" >Bolus 주입이 진행 중 입니다.</string>
+    <string name="gettingbolusstatus" >Bolus 상태 조회</string>
+    <string name="stoppingtempbasal">임시Basal 중지</string>
+    <string name="settingtempbasal" >임시Basal 설정</string>
+    <string name="settingextendedbolus" >확장 Bolus 설정</string>
+    <string name="stoppingextendedbolus" >확장 Bolus 중지</string>
+    <string name="updatingbasalrates" >Basal 패턴 반영</string>
+    <string name="description_pump_diaconn_g8">G2e에서 만든 Diaconn G8 펌프</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">Diaconn G8</string>
+    <string name="maxbolusviolation" >Max bolus violation</string>
+    <string name="commanderror" >Command error</string>
+    <string name="speederror" >속도 에러</string>
+    <string name="insulinlimitviolation" >Insulin limit violation</string>
+    <string name="boluserrorcode" >Asked: %1$.2fU Delivered: %2$.2fU Error code: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly" >Value not set properly</string>
+    <string name="diaconn_g8_bt_name_title" >Diaconn G8 Bluetooth device</string>
+
+    <string name="diaconn_g8_password_title" >Pump Password</string>
+
+    <string name="bolusspeed">Bolus 주입속도</string>
+    <string name="selectedpump">펌프를 선택하세요.</string>
+    <string name="diaconn_g8_bluetooth_status">Bluetooth Status</string>
+    <string name="diagonn_g8_tdd_label">TDD</string>
+    <string name="bolus_step">Bolus Step</string>
+    <string name="basal_step">Basal Step</string>
+    <string name="pump_firmware_label">Firmware</string>
+    <string name="diagonn_g8_useroptions">사용자설정</string>
+    <string name="pairfirst">펌프와 전화기를 페어링해 주세요!</string>
+    <string name="processinghistory">"Processing Event "</string>
+    <string name="apslastLogNum">aps_last_log_num</string>
+    <string name="apsWrappingCount">aps_wrapping_count</string>
+    <string name="diaconn_g8_history_tempbasal">임시 Basal</string>
+    <string name="diaconng8_pump_settings">디아콘 펌프 설정</string>
+    <string name="diaconn_g8_pumpalarm">음향 선택</string>
+    <string name="diaconn_g8_pumpalarm_sound">소리</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">진동</string>
+    <string name="diaconn_g8_pumpalarm_silent">무음</string>
+    <string name="diaconn_g8_pumpalarmlevel">음향 세기</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">소</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">중</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">대</string>
+    <string name="diaconn_g8_screentimeout">조명지속시간[초]</string>
+    <string name="diaconn_g8_language">언어설정</string>
+    <string name="diaconn_g8_bolus_speed">Bolus 주입속도 [U/min]</string>
+    <string name="diaconn_g8_pumplang_chiness">중국어</string>
+    <string name="diaconn_g8_pumplang_korean">한국어</string>
+    <string name="diaconn_g8_pumplang_english">영어</string>
+    <string name="diaconn_g8_screentimeout_10">"10 "</string>
+    <string name="diaconn_g8_pumpscreentimeout_10">10</string>
+    <string name="diaconn_g8_pumpscreentimeout_20">20</string>
+    <string name="diaconn_g8_pumpscreentimeout_30">30</string>
+    <string name="diaconn_g8_pumpalarm_low">소</string>
+    <string name="injectionblocked">Bolus 주입막힘</string>
+    <string name="batterywarning">베터리 경고</string>
+    <string name="insulinlackwarning">인슐린 부족 경고</string>
+    <string name="needbatteryreplace">베터리 교체가 필요합니다.</string>
+    <string name="needinsullinreplace">인슐린 교체가 필요합니다.</string>
+    <string name="pumpversion">pump_version</string>
+    <string name="apsIncarnationNo">aps_incarnation_no</string>
+    <string name="pumpserialno">pump_serial_no</string>
+    <string name="diaconn_g8_loginsulinchange_title">인슐린 교체</string>
+    <string name="diaconn_g8_loginsulinchange_summary">로그 동기화 시 케어포털 \"인슐린 교체\" 정보 자동 업로드</string>
+    <string name="diaconn_g8_logcanulachange_title">바늘 교체</string>
+    <string name="diaconn_g8_logcanulachange_summary">로그 동기화 시 케어포털 \"위치 교체\" 정보 자동 업로드</string>
+    <string name="diaconn_g8_logbatterychange_summary">로그 동기화 시 케어포털 \"베터리 교체\" 정보 자동 업로드</string>
+    <string name="diaconn_g8_logbatterychange_title">베터리 교체</string>
+    <string name="diaconn_g8_logsyncinprogress">로그 동기화 진행 중</string>
+    <string name="diaconn_g8_loginsulinshorage">인슐린 부족 경고</string>
+    <string name="diaconn_g8_logbatteryshorage">베터리 부족 경고</string>
+    <string name="diaconn_g8_logneedleprime">바늘교체 공기 빼기 :%1$.2fU</string>
+    <string name="diaconn_g8_loginjectorprime">주사기 교체 공기빼기 :%1$.2fU</string>
+    <string name="diaconn_g8_logtubeprime">튜브 교체 공기빼기 :%1$.2fU</string>
+    <string name="diaconn_g8_resetfactoryreset">공장초기화 리셋</string>
+    <string name="diaconn_g8_resetemergencyoff">긴급 전원오프 리셋</string>
+    <string name="diaconn_g8_resetbatteryreplacement">베터리교체 후 리셋</string>
+    <string name="diaconn_g8_resetaftercalibration">보정 후 리셋</string>
+    <string name="diaconn_g8_resetpreshipment">출하전설정 후 리셋</string>
+    <string name="diaconn_g8_resetunexpected">예상치 못한 시스템 리셋</string>
+    <string name="diaconn_g8_reasoncomplete">완료</string>
+    <string name="diaconn_g8_reasoninjectonblock">주입 막힘</string>
+    <string name="diaconn_g8_reasonbatteryshortage">베터리 부족</string>
+    <string name="diaconn_g8_reasoninsulinshortage">인슐린 부족</string>
+    <string name="diaconn_g8_reasonuserstop">사용자 중지</string>
+    <string name="diaconn_g8_reasonsystemreset">시스템 리셋</string>
+    <string name="diaconn_g8_reasonother">기타</string>
+    <string name="diaconn_g8_reasonemergencystop">긴급 정지</string>
+    <string name="diacon_g8_blockbasal">기저주입</string>
+    <string name="diacon_g8_blockmealbolus">식사주입</string>
+    <string name="diacon_g8_blocknormalbolus">일반주입</string>
+    <string name="diacon_g8_blocksquarebolus">스퀘어주입</string>
+    <string name="diacon_g8_blockdualbolus">듀얼주입</string>
+    <string name="diacon_g8_blockreplacetube">튜브교체</string>
+    <string name="diacon_g8_blockreplaceneedle">바늘교체</string>
+    <string name="diacon_g8_blockreplacesyringe">주사기교체</string>
+    <string name="diaconn_g8_logalarmblock" >주입막힘 (%s)</string>
+    <string name="diaconn_g8_lgorelease" >기저 재개 (%s)</string>
+    <string name="diaconn_g8_lgosuspend" >기저 중지 (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">듀얼 일반 성공</string>
+    <string name="diaconn_g8_logdualsquarestart">듀얼 스퀘어 시작</string>
+    <string name="diaconn_g8_logdualsquaresuccess">듀얼 스퀘어 성공</string>
+    <string name="diaconn_g8_logsquarestart">스퀘어 시작</string>
+    <string name="diaconn_g8_logsquaresuccess">스퀘어 성공</string>
+    <string name="diaconn_g8_logmealfail">식사 실패</string>
+    <string name="diaconn_g8_logsuccess">성공</string>
+    <string name="diaconn_g8_logmealsuccess">식사 성공</string>
+    <string name="diaconn_g8_errorcode_1">패킷 CRC 오류로 조회 불가합니다.</string>
+    <string name="diaconn_g8_errorcode_2">입력 파라미터 오류로 설정 불가합니다.</string>
+    <string name="diaconn_g8_errorcode_3">프로토콜 규격 오류로 설정 불가합니다.</string>
+    <string name="diaconn_g8_errorcode_4">식사 시간제한 상태로, 주입할 수 없습니다.</string>
+    <string name="diaconn_g8_errorcode_6">펌프에서 취소 하였습니다.</string>
+    <string name="diaconn_g8_errorcode_7">타 작업중으로, 앱 설정 기능이 제한됩니다.</string>
+    <string name="diaconn_g8_errorcode_8">다른 Bolus 주입 중으로, 주입이 제한됩니다.</string>
+    <string name="diaconn_g8_errorcode_9">기저정지 해제가 필요합니다.</string>
+    <string name="diaconn_g8_errorcode_10">펌프 미응답으로 취소 되었습니다.</string>
+    <string name="diaconn_g8_errorcode_11">배터리 부족으로 주입할 수 없습니다.</string>
+    <string name="diaconn_g8_errorcode_12">인슐린 부족으로 주입할 수 없습니다.</string>
+    <string name="diaconn_g8_errorcode_13">1회 제한량 초과로 주입할 수 없습니다.</string>
+    <string name="diaconn_g8_errorcode_14">금일 주입량 초과로 주입할 수 없습니다.</string>
+    <string name="diaconn_g8_errorcode_15">기저설정 완료 후, 기저주입할 수 있습니다.</string>
+    <string name="diaconn_g8_errotpreceivedyet">명령이 전달되지 않았습니다. 다시 시도해주세요.</string>
+    <string name="diaconn_g8_logtubechange_title">튜브 교체</string>
+    <string name="diaconn_g8_logtubechange_summary">로그 동기화 시 \"튜브 교체\" 노트 정보 자동 업로드</string>
+    <string name="diaconn_g8_logtempstart">임시Basal 시작</string>
+    <string name="diaconn_g8_errorcode_32">LGS 동작 중 볼러스 주입 거절</string>
+    <string name="diaconn_g8_errorcode_33">LGS ON일때, ON 거절</string>
+    <string name="diaconn_g8_errorcode_34">LGS OFF일 때, OFF 거절</string>
+    <string name="diaconn_g8_errorcode_35">임시기저 설정중인 상태일 때, 임시기저 시작 명령 거절</string>
+    <string name="diaconn_g8_errorcode_36">임시기저 설정이 안 된 상태일 때, 임시기저 중지 명령 거절</string>
+</resources>
diff --git a/diaconn/src/main/res/values/arrays.xml b/diaconn/src/main/res/values/arrays.xml
new file mode 100644
index 0000000000..ab98405145
--- /dev/null
+++ b/diaconn/src/main/res/values/arrays.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string-array name="diaconnSpeedArray">
+        <item>1 U/min</item>
+        <item>2 U/min</item>
+        <item>3 U/min</item>
+        <item>4 U/min</item>
+        <item>5 U/min</item>
+        <item>6 U/min</item>
+        <item>7 U/min</item>
+        <item>8 U/min</item>
+    </string-array>
+    <string-array name="diaconnSpeedValues">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+        <item>4</item>
+        <item>5</item>
+        <item>6</item>
+        <item>7</item>
+        <item>8</item>
+    </string-array>
+
+    <string-array name="diaconnlanguageArray">
+        <item>Chiness</item>
+        <item>Korean</item>
+        <item>English</item>
+    </string-array>
+    <string-array name="diaconnlanguageValues">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+    <string-array name="diaconnVolumnLevelArray">
+        <item>Small</item>
+        <item>Medium</item>
+        <item>Large</item>
+    </string-array>
+    <string-array name="diaconnVolumnLevelValues">
+        <item>1</item>
+        <item>2</item>
+        <item>3</item>
+    </string-array>
+
+
+</resources>
\ No newline at end of file
diff --git a/diaconn/src/main/res/values/colors.xml b/diaconn/src/main/res/values/colors.xml
new file mode 100644
index 0000000000..f8c6127d32
--- /dev/null
+++ b/diaconn/src/main/res/values/colors.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="purple_200">#FFBB86FC</color>
+    <color name="purple_500">#FF6200EE</color>
+    <color name="purple_700">#FF3700B3</color>
+    <color name="teal_200">#FF03DAC5</color>
+    <color name="teal_700">#FF018786</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
+</resources>
\ No newline at end of file
diff --git a/diaconn/src/main/res/values/ids.xml b/diaconn/src/main/res/values/ids.xml
new file mode 100644
index 0000000000..ab4bb053a1
--- /dev/null
+++ b/diaconn/src/main/res/values/ids.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <item name="diaconn_g8_history_time" type="id" />
+    <item name="diaconn_g8_history_value" type="id" />
+    <item name="diaconn_g8_history_bolustype" type="id" />
+    <item name="diaconn_g8_history_stringvalue" type="id" />
+    <item name="diaconn_g8_history_duration" type="id" />
+    <item name="diaconn_g8_history_dailybasal" type="id" />
+    <item name="diaconn_g8_history_dailybolus" type="id" />
+    <item name="diaconn_g8_history_dailytotal" type="id" />
+    <item name="diaconn_g8_history_alarm" type="id" />
+</resources>
\ No newline at end of file
diff --git a/diaconn/src/main/res/values/strings.xml b/diaconn/src/main/res/values/strings.xml
new file mode 100644
index 0000000000..3a51a9ff15
--- /dev/null
+++ b/diaconn/src/main/res/values/strings.xml
@@ -0,0 +1,171 @@
+<resources>
+    <string name="diaconn_g8_pump_settings" translatable="false" >diaconn_g8_pump_settings</string>
+    <string name="key_diaconn_g8_address" translatable="false">diagonn_g8_address</string>
+    <string name="key_diaconn_g8_name" translatable="false">Diaconn G8</string>
+    <string name="key_diaconn_g8_bt_name" translatable="false" >key_diaconn_g8_bt_name</string>
+    <string name="key_diaconn_g8_useextended" translatable="false">diaconn_g8_useextended</string>
+    <string name="key_diaconn_g8_visualizeextendedaspercentage"  translatable="false">diaconn_g8_visualizeextendedaspercentage</string>
+
+    <string name="key_diaconn_g8_bolusspeed"  translatable="false">g8_bolusspeed</string>
+    <string name="key_diaconn_g8_logbatterychange" translatable="false">diaconn_g8_logbatterychanges</string>
+    <string name="key_diaconn_g8_loginsulinchange" translatable="false">diaconn_g8_loginsulinchange</string>
+    <string name="key_diaconn_g8_logneedlechange" translatable="false">diaconn_g8_logneedlechange</string>
+
+    <string name="resetpairing" >Reset Pairing</string>
+    <string name="diaconn_nodeviceavailable" >No Device available</string>
+    <string name="diaconn_pairing" >Diaconn Pump Pairing</string>
+    <string name="pumperror" >Pump Error</string>
+    <string name="diaconn_g8_history_alarm" >Alarms</string>
+    <string name="diaconn_g8_history_basalhours" >Basal Hours</string>
+    <string name="diaconn_g8_history_bolus" >Boluses</string>
+    <string name="diaconn_g8_history_dailyinsulin" >Daily insulin</string>
+    <string name="diaconn_g8_history_errors">Errors</string>
+    <string name="diaconn_g8_history_prime">Prime</string>
+    <string name="diaconn_g8_history_refill">Refill</string>
+    <string name="diaconn_g8_history_suspend">Suspend</string>
+    <string name="diaconn_g8_pairingok" >Pairing Ok</string>
+    <string name="diaconn_g8_waitingforpairing" >Waiting for Pairing</string>
+    <string name="diaconn_firmware_version" >Version</string>
+    <string name="invalidpairing" >Invalid pairing information. Requesting new pairing</string>
+    <string name="gettingpumpsettings" >Getting pump settings</string>
+    <string name="gettingpumptime" >Getting pump time</string>
+    <string name="largetimediff" >Large time difference:\nTime in pump is off by more than 1.5 hours.\nPlease adjust the time manually on the pump and make sure that reading the history from the pump does not cause unexpected behaviour.\nIf possible, remove the history from the pump before changing the time or disable the closed loop for one DIA after the last wrong history entry but minimum one DIA from now.</string>
+    <string name="largetimedifftitle" >Large time difference Title</string>
+    <string name="approachingdailylimit" >Approaching insulin daily limit</string>
+    <string name="startingbolus" >Starting bolus delivery</string>
+    <string name="waitingforestimatedbolusend" >Waiting for estimated bolus end</string>
+    <string name="gettingbolusstatus" >Getting Bolus Status</string>
+    <string name="stoppingtempbasal">Stopping temp basal</string>
+    <string name="settingtempbasal" >Setting temp basal</string>
+    <string name="settingextendedbolus" >Setting extended bolus</string>
+    <string name="stoppingextendedbolus" >Stopping extended bolus</string>
+    <string name="updatingbasalrates" >Updating basal rates</string>
+    <string name="description_pump_diaconn_g8">Pump Integration for Diaconn G8 Pumps</string>
+    <string name="diaconn_g8_pump">Diaconn G8</string>
+    <string name="diaconn_g8_pump_shortname">Diaconn G8</string>
+    <string name="maxbolusviolation" >Max bolus violation</string>
+    <string name="commanderror" >Command error</string>
+    <string name="speederror" >Speed error</string>
+    <string name="insulinlimitviolation" >Insulin limit violation</string>
+    <string name="boluserrorcode" >Asked: %1$.2fU Delivered: %2$.2fU Error code: %3$s</string>
+    <string name="diaconn_g8_valuenotsetproperly" >Value not set properly</string>
+    <string name="diaconn_g8_bt_name_title" >Diaconn G8 Bluetooth device</string>
+
+    <string name="diaconn_g8_password_title" >Pump Password</string>
+
+    <string name="bolusspeed">Bolus speed</string>
+    <string name="selectedpump">Selected pump</string>
+    <string name="diaconn_g8_useextended_title">Use extended boluses for >200%%</string>
+    <string name="diaconn_g8_visualizeextendedaspercentage_title">Visualize extended bolus as %%</string>
+    <string name="diaconn_g8_bluetooth_status">Bluetooth Status</string>
+    <string name="diagonn_g8_tdd_label">TDD</string>
+    <string name="bolus_step">Bolus Step</string>
+    <string name="basal_step">Basal Step</string>
+    <string name="pump_firmware_label">Firmware</string>
+    <string name="diagonn_g8_useroptions">USER OPTIONS</string>
+    <string name="pairfirst">Please pair your pump with your phone!</string>
+    <string name="processinghistory">"Processing Event "</string>
+    <string name="apslastLogNum">aps_last_log_num</string>
+    <string name="apsWrappingCount">aps_wrapping_count</string>
+    <string name="diaconn_g8_history_tempbasal">Temp Basal</string>
+    <string name="diaconng8_pump_settings">Diaconn pump Settings</string>
+    <string name="diaconn_g8_pumpalarm">Sound</string>
+    <string name="diaconn_g8_pumpalarm_sound">sound</string>
+    <string name="diaconn_g8_pumpalarm_vibrate">vibrate</string>
+    <string name="diaconn_g8_pumpalarm_silent">silent</string>
+    <string name="diaconn_g8_pumpalarmlevel">Alarm intensity</string>
+    <string name="diaconn_g8_pumpalarm_intensity_low">low</string>
+    <string name="diaconn_g8_pumpalarm_intensity_middle">middle</string>
+    <string name="diaconn_g8_pumpalarm_intensity_high">high</string>
+    <string name="diaconn_g8_screentimeout">LCD on time [second]</string>
+    <string name="diaconn_g8_saveuseroptions">SAVE OPTION TO PUMP</string>
+    <string name="diaconn_g8_language">Language</string>
+    <string name="diaconn_g8_bolus_speed">Bolus speed</string>
+    <string name="diaconn_g8_pumplang_chiness">Chiness</string>
+    <string name="diaconn_g8_pumplang_korean">Korean</string>
+    <string name="diaconn_g8_pumplang_english">English</string>
+    <string name="diaconn_g8_screentimeout_10">"10 "</string>
+    <string name="diaconn_g8_pumpscreentimeout_10">10</string>
+    <string name="diaconn_g8_pumpscreentimeout_20">20</string>
+    <string name="diaconn_g8_pumpscreentimeout_30">30</string>
+    <string name="diaconn_g8_pumpalarm_low">low</string>
+    <string name="injectionblocked">Injection Blocked</string>
+    <string name="batterywarning">Battery Warning</string>
+    <string name="insulinlackwarning">Insulin Lack Warning</string>
+    <string name="needbatteryreplace">Battery replacement is required</string>
+    <string name="needinsullinreplace">Insulin replacement is required</string>
+    <string name="pumpversion">pump_version</string>
+    <string name="apsIncarnationNo">aps_incarnation_no</string>
+    <string name="pumpserialno">pump_serial_no</string>
+    <string name="diaconn_g8_loginsulinchange_title">Log reservoir change</string>
+    <string name="diaconn_g8_loginsulinchange_summary">Add \"Insulin Change\" event to careportal when detected in history</string>
+    <string name="diaconn_g8_logcanulachange_title">Log needle change</string>
+    <string name="diaconn_g8_logcanulachange_summary">Add \"Site Change\" event to careportal when detected in history</string>
+    <string name="diaconn_g8_logbatterychange_summary">Add \"Battery Change\" event to careportal when detected in history</string>
+    <string name="diaconn_g8_logbatterychange_title">Log battery change</string>
+    <string name="diaconn_g8_logsyncinprogress">Log Synchronization in progress</string>
+    <string name="diaconn_g8_loginsulinshorage">Inuslin shortage</string>
+    <string name="diaconn_g8_logbatteryshorage">Battery shortage</string>
+    <string name="diaconn_g8_logneedleprime">Needle prime :%1$.2fU</string>
+    <string name="diaconn_g8_loginjectorprime">Injector prime :%1$.2fU</string>
+    <string name="diaconn_g8_logtubeprime">Tube change prime :%1$.2fU</string>
+    <string name="diaconn_g8_resetfactoryreset">Reset after factory reset</string>
+    <string name="diaconn_g8_resetemergencyoff">Reset after Emergency Off</string>
+    <string name="diaconn_g8_resetbatteryreplacement">Reset after user battery replacement</string>
+    <string name="diaconn_g8_resetaftercalibration">Reset after Calibration</string>
+    <string name="diaconn_g8_resetpreshipment">Reset after pre-shipment setup</string>
+    <string name="diaconn_g8_resetunexpected">Unexpected system reset</string>
+    <string name="diaconn_g8_reasoncomplete">Complete</string>
+    <string name="diaconn_g8_reasoninjectonblock">Injection block</string>
+    <string name="diaconn_g8_reasonbatteryshortage">Battery shortage</string>
+    <string name="diaconn_g8_reasoninsulinshortage">Insuiln shortage</string>
+    <string name="diaconn_g8_reasonuserstop">User stop</string>
+    <string name="diaconn_g8_reasonsystemreset">System reset</string>
+    <string name="diaconn_g8_reasonother">Other</string>
+    <string name="diaconn_g8_reasonemergencystop">Emergency stop</string>
+    <string name="diacon_g8_blockbasal">BASAL</string>
+    <string name="diacon_g8_blockmealbolus">MEAL BOLUS</string>
+    <string name="diacon_g8_blocknormalbolus">NORMAL BOLUS</string>
+    <string name="diacon_g8_blocksquarebolus">SQUARE BOLUS</string>
+    <string name="diacon_g8_blockdualbolus">DUAL BOLUS</string>
+    <string name="diacon_g8_blockreplacetube">REPLACE TUBE</string>
+    <string name="diacon_g8_blockreplaceneedle">REPLACE NEEDLE</string>
+    <string name="diacon_g8_blockreplacesyringe">REPLACE SYRINGE</string>
+    <string name="diaconn_g8_logalarmblock" >Injection Block (%s)</string>
+    <string name="diaconn_g8_lgorelease" >basal release (%s)</string>
+    <string name="diaconn_g8_lgosuspend" >basal suspend (%s)</string>
+    <string name="diaconn_g8_logdualnormalsuccess">Dual Nomarl Success</string>
+    <string name="diaconn_g8_logdualsquarestart">Dual Square Start</string>
+    <string name="diaconn_g8_logdualsquaresuccess">Dual Square Success</string>
+    <string name="diaconn_g8_logsquarestart">Square Start</string>
+    <string name="diaconn_g8_logsquaresuccess">Square Success</string>
+    <string name="diaconn_g8_logmealfail">Meal Failed</string>
+    <string name="diaconn_g8_logsuccess">Success</string>
+    <string name="diaconn_g8_logmealsuccess">Meal Success</string>
+    <string name="key_diaconn_g8_logtubechange">diaconn_g8_logtubechange</string>
+    <string name="diaconn_g8_errorcode_1">Can\'t lookup due to packet CRC error.</string>
+    <string name="diaconn_g8_errorcode_2">Can\'t be set to an input parameter error.</string>
+    <string name="diaconn_g8_errorcode_3">Can\'t be set to a protocol specification error.</string>
+    <string name="diaconn_g8_errorcode_4">Eating timed, cannot be injected.</string>
+    <string name="diaconn_g8_errorcode_6">Cancelled by pump</string>
+    <string name="diaconn_g8_errorcode_7">Taking other actions, limiting app settings.</string>
+    <string name="diaconn_g8_errorcode_8">During another Bolus injection, injection is restricted.</string>
+    <string name="diaconn_g8_errorcode_9">Require resume the basal injection</string>
+    <string name="diaconn_g8_errorcode_10">Cancelled due to pump not responding.</string>
+    <string name="diaconn_g8_errorcode_11">Injection is not possible due to low battery.</string>
+    <string name="diaconn_g8_errorcode_12">Insulin insufficiency cannot be injected.</string>
+    <string name="diaconn_g8_errorcode_13">You cannot inject it because it exceeds the limit once.</string>
+    <string name="diaconn_g8_errorcode_14">Injection cannot be injected because it exceeds the injection volume today.</string>
+    <string name="diaconn_g8_errorcode_15">After basal setup is complete, basal injection can be performed.</string>
+    <string name="diaconn_g8_errotpreceivedyet">The command was not delivered. Please try again.</string>
+    <string name="diaconn_g8_logtubechange_title">Log tube change</string>
+    <string name="diaconn_g8_logtubechange_summary">Add \"Tube Change\" event to Note when detected in history</string>
+    <string name="diaconn_g8_logtempstart">TempBasal Start</string>
+    <string name="diaconn_g8_errorcode_32">During LGS running, injection is restricted</string>
+    <string name="diaconn_g8_errorcode_33">LGS status is ON, ON Command is declined.</string>
+    <string name="diaconn_g8_errorcode_34">LGS status is OFF, OFF Command is declined.</string>
+    <string name="diaconn_g8_errorcode_35">Tempbasal start is rejected  when tempbasal is running</string>
+    <string name="diaconn_g8_errorcode_36">Tempbasal stop is rejected  when tempbasal is not running</string>
+
+
+</resources>
\ No newline at end of file
diff --git a/diaconn/src/main/res/values/themes.xml b/diaconn/src/main/res/values/themes.xml
new file mode 100644
index 0000000000..e52448bafa
--- /dev/null
+++ b/diaconn/src/main/res/values/themes.xml
@@ -0,0 +1,16 @@
+<resources xmlns:tools="http://schemas.android.com/tools">
+    <!-- Base application theme. -->
+    <style name="Theme.AndroidAPS" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <!-- Primary brand color. -->
+        <item name="colorPrimary">@color/purple_500</item>
+        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorOnPrimary">@color/white</item>
+        <!-- Secondary brand color. -->
+        <item name="colorSecondary">@color/teal_200</item>
+        <item name="colorSecondaryVariant">@color/teal_700</item>
+        <item name="colorOnSecondary">@color/black</item>
+        <!-- Status bar color. -->
+        <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
+        <!-- Customize your theme here. -->
+    </style>
+</resources>
\ No newline at end of file
diff --git a/diaconn/src/main/res/xml/pref_diaconn.xml b/diaconn/src/main/res/xml/pref_diaconn.xml
new file mode 100644
index 0000000000..f81699e887
--- /dev/null
+++ b/diaconn/src/main/res/xml/pref_diaconn.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.preference.PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:validate="http://schemas.android.com/apk/res-auto"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        android:title="@string/diaconn_g8_pump"
+        app:initialExpandedChildrenCount="0">
+
+        <Preference
+            android:key="@string/key_diaconn_g8_name"
+            android:summary=""
+            android:title="@string/selectedpump">
+            <intent android:action="info.nightscout.androidaps.plugins.PumpDiaconnG8.activities.DiaconnG8BLEScanActivity" />
+        </Preference>
+
+        <ListPreference
+            android:defaultValue="5"
+            android:entries="@array/diaconnSpeedArray"
+            android:entryValues="@array/diaconnSpeedValues"
+            android:key="@string/key_diaconn_g8_bolusspeed"
+            android:title="@string/bolusspeed" />
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_diaconn_g8_loginsulinchange"
+            android:summary="@string/diaconn_g8_loginsulinchange_summary"
+            android:title="@string/diaconn_g8_loginsulinchange_title" />
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_diaconn_g8_logneedlechange"
+            android:summary="@string/diaconn_g8_logcanulachange_summary"
+            android:title="@string/diaconn_g8_logcanulachange_title" />
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_diaconn_g8_logtubechange"
+            android:summary="@string/diaconn_g8_logtubechange_summary"
+            android:title="@string/diaconn_g8_logtubechange_title" />
+
+        <SwitchPreference
+            android:defaultValue="true"
+            android:key="@string/key_diaconn_g8_logbatterychange"
+            android:summary="@string/diaconn_g8_logbatterychange_summary"
+            android:title="@string/diaconn_g8_logbatterychange_title" />
+
+    </PreferenceCategory>
+
+</androidx.preference.PreferenceScreen>
\ No newline at end of file
diff --git a/gradle/android_dependencies.gradle b/gradle/android_dependencies.gradle
index c07f69eea0..b3b28c7edc 100644
--- a/gradle/android_dependencies.gradle
+++ b/gradle/android_dependencies.gradle
@@ -5,7 +5,6 @@ android {
         targetSdkVersion 28
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles 'consumer-rules.pro'
     }
 
     kotlinOptions {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 404e613d00..6d6af4e166 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl = https://services.gradle.org/distributions/gradle-6.8.2-all.zip
+distributionUrl = https\://services.gradle.org/distributions/gradle-7.0-all.zip
diff --git a/insight/build.gradle b/insight/build.gradle
index 33b66a5090..91897b762a 100644
--- a/insight/build.gradle
+++ b/insight/build.gradle
@@ -10,8 +10,6 @@ apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
 android {
     defaultConfig {
-        versionCode 1
-        versionName "1.0"
         kapt {
             arguments {
                 arg("room.incremental", "true")
diff --git a/medtronic/build.gradle b/medtronic/build.gradle
index 4c3af48c8a..464f0c4d34 100644
--- a/medtronic/build.gradle
+++ b/medtronic/build.gradle
@@ -7,12 +7,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
 
 dependencies {
     implementation project(':core')
diff --git a/medtronic/src/main/res/values-bg-rBG/strings.xml b/medtronic/src/main/res/values-bg-rBG/strings.xml
index 11b22095af..fcb54883c4 100644
--- a/medtronic/src/main/res/values-bg-rBG/strings.xml
+++ b/medtronic/src/main/res/values-bg-rBG/strings.xml
@@ -70,6 +70,7 @@
     <string name="medtronic_cmd_desc_set_basal_profile">Приложи базалният профил</string>
     <string name="medtronic_cmd_desc_get_tbr">Получи временния базал</string>
     <string name="medtronic_cmd_desc_set_tbr">Приложи временен базал</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Откажи временен базал</string>
     <string name="medtronic_cmd_desc_set_bolus">Стартирай болус</string>
     <string name="medtronic_pump_status_pump_unreachable">Помпата е недостъпна</string>
     <string name="medtronic_warning">Внимание</string>
diff --git a/medtronic/src/main/res/values-de-rDE/strings.xml b/medtronic/src/main/res/values-de-rDE/strings.xml
index eef43f6c40..37d628e324 100644
--- a/medtronic/src/main/res/values-de-rDE/strings.xml
+++ b/medtronic/src/main/res/values-de-rDE/strings.xml
@@ -65,6 +65,8 @@
     <string name="medtronic_cmd_desc_get_history">Hole Verlauf - Seite %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Hole Verlauf - Seite %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Hole Pumpen-Zeit</string>
+    <string name="medtronic_cmd_desc_set_time">Pumpen-Zeit einstellen</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Akku-Status abfragen</string>
     <string name="medtronic_cmd_desc_get_settings">Hole Einstellungen</string>
     <string name="medtronic_cmd_desc_get_model">Hole Pumpenmodel</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Hole Basal-Profil</string>
@@ -73,6 +75,7 @@
     <string name="medtronic_cmd_desc_set_tbr">Setze Temporäre Basalrate</string>
     <string name="medtronic_cmd_desc_cancel_tbr">Temp. Basalrate abbrechen</string>
     <string name="medtronic_cmd_desc_set_bolus">Setze Bolus</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Verbleibendes Insulin abfragen</string>
     <string name="medtronic_pump_status_pump_unreachable">Pumpe nicht erreichbar</string>
     <string name="medtronic_warning">Warnung</string>
     <!-- medtronic_warning -->
@@ -86,4 +89,5 @@
     <string name="pump_time_updated">Pumpenzeit aktualisiert</string>
     <string name="set_neutral_temps_title">Neutrale TBR setzen</string>
     <string name="set_neutral_temps_summary">Wenn diese Option aktiviert ist, wird die TBR vor Ende jeder Stunde abgebrochen. Dies kann dazu beitragen, einige Pumpen davon abzuhalten, zur vollen Stunde zu vibrieren / zu piepsen.</string>
+    <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d Minuten verbleibend)</string>
 </resources>
diff --git a/medtronic/src/main/res/values-it-rIT/strings.xml b/medtronic/src/main/res/values-it-rIT/strings.xml
index c4f633ede3..7d0e0e674e 100644
--- a/medtronic/src/main/res/values-it-rIT/strings.xml
+++ b/medtronic/src/main/res/values-it-rIT/strings.xml
@@ -65,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Ottieni storico - Pagina %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Ottieni storico - Pagina %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Ottieni ora micro</string>
+    <string name="medtronic_cmd_desc_set_time">Imposta ora del micro</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Ottieni stato batteria</string>
     <string name="medtronic_cmd_desc_get_settings">Ottieni impostazioni</string>
     <string name="medtronic_cmd_desc_get_model">Ottieni modello micro</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Ottieni profilo basale</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Imposta profilo basale</string>
     <string name="medtronic_cmd_desc_get_tbr">Ottieni basale temporanea</string>
     <string name="medtronic_cmd_desc_set_tbr">Imposta basale temporanea</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Cancella basale temporanea</string>
     <string name="medtronic_cmd_desc_set_bolus">Imposta bolo</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Ottieni insulina rimanente</string>
     <string name="medtronic_pump_status_pump_unreachable">Micro irraggiungibile</string>
     <string name="medtronic_warning">Avviso</string>
     <!-- medtronic_warning -->
@@ -85,4 +89,5 @@
     <string name="pump_time_updated">Ora del micro aggiornata</string>
     <string name="set_neutral_temps_title">Imposta basali temporanee neutre</string>
     <string name="set_neutral_temps_summary">Se abilitato, cancellerà una basale temporanea prima della fine di ogni ora. Questo metodo può aiutare a fermare alcuni micro dall\'emettere un suono/vibrare allo scoccare dell\'ora.</string>
+    <string name="mdt_tbr_remaining">%1$.1f U/h (%2$d min rimanenti/e)</string>
 </resources>
diff --git a/medtronic/src/main/res/values-no-rNO/strings.xml b/medtronic/src/main/res/values-no-rNO/strings.xml
index 0c93599b2e..cc3e35d7df 100644
--- a/medtronic/src/main/res/values-no-rNO/strings.xml
+++ b/medtronic/src/main/res/values-no-rNO/strings.xml
@@ -65,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Henter historikk - side %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Henter historikk - side %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Henter pumpe tid</string>
+    <string name="medtronic_cmd_desc_set_time">Still pumpens klokke</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Les batteri status</string>
     <string name="medtronic_cmd_desc_get_settings">Henter innstillinger</string>
     <string name="medtronic_cmd_desc_get_model">Henter pumpe modell</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Henter basal profil</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Angi basal profil</string>
     <string name="medtronic_cmd_desc_get_tbr">Henter Temp Basal</string>
     <string name="medtronic_cmd_desc_set_tbr">Angi Temp Basal</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Avbryt temp basal</string>
     <string name="medtronic_cmd_desc_set_bolus">Angi Bolus</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Oppdater status insulinvolum</string>
     <string name="medtronic_pump_status_pump_unreachable">Pumpe utilgjengelig</string>
     <string name="medtronic_warning">Advarsel</string>
     <!-- medtronic_warning -->
@@ -85,4 +89,5 @@
     <string name="pump_time_updated">Pumpens tid ble oppdatert</string>
     <string name="set_neutral_temps_title">Sett nøytrale temp basaler</string>
     <string name="set_neutral_temps_summary">Hvis aktivert så vil den stoppe en temp basal rett før hver hele time for å stoppe noen pumpers varsler/vibreringer på hver hele time.</string>
+    <string name="mdt_tbr_remaining">%1$.1f E/t (%2$d min gjenstår)</string>
 </resources>
diff --git a/medtronic/src/main/res/values-sk-rSK/strings.xml b/medtronic/src/main/res/values-sk-rSK/strings.xml
index 62ac7c4c3f..6f94f8ebe4 100644
--- a/medtronic/src/main/res/values-sk-rSK/strings.xml
+++ b/medtronic/src/main/res/values-sk-rSK/strings.xml
@@ -65,13 +65,17 @@
     <string name="medtronic_cmd_desc_get_history">Načítanie histórie - Strana %1$d (%2$d/16)</string>
     <string name="medtronic_cmd_desc_get_history_request">Načítanie histórie - Strana %1$d</string>
     <string name="medtronic_cmd_desc_get_time">Načítanie času pumpy</string>
+    <string name="medtronic_cmd_desc_set_time">Nastaviť čas pumpy</string>
+    <string name="medtronic_cmd_desc_get_battery_status">Stav batérie</string>
     <string name="medtronic_cmd_desc_get_settings">Načítanie nastavení</string>
     <string name="medtronic_cmd_desc_get_model">Načítanie modelu pumpy</string>
     <string name="medtronic_cmd_desc_get_basal_profile">Načítanie bazálneho profilu</string>
     <string name="medtronic_cmd_desc_set_basal_profile">Nastavovanie bazálneho profilu</string>
     <string name="medtronic_cmd_desc_get_tbr">Načítanie dočasného bazálu</string>
     <string name="medtronic_cmd_desc_set_tbr">Nastavovanie dočasného bazálu</string>
+    <string name="medtronic_cmd_desc_cancel_tbr">Zrušiť dočasný bazál</string>
     <string name="medtronic_cmd_desc_set_bolus">Nastavovanie bolusu</string>
+    <string name="medtronic_cmd_desc_get_remaining_insulin">Zostávajúci inzulín</string>
     <string name="medtronic_pump_status_pump_unreachable">Pumpa nedostupná</string>
     <string name="medtronic_warning">Upozornenie</string>
     <!-- medtronic_warning -->
@@ -85,4 +89,5 @@
     <string name="pump_time_updated">Čas v pumpe bol aktualizovaný</string>
     <string name="set_neutral_temps_title">Nastaviť neutrálny dočasný bazál</string>
     <string name="set_neutral_temps_summary">Ak je povolená táto možnosť, zastaví sa dočasný bazál pred koncom každej hodiny. To môže u niektorých púmp pomôcť zastaviť pípanie/vibrácie na celú hodinu.</string>
+    <string name="mdt_tbr_remaining">%1$.1f JI/h (%2$d min zostáva)</string>
 </resources>
diff --git a/omnipod-common/build.gradle b/omnipod-common/build.gradle
index 19430b670c..4b8380b21a 100644
--- a/omnipod-common/build.gradle
+++ b/omnipod-common/build.gradle
@@ -8,12 +8,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
 
 dependencies {
     implementation project(':core')
diff --git a/omnipod-dash/build.gradle b/omnipod-dash/build.gradle
index ea8c60af66..07c4af856d 100644
--- a/omnipod-dash/build.gradle
+++ b/omnipod-dash/build.gradle
@@ -7,12 +7,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
 
 dependencies {
     implementation project(':core')
diff --git a/omnipod-eros/build.gradle b/omnipod-eros/build.gradle
index e530957c56..83c088300f 100644
--- a/omnipod-eros/build.gradle
+++ b/omnipod-eros/build.gradle
@@ -7,12 +7,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
 
 dependencies {
     implementation project(':core')
diff --git a/omnipod-eros/src/main/res/values-bg-rBG/strings.xml b/omnipod-eros/src/main/res/values-bg-rBG/strings.xml
index bc89093c83..5b26a40bd0 100644
--- a/omnipod-eros/src/main/res/values-bg-rBG/strings.xml
+++ b/omnipod-eros/src/main/res/values-bg-rBG/strings.xml
@@ -4,10 +4,68 @@
     <!-- Omnipod Eros - Keys -->
     <!-- Omnipod Eros - Overview -->
     <!-- Omnipod Eros - Preferences -->
+    <string name="omnipod_eros_preferences_riley_link_configuration">Конфигурация на RileyLink</string>
+    <string name="omnipod_eros_preferences_category_notifications">Известия</string>
+    <string name="omnipod_eros_preferences_pulse_log_button_enabled">Показване на PULSE LOG в менюто на Pod Management</string>
+    <string name="omnipod_eros_preferences_riley_link_stats_button_enabled">Показване на RileyLink Stats бутон в меню Управление на Pod</string>
+    <string name="omnipod_eros_preferences_battery_change_logging_enabled">Позволи на записване на смяна на батерията в Действия</string>
+    <string name="omnipod_eros_preferences_category_riley_link">RileyLink</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_tbr_sound_enabled">Сигнал при неясни TBR известия, разрешен</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_smb_sound_enabled">Сигнал при неясни SMB известия, разрешен</string>
+    <string name="omnipod_eros_preferences_notification_uncertain_bolus_sound_enabled">Сигнал при неясни болус известия, разрешен</string>
     <!-- Omnipod Eros - History -->
+    <string name="omnipod_eros_history_title">История в Pod</string>
+    <string name="omnipod_eros_history_item_description">Описание</string>
+    <string name="omnipod_eros_history_item_source">Източник</string>
+    <string name="omnipod_eros_history_item_date">Дата</string>
+    <string name="omnipod_eros_history_type">Тип:</string>
+    <string name="omnipod_eros_history_bolus_value">%1$.2fЕ</string>
+    <string name="omnipod_eros_history_bolus_value_with_carbs">%1$.2f Е, Вх=%2$.1f гр</string>
+    <string name="omnipod_eros_history_tbr_value">Количество: %1$.2f U, Продължителност: %2$d мин</string>
     <!-- Omnipod Eros - Short Status -->
+    <string name="omnipod_eros_short_status_riley_link_battery">RL бат: %1$d</string>
     <!-- Omnipod Eros - Error -->
+    <string name="omnipod_eros_error_riley_link_address_invalid">Грешен RileyLink адрес.</string>
+    <string name="omnipod_eros_error_crc_mismatch">Неуспешна комуникация: проверката на цялостта на съобщението е неуспешна</string>
+    <string name="omnipod_eros_error_invalid_packet_type">Неуспешна комуникация: получиен невалиден пакет от под</string>
+    <string name="omnipod_eros_error_invalid_progress_state">Неуспешна комуникация: под е в грешно състояние</string>
+    <string name="omnipod_eros_error_invalid_response">Неуспешна комуникация: получени грешен отговор от под</string>
+    <string name="omnipod_eros_error_invalid_message_sequence_number">Неуспешна комуникация: получи съобщение с невалиден номер на последователност от Pod</string>
+    <string name="omnipod_eros_error_invalid_message_address">Неуспешна комуникация: получено съобщение с невалиден адрес от Pod</string>
+    <string name="omnipod_eros_error_message_decoding_failed">Неуспешна комуникация: неуспешно декодиране на съобщение от Pod</string>
+    <string name="omnipod_eros_error_nonce_resync_failed">Комуникацията е неуспешна: ресинхронизирането е неуспешно</string>
+    <string name="omnipod_eros_error_nonce_out_of_sync">Комуникацията е неуспешна: ресинхронизирането е неуспешно</string>
+    <string name="omnipod_eros_error_not_enough_data">Комуникацията е неуспешна: не достатъчно данни получени от Pod</string>
+    <string name="omnipod_eros_error_pod_fault">Грешка на Pod (%1$03d %2$s). Моля, деактивирайте вашия Pod и стартирайте нов</string>
+    <string name="omnipod_eros_error_pod_returned_error_response">Комуникацията е неуспешна: Pod върна отговор с грешка</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_riley_link">Няма отговор от RileyLink</string>
+    <string name="omnipod_eros_error_communication_failed_riley_link_interrupted">RileyLink прекъснат</string>
+    <string name="omnipod_eros_error_communication_failed_no_response_from_pod">Няма отговор от Pod</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_might_be_suspended">Неуспешно задаване на базален профил. Доставката на инсулин може да бъде спряна! Моля, ръчно опреснете състоянието на Pod от раздел Omnipod и възобновете доставката, ако е необходимо.</string>
+    <string name="omnipod_eros_error_set_basal_might_have_failed_delivery_might_be_suspended">Неуспешно задаване на базален профил. Доставката на инсулин може да бъде спряна! Моля, ръчно опреснете състоянието на Pod от раздел Omnipod и възобновете доставката, ако е необходимо.</string>
+    <string name="omnipod_eros_error_set_basal_failed_delivery_suspended">Неуспешно задаване на базален профил. Инсулинът е спрян! Моля, ръчно подновяване на доставката от раздела Omnipod.</string>
+    <string name="omnipod_eros_error_cancel_temp_basal_failed_uncertain">Отменянето на временния базал може да е неуспешно. Моля, ръчно опреснете статуса на Pod от раздел Omnipod.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_might_be_cancelled">Задаването на временен базал е неуспешно. Ако преди това е изпълнявал временен базал, може да е бил отменен. Моля, ръчно опреснете статуса на Pod от раздела Omnipod.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_old_tbr_cancelled_new_might_have_failed">Задаването на временен базал е неуспешно. Ако преди това е имало временен базал, може да е бил отменен. Моля, ръчно опреснете статуса на Pod от раздела Omnipod.</string>
+    <string name="omnipod_eros_error_set_temp_basal_failed_validation">Продължителността трябва да бъде по-голяма от нула и кратно на %1$s минути.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_might_be_suspended">Неуспешно задаване на базален профил. Доставката на инсулин може да бъде спряна! Моля, ръчно опреснете състоянието на Pod от раздел Omnipod и възобновете доставката, ако е необходимо.</string>
+    <string name="omnipod_eros_error_set_time_failed_delivery_suspended">Неуспешно задаване на време. Инсулинът е спрян! Моля, ръчно подновяване на доставката от раздела Omnipod.</string>
+    <string name="omnipod_eros_error_failed_to_read_pulse_log">Неуспешно прочитане на Pulse Log</string>
+    <string name="omnipod_eros_error_automatic_time_or_timezone_change_failed">Неуспешно променяне на времето на под. Трябва ръчно да синхронизирате времето в раздела Omnipod.</string>
+    <string name="omnipod_eros_error_operation_not_possible_no_configuration">Забранено действие.\n\n Първо трябва да конфигурурате Omnipod , преди да използвате тази операция,.</string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain">Не може да се провери дали болус е поставен. Моля, уверете се ръчно, че Вашият Pod се активира чрез слушане на кликвания. <b>Ако сте сигурни, че болус не е успял, вие трябва ръчно да изтриете болния запис от лечение, дори ако щракнете върху \'Отказ от болус\' сега!</b></string>
+    <string name="omnipod_eros_error_bolus_failed_uncertain_smb">Не може да се провери дали SMB болус(%1$.2f Е) е успешен. <b>Ако сте сигурни, че не е успял, трябва ръчно да изтриете запис SMB от леченията.</b></string>
+    <string name="omnipod_eros_error_tbr_running_but_aaps_not_aware">В Pod има пуснат временен базал но AAPS не знае за него. Моля, отменете временния си базал ръчно.</string>
     <!-- Omnipod Eros - Pod Management -->
+    <string name="omnipod_eros_pod_management_button_riley_link_stats">RileyLink статистика</string>
+    <string name="omnipod_eros_pod_management_waiting_for_riley_link_connection">Изчакване на RileyLink връзка…</string>
+    <string name="omnipod_eros_pod_management_button_reset_riley_link_config">Изчисти RileyLink конфигурацията</string>
+    <string name="omnipod_eros_pod_management_button_read_pulse_log">Прочети Pulse log</string>
+    <string name="omnipod_eros_pod_management_button_reading_pulse_log">Четене на Pulse log…</string>
+    <string name="omnipod_eros_pod_management_pulse_log">Pulse лог</string>
+    <string name="omnipod_eros_pod_management_pulse_log_value">Pulse log(копиран в клипборда)</string>
     <!-- Omnipod Eros - Pod Activation Wizard -->
+    <string name="omnipod_eros_pod_activation_wizard_initialize_pod_text">Опитвам се да се сдвоя с Pod.\n\nКогато всички елементи са проверени, можете да натиснете <b>Следващ</b>.\n\n<b>Забележка:</b> задръжте Pod много близо до RileyLink в този момент.</string>
     <!-- Omnipod Eros - Other -->
+    <string name="omnipod_eros_uncertain">неизвестно</string>
 </resources>
diff --git a/pump-common/build.gradle b/pump-common/build.gradle
index 4661d58948..9923421f06 100644
--- a/pump-common/build.gradle
+++ b/pump-common/build.gradle
@@ -7,12 +7,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
 
 dependencies {
     implementation project(':core')
diff --git a/rileylink/build.gradle b/rileylink/build.gradle
index 96f2bfa148..1ae5804c92 100644
--- a/rileylink/build.gradle
+++ b/rileylink/build.gradle
@@ -7,12 +7,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
 apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
 
-android {
-    defaultConfig {
-        versionCode 1
-        versionName "1.0"
-    }
-}
 
 dependencies {
     implementation project(':core')
diff --git a/rileylink/src/main/res/values-it-rIT/strings.xml b/rileylink/src/main/res/values-it-rIT/strings.xml
index 6834a842e1..cdce27e5aa 100644
--- a/rileylink/src/main/res/values-it-rIT/strings.xml
+++ b/rileylink/src/main/res/values-it-rIT/strings.xml
@@ -64,6 +64,7 @@
     <string name="riley_link_common_yes">Sì</string>
     <string name="riley_link_common_no">No</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Mostra livello batteria riportato da OrangeLink/EmaLink/DiaLink</string>
     <string name="riley_link_show_battery_level_summary">NON funziona con il RileyLink originale. Potrebbe non funzionare con altre alternative al RileyLink.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d giorno</item>
diff --git a/rileylink/src/main/res/values-no-rNO/strings.xml b/rileylink/src/main/res/values-no-rNO/strings.xml
index ab5d3058ae..a9e91e1de2 100644
--- a/rileylink/src/main/res/values-no-rNO/strings.xml
+++ b/rileylink/src/main/res/values-no-rNO/strings.xml
@@ -64,6 +64,7 @@
     <string name="riley_link_common_yes">Ja</string>
     <string name="riley_link_common_no">Nei</string>
     <!-- RileyLink - Preferences -->
+    <string name="riley_link_show_battery_level">Vis batterinivå rapportert av OrangeLink/EmaLink/DiaLink</string>
     <string name="riley_link_show_battery_level_summary">Virker IKKE med RileyLink. Kan hende den ikke fungerer med andre RileyLink alternativer.</string>
     <plurals name="duration_days">
         <item quantity="one">%1$d dag</item>
diff --git a/settings.gradle b/settings.gradle
index 15a8fcf539..97c317e0d3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -14,4 +14,5 @@ include ':medtronic'
 include ':omnipod-common'
 include ':omnipod-eros'
 include ':omnipod-dash'
+include ':diaconn'