Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

app/build.gradle

@@ -97,12 +97,6 @@ def allCommitted = { ->
     return stringBuilder.toString().isEmpty()
 }
 
-tasks.matching { it instanceof Test }.all {
-    testLogging.events = ["failed", "skipped", "started"]
-    // testLogging.events = ["failed", "skipped", "started", "standard_out"] use to display stdout in travis
-    testLogging.exceptionFormat = "full"
-}
-
 android {
 
     namespace 'info.nightscout.androidaps'
@@ -111,7 +105,7 @@ android {
     defaultConfig {
         multiDexEnabled true
         versionCode 1500
-        version "3.0.0.2-dev-n"
+        version "3.0.0.2-dev-o"
         buildConfigField "String", "VERSION", '"' + version + '"'
         buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'

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

@@ -2,9 +2,9 @@ package info.nightscout.androidaps.activities
 
 import android.content.Context
 import android.os.Bundle
-import android.text.Editable
+import android.view.Menu
-import android.text.TextWatcher
 import android.view.MenuItem
+import androidx.appcompat.widget.SearchView
 import androidx.preference.PreferenceFragmentCompat
 import androidx.preference.PreferenceScreen
 import info.nightscout.androidaps.R
@@ -15,6 +15,7 @@ class PreferencesActivity : NoSplashAppCompatActivity(), PreferenceFragmentCompa
 
     private var preferenceId = 0
     private var myPreferenceFragment: MyPreferenceFragment? = null
+    private var searchView: SearchView? = null
 
     private lateinit var binding: ActivityPreferencesBinding
 
@@ -24,15 +25,6 @@ class PreferencesActivity : NoSplashAppCompatActivity(), PreferenceFragmentCompa
         binding = ActivityPreferencesBinding.inflate(layoutInflater)
         setContentView(binding.root)
 
-        binding.prefFilter.addTextChangedListener(object : TextWatcher {
-            override fun beforeTextChanged(s: CharSequence, start: Int, count: Int, after: Int) {}
-            override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
-                filterPreferences()
-            }
-
-            override fun afterTextChanged(s: Editable) {}
-        })
-
         title = rh.gs(R.string.nav_preferences)
         supportActionBar?.setDisplayHomeAsUpEnabled(true)
         supportActionBar?.setDisplayShowHomeEnabled(true)
@@ -40,12 +32,29 @@ class PreferencesActivity : NoSplashAppCompatActivity(), PreferenceFragmentCompa
         preferenceId = intent.getIntExtra("id", -1)
         myPreferenceFragment?.arguments = Bundle().also {
             it.putInt("id", preferenceId)
-            it.putString("filter", binding.prefFilter.text.toString())
         }
         if (savedInstanceState == null)
             supportFragmentManager.beginTransaction().replace(R.id.frame_layout, myPreferenceFragment!!).commit()
     }
 
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_preferences, menu)
+        val searchItem = menu.findItem(R.id.menu_search)
+        searchView = searchItem.actionView as SearchView
+        searchView?.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
+
+            override fun onQueryTextChange(newText: String): Boolean {
+                myPreferenceFragment?.setFilter(newText)
+                return false
+            }
+
+            override fun onQueryTextSubmit(query: String): Boolean {
+                return false
+            }
+        })
+        return super.onCreateOptionsMenu(menu)
+    }
+
     override fun onPreferenceStartScreen(caller: PreferenceFragmentCompat, pref: PreferenceScreen): Boolean {
         val fragment = MyPreferenceFragment()
         fragment.arguments = Bundle().also {
@@ -60,10 +69,6 @@ class PreferencesActivity : NoSplashAppCompatActivity(), PreferenceFragmentCompa
         super.attachBaseContext(LocaleHelper.wrap(newBase))
     }
 
-    private fun filterPreferences() {
-        myPreferenceFragment?.setFilter(binding.prefFilter.text.toString())
-    }
-
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             android.R.id.home -> {

app/src/main/java/info/nightscout/androidaps/dialogs/CarbsDialog.kt

@@ -56,9 +56,9 @@ class CarbsDialog : DialogFragmentWithDate() {
 
     companion object {
 
-        private const val FAV1_DEFAULT = 5
+        const val FAV1_DEFAULT = 5
-        private const val FAV2_DEFAULT = 10
+        const val FAV2_DEFAULT = 10
-        private const val FAV3_DEFAULT = 20
+        const val FAV3_DEFAULT = 20
     }
 
     private var queryingProtection = false

app/src/main/java/info/nightscout/androidaps/dialogs/InsulinDialog.kt

@@ -58,9 +58,9 @@ class InsulinDialog : DialogFragmentWithDate() {
 
     companion object {
 
-        private const val PLUS1_DEFAULT = 0.5
+        const val PLUS1_DEFAULT = 0.5
-        private const val PLUS2_DEFAULT = 1.0
+        const val PLUS2_DEFAULT = 1.0
-        private const val PLUS3_DEFAULT = 2.0
+        const val PLUS3_DEFAULT = 2.0
     }
 
     private var queryingProtection = false

app/src/main/java/info/nightscout/androidaps/dialogs/WizardDialog.kt

@@ -345,6 +345,7 @@ class WizardDialog : DaggerDialogFragment() {
         val basalIob = iobCobCalculator.calculateIobFromTempBasalsIncludingConvertedExtended().round()
 
         runOnUiThread {
+            _binding ?: return@runOnUiThread
             if (carbsPassedIntoWizard != 0.0) {
                 binding.carbsInput.value = carbsPassedIntoWizard
             }

app/src/main/java/info/nightscout/androidaps/plugins/constraints/objectives/objectives/Objective2.kt

@@ -178,6 +178,21 @@ class Objective2(injector: HasAndroidInjector) : Objective(injector, "exam", R.s
             .option(Option(R.string.iob_negiob, true))
             .option(Option(R.string.iob_posiob, true))
         )
+        tasks.add(ExamTask(this, R.string.cob_label, R.string.cob_question, "cob1")
+            .option(Option(R.string.cob_longer, true))
+            .option(Option(R.string.cob_shorter, false))
+            .option(Option(R.string.cob_no_effect, false))
+        )
+        tasks.add(ExamTask(this, R.string.cob_label, R.string.cob2_question, "cob2")
+            .option(Option(R.string.cob2_longer, false))
+            .option(Option(R.string.cob2_shorter, true))
+            .option(Option(R.string.cob2_no_effect, false))
+        )
+        tasks.add(ExamTask(this, R.string.cob_label, R.string.cob3_question, "cob3")
+            .option(Option(R.string.cob3_longer, false))
+            .option(Option(R.string.cob3_shorter, false))
+            .option(Option(R.string.cob3_no_effect, true))
+        )
         tasks.add(ExamTask(this, R.string.breadgrams_label, R.string.blank, "breadgrams")
             .option(Option(R.string.breadgrams_grams, true))
             .option(Option(R.string.breadgrams_exchange, false))

app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneFragment.kt

@@ -100,7 +100,6 @@ class AutotuneFragment : DaggerFragment() {
         )
         binding.autotuneRun.setOnClickListener {
             val daysBack = SafeParse.stringToInt(binding.tuneDays.text)
-            autotunePlugin.calculationRunning = true
             autotunePlugin.lastNbDays = daysBack.toString()
             log("Run Autotune $profileName, $daysBack days")
             Thread {
@@ -126,7 +125,7 @@ class AutotuneFragment : DaggerFragment() {
             autotunePlugin.tunedProfile?.let { tunedProfile ->
                 showConfirmation(requireContext(),
                                  rh.gs(R.string.autotune_copy_localprofile_button),
-                                 rh.gs(R.string.autotune_copy_local_profile_message) + "\n" + localName + " " + dateUtil.dateAndTimeString(autotunePlugin.lastRun),
+                                 rh.gs(R.string.autotune_copy_local_profile_message) + "\n" + localName,
                                  Runnable {
                                      localProfilePlugin.addProfile(localProfilePlugin.copyFrom(tunedProfile.getProfile(circadian), localName))
                                      rxBus.send(EventLocalProfileChanged())

app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneIob.kt

@@ -2,31 +2,31 @@ package info.nightscout.androidaps.plugins.general.autotune
 
 import info.nightscout.androidaps.Constants
 import info.nightscout.androidaps.R
-import info.nightscout.androidaps.data.*
+import info.nightscout.androidaps.data.IobTotal
+import info.nightscout.androidaps.data.LocalInsulin
 import info.nightscout.androidaps.database.AppRepository
 import info.nightscout.androidaps.database.embedments.InterfaceIDs
-import info.nightscout.androidaps.interfaces.ActivePlugin
-import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.database.entities.*
 import info.nightscout.androidaps.extensions.durationInMinutes
 import info.nightscout.androidaps.extensions.iobCalc
 import info.nightscout.androidaps.extensions.toJson
 import info.nightscout.androidaps.extensions.toTemporaryBasal
+import info.nightscout.androidaps.interfaces.ActivePlugin
 import info.nightscout.androidaps.interfaces.Profile
+import info.nightscout.androidaps.interfaces.ProfileFunction
 import info.nightscout.androidaps.plugins.general.autotune.data.ATProfile
 import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.Round
 import info.nightscout.androidaps.utils.T
 import info.nightscout.shared.logging.AAPSLogger
+import info.nightscout.shared.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
 import org.json.JSONArray
 import org.json.JSONObject
-import org.slf4j.LoggerFactory
 import java.util.*
 import javax.inject.Inject
 import javax.inject.Singleton
 import kotlin.math.ceil
-import kotlin.math.roundToInt
 
 @Singleton
 open class AutotuneIob @Inject constructor(
@@ -39,7 +39,7 @@ open class AutotuneIob @Inject constructor(
     private val autotuneFS: AutotuneFS
 ) {
 
-    private val nsTreatments = ArrayList<NsTreatment>()
+    private var nsTreatments = ArrayList<NsTreatment>()
     private var dia: Double = Constants.defaultDIA
     var boluses: ArrayList<Bolus> = ArrayList()
     var meals = ArrayList<Carbs>()
@@ -59,24 +59,38 @@ open class AutotuneIob @Inject constructor(
         initializeTreatmentData(from - range(), to)
         initializeTempBasalData(from - range(), to, tunedProfile)
         initializeExtendedBolusData(from - range(), to, tunedProfile)
-        Collections.sort(tempBasals) { o1: TemporaryBasal, o2: TemporaryBasal -> (o2.timestamp - o1.timestamp).toInt() }
+        sortTempBasal()
-        // Without Neutral TBR, Autotune Web will ignore iob for periods without TBR running
+        addNeutralTempBasal(from - range(), to, tunedProfile)        // Without Neutral TBR, Autotune Web will ignore iob for periods without TBR running
-        addNeutralTempBasal(from - range(), to, tunedProfile)
+        sortNsTreatments()
-        Collections.sort(nsTreatments) { o1: NsTreatment, o2: NsTreatment -> (o2.date - o1.date).toInt() }
+        sortBoluses()
-        Collections.sort(boluses) { o1: Bolus, o2: Bolus -> (o2.timestamp - o1.timestamp).toInt() }
+        aapsLogger.debug(LTag.AUTOTUNE, "Nb Treatments: " + nsTreatments.size + " Nb meals: " + meals.size)
-        log.debug("D/AutotunePlugin: Nb Treatments: " + nsTreatments.size + " Nb meals: " + meals.size)
+    }
+
+    @Synchronized
+    private fun sortTempBasal() {
+        tempBasals = ArrayList(tempBasals.toList().sortedWith { o1: TemporaryBasal, o2: TemporaryBasal -> (o2.timestamp - o1.timestamp).toInt() })
+    }
+
+    @Synchronized
+    private fun sortNsTreatments() {
+        nsTreatments = ArrayList(nsTreatments.toList().sortedWith { o1: NsTreatment, o2: NsTreatment -> (o2.date - o1.date).toInt() })
+    }
+
+    @Synchronized
+    private fun sortBoluses() {
+        boluses = ArrayList(boluses.toList().sortedWith { o1: Bolus, o2: Bolus -> (o2.timestamp - o1.timestamp).toInt() })
     }
 
     private fun initializeBgreadings(from: Long, to: Long) {
-        glucose = repository.compatGetBgReadingsDataFromTime(from, to, false).blockingGet();
+        glucose = repository.compatGetBgReadingsDataFromTime(from, to, false).blockingGet()
     }
 
     //nsTreatment is used only for export data, meals is used in AutotunePrep
     private fun initializeTreatmentData(from: Long, to: Long) {
-        val oldestBgDate = if (glucose.size > 0) glucose[glucose.size - 1].timestamp else from
+        val oldestBgDate = if (glucose.isNotEmpty()) glucose[glucose.size - 1].timestamp else from
-        log.debug("AutotunePlugin Check BG date: BG Size: " + glucose.size + " OldestBG: " + dateUtil.dateAndTimeAndSecondsString(oldestBgDate) + " to: " + dateUtil.dateAndTimeAndSecondsString(to))
+        aapsLogger.debug(LTag.AUTOTUNE, "Check BG date: BG Size: " + glucose.size + " OldestBG: " + dateUtil.dateAndTimeAndSecondsString(oldestBgDate) + " to: " + dateUtil.dateAndTimeAndSecondsString(to))
         val tmpCarbs = repository.getCarbsDataFromTimeToTimeExpanded(from, to, false).blockingGet()
-        log.debug("AutotunePlugin Nb treatments after query: " + tmpCarbs.size)
+        aapsLogger.debug(LTag.AUTOTUNE, "Nb treatments after query: " + tmpCarbs.size)
         meals.clear()
         boluses.clear()
         var nbCarbs = 0
@@ -146,6 +160,7 @@ open class AutotuneIob @Inject constructor(
 
     // addNeutralTempBasal will add a fake neutral TBR (100%) to have correct basal rate in exported file for periods without TBR running
     // to be able to compare results between oref0 algo and aaps
+    @Synchronized
     private fun addNeutralTempBasal(from: Long, to: Long, tunedProfile: ATProfile) {
         var previousStart = to
         for (i in tempBasals.indices) {
@@ -180,6 +195,7 @@ open class AutotuneIob @Inject constructor(
 
     // toSplittedTimestampTB will split all TBR across hours in different TBR with correct absolute value to be sure to have correct basal rate
     // even if profile rate is not the same
+    @Synchronized
     private fun toSplittedTimestampTB(tb: TemporaryBasal, tunedProfile: ATProfile) {
         var splittedTimestamp = tb.timestamp
         val cutInMilliSec = T.mins(60).msecs()                  //30 min to compare with oref0, 60 min to improve accuracy
@@ -217,7 +233,7 @@ open class AutotuneIob @Inject constructor(
                     tempBasals.add(newtb)
                     nsTreatments.add(NsTreatment(newtb))
                     splittedTimestamp += durationFilled
-                    splittedDuration = splittedDuration - durationFilled
+                    splittedDuration -= durationFilled
                     val profile = profileFunction.getProfile(newtb.timestamp) ?:continue
                     boluses.addAll(convertToBoluses(newtb, profile, tunedProfile.profile))           // required for correct iob calculation with oref0 algo
                 }
@@ -295,7 +311,7 @@ open class AutotuneIob @Inject constructor(
         return result
     }
 
-
+    @Synchronized
     fun glucoseToJSON(): String {
         val glucoseJson = JSONArray()
         for (bgreading in glucose)
@@ -303,6 +319,7 @@ open class AutotuneIob @Inject constructor(
         return glucoseJson.toString(2)
     }
 
+    @Synchronized
     fun bolusesToJSON(): String {
         val bolusesJson = JSONArray()
         for (bolus in boluses)
@@ -310,6 +327,7 @@ open class AutotuneIob @Inject constructor(
         return bolusesJson.toString(2)
     }
 
+    @Synchronized
     fun nsHistoryToJSON(): String {
         val json = JSONArray()
         for (t in nsTreatments) {
@@ -377,8 +395,4 @@ open class AutotuneIob @Inject constructor(
     private fun log(message: String) {
         autotuneFS.atLog("[iob] $message")
     }
-
-    companion object {
-        private val log = LoggerFactory.getLogger(AutotunePlugin::class.java)
-    }
 }

app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePlugin.kt

@@ -22,6 +22,7 @@ import info.nightscout.androidaps.utils.MidnightTime
 import info.nightscout.androidaps.utils.T
 import info.nightscout.androidaps.interfaces.BuildHelper
 import info.nightscout.shared.logging.AAPSLogger
+import info.nightscout.shared.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
 import org.json.JSONException
 import org.json.JSONObject
@@ -65,7 +66,7 @@ class AutotunePlugin @Inject constructor(
 ), Autotune {
     @Volatile override var lastRunSuccess: Boolean = false
     @Volatile var result: String = ""
-    @Volatile var calculationRunning: Boolean = false
+    @Volatile override var calculationRunning: Boolean = false
     @Volatile var lastRun: Long = 0
     @Volatile var selectedProfile = ""
     @Volatile var lastNbDays: String = ""
@@ -76,21 +77,34 @@ class AutotunePlugin @Inject constructor(
     private lateinit var profile: Profile
     val autotuneStartHour: Int = 4
 
-    override fun aapsAutotune(daysBack: Int, autoSwitch: Boolean, profileToTune: String): String {
+    override fun aapsAutotune(daysBack: Int, autoSwitch: Boolean, profileToTune: String) {
+        lastRunSuccess = false
+        if (calculationRunning) {
+            aapsLogger.debug(LTag.AUTOMATION, "Autotune run detected, Autotune Run Cancelled")
+            return
+        }
+        calculationRunning = true
         tunedProfile = null
         updateButtonVisibility = View.GONE
-        lastRunSuccess = false
         var logResult = ""
         result = ""
         if (profileFunction.getProfile() == null) {
             result = rh.gs(R.string.profileswitch_ismissing)
-            return result
+            rxBus.send(EventAutotuneUpdateGui())
+            calculationRunning = false
+            return
         }
         val detailedLog = sp.getBoolean(R.string.key_autotune_additional_log, false)
         calculationRunning = true
         lastNbDays = "" + daysBack
         lastRun = dateUtil.now()
-        val profileStore = activePlugin.activeProfileSource.profile ?: return rh.gs(R.string.profileswitch_ismissing)
+        val profileStore = activePlugin.activeProfileSource.profile
+        if (profileStore == null) {
+            result = rh.gs(R.string.profileswitch_ismissing)
+            rxBus.send(EventAutotuneUpdateGui())
+            calculationRunning = false
+            return
+        }
         selectedProfile = if (profileToTune.isEmpty()) profileFunction.getProfileName() else profileToTune
         profileFunction.getProfile()?.let { currentProfile ->
             profile = profileStore.getSpecificProfile(profileToTune)?.let { ProfileSealed.Pure(it) } ?: currentProfile
@@ -144,11 +158,11 @@ class AutotunePlugin @Inject constructor(
             if (tunedProfile == null) {
                 result = rh.gs(R.string.autotune_error)
                 log("TunedProfile is null on day ${i + 1}")
-                calculationRunning = false
-                rxBus.send(EventAutotuneUpdateGui())
                 autotuneFS.exportResult(result)
                 autotuneFS.exportLogAndZip(lastRun)
-                return result
+                rxBus.send(EventAutotuneUpdateGui())
+                calculationRunning = false
+                return
             }
         }
         result = rh.gs(R.string.autotune_result, dateUtil.dateAndTimeString(lastRun))
@@ -193,13 +207,16 @@ class AutotunePlugin @Inject constructor(
         }
 
         tunedProfile?.let {
-            lastRunSuccess = true
             saveLastRun()
+            lastRunSuccess = true
             rxBus.send(EventAutotuneUpdateGui())
             calculationRunning = false
-            return result
+            return
         }
-        return rh.gs(R.string.autotune_error)
+        result = rh.gs(R.string.autotune_error)
+        rxBus.send(EventAutotuneUpdateGui())
+        calculationRunning = false
+        return
     }
 
     private fun showResults(tunedProfile: ATProfile?, pumpProfile: ATProfile): String {

app/src/main/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePrep.kt

@@ -10,6 +10,8 @@ import info.nightscout.androidaps.utils.DateUtil
 import info.nightscout.androidaps.utils.MidnightTime
 import info.nightscout.androidaps.utils.Round
 import info.nightscout.androidaps.utils.T
+import info.nightscout.shared.logging.AAPSLogger
+import info.nightscout.shared.logging.LTag
 import info.nightscout.shared.sharedPreferences.SP
 import java.util.*
 import javax.inject.Inject
@@ -17,6 +19,7 @@ import javax.inject.Singleton
 
 @Singleton
 class AutotunePrep @Inject constructor(
+    private val aapsLogger: AAPSLogger,
     private val sp: SP,
     private val dateUtil: DateUtil,
     private val autotuneFS: AutotuneFS,
@@ -146,6 +149,7 @@ class AutotunePrep @Inject constructor(
             }
         }
         if (glucose.size == 0 || glucoseData.size == 0 ) {
+            //aapsLogger.debug(LTag.AUTOTUNE, "No BG value received")
             if (verbose)
                 log("No BG value received")
             return null
@@ -159,11 +163,13 @@ class AutotunePrep @Inject constructor(
         //val boluses = 0
         //val maxCarbs = 0
         if (treatments.size == 0) {
+            //aapsLogger.debug(LTag.AUTOTUNE, "No Carbs entries")
             if (verbose)
                 log("No Carbs entries")
             //return null
         }
         if (autotuneIob.boluses.size == 0) {
+            //aapsLogger.debug(LTag.AUTOTUNE, "No treatment received")
             if (verbose)
                 log("No treatment received")
             return null
@@ -253,6 +259,7 @@ class AutotunePrep @Inject constructor(
                 }
                 avgDelta = (bg - bucketedData[i + 4].value) / 4
             } else {
+                //aapsLogger.debug(LTag.AUTOTUNE, "Could not find glucose data")
                 if (verbose)
                     log("Could not find glucose data")
             }
@@ -320,8 +327,9 @@ class AutotunePrep @Inject constructor(
                     crInitialIOB = iob.iob
                     crInitialBG = glucoseDatum.value
                     crInitialCarbTime = glucoseDatum.date
+                    //aapsLogger.debug(LTag.AUTOTUNE, "CRInitialIOB: $crInitialIOB CRInitialBG: $crInitialBG CRInitialCarbTime: ${dateUtil.toISOString(crInitialCarbTime)}")
                     if (verbose)
-                        log("CRInitialIOB: " + crInitialIOB + " CRInitialBG: " + crInitialBG + " CRInitialCarbTime: " + dateUtil.toISOString(crInitialCarbTime))
+                        log("CRInitialIOB: $crInitialIOB CRInitialBG: $crInitialBG CRInitialCarbTime: ${dateUtil.toISOString(crInitialCarbTime)}")
                 }
                 // keep calculatingCR as long as we have COB or enough IOB
                 if (mealCOB > 0 && i > 1) {
@@ -333,8 +341,9 @@ class AutotunePrep @Inject constructor(
                     val crEndIOB = iob.iob
                     val crEndBG = glucoseDatum.value
                     val crEndTime = glucoseDatum.date
+                    //aapsLogger.debug(LTag.AUTOTUNE, "CREndIOB: $crEndIOB CREndBG: $crEndBG CREndTime: ${dateUtil.toISOString(crEndTime)}")
                     if (verbose)
-                        log("CREndIOB: " + crEndIOB + " CREndBG: " + crEndBG + " CREndTime: " + dateUtil.toISOString(crEndTime))
+                        log("CREndIOB: $crEndIOB CREndBG: $crEndBG CREndTime: ${dateUtil.toISOString(crEndTime)}")
                     val crDatum = CRDatum(dateUtil)
                     crDatum.crInitialBG = crInitialBG
                     crDatum.crInitialIOB = crInitialIOB
@@ -349,6 +358,7 @@ class AutotunePrep @Inject constructor(
 
                     //log.debug(CREndTime - CRInitialCarbTime, CRElapsedMinutes);
                     if (CRElapsedMinutes < 60 || i == 1 && mealCOB > 0) {
+                        //aapsLogger.debug(LTag.AUTOTUNE, "Ignoring $CRElapsedMinutes m CR period.")
                         if (verbose)
                             log("Ignoring $CRElapsedMinutes m CR period.")
                     } else {
@@ -378,8 +388,9 @@ class AutotunePrep @Inject constructor(
                 //log.debug(type);
                 if (type != "csf") {
                     glucoseDatum.mealAbsorption = "start"
+                    //aapsLogger.debug(LTag.AUTOTUNE, "${glucoseDatum.mealAbsorption} carb absorption")
                     if (verbose)
-                        log(glucoseDatum.mealAbsorption + " carb absorption")
+                        log("${glucoseDatum.mealAbsorption} carb absorption")
                 }
                 type = "csf"
                 glucoseDatum.mealCarbs = mealCarbs.toInt()
@@ -389,8 +400,9 @@ class AutotunePrep @Inject constructor(
                 // check previous "type" value, and if it was csf, set a mealAbsorption end flag
                 if (type == "csf") {
                     csfGlucoseData[csfGlucoseData.size - 1].mealAbsorption = "end"
+                    //aapsLogger.debug(LTag.AUTOTUNE, "${csfGlucoseData[csfGlucoseData.size - 1].mealAbsorption} carb absorption")
                     if (verbose)
-                        log(csfGlucoseData[csfGlucoseData.size - 1].mealAbsorption + " carb absorption")
+                        log("${csfGlucoseData[csfGlucoseData.size - 1].mealAbsorption} carb absorption")
                 }
                 if (iob.iob > 2 * currentBasal || deviation > 6 || uam) {
                     uam = if (deviation > 0) {
@@ -400,6 +412,7 @@ class AutotunePrep @Inject constructor(
                     }
                     if (type != "uam") {
                         glucoseDatum.uamAbsorption = "start"
+                        //aapsLogger.debug(LTag.AUTOTUNE, "${glucoseDatum.uamAbsorption} unannnounced meal absorption")
                         if (verbose)
                             log(glucoseDatum.uamAbsorption + " unannnounced meal absorption")
                     }
@@ -407,6 +420,7 @@ class AutotunePrep @Inject constructor(
                     uamGlucoseData.add(glucoseDatum)
                 } else {
                     if (type == "uam") {
+                        //aapsLogger.debug(LTag.AUTOTUNE, "end unannounced meal absorption")
                         if (verbose)
                             log("end unannounced meal absorption")
                     }
@@ -433,8 +447,10 @@ class AutotunePrep @Inject constructor(
                 }
             }
             // debug line to print out all the things
+            //aapsLogger.debug(LTag.AUTOTUNE, "${(if (absorbing) 1 else 0)} mealCOB: ${Round.roundTo(mealCOB, 0.1)} mealCarbs: ${Math.round(mealCarbs)} basalBGI: ${Round.roundTo(basalBGI, 0.1)} BGI: ${Round.roundTo(BGI, 0.1)} IOB: ${iob.iob} Activity: ${iob.activity} at ${dateUtil.timeStringWithSeconds(BGTime)} dev: $deviation avgDelta: $avgDelta $type")
             if (verbose)
-                log((if (absorbing) 1 else 0).toString() + " mealCOB: " + Round.roundTo(mealCOB, 0.1) + " mealCarbs: " + Math.round(mealCarbs) + " basalBGI: " + Round.roundTo(basalBGI, 0.1) + " BGI: " + Round.roundTo(BGI, 0.1) + " IOB: " + iob.iob+ " Activity: " + iob.activity + " at " + dateUtil.timeStringWithSeconds(BGTime) + " dev: " + deviation + " avgDelta: " + avgDelta + " " + type)
+                log("${(if (absorbing) 1 else 0)} mealCOB: ${Round.roundTo(mealCOB, 0.1)} mealCarbs: ${Math.round(mealCarbs)} basalBGI: ${Round.roundTo(basalBGI, 0.1)} BGI: ${Round
+                        .roundTo(BGI, 0.1)} IOB: ${iob.iob} Activity: ${iob.activity} at ${dateUtil.timeStringWithSeconds(BGTime)} dev: $deviation avgDelta: $avgDelta $type")
         }
 
 //****************************************************************************************************************************************
@@ -449,16 +465,20 @@ class AutotunePrep @Inject constructor(
         val UAMLength = uamGlucoseData.size
         var basalLength = basalGlucoseData.size
         if (sp.getBoolean(R.string.key_autotune_categorize_uam_as_basal, false)) {
+            //aapsLogger.debug(LTag.AUTOTUNE, "Categorizing all UAM data as basal.")
             if (verbose)
                 log("Categorizing all UAM data as basal.")
             basalGlucoseData.addAll(uamGlucoseData)
         } else if (CSFLength > 12) {
+            //aapsLogger.debug(LTag.AUTOTUNE, "Found at least 1h of carb: assuming meals were announced, and categorizing UAM data as basal.")
             if (verbose)
                 log("Found at least 1h of carb: assuming meals were announced, and categorizing UAM data as basal.")
             basalGlucoseData.addAll(uamGlucoseData)
         } else {
             if (2 * basalLength < UAMLength) {
                 //log.debug(basalGlucoseData, UAMGlucoseData);
+                //aapsLogger.debug(LTag.AUTOTUNE, "Warning: too many deviations categorized as UnAnnounced Meals")
+                //aapsLogger.debug(LTag.AUTOTUNE, "Adding $UAMLength UAM deviations to $basalLength basal ones")
                 if (verbose) {
                     log("Warning: too many deviations categorized as UnAnnounced Meals")
                     log("Adding $UAMLength UAM deviations to $basalLength basal ones")
@@ -473,10 +493,12 @@ class AutotunePrep @Inject constructor(
                 }
                 //log.debug(newBasalGlucose);
                 basalGlucoseData = newBasalGlucose
+                //aapsLogger.debug(LTag.AUTOTUNE, "and selecting the lowest 50%, leaving ${basalGlucoseData.size} basal+UAM ones")
                 if (verbose)
-                    log("and selecting the lowest 50%, leaving " + basalGlucoseData.size + " basal+UAM ones")
+                    log("and selecting the lowest 50%, leaving ${basalGlucoseData.size} basal+UAM ones")
             }
             if (2 * ISFLength < UAMLength) {
+                //aapsLogger.debug(LTag.AUTOTUNE, "Adding $UAMLength UAM deviations to $ISFLength ISF ones")
                 if (verbose)
                     log("Adding $UAMLength UAM deviations to $ISFLength ISF ones")
                 isfGlucoseData.addAll(uamGlucoseData)
@@ -488,14 +510,17 @@ class AutotunePrep @Inject constructor(
                 }
                 //console.error(newISFGlucose);
                 isfGlucoseData = newISFGlucose
+                //aapsLogger.debug(LTag.AUTOTUNE, "and selecting the lowest 50%, leaving ${isfGlucoseData.size} ISF+UAM ones")
                 if (verbose)
-                    log("and selecting the lowest 50%, leaving " + isfGlucoseData.size + " ISF+UAM ones")
+                    log("and selecting the lowest 50%, leaving ${isfGlucoseData.size} ISF+UAM ones")
                 //log.error(ISFGlucoseData.length, UAMLength);
             }
         }
         basalLength = basalGlucoseData.size
         ISFLength = isfGlucoseData.size
         if (4 * basalLength + ISFLength < CSFLength && ISFLength < 10) {
+            //aapsLogger.debug(LTag.AUTOTUNE, "Warning: too many deviations categorized as meals")
+            //aapsLogger.debug(LTag.AUTOTUNE, "Adding $CSFLength CSF deviations to $ISFLength ISF ones")
             if (verbose) {
                 log("Warning: too many deviations categorized as meals")
                 //log.debug("Adding",CSFLength,"CSF deviations to",basalLength,"basal ones");
@@ -507,8 +532,9 @@ class AutotunePrep @Inject constructor(
         }
 
 // categorize.js Lines 437-444
+        //aapsLogger.debug(LTag.AUTOTUNE, "CRData: ${crData.size} CSFGlucoseData: ${csfGlucoseData.size} ISFGlucoseData: ${isfGlucoseData.size} BasalGlucoseData: ${basalGlucoseData.size}")
         if (verbose)
-            log("CRData: " + crData.size + " CSFGlucoseData: " + csfGlucoseData.size + " ISFGlucoseData: " + isfGlucoseData.size + " BasalGlucoseData: " + basalGlucoseData.size)
+            log("CRData: ${crData.size} CSFGlucoseData: ${csfGlucoseData.size} ISFGlucoseData: ${isfGlucoseData.size} BasalGlucoseData: ${basalGlucoseData.size}")
 
         return PreppedGlucose(autotuneIob.startBG, crData, csfGlucoseData, isfGlucoseData, basalGlucoseData, dateUtil)
     }
@@ -516,6 +542,7 @@ class AutotunePrep @Inject constructor(
     //dosed.js full
     private fun dosed(start: Long, end: Long, treatments: List<Bolus>): Double {
         var insulinDosed = 0.0
+        //aapsLogger.debug(LTag.AUTOTUNE, "No treatments to process.")
         if (treatments.size == 0) {
             log("No treatments to process.")
             return 0.0

app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataHandlerMobile.kt

@@ -12,6 +12,8 @@ import info.nightscout.androidaps.database.entities.*
 import info.nightscout.androidaps.database.interfaces.end
 import info.nightscout.androidaps.database.transactions.CancelCurrentTemporaryTargetIfAnyTransaction
 import info.nightscout.androidaps.database.transactions.InsertAndCancelCurrentTemporaryTargetTransaction
+import info.nightscout.androidaps.dialogs.CarbsDialog
+import info.nightscout.androidaps.dialogs.InsulinDialog
 import info.nightscout.androidaps.events.EventMobileToWear
 import info.nightscout.androidaps.extensions.convertedToAbsolute
 import info.nightscout.androidaps.extensions.toStringShort
@@ -694,7 +696,11 @@ class DataHandlerMobile @Inject constructor(
                     unitsMgdl = profileFunction.getUnits() == GlucoseUnit.MGDL,
                     bolusPercentage = sp.getInt(R.string.key_boluswizard_percentage, 100),
                     maxCarbs = sp.getInt(R.string.key_treatmentssafety_maxcarbs, 48),
-                    maxBolus = sp.getDouble(R.string.key_treatmentssafety_maxbolus, 3.0)
+                    maxBolus = sp.getDouble(R.string.key_treatmentssafety_maxbolus, 3.0),
+                    insulinButtonIncrement1 = sp.getDouble(R.string.key_insulin_button_increment_1, InsulinDialog.PLUS1_DEFAULT),
+                    insulinButtonIncrement2 = sp.getDouble(R.string.key_insulin_button_increment_2, InsulinDialog.PLUS2_DEFAULT),
+                    carbsButtonIncrement1 = sp.getInt(R.string.key_carbs_button_increment_1, CarbsDialog.FAV1_DEFAULT),
+                    carbsButtonIncrement2 = sp.getInt(R.string.key_carbs_button_increment_2, CarbsDialog.FAV2_DEFAULT)
                 )
             )
         )
@@ -1185,4 +1191,4 @@ class DataHandlerMobile @Inject constructor(
     @Synchronized private fun sendError(errorMessage: String) {
         rxBus.send(EventMobileToWear(EventData.ConfirmAction(rh.gs(R.string.error), errorMessage, returnCommand = EventData.Error(dateUtil.now())))) // ignore return path
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/plugins/general/wear/wearintegration/DataLayerListenerServiceMobile.kt

@@ -134,7 +134,7 @@ class DataLayerListenerServiceMobile : WearableListenerService() {
             aapsLogger.debug(LTag.WEAR, "Nodes: ${capabilityInfo.nodes.joinToString(", ") { it.displayName + "(" + it.id + ")" }}")
             val bestNode = pickBestNodeId(capabilityInfo.nodes)
             transcriptionNodeId = bestNode?.id
-            wearPlugin.connectedDevice = bestNode?.displayName ?: "---"
+            wearPlugin.connectedDevice = bestNode?.displayName ?: rh.gs(R.string.no_watch_connected)
             rxBus.send(EventWearUpdateGui())
             aapsLogger.debug(LTag.WEAR, "Selected node: ${bestNode?.displayName} $transcriptionNodeId")
             rxBus.send(EventMobileToWear(EventData.ActionPing(System.currentTimeMillis())))

app/src/main/java/info/nightscout/androidaps/plugins/profile/local/LocalProfileFragment.kt

@@ -394,6 +394,7 @@ class LocalProfileFragment : DaggerFragment() {
     }
 
     private fun updateProtectedUi() {
+        _binding ?: return
         val isLocked = protectionCheck.isLocked(ProtectionCheck.Protection.PREFERENCES)
         binding.mainLayout.visibility = isLocked.not().toVisibility()
         binding.unlock.visibility = isLocked.toVisibility()

app/src/main/java/info/nightscout/androidaps/utils/stats/TddCalculator.kt

@@ -1,6 +1,5 @@
 package info.nightscout.androidaps.utils.stats
 
-import android.annotation.SuppressLint
 import android.content.Context
 import android.graphics.Typeface
 import android.util.LongSparseArray
@@ -99,9 +98,19 @@ class TddCalculator @Inject constructor(
         return result
     }
 
+    fun calculateToday(): TotalDailyDose {
+        var startTime = MidnightTime.calc(dateUtil.now())
+        val endTime = dateUtil.now()
+        return calculate(startTime, endTime)
+    }
+
     fun calculateDaily(startHours: Long, endHours: Long): TotalDailyDose {
         val startTime = dateUtil.now() + T.hours(hour = startHours).msecs()
         val endTime = dateUtil.now() + T.hours(hour = endHours).msecs()
+        return calculate(startTime, endTime)
+    }
+
+    fun calculate(startTime: Long, endTime: Long): TotalDailyDose {
         val tdd = TotalDailyDose(timestamp = startTime)
         repository.getBolusesDataFromTimeToTime(startTime, endTime, true).blockingGet()
             .filter { it.type != Bolus.Type.PRIMING }
@@ -147,10 +156,10 @@ class TddCalculator @Inject constructor(
         return totalTdd
     }
 
-    @SuppressLint("SetTextI18n")
     fun stats(context: Context): TableLayout {
         val tdds = calculate(7)
         val averageTdd = averageTDD(tdds)
+        val todayTdd = calculateToday()
         val lp = TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, TableRow.LayoutParams.WRAP_CONTENT)
         return TableLayout(context).also { layout ->
             layout.layoutParams = TableLayout.LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1f)
@@ -172,6 +181,13 @@ class TddCalculator @Inject constructor(
                 })
                 layout.addView(averageTdd.toTableRow(context, rh, tdds.size(), includeCarbs = true))
             }
+            layout.addView(TextView(context).apply {
+                text = rh.gs(R.string.today)
+                setTypeface(typeface, Typeface.BOLD)
+                gravity = Gravity.CENTER_HORIZONTAL
+                setTextAppearance(android.R.style.TextAppearance_Material_Medium)
+            })
+            layout.addView(todayTdd.toTableRow(context, rh, dateUtil, includeCarbs = true))
         }
     }
-}
+}

app/src/main/java/info/nightscout/androidaps/utils/ui/TimeListEdit.java

@@ -182,7 +182,7 @@ public class TimeListEdit {
         numberPickers1[position].setTextWatcher(new TextWatcher() {
             @Override
             public void afterTextChanged(Editable s) {
-                Double value1 = SafeParse.INSTANCE.stringToDouble(numberPickers1[position].getText());
+                Double value1 = SafeParse.INSTANCE.stringToDouble(numberPickers1[position].getText(), 0.0);
                 Double value2 = value2(position);
                 if (data2 != null && value1 > value2) {
                     value2 = value1;
@@ -209,7 +209,7 @@ public class TimeListEdit {
             @Override
             public void afterTextChanged(Editable s) {
                 Double value1 = value1(position);
-                Double value2 = SafeParse.INSTANCE.stringToDouble(numberPickers2[position].getText());
+                Double value2 = SafeParse.INSTANCE.stringToDouble(numberPickers2[position].getText(), 0.0);
                 if (data2 != null && value2 < value1) {
                     value1 = value2;
                     numberPickers1[position].setValue(value1);

app/src/main/res/drawable/ic_sort.xml

@@ -2,7 +2,6 @@
     android:width="24dp"
     android:height="24dp"
     android:autoMirrored="true"
-    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path

app/src/main/res/layout/activity_preferences.xml

@@ -5,28 +5,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/filter"
-        app:endIconMode="clear_text">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/pref_filter"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:layout_gravity="center_vertical"
-            android:layout_weight="1"
-            android:autofillHints="@string/filter"
-            android:gravity="start"
-            android:textStyle="bold"
-            android:inputType="text"
-            android:background="@color/transparent"/>
-
-    </com.google.android.material.textfield.TextInputLayout>
-
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="match_parent"

app/src/main/res/layout/overview_graphs_layout.xml

@@ -22,6 +22,7 @@
             android:layout_height="wrap_content"
             android:layout_alignParentTop="true"
             android:layout_alignParentEnd="true"
+            android:layout_marginEnd="3dp"
             android:contentDescription="@string/chart_menu"
             android:paddingTop="5dp"
             app:srcCompat="@drawable/ic_arrow_drop_down_white_24dp" />

app/src/main/res/layout/wear_fragment.xml

@@ -13,7 +13,7 @@
         android:gravity="center_vertical|center_horizontal"
         android:paddingTop="10dp"
         android:paddingBottom="10dp"
-        android:text="---"
+        android:text="@string/no_watch_connected"
         android:textAppearance="@style/TextAppearance.AppCompat.Medium"
         tools:ignore="HardcodedText" />
 

app/src/main/res/menu/menu_preferences.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/menu_search"
+        android:title="@string/search"
+        app:showAsAction="always"
+        app:actionViewClass="androidx.appcompat.widget.SearchView" />
+
+</menu>

app/src/main/res/values-ca-rES/exam.xml

@@ -134,7 +134,6 @@
     <string name="wronginsulin_prime">Lliurar un bolus amb part de la insulina que falta utilitzant una jeringa/ploma o el menú d\'encebat.</string>
     <string name="wronginsulin_donothing">No fer res i permetre que AndroidAPS corregeixi els possibles valors alts de glucèmia que es produeixin.</string>
     <string name="iob_label">Insulina \"a bord\" (IOB)</string>
-    <string name="iob_which">Marqueu totes les respostes correctes.</string>
     <string name="iob_value">El valor d\'IOB es veu afectat per les basals temporals lliurades.</string>
     <string name="iob_hightemp">Una basal temporal alta no serà lliurada si la glucèmia està per sota de l\'objectiu.</string>
     <string name="iob_posiob">Un valor d\'IOB positiu durant un període de temps important suggereix resistència a la insulina o àpats no anunciats.</string>

app/src/main/res/values-cs-rCZ/exam.xml

@@ -136,8 +136,20 @@
     <string name="wronginsulin_compare">Porovnat hodnoty v AndroidAPS s hodnotami v historii pumpy (pokud to pumpa podporuje).</string>
     <string name="wronginsulin_prime">Pošlete bolus na vypočtený „chybějící“ inzulín buď injekční stříkačkou nebo perem nebo pomocí plnění na pumpě.</string>
     <string name="wronginsulin_donothing">Neudělejte nic a dovolte AndroidAPS opravit jakoukoliv výslednou vysokou hladinu glukózy v krvi.</string>
+    <string name="cob_label">Zbývající sacharidy (COB)</string>
+    <string name="cob_question">Jak změna hodnoty citlivosti ovlivňuje výpočet COB?</string>
+    <string name="cob_longer">Zvýšení hodnoty citlivosti prodlouží dobu pohlcování sacharidů</string>
+    <string name="cob_shorter">Zvýšení hodnoty citlivosti zkrátí dobu pohlcování sacharidů</string>
+    <string name="cob_no_effect">Zvýšení citlivosti neovlivní vypočtenou absorpci sacharidů</string>
+    <string name="cob2_question">Jak změna inzulíno-sacharidového poměru ovlivňuje výpočet COB?</string>
+    <string name="cob2_longer">Zvýšení hodnoty inzulíno-sacharidového poměru prodlouží dobu pohlcování sacharidů</string>
+    <string name="cob2_shorter">Zvýšení hodnoty inzulíno-sacharidového poměru zkrátí dobu pohlcování sacharidů</string>
+    <string name="cob2_no_effect">Zvýšení inzulíno-sacharidového poměru neovlivní vypočtenou absorpci sacharidů</string>
+    <string name="cob3_question">Jak procentuální změna profilu ovlivňuje výpočet COB?</string>
+    <string name="cob3_longer">Nastavením profilu na 150% dojde k prodloužení doby pohlcování sacharidů</string>
+    <string name="cob3_shorter">Nastavením profilu na 150% dojde ke zkrácení doby pohlcování sacharidů</string>
+    <string name="cob3_no_effect">Nastavení profilu na 150% neovlivní vypočtenou absorpci sacharidů</string>
     <string name="iob_label">Aktivní inzulín (IOB)</string>
-    <string name="iob_which">Zatrhněte všechny správné odpovědi.</string>
     <string name="iob_value">Hodnota IOB je ovlivněna vydanými dočasnými bazály.</string>
     <string name="iob_hightemp">Vysoký dočasný bazál nebude spuštěn, pokud je Vaše glykémie nižší než cíl.</string>
     <string name="iob_negiob">Negativní IOB po značnou dobu bez cvičení naznačuje, že váš profil je příliš \"silný\" a ve vašem profilu je potřeba méně inzulínu.</string>

app/src/main/res/values-cs-rCZ/strings.xml

@@ -1043,4 +1043,5 @@
     <string name="description_source_aidex">Přijímat hodnoty glykémie ze senzoru GlucoRx Aidex.</string>
     <string name="blocked_by_charging">Zablokováno možností nabíjení</string>
     <string name="blocked_by_connectivity">Zablokováno možností připojení</string>
+    <string name="no_watch_connected">(Žádné hodinky nejsou připojeny)</string>
 </resources>

app/src/main/res/values-da-rDK/exam.xml

@@ -136,7 +136,6 @@
     <string name="wronginsulin_prime">Bolus en del af din beregnede \"glemte\" insulin med enten sprøjter / pen eller brug af en kanylefyldning.</string>
     <string name="wronginsulin_donothing">Gør ingenting og tillad AndroidAPS at rette op på højt blodsukker.</string>
     <string name="iob_label">Insulin om bord (IOB)</string>
-    <string name="iob_which">Tjek alle de korrekte svar.</string>
     <string name="iob_value">IOB-værdi påvirkes af midlertidige basaler.</string>
     <string name="iob_hightemp">Høj midlertidlig basal vil ikke blive givet, når dit blodsukker er under målet.</string>
     <string name="iob_negiob">Negative IOB i en længere periode uden motion tyder på, at din profil er for stærk, og at der er behov for mindre insulin i dine indstillinger.</string>

app/src/main/res/values-de-rDE/exam.xml

@@ -134,7 +134,6 @@
     <string name="wronginsulin_prime">Gib einen Teil-Bolus des \'nicht erhaltenen\' Insulins mit Spritze / Pen oder durch Befüllen der Kanüle.</string>
     <string name="wronginsulin_donothing">Unternimm nichts und lass AndroidAPS die entstehenden hohen Glukosewerte korrigieren.</string>
     <string name="iob_label">Aktives Insulin (IOB)</string>
-    <string name="iob_which">Kreuze alle richtigen Antworten an.</string>
     <string name="iob_value">IOB wird von den abgegebenen temporären Basalraten beeinflusst.</string>
     <string name="iob_hightemp">Eine hohe temporäre Basalrate wird nicht abgegeben, wenn der BZ unterhalb des Zielwerts liegt.</string>
     <string name="iob_negiob">Ein negativer IOB über einen längeren Zeitraum bei fehlender Bewegung deutet darauf hin, dass Dein Profil zu stark ist und weniger Insulin in Deinen Einstellungen benötigt wird.</string>

app/src/main/res/values-es-rES/exam.xml

@@ -136,8 +136,14 @@
     <string name="wronginsulin_compare">Comparar valores en AndroidAPS con el historial de la bomba (si la bomba lo soporta).</string>
     <string name="wronginsulin_prime">Bolo una proporción de la insulina calculada “perdida” por jeringa/pluma o usando menú de llenado.</string>
     <string name="wronginsulin_donothing">No haga nada y permite que AndroidAPS corrija cualquier nivel alto de glucosa en la sangre resultante.</string>
+    <string name="cob_label">Carbohidratos activos (COB)</string>
+    <string name="cob_question">¿Cómo afecta el cambio del valor ISF al cálculo de COB?</string>
+    <string name="cob_no_effect">Incrementar el ISF no afectará la absorción calculada de carbohidratos</string>
+    <string name="cob2_question">¿Cómo afecta cambiar los valores de IC a los cálculos de COB?</string>
+    <string name="cob2_no_effect">Incrementar el IC no afectará la absorción calculada de carbohidratos</string>
+    <string name="cob3_question">¿Cómo afecta el cambio de porcentaje del perfil al cálculo de los COB?</string>
+    <string name="cob3_no_effect">Establecer el perfil a 150% no afectará la absorción calculada de carbohidratos</string>
     <string name="iob_label">Insulina a bordo (IOB)</string>
-    <string name="iob_which">Marca todas las respuestas correctas.</string>
     <string name="iob_value">El valor del IOB se ve afectado por las bases temporales ejecutadas.</string>
     <string name="iob_hightemp">No se dará alta tasa basal temporal cuando su nivel de azúcar en sangre esté por debajo del objetivo.</string>
     <string name="iob_negiob">El IOB negativo durante un período sustancial en ausencia de ejercicio sugiere que tu perfil es demasiado fuerte y que se necesita menos insulina en tus ajustes.</string>

app/src/main/res/values-es-rES/strings.xml

@@ -1043,4 +1043,5 @@
     <string name="description_source_aidex">Recibir los valores de glucosa de GlucoRx Aidex CGMS</string>
     <string name="blocked_by_charging">Bloqueado por opciones de carga</string>
     <string name="blocked_by_connectivity">Bloqueado por opciones de conectividad</string>
+    <string name="no_watch_connected">(Ningún reloj conectado)</string>
 </resources>

app/src/main/res/values-fr-rFR/exam.xml

@@ -137,7 +137,6 @@
     <string name="wronginsulin_prime">Faites un bolus du montant de votre insuline calculée « manquante » soit par seringue / stylo ou en utilisant un amorçage.</string>
     <string name="wronginsulin_donothing">Ne faites rien et laissez AndroidAPS corriger tout taux élevé de glycémie qui en résulte.</string>
     <string name="iob_label">Insuline Active (IA)</string>
-    <string name="iob_which">Sélectionnez toutes les bonnes réponses.</string>
     <string name="iob_value">La valeur de l\'IA est impactée par les débits de basal temporaires émis.</string>
     <string name="iob_hightemp">Une basale temp haute ne sera pas donnée quand votre glycémie est en dessous de la cible.</string>
     <string name="iob_negiob">Une IA négative pendant une période significative en l\'absence d\'exercice indique que votre profil est trop fort et qu\'il faut moins d\'insuline dans vos paramètres.</string>

app/src/main/res/values-fr-rFR/strings.xml

@@ -434,6 +434,8 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="ns_localbroadcasts_title">Activer les transmissions locales</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="openaps_smb_dynamic_isf">SI dynamique</string>
+    <string name="DynISFAdjust_title" formatted="false">Facteur d\'ajustement Si dynamique %</string>
+    <string name="DynISFAdjust_summary" formatted="false">Facteur d\'ajustement pour Si dynamique. Définissez plus de 100 % pour des corrections plus agressives et moins de 100 % pour des corrections moins agressives.</string>
     <string name="enableuam">Activer RNS</string>
     <string name="enablesmb">Activer SMB</string>
     <string name="enablesmb_summary">Utiliser les Super Micro Bolus au lieu des débits de base temporaires pour une action rapide</string>
@@ -968,6 +970,7 @@ L\'ENSEMBLE DES RISQUES LIÉS À LA QUALITÉ ET À LA PERFORMANCE DU PROGRAMME S
     <string name="wear_action_tempt_max_bg_error">Gly maxi hors limite!</string>
     <string name="wear_action_tempt_manual_range_message">Cible temporaire:\nMin: %1$s\nMax : %2$s\nDurée : %3$s</string>
     <string name="wear_action_tempt_manual_message">Cible temporaire:\nCible: %1$s\nDurée: %2$s</string>
+    <string name="wear_action_tempt_preset_message">Cible temp:\nRaison: %1$s\nCible : %2$s\nDurée : %3$s</string>
     <string name="quick_wizard_message">Assistant: %1$s\nInsuline : %2$.2fU\nGlucides : %3$dg</string>
     <string name="wizard_result">Assistant Calc :\nInsuline : %1$.2fU\nGlucides : %2$dg</string>
     <string name="overview_editquickwizard_show_on_device">Afficher l\'entrée sur l\'appareil :</string>

app/src/main/res/values-it-rIT/exam.xml

@@ -137,7 +137,6 @@
     <string name="wronginsulin_prime">Erogare un bolo con parte della tua insulina calcolata \"mancante\" usando una siringa/penna o la funzione caricamento.</string>
     <string name="wronginsulin_donothing">Non fare nulla e permettere ad AndroidAPS di correggere eventuali glicemie alte.</string>
     <string name="iob_label">Insulina attiva (IOB)</string>
-    <string name="iob_which">Seleziona tutte le risposte corrette.</string>
     <string name="iob_value">Il valore IOB è influenzato dalle basali temporanee emesse.</string>
     <string name="iob_hightemp">Non verrà emessa una basale temporanea alta quando la tua glicemia è al di sotto del target.</string>
     <string name="iob_negiob">IOB negativo per un periodo considerevole in assenza di esercizio fisico suggerisce che il tuo profilo è troppo incisivo e che è necessaria meno insulina nelle tue impostazioni.</string>

app/src/main/res/values-it-rIT/strings.xml

@@ -970,6 +970,7 @@
     <string name="wear_action_tempt_max_bg_error">Max-BG fuori range!</string>
     <string name="wear_action_tempt_manual_range_message">Temptarget:\nMin: %1$s\nMax: %2$s\nDurata: %3$s</string>
     <string name="wear_action_tempt_manual_message">Temptarget:\nTarget: %1$s\nDurata: %2$s</string>
+    <string name="wear_action_tempt_preset_message">Temptarget:\nMotivo: %1$s\nTarget: %2$s\nDurata: %3$s</string>
     <string name="quick_wizard_message">QuickWizard: %1$s\nInsulina: %2$.2fU\nCHO: %3$dg</string>
     <string name="wizard_result">Calc. Wizard:\nInsulina: %1$.2fU\nCHO: %2$dg</string>
     <string name="overview_editquickwizard_show_on_device">Mostra voce sul dispositivo:</string>

app/src/main/res/values-iw-rIL/exam.xml

@@ -136,8 +136,20 @@
     <string name="wronginsulin_compare">השוו את הרשומות שב-AndroidAPS עם היסטוריית המשאבה (אם המשאבה תומכת בכך).</string>
     <string name="wronginsulin_prime">מזריקים בולוס על חלק מהאינסולין המחושב \"שחסר\" עם מזרק\\עט או באמצעות תיחול (Prime).</string>
     <string name="wronginsulin_donothing">לא לעשות דבר ולאפשר ל-AndroidAPS לתקן כל רמת סוכר גבוהה.</string>
+    <string name="cob_label">פחמ\' פעילות</string>
+    <string name="cob_question">איך שינויים ביחס התיקון משפיעים על חישוב הפחמימות הפעילות?</string>
+    <string name="cob_longer">הגדלת ערך יחס התיקון תגרום להארכת משך ספיגת הפחמימות</string>
+    <string name="cob_shorter">הגדלת ערך יחס התיקון תגרום לקיצור משך ספיגת הפחמימות</string>
+    <string name="cob_no_effect">הגדלת ערך יחס התיקון לא תשפיע על חישוב ספיגת הפחמימות</string>
+    <string name="cob2_question">איך שינויים ביחס הפחמימות משפיעים על חישוב הפחמימות הפעילות?</string>
+    <string name="cob2_longer">הגדלת ערך יחס הפחמימות תגרום להארכת משך ספיגת הפחמימות</string>
+    <string name="cob2_shorter">הגדלת ערך יחס הפחמימות תגרום לקיצור משך ספיגת הפחמימות</string>
+    <string name="cob2_no_effect">הגדלת ערך יחס הפחמימות לא תשפיע על חישוב ספיגת הפחמימות</string>
+    <string name="cob3_question">איך שינויים באחוזי הפרופיל משפיעים על חישוב הפחמימות הפעילות?</string>
+    <string name="cob3_longer">הגדרת 150% פרופיל תגרום להארכת משך ספיגת הפחמימות</string>
+    <string name="cob3_shorter">הגדרת 150% פרופיל תגרום לקיצור משך ספיגת הפחמימות</string>
+    <string name="cob3_no_effect">הגדרת 150% פרופיל לא תשפיע על חישוב משך ספיגת הפחמימות</string>
     <string name="iob_label">אינסולין פעיל בגוף (IOB)</string>
-    <string name="iob_which">סמנו את כל התשובות הנכונות.</string>
     <string name="iob_value">ערך האינסולין הפעיל (IOB) מושפע ממינונים בזאליים זמניים שסופקו.</string>
     <string name="iob_hightemp">מינון בזאלי גבוה לא יינתן כאשר רמת הסוכר נמוכה מערך המטרה.</string>
     <string name="iob_negiob">אינסולין פעיל שלילי לאורך זמן בו לא נעשית פעילות מצביע על כך שהפרופיל חזק מדי, נדרש פחות אינסולין ויש להגדיר זאת בפרופיל.</string>

app/src/main/res/values-iw-rIL/strings.xml

@@ -966,6 +966,7 @@
     <string name="wear_action_tempt_max_bg_error">ערך הסוכר המקסימלי מחוץ לטווח!</string>
     <string name="wear_action_tempt_manual_range_message">ע\' מטרה זמני:\nמינ\': %1$s\nמקס\': %2$s\nמשך: %3$s</string>
     <string name="wear_action_tempt_manual_message">ע\' מטרה זמני:\nמטרה: %1$s\n משך: %2$s</string>
+    <string name="wear_action_tempt_preset_message">ע\' מטרה זמני:\nסיבה: %1$s\nמטרה: %2$s\nמשך: %3$s</string>
     <string name="quick_wizard_message">אשף מהיר: %1$s\n אינס\': %2$.2f יח\'\nפחמ\': %3$d גר\'</string>
     <string name="wizard_result">מחשבון: %1$s\n אינס\': %2$.2f יח\'\nפחמ\': %3$d גר\'</string>
     <string name="overview_editquickwizard_show_on_device">הצג רשומה על המכשיר:</string>
@@ -1038,4 +1039,5 @@
     <string name="description_source_aidex">קבלת נתוני סוכר מחיישני GlucoRx Aidex.</string>
     <string name="blocked_by_charging">חסום ע\"י הגדרות טעינה</string>
     <string name="blocked_by_connectivity">חסום ע\"י הגדרות חיבור</string>
+    <string name="no_watch_connected">(השעון לא מחובר)</string>
 </resources>

app/src/main/res/values-ko-rKR/exam.xml

@@ -134,7 +134,6 @@
     <string name="wronginsulin_prime">\"주입되지 않은\" 인슐린양을 계산하여 시린지/펜 또는 prime 기능을 사용하여 인슐린을 주입합니다.</string>
     <string name="wronginsulin_donothing">특별한 조치를 취하지 않고, AndroidAPS가 결과적으로 높은 혈당 정도를 조정할 수 있도록 합니다.</string>
     <string name="iob_label">활성 인슐린 (IOB)</string>
-    <string name="iob_which">올바른 답변을 모두 체크하세요.</string>
     <string name="iob_value">IOB 값은 실행된 임시 basal의 영향을 받습니다.</string>
     <string name="iob_hightemp">혈당이 목표보다 낮을 경우 높은 임시 basal은 실행되지 않습니다.</string>
     <string name="iob_negiob">운동 없이도 음수의 IOB (마이너스 IOB) 구간이 많을 경우, 프로파일이 너무 강한 것이며 인슐린 양을 적게 설정해야 합니다.</string>

app/src/main/res/values-lt-rLT/exam.xml

@@ -134,7 +134,6 @@
     <string name="wronginsulin_prime">Susileisti trūkstamą insulino kiekį švirkštu ar naudojantis infuzinės sistemos užpildymo funkcija.</string>
     <string name="wronginsulin_donothing">Nieko nedaryti ir leisti AndroidAPS koreguoti padidėjusį gliukozės kiekį kraujyje.</string>
     <string name="iob_label">Aktyvus insulinas organizme (AIO)</string>
-    <string name="iob_which">Pasirinkite visus teisingus atsakymus.</string>
     <string name="iob_value">AIO reikšmei įtakos turi nustatyta laikina valandinė bazė.</string>
     <string name="iob_hightemp">Padidinta laikina bazė nebus nustatyta, jei kraujo glikemija yra žemiau nustatyto tikslo.</string>
     <string name="iob_negiob">Jei ilgą laiką stebima neigiama AIO reikšmė ir nėra fizinio aktyvumo, tai rodo, kad jūsų nustatymai yra per „agresyvūs“ ir kad jums reikia mažiau insulino nei nustatyta.</string>

app/src/main/res/values-nl-rNL/exam.xml

@@ -137,7 +137,6 @@
     <string name="wronginsulin_prime">Bolus een deel van je berekende \'gemiste\' insuline door een injectiespuit/pen of door de uitvulfunctie te gebruiken.</string>
     <string name="wronginsulin_donothing">Doe niets en laat AndroidAPS de resulterende hoge bloedglucosespiegel corrigeren.</string>
     <string name="iob_label">Insuline aan boord (IOB)</string>
-    <string name="iob_which">Selecteer alle juiste antwoorden.</string>
     <string name="iob_value">De IOB-waarde wordt beïnvloed door eerdere tijdelijke basaalstanden.</string>
     <string name="iob_hightemp">Een hoge tijdelijke basaal zal niet worden ingesteld wanneer je bloedsuiker onder het streefdoel ligt.</string>
     <string name="iob_negiob">Negatieve IOB voor een aanzienlijke periode vrij van inspanning, suggereert dat je profiel te hoog is ingesteld, dus dat er minder insuline nodig is.</string>

app/src/main/res/values-nl-rNL/strings.xml

@@ -970,6 +970,7 @@
     <string name="wear_action_tempt_max_bg_error">Max BG buiten bereik!</string>
     <string name="wear_action_tempt_manual_range_message">Tijdelijk streefdoel:\nMin: %1$s\nMax: %2$s\nDuur: %3$s</string>
     <string name="wear_action_tempt_manual_message">Tijdelijk streefdoel:\nDoel: %1$s\nDuur: %2$s</string>
+    <string name="wear_action_tempt_preset_message">Tijdelijk streefdoel:\nReden: %1$s\nDoel: %2$s\nDuur: %3$s</string>
     <string name="quick_wizard_message">QuickWizard: %1$s\nInsuline: %2$.2fE\nKoolhy.: %3$dg</string>
     <string name="wizard_result">Reken. Wizard:\nInsuline: %1$.2fE\nKoolhy.: %2$dg</string>
     <string name="overview_editquickwizard_show_on_device">Toon invoer op apparaat:</string>

app/src/main/res/values-no-rNO/exam.xml

@@ -136,8 +136,14 @@
     <string name="wronginsulin_compare">Sammenlign verdiene i AndroidAPS og pumpehistorikken (hvis pumpen støtter dette).</string>
     <string name="wronginsulin_prime">Gi en bolus med en del av det insulinet du mangler enten med penn eller ved å bruke prime funksjonen.</string>
     <string name="wronginsulin_donothing">Ikke gjør noe og la AndroidAPS korrigere eventuelle høye blodsukkerverdier.</string>
+    <string name="cob_label">Karbohydrater ombord (COB)</string>
+    <string name="cob_question">Hvordan vil endring av ISF-verdi påvirke COB-beregning?</string>
+    <string name="cob_no_effect">Økning av ISF påvirker ikke beregningen av absorbering av karbohydrater</string>
+    <string name="cob2_question">Hvordan vil endring av IC-verdi påvirke COB-beregning?</string>
+    <string name="cob2_no_effect">Økning av IC påvirker ikke beregningen av absorbering av karbohydrater</string>
+    <string name="cob3_question">Hvordan vil endring av profil-prosent påvirke COB-beregning?</string>
+    <string name="cob3_no_effect">Ved å sette profilen til 150% påvirkes ikke beregningen av absorbering av karbohydrater</string>
     <string name="iob_label">Aktivt insulin (IOB)</string>
-    <string name="iob_which">Marker alle riktige svar.</string>
     <string name="iob_value">IOB verdi påvirkes av midlertidige temp basaler.</string>
     <string name="iob_hightemp">Høy temp basal vil ikke bli gitt når ditt blodsukker er under målverdi.</string>
     <string name="iob_negiob">Negativ IOB i en lengre periode selv om du ikke trener tyder på at profilen din gir for mye insulin og kanskje bør reduseres i innstillingene.</string>

app/src/main/res/values-no-rNO/strings.xml

@@ -6,8 +6,8 @@
     <string name="treatmentssafety_title">Sikkerhet ved behandlinger</string>
     <string name="treatmentssafety_maxbolus_title">Maks tillat bolus [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Maks tillat karbo [g]</string>
-    <string name="treatmentssafety_lgsThreshold_title">BS er under terskelverdi slik at all insulintilførsel stoppes</string>
+    <string name="treatmentssafety_lgsThreshold_title">Insulintilførsel stoppes når BS er under denne terskelverdien</string>
-    <string name="nav_preferences_plugin">%1$s innstillinger</string>
+    <string name="nav_preferences_plugin">%1$s Innstillinger</string>
     <string name="nav_preferences">Innstillinger</string>
     <string name="nav_refreshtreatments">Oppdater behandlinger fra NS</string>
     <string name="nav_resetdb">Nullstill databasene</string>
@@ -15,12 +15,12 @@
     <string name="nav_exit">Avslutt</string>
     <string name="alert_dialog_permission_battery_optimization_failed">Det ser ikke ut som mobilen støtter registrering av apper som unntas fra batterioptimalisering - du kan oppleve ytelsesproblemer.</string>
     <string name="description_actions">Knapper for rask tilgang til ofte brukte funksjoner</string>
-    <string name="description_config_builder">Brukt for innstilling av aktive plugin</string>
+    <string name="description_config_builder">Brukes for innstilling av aktive plugins</string>
     <string name="description_objectives">Opplæringsprogram</string>
-    <string name="description_food">Viser forhåndsinnstillinger for mat som er definert i Nightscout</string>
+    <string name="description_food">Viser forhåndsinnstillinger for mat fra Nightscout</string>
-    <string name="description_insulin_rapid">Innstillinger for Humalog og NovoRapid / NovoLog insulin</string>
+    <string name="description_insulin_rapid">Innstillinger for Humalog og NovoRapid / NovoLog</string>
     <string name="description_insulin_ultra_rapid">Innstillinger for Fiasp</string>
-    <string name="description_insulin_lyumjev">Insulin innstillinger for Lyumjev</string>
+    <string name="description_insulin_lyumjev">Innstillinger for Lyumjev</string>
     <string name="description_insulin_free_peak">Lar deg stille inn tidspunktet for toppen av insulinvirkningen. Bør bare benyttes av erfarne brukere</string>
     <string name="description_loop">Aktiver eller deaktiver hendelsen som trigger loop.</string>
     <string name="description_ns_client">Synkroniserer dine data med Nightscout</string>
@@ -32,17 +32,17 @@
     <string name="description_profile_local">Definer en profil som er tilgjengelig offline.</string>
     <string name="description_pump_virtual">Integrasjon mot pumper som ikke støttes av AndroidAPS (åpen loop)</string>
     <string name="description_sensitivity_aaps">Sensitiviteten beregnes på samme måte som i Oref0, men du kan angi hvor mye av historikken som skal tas med i beregningen. Minimum opptak av karbohydrater beregnes ut fra maks karbohydratopptak angitt i dine innstillinger.</string>
-    <string name="description_sensitivity_oref1">Sensitivitet beregnes fra 8t og 24t historiske dat (velger alltid det resultatet som gir høyest insulinsensitivitet. Karbohydrater som ikke er absorbert blir avsluttet etter tiden som er angitt i innstillinger. Plugin beregner også UAM.</string>
+    <string name="description_sensitivity_oref1">Sensitivitet beregnes fra 8t og 24t historiske data (velger alltid det resultatet som gir høyest insulinsensitivitet). Karbohydrater (som ikke er absorbert) blir avsluttet etter tiden som er angitt i innstillinger. Plugin beregner også UAM.</string>
     <string name="description_sensitivity_weighted_average">Sensitivitet beregnes som en vektet gjennomsnittsverdi av avvikene. Ferske avvik har høyere vekting. Minimum opptak av karbohydrater beregnes ut fra maks opptakstid for karbohydrater angitt i dine innstillinger. Denne algoritmen er den raskeste for å justere endringer i sensitivitet.</string>
-    <string name="description_source_eversense">Motta BS verdier fra den modifiserte Eversense appen.</string>
+    <string name="description_source_eversense">Motta BS-verdier fra den modifiserte Eversense-appen.</string>
-    <string name="description_source_glimp">Motta BS verdier fra Glimp.</string>
+    <string name="description_source_glimp">Motta BS-verdier fra Glimp.</string>
-    <string name="description_source_mm640g">Motta BS verdier fra 600SeriesAndroidUploader.</string>
+    <string name="description_source_mm640g">Motta BS-verdier fra 600SeriesAndroidUploader.</string>
-    <string name="description_source_ns_client">Last ned BS verdier fra Nightscout</string>
+    <string name="description_source_ns_client">Last ned BS-verdier fra Nightscout</string>
-    <string name="description_source_xdrip">Motta BS verdier fra xDrip+.</string>
+    <string name="description_source_xdrip">Motta BS-verdier fra xDrip+.</string>
     <string name="description_treatments">Lagre data om alle behandlinger som er utført</string>
-    <string name="description_wear">Monitorer og kontroller AndroidAPS med din WearOS klokke.</string>
+    <string name="description_wear">Overvåke og styre AndroidAPS med din WearOS-klokke.</string>
     <string name="description_xdrip_status_line">Vis informasjon om loop på din xDrip+ urskive.</string>
-    <string name="description_sms_communicator">Fjernstyr AndroidAPS med SMS kommandoer.</string>
+    <string name="description_sms_communicator">Fjernstyre AndroidAPS med SMS-kommandoer.</string>
     <string name="treatments_insulin_label_string">Insulin:</string>
     <string name="treatments_carbs_label_string">Karbo:</string>
     <string name="treatments_iob_label_string">IOB:</string>
@@ -70,7 +70,7 @@
     <string name="openapsma_mealdata_label">Måltidsdata</string>
     <string name="result">Resultat</string>
     <string name="result_insulin_carbs">Resultat: %1$s %2$s</string>
-    <string name="openapsma_noglucosedata">Ingen BS data tilgjengelig</string>
+    <string name="openapsma_noglucosedata">Ingen BS-data tilgjengelig</string>
     <string name="openapsma_request_label">Forespørsel</string>
     <string name="delta">Delta</string>
     <string name="sms_delta">Delta:</string>
@@ -83,7 +83,7 @@
     <string name="configbuilder_profile">Profil</string>
     <string name="configbuilder_profile_description">Hvilken profil bør AndroidAPS bruke?</string>
     <string name="configbuilder_aps">APS</string>
-    <string name="configbuilder_aps_description">Hvilken APS algoritme skal brukes for administrasjon av behandlinger?</string>
+    <string name="configbuilder_aps_description">Hvilken algoritme skal APS benytte for behandlinger?</string>
     <string name="configbuilder_general">Generelt</string>
     <string name="configbuilder_general_description">Det er noen generelle plugins som kan være nyttige.</string>
     <string name="configbuilder_constraints_description">Hvilke begrensninger brukes?</string>
@@ -92,12 +92,12 @@
     <string name="configbuilder_loop_description">Bruk dette for å aktivere AndroidAPS loop integrasjon.</string>
     <string name="loop_aps_label">APS</string>
     <string name="loop_constraintsprocessed_label">Etter behandling av begrensninger</string>
-    <string name="loop_tbrsetbypump_label">Temp Basal satt av pumpen</string>
+    <string name="loop_tbrsetbypump_label">Temp basal satt av pumpen</string>
     <string name="noapsselected">INGEN APS ER VALGT ELLER HAR LEVERT RESULTAT</string>
     <string name="safety">Sikkerhet</string>
     <string name="openapsma_disabled">Plugin er deaktivert</string>
     <string name="constraints_violation">Brudd på begrensninger</string>
-    <string name="treatmentdeliveryerror">Er registrert en feil med bolus leveransen. Sjekk manuelt om den er levert og hvor mye!</string>
+    <string name="treatmentdeliveryerror">Det er registrert en feil med bolus-leveransen. Sjekk manuelt om den er levert og hvor mye</string>
     <string name="setbasalquestion">Aksepter ny temp basal:</string>
     <string name="overview_treatment_label">Behandling</string>
     <string name="overview_calculator_label">Kalkulator</string>
@@ -105,24 +105,24 @@
     <string name="sms_bolus">Bolus:</string>
     <string name="sms_basal">Basal:</string>
     <string name="changeyourinput">Endre dine inndata!</string>
-    <string name="configbuilder_bgsource">BS kilde</string>
+    <string name="configbuilder_bgsource">BS-kilde</string>
     <string name="configbuilder_bgsource_description">Hvor skal AndroidAPS hente sine data fra?</string>
     <string name="xdrip">xDrip+</string>
     <string name="apsmode_title">APS modus</string>
-    <string name="closedloop">Lukket loop</string>
+    <string name="closedloop">Lukket Loop</string>
-    <string name="openloop">Åpen loop</string>
+    <string name="openloop">Åpen Loop</string>
-    <string name="lowglucosesuspend">Stopp hvis lavt BS</string>
+    <string name="lowglucosesuspend">Stopp ved lavt BS</string>
     <string name="disabledloop">Loop er deaktivert</string>
     <string name="openloop_newsuggestion">Ny anbefaling tilgjengelig</string>
     <string name="carbssuggestion">Karbo forslag</string>
     <string name="unsupportednsversion">Versjonen av Nightscout støttes ikke</string>
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
-    <string name="bolusconstraintapplied">Bolus begrensning utført</string>
+    <string name="bolusconstraintapplied">Bolus-begrensning utført</string>
-    <string name="carbsconstraintapplied">Karbohydrat begrensning utført</string>
+    <string name="carbsconstraintapplied">Karbohydrat-begrensning utført</string>
     <string name="careportal_newnstreatment_other">Annet</string>
     <string name="careportal_newnstreatment_meter">Meter</string>
     <string name="careportal_newnstreatment_sensor">Sensor</string>
-    <string name="carb_time_label">Karbo tid</string>
+    <string name="carb_time_label">Karbo-tid</string>
     <string name="careportal_newnstreatment_duration_label">Varighet</string>
     <string name="profile_label">Profil</string>
     <string name="careportal_newnstreatment_glucosetype">Glukosetype</string>
@@ -130,7 +130,7 @@
     <string name="overview_extendedbolus_button">Forlenget bolus</string>
     <string name="configbuilder_nightscoutversion_label">Nightscout versjon:</string>
     <string name="missing_carbs">Mangler %1$d g</string>
-    <string name="exported">Innstillinger lagret</string>
+    <string name="exported">Innstillinger er eksportert</string>
     <string name="ue_exported">Brukeroppføringer er eksportert</string>
     <string name="export_to">Eksporter innstillinger til</string>
     <string name="import_from">Importer innstillinger fra</string>
@@ -163,27 +163,27 @@
     <string name="end_user_license_agreement_i_understand">JEG FORSTÅR OG GODTAR</string>
     <string name="save">Lagre</string>
     <string name="reloadprofile">Les inn profil på nytt</string>
-    <string name="smscommunicator">SMS tjeneste</string>
+    <string name="smscommunicator">SMS-tjeneste</string>
     <string name="smscommunicator_allowednumbers">Godkjente mobilnumre</string>
     <string name="smscommunicator_allowednumbers_summary">+XXXXXXXXXX;+YYYYYYYYYY</string>
     <string name="smscommunicator_bolusreplywithcode">For å levere bolus på %1$.2fE, svar med kode %2$s</string>
     <string name="smscommunicator_mealbolusreplywithcode">For å levere måltidsbolus på %1$.2fE, svar med kode %2$s</string>
     <string name="smscommunicator_temptargetwithcode">For å sette Temp Target på %1$s, svar med kode %2$s</string>
     <string name="smscommunicator_temptargetcancel">For å avbryte Temp Target, svar med kode %1$s</string>
-    <string name="smscommunicator_stopsmswithcode">For å deaktivere fjernstyring via SMS meldinger, svar med kode %1$s.\n\nHusk at du vil kunne reaktivere den igjen kun fra AAPS master telefon.</string>
+    <string name="smscommunicator_stopsmswithcode">For å deaktivere fjernstyring via SMS-meldinger, svar med kode %1$s.\n\nHusk at du vil kunne reaktivere den igjen kun fra AAPS hovedtelefon.</string>
-    <string name="smscommunicator_stoppedsms">Fjernstyring via SMS meldinger er stanset. For å reaktivere, bruk AAPS på master telefonen.</string>
+    <string name="smscommunicator_stoppedsms">Fjernstyring via SMS-meldinger er stanset. For å reaktivere, bruk AAPS på hovedtelefonen.</string>
     <string name="smscommunicator_calibrationreplywithcode">For å sende kalibrering %1$.2f, svar med kode %2$s</string>
     <string name="smscommunicator_bolusfailed">Bolus mislyktes</string>
     <string name="smscommunicator_remotebolusmindistance_summary">Minimum antall minutter som må forløpe mellom en fjernstyrt bolus og den neste</string>
     <string name="smscommunicator_remotebolusmindistance">Minimum antall minutter mellom en fjernstyrt bolus og neste</string>
-    <string name="smscommunicator_remotebolusmindistance_caveat">For din egen sikkerhet, for å endre denne innstillingen må du legge til minst 2 telefonnumre.</string>
+    <string name="smscommunicator_remotebolusmindistance_caveat">For din egen sikkerhet, må du legge til minst 2 telefonnumre for å endre denne innstillingen.</string>
     <string name="bolusrequested">Skal levere %1$.2f E</string>
-    <string name="smscommunicator_bolusdelivered">Bolus %1$.2f E levert vellykket</string>
+    <string name="smscommunicator_bolusdelivered">Bolus på %1$.2f E er levert</string>
-    <string name="smscommunicator_mealbolusdelivered">Måltidsbolus %1$.2f E levert vellykket</string>
+    <string name="smscommunicator_mealbolusdelivered">Måltidsbolus på %1$.2f E er levert</string>
-    <string name="smscommunicator_mealbolusdelivered_tt">Temp target på %1$s er satt for %2$d minutter</string>
+    <string name="smscommunicator_mealbolusdelivered_tt">Temp target på %1$s er satt i %2$d minutter</string>
-    <string name="smscommunicator_tt_set">Temp target på %1$s for %2$d minutter ble vellykket definert</string>
+    <string name="smscommunicator_tt_set">Temp target på %1$s i %2$d minutter ble lagret</string>
-    <string name="smscommunicator_tt_canceled">Temp Target ble vellykket avbrutt</string>
+    <string name="smscommunicator_tt_canceled">Temp Target ble fjernet</string>
-    <string name="smscommunicator_remotecommandsallowed">Tillat fjernstyring via SMS meldinger</string>
+    <string name="smscommunicator_remotecommandsallowed">Tillat fjernstyring via SMS-meldinger</string>
     <string name="smscommunicator_loophasbeendisabled">Loop har blitt deaktivert</string>
     <string name="smscommunicator_loophasbeenenabled">Loop har blitt aktivert</string>
     <string name="smscommunicator_loopisenabled">Loop er aktivert</string>
@@ -193,7 +193,7 @@
     <string name="smscommunicator_pumpdisconnected">Pumpe frakoblet</string>
     <string name="smscommunicator_reconnect">Pumpen tilkoblet igjen</string>
     <string name="smscommunicator_remotecommandnotallowed">Fjernstyringskommando er ikke tillatt</string>
-    <string name="smscommunicator_remotebolusnotallowed">Fjernstyrings bolus er ikke tilgjengelig. Prøv igjen senere.</string>
+    <string name="smscommunicator_remotebolusnotallowed">Fjernstyringsbolus er ikke tilgjengelig. Prøv igjen senere.</string>
     <string name="smscommunicator_basalreplywithcode">For å starte basal %1$.2f E/t i %2$d minutter, svar med kode %3$s</string>
     <string name="smscommunicator_profilereplywithcode">For å bytte profil til %1$s %2$d%%, svar med kode %3$s</string>
     <string name="smscommunicator_extendedreplywithcode">For å starte forlenget bolus %1$.2f E i %2$d minutter, svar med kode %3$s</string>
@@ -227,9 +227,9 @@
     <string name="mealbolus">Måltid</string>
     <string name="correctionbous">Korreksjon</string>
     <string name="actions">Handlinger</string>
-    <string name="ns_upload_only">(FARLIG Å DEAKTIVERE) Kun NS opplast</string>
+    <string name="ns_upload_only">(FARLIG Å DEAKTIVERE) Kun NS opplasting</string>
     <string name="ns_upload_only_summary">Kun NS opplasting (deaktivert sync). Ikke effektiv på SGV med mindre en lokal kilde som xDrip+ er valgt. Ikke effektiv på Profiler mens NS-Profiler brukes.\n!!! ADVARSEL !!! Deaktivering av dette alternativet kan føre til funksjonsfeil og overdosering av insulin hvis noen av dine komponenter (AAPS, NS, xDrip+) er feil konfigurert. Observer at data som vises i AAPS samsvarer med pumpestatus!</string>
-    <string name="pumpNotInitialized">Pumpen ikke initialisert!</string>
+    <string name="pumpNotInitialized">Pumpen er ikke startet!</string>
     <string name="primefill">Prime/fylling</string>
     <string name="fillwarning">Kontroller at mengden samsvarer med spesifikasjonen for slangesettet ditt!</string>
     <string name="fillbolus_title">Standardverdier for påfyll/prime</string>
@@ -246,8 +246,8 @@
     <string name="wear">Klokke</string>
     <string name="resend_all_data">Send alle data på nytt</string>
     <string name="open_settings_on_wear">Åpne Innstillinger på klokken</string>
-    <string name="basal_rate">Basal rate</string>
+    <string name="basal_rate">Basalrate</string>
-    <string name="basalvaluebelowminimum">Basal verdi under minimum. Profilen settes ikke!</string>
+    <string name="basalvaluebelowminimum">Basalverdi under minimum. Profilen settes ikke!</string>
     <string name="sms_actualbg">BS:</string>
     <string name="sms_lastbg">Siste BS:</string>
     <string name="MM640g">MM640G</string>
@@ -257,11 +257,11 @@
     <string name="localprofile">Profil</string>
     <string name="openapsama">OpenAPS AMA</string>
     <string name="array_of_elements">Liste med %1$d elementer.\nFaktisk verdi:</string>
-    <string name="openapsma_autosensdata_label">Autosens data</string>
+    <string name="openapsma_autosensdata_label">Autosens-data</string>
     <string name="openapsma_scriptdebugdata_label">Script feilsøking</string>
     <string name="openapsama_useautosens">Bruk Autosens funksjon</string>
     <string name="refresheventsfromnightscout">Gjenoppfrisk fra NS</string>
-    <string name="deletefuturetreatments">Slett behandlinger i fremtiden</string>
+    <string name="deletefuturetreatments">Slett fremtidige behandlinger</string>
     <string name="actions_shortname">ACT</string>
     <string name="configbuilder_shortname">KONF</string>
     <string name="loop_shortname">LOOP</string>
@@ -282,12 +282,12 @@
     <string name="openapsama_current_basal_safety_multiplier_summary">Standardverdi: 4 Dette er en viktig OpenAPS sikkerhetsbegrensning. Dette begrenser dine temp basal til max 4 ganger din nåværende basal dose, uansett hva som er maks basal i pumpen. Dette er for å unngå at man setter farlige høye maks basal doser uten at man har forstått algoritmene. Når du taket i denne begrensningen bør du i stedet fokusere på å endre andre innstillinger.</string>
     <string name="openapsama_autosens_max_summary">Standardverdi: 1.2\nDetta er en multiplikatorbegrensning for autosens (og snart autotune) som begrenser at autosens ikke kan øke med mer enn 20%%, som dermed begrenser hvor mye autosens kan justere opp dine basaler, hvor mye ISK kan reduseres og hvor lavt BS målverdi kan settes.</string>
     <string name="openapsama_autosens_min_summary">Standardverdi: 0.7\nDette er en multiplikatorbegrensning for autosens sikkerhet. Den begrenser autosens til å redusere basalverdier, og øke isulinssensitivitet (ISF) og BS mål med ikke mer enn enn 30%.</string>
-    <string name="openapsama_autosens_adjusttargets">Autosens justerer også BS målverdier</string>
+    <string name="openapsama_autosens_adjusttargets">Autosens justerer også BS-målverdier</string>
-    <string name="openapsama_autosens_adjusttargets_summary">Standard verdi: sann\nGir autosens tillatelse til å justere BS mål, i tillegg til ISF og basaler.</string>
+    <string name="openapsama_autosens_adjusttargets_summary">Standard verdi: sann\nGir autosens tillatelse til å justere BS-mål, i tillegg til ISF og basaler.</string>
-    <string name="openapsama_bolussnooze_dia_divisor_summary">Standard verdi: 2\nBolus snooze er aktivt etter at du har gitt en måltidsbolus slik at loop ikke skal forsøke å sette lav-temp når du nettopp har spist. I dette eksempelet brukesg standardverdi på 2, så med en 3 timers DIA vil bolus snooze begrensning gradvis forsvinne etter 1.5 timer (3DIA / 2). Bolus snooze brukes ikke hvis SMB er aktivert.</string>
+    <string name="openapsama_bolussnooze_dia_divisor_summary">Standard verdi: 2\nBolus-snooze er aktivt etter at du har gitt en måltidsbolus slik at loop ikke skal forsøke å sette lav-temp når du nettopp har spist. I dette eksempelet brukes standardverdi på 2, så med en 3 timers DIA vil bolus-snoozebegrensning gradvis forsvinne etter 1.5 timer (3DIA / 2). Bolus-snooze brukes ikke hvis SMB er aktivert.</string>
-    <string name="openapsama_min_5m_carbimpact_summary">Standardverdi er: 3.0 (AMA) eller 8.0 (SMB). Dette er grunninnstillingen for KH opptak per 5 minutt. Den påvirker hvor raskt COB skal reduseres, og benyttes i beregning av fremtidig BS kurve når BS enten synker eller øker mer enn forventet. Standardverdi er 3mg/dl/5 min.</string>
+    <string name="openapsama_min_5m_carbimpact_summary">Standardverdi er: 3.0 (AMA) eller 8.0 (SMB). Dette er grunninnstillingen for KH-opptak per 5 minutt. Den påvirker hvor raskt COB skal reduseres, og benyttes i beregning av fremtidig BS-kurve når BS enten synker eller øker mer enn forventet. Standardverdi er 3mg/dl/5 min.</string>
     <string name="openapsama_link_to_preferncejson_doc_txt">Advarsel!\nNormalt vil du ikke trenge å endre verdiene under. Vennligst TRYKK HER og LES teksten for å være sikker på at du FORSTÅR konsekvensene før du gjør endringer.</string>
-    <string name="smscommunicator_invalidphonennumber">Ugyldig SMS mobilnummer</string>
+    <string name="smscommunicator_invalidphonennumber">Ugyldig mobilnummer for SMS</string>
     <string name="overview_calibration">Kalibrering</string>
     <string name="xdripnotinstalled">xDrip+ ikke installert</string>
     <string name="calibrationsent">Kalibrering er sendt til xDrip+</string>
@@ -295,7 +295,7 @@
     <string name="smscommunicator_calibrationfailed">xDrip+ tar ikke imot kalibreringer</string>
     <string name="pumpsuspended">Pumpen er pauset</string>
     <string name="executing">Utfører</string>
-    <string name="virtualpump_settings">Virtuelle pumpe innstillinger</string>
+    <string name="virtualpump_settings">Innstillinger for virtuell pumpe</string>
     <string name="virtualpump_uploadstatus_title">Last opp status til Nightscout</string>
     <string name="nsclientinternal">NSClient</string>
     <string name="nsclientinternal_shortname">NSCI</string>
@@ -305,40 +305,40 @@
     <string name="nsclientinternal_title">NSClient</string>
     <string name="nsclientinternal_url_title">Nightscout URL</string>
     <string name="nsclientinternal_url_dialogmessage">Oppgi din Nightscout URL</string>
-    <string name="nsclientinternal_secret_title">Nightscout API secret</string>
+    <string name="nsclientinternal_secret_title">Nightscout API-nøkkel</string>
-    <string name="nsclientinternal_secret_dialogtitle">Nightscout API secret</string>
+    <string name="nsclientinternal_secret_dialogtitle">Nightscout API-nøkkel</string>
-    <string name="nsclientinternal_secret_dialogmessage">Oppgi NS API secret (min 12 tegn)</string>
+    <string name="nsclientinternal_secret_dialogmessage">Oppgi NS API-nøkkel (min 12 tegn)</string>
     <string name="deliver_now">Lever nå</string>
     <string name="clear_queue">Tøm kø</string>
     <string name="show_queue">Vis kø</string>
     <string name="queue">Kø:</string>
     <string name="status">Status:</string>
     <string name="clearlog">Tøm logg</string>
-    <string name="nowritepermission">NSCLIENT har ingen skriverettighet. Feil API secret?</string>
+    <string name="nowritepermission">NSCLIENT har ingen skriverettighet. Feil API-nøkkel?</string>
-    <string name="wear_settings">Klokke innstillinger</string>
+    <string name="wear_settings">Klokkeinnstillinger</string>
     <string name="wear_detailedIOB_title">Vis detaljert IOB</string>
-    <string name="wear_detailedIOB_summary">Vis IOB med bolus och basal IOB på klokke</string>
+    <string name="wear_detailedIOB_summary">Splitt IOB til bolus- og basal-IOB på klokken</string>
-    <string name="nosuccess">mislykket - sjekk telefonen</string>
+    <string name="nosuccess">feilet - sjekk telefonen</string>
     <string name="notavailable">n/a</string>
-    <string name="patientage">Pasient type</string>
+    <string name="patientage">Pasienttype</string>
     <string name="child">Barn</string>
     <string name="teenage">Tenåring</string>
     <string name="adult">Voksen</string>
-    <string name="resistantadult">Insulin resistent voksen</string>
+    <string name="resistantadult">Insulinresistent voksen</string>
     <string name="pregnant">Graviditet</string>
-    <string name="patientage_summary">Velg pasientens type for oppsett av sikkerhetsgrenser</string>
+    <string name="patientage_summary">Velg pasienttype for oppsett av sikkerhetsgrenser</string>
-    <string name="patient_name">Pasientens navn</string>
+    <string name="patient_name">Pasientnavn</string>
     <string name="patient_name_summary">Angi pasientnavn eller kallenavn for å kunne skille mellom flere oppsett</string>
     <string name="patient_name_default" comment="This is default patient display name, when user does not provide real one">Bruker</string>
     <string name="Glimp">Glimp</string>
-    <string name="needwhitelisting">%1$s behøver å omgå batterispare funksjonene for å fungere tilfredsstillende</string>
+    <string name="needwhitelisting">%1$s behøver å omgå batterisparefunksjonene for å fungere tilfredsstillende</string>
     <string name="loopsuspended">Loop pauset</string>
     <string name="loopsuspendedfor">Pauset (%1$d m)</string>
     <string name="suspendloopfor1h">Pause loop i 1t</string>
     <string name="suspendloopfor2h">Pause loop i 2t</string>
     <string name="suspendloopfor3h">Pause loop i 3t</string>
     <string name="suspendloopfor10h">Pause loop i 10t</string>
-    <string name="disconnectpump">Frakoble pumpe</string>
+    <string name="disconnectpump">Koble fra pumpen</string>
     <string name="disconnectpumpfor15m">Koble fra pumpen i 15 min</string>
     <string name="disconnectpumpfor30m">Koble fra pumpen i 30 min</string>
     <string name="disconnectpumpfor1h">Koble fra pumpen i 1t</string>
@@ -351,36 +351,36 @@
     <string name="duration3h">3 timer</string>
     <string name="duration10h">10 timer</string>
     <string name="resume">Gjenoppta</string>
-    <string name="reconnect">Tilkoble pumpen</string>
+    <string name="reconnect">Koble til pumpen</string>
     <string name="smscommunicator_wrongduration">Feil varighet</string>
     <string name="smscommunicator_loopsuspended">Loop er pauset</string>
     <string name="smscommunicator_loopresumed">Loop gjenopptatt</string>
     <string name="bg_trend_label">15 min trend</string>
     <string name="treatments_wizard_cob_label">COB</string>
     <string name="superbolus">Superbolus</string>
-    <string name="ns_logappstartedevent">Logg app start til NS</string>
+    <string name="ns_logappstartedevent">Logg app-start til NS</string>
-    <string name="restartingapp">Avslutter appen for at innstillinger skal tas i bruk.</string>
+    <string name="restartingapp">Avslutter appen for å aktivere innstillinger.</string>
     <string name="configbuilder_insulin_description">Hvilken type insulin bruker du?</string>
     <string name="fastactinginsulincomment">Novorapid, Novolog, Humalog</string>
     <string name="ultrafastactinginsulincomment">Fiasp</string>
     <string name="insulin_shortname">INS</string>
     <string name="enablesuperbolus">Aktiver superbolus i veiviser</string>
-    <string name="enablesuperbolus_summary">Aktiver superbolus funksjonen i wizard. Ikke aktiver denne før du vet hvordan den fungerer. DEN KAN LEDE TIL EN OVERDOSERING AV INSULIN HVIS DEN BRUKES BLINDT!</string>
+    <string name="enablesuperbolus_summary">Aktiver superbolus-funksjonen i veiviseren. Ikke aktiver denne før du vet hvordan den fungerer. DEN KAN LEDE TIL EN OVERDOSERING AV INSULIN HVIS DEN BRUKES BLINDT!</string>
-    <string name="show_statuslights">Vis statusindikatorer på hjem skjermen</string>
+    <string name="show_statuslights">Vis statusindikatorer på hjem-skjermen</string>
-    <string name="statuslights_cage_warning">OBS: alder slangesett [h]</string>
+    <string name="statuslights_cage_warning">Terskel for advarsel, alder på slangesett [h]</string>
-    <string name="statuslights_cage_critical">Advarsel: alder slangesett [h]</string>
+    <string name="statuslights_cage_critical">Terskel for kritisk alder på slangesett [h]</string>
-    <string name="statuslights_iage_warning">OBS: alder insulin [h]</string>
+    <string name="statuslights_iage_warning">Terskel for advarsel, alder på insulin [h]</string>
-    <string name="statuslights_iage_critical">Advarsel: alder insulin [h]</string>
+    <string name="statuslights_iage_critical">Terskel for kritisk alder på insulin [h]</string>
-    <string name="statuslights_sage_warning">OBS: alder CGM [h]</string>
+    <string name="statuslights_sage_warning">Terskel for advarsel, alder på CGM [h]</string>
-    <string name="statuslights_sage_critical">Advarsel: alder CGM [h]</string>
+    <string name="statuslights_sage_critical">Terskel for kritisk alder på CGM [h]</string>
-    <string name="statuslights_sbat_warning">Nivå for når batterivarsel skal gis [%]</string>
+    <string name="statuslights_sbat_warning">Terskel for advarsel, batterinivå for sensor [%]</string>
-    <string name="statuslights_sbat_critical">Nivå for når kritisk batteriadvarsel skal gis [%]</string>
+    <string name="statuslights_sbat_critical">Terskel for kritisk batterinivå for sensor [%]</string>
-    <string name="statuslights_bage_warning">Nivå for når batterivarsel for pumpe skal gis [h]</string>
+    <string name="statuslights_bage_warning">Terskel for advarsel, batterialder for pumpe [h]</string>
-    <string name="statuslights_bage_critical">Nivå for når kritisk batteriadvarsel for pumpe skal gis [h]</string>
+    <string name="statuslights_bage_critical">Terskel for kritisk batterialder for pumpe [h]</string>
-    <string name="statuslights_res_warning">OBS: nivå insulinreservoar [U]</string>
+    <string name="statuslights_res_warning">Terskel for advarsel, insulinreservoar [U]</string>
-    <string name="statuslights_res_critical">Advarsel: nivå insulinreservoar [U]</string>
+    <string name="statuslights_res_critical">Terskel for kritisk insulinreservoar [U]</string>
-    <string name="statuslights_bat_warning">Nivå for når batterivarsel for pumpe skal gis [%]</string>
+    <string name="statuslights_bat_warning">Terskel for advarsel, batterinivå for pumpe [%]</string>
-    <string name="statuslights_bat_critical">Nivå for når kritisk batteriadvarsel for pumpe skal gis [%]</string>
+    <string name="statuslights_bat_critical">Terskel for kritisk batterinivå for pumpe [%]</string>
     <string name="prediction_shortname">PROGN</string>
     <string name="basal_shortname">BAS</string>
     <string name="deviation_shortname">DEV</string>
@@ -389,8 +389,8 @@
     <string name="abs_insulin_shortname">ABS</string>
     <string name="devslope_shortname">DEVSLOPE</string>
     <string name="nav_about">Om</string>
-    <string name="smscommunicator_missingsmspermission">Mangler SMS tillatelse</string>
+    <string name="smscommunicator_missingsmspermission">Mangler SMS-tillatelse</string>
-    <string name="smscommunicator_missingphonestatepermission">Mangler app tillatelse til telefon</string>
+    <string name="smscommunicator_missingphonestatepermission">Appen mangler tilgang til telefonstatus</string>
     <string name="xdripstatus_settings">xDrip+ Status (klokke)</string>
     <string name="xdripstatus">xDrip+ Statuslinje (klokke)</string>
     <string name="xdripstatus_shortname">xds</string>
@@ -400,45 +400,47 @@
     <string name="doprofileswitch">Gjør profilbytte</string>
     <string name="careportal_sensor_label">Sensor</string>
     <string name="careportal_insulin_label">Insulin</string>
-    <string name="careportal_pb_label">Pumpe batteri</string>
+    <string name="careportal_pb_label">Pumpebatteri</string>
     <string name="careportal_age_label">alder:</string>
     <string name="careportal_level_label">nivå:</string>
-    <string name="ns_alarmoptions">Alarm valg</string>
+    <string name="ns_alarmoptions">Alarmvalg</string>
-    <string name="ns_alarms">Opprett varsler fra NS alarmer</string>
+    <string name="ns_alarms">Opprett varsler fra NS-alarmer</string>
-    <string name="ns_announcements">Opprett varsler fra NS meldinger</string>
+    <string name="ns_announcements">Opprett varsler fra NS-meldinger</string>
-    <string name="nsalarm_staledatavalue_label">Ingen data advarsel [min]</string>
+    <string name="nsalarm_staledatavalue_label">Advarsel ved manglende data [min]</string>
-    <string name="nsalarm_urgent_staledatavalue_label">Kritisk mangel på data advarsel [min]</string>
+    <string name="nsalarm_urgent_staledatavalue_label">Advarsel ved kritisk mangel på data [min]</string>
     <string name="openapsama_autosens_period">Intervall for autosens [h]</string>
     <string name="openapsama_autosens_period_summary">Antall timer med historiske data for beregning av sensitivitet (absorpsjonstid for KH er ekskludert)</string>
     <string name="openaps">OpenAPS</string>
     <string name="uploader">Opplaster</string>
-    <string name="configbuilder_sensitivity">Sensitivitets deteksjon</string>
+    <string name="configbuilder_sensitivity">Sensitivitetsdeteksjon</string>
     <string name="configbuilder_sensitivity_description">Hvilken sensitivitetsalgoritme skal benyttes?</string>
     <string name="sensitivity_shortname">SENS</string>
     <string name="sensitivityoref1">Sensitivitet Oref1</string>
     <string name="sensitivityaaps">Sensitivitet AAPS</string>
-    <string name="absorptionsettings_title">Absorpsjon innstillinger</string>
+    <string name="absorptionsettings_title">Absorpsjonsinnstillinger</string>
     <string name="absorption_maxtime_title">Maks absorpsjonstid for måltid [h]</string>
     <string name="absorption_maxtime_summary">Tid i timer hvor det forventes at alle karbohydrater fra måltid vil være absorbert</string>
     <string name="openaps_short">OAPS</string>
     <string name="uploader_short">UPLD</string>
     <string name="basal_short">BAS</string>
     <string name="keep_screen_on_title">Hold skjermen påslått</string>
-    <string name="keep_screen_on_summary">Forhindre Android å slå av skjermen. Mobil vil bruke mye batteri hvis den ikke plugges til strømledning.</string>
+    <string name="keep_screen_on_summary">Forhindre Android fra å slå av skjermen. Mobilen vil bruke mye batteri hvis den ikke plugges til strømledning.</string>
-    <string name="sensitivity_warning">Hvis du slår på Autosense funksjonen må du huske å angi alle spiste karbohydrater. Ellers vil KH avvik gi feil i sensitivitetsberegningen !!</string>
+    <string name="sensitivity_warning">Hvis du slår på Autosense-funksjonen må du huske å angi alle spiste karbohydrater. Ellers vil KH-avvik gi feil i sensitivitetsberegningen !!</string>
     <string name="sensitivityweightedaverage">Sensitivitet vektet middelverdi</string>
     <string name="notloadedplugins">Ikke alle profiler ble lastet!</string>
     <string name="valuesnotstored">Verdier ikke lagret!</string>
-    <string name="ns_localbroadcasts">Aktiver kringkasting til andre apper (som xDrip+). Ikke aktiver dette hvis du har mer enn en AAPS eller NSClient installert!</string>
+    <string name="ns_localbroadcasts">Aktiver kringkasting til andre apper (som xDrip+). Ikke aktiver dette hvis du har mer enn én AAPS eller NSClient installert!</string>
-    <string name="ns_localbroadcasts_title">Aktiver lokale sendinger.</string>
+    <string name="ns_localbroadcasts_title">Aktiver deling av data mellom apper på telefonen.</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="openaps_smb_dynamic_isf">Dynamisk ISF</string>
+    <string name="DynISFAdjust_title" formatted="false">DynamiskISF justeringsfaktor %</string>
+    <string name="DynISFAdjust_summary" formatted="false">Justeringsfaktor for dynamisk ISF. Verdier over 100% vil gi mer aggressive korreksjonsdoser, mens verdier under 100% vil gi mildere korreksjonsdoser.</string>
     <string name="enableuam">Aktiver UAM</string>
     <string name="enablesmb">Aktiver SMB</string>
-    <string name="enablesmb_summary">Bruk Super Mikro Solen i stedet for temp basal for raskere resultat</string>
+    <string name="enablesmb_summary">Bruk Super Mikro Bolus i stedet for temp basal for raskere resultat</string>
-    <string name="enableuam_summary">Oppdaget uannonsert måltid (UAM)</string>
+    <string name="enableuam_summary">Oppdag uannonsert måltid (UAM)</string>
-    <string name="insulin_oref_peak">IOB kurvens topp tid</string>
+    <string name="insulin_oref_peak">IOB-kurvens topptid</string>
-    <string name="insulin_peak_time">Topp tid [min]</string>
+    <string name="insulin_peak_time">Topptid [min]</string>
     <string name="insulin_peak">Topp</string>
     <string name="free_peak_oref">Free-Peak Oref</string>
     <string name="rapid_acting_oref">Rapid-Acting Oref</string>
@@ -450,10 +452,10 @@
     <string name="careportal_newnstreatment_percentage_label">Prosent</string>
     <string name="careportal_newnstreatment_timeshift_label">Tidsforskyving</string>
     <string name="default_temptargets">Standard temp mål</string>
-    <string name="eatingsoon_duration">spise snart varighet</string>
+    <string name="eatingsoon_duration">spise snart-varighet</string>
-    <string name="eatingsoon_target">spise snart målverdi</string>
+    <string name="eatingsoon_target">spise snart-målverdi</string>
-    <string name="activity_duration">aktivitet varighet</string>
+    <string name="activity_duration">varighet for aktivitet</string>
-    <string name="activity_target">aktivitet målverdi</string>
+    <string name="activity_target">målverdi ved aktivitet</string>
     <string name="hypo_duration">hypo varighet</string>
     <string name="hypo_target">hypo målverdi</string>
     <string name="reuse_profile_pct_hours">Gjenbruk %1$d%% %2$dt</string>
@@ -467,52 +469,52 @@
     <string name="shortprotein">Pr</string>
     <string name="shortfat">Fett</string>
     <string name="executingrightnow">Kommandoen utføres akkurat nå</string>
-    <string name="missed_bg_readings">Mangler BS målinger</string>
+    <string name="missed_bg_readings">Mangler BS-målinger</string>
     <string name="raise_notifications_as_android_notifications">Bruk systemvarslinger for alarmer og varslinger</string>
     <string name="gradually_increase_notification_volume">Øk volumet gradvis for alarmer og varsler</string>
     <string name="localalertsettings_title">Lokale varsler</string>
-    <string name="enable_missed_bg_readings_alert">Varsel hvis ingen BS data mottas</string>
+    <string name="enable_missed_bg_readings_alert">Varsel hvis ingen BS-data mottas</string>
     <string name="enable_pump_unreachable_alert">Varsel hvis pumpen er utilgjengelig</string>
     <string name="pump_unreachable_threshold">Pumpen er ikke tilgjengelig etter [min]</string>
     <string name="enable_carbs_req_alert">Varsel hvis karbohydrater må tilføres</string>
     <string name="urgent_alarm">Kritisk alarm</string>
     <string name="info">INFO</string>
     <string name="eversense">Eversense App (patched)</string>
-    <string name="dexcomg5_nsupload_title">Last opp BS data til NS</string>
+    <string name="dexcomg5_nsupload_title">Last opp BS-data til NS</string>
-    <string name="bgsource_upload">BS opplast innstillinger</string>
+    <string name="bgsource_upload">Innstillinger for opplasting av BS</string>
     <string name="wear_detailed_delta_title">Vis detaljer om delta</string>
     <string name="wear_detailed_delta_summary">Vis delta med én ekstra desimal</string>
     <string name="smbinterval_summary">Minste antall minutter mellom hver SMB</string>
     <string name="smbmaxminutes_summary">Maks antall minutter med basal som kan bli SMB</string>
     <string name="uamsmbmaxminutes">UAM SMB maks minutter</string>
     <string name="uamsmbmaxminutes_summary">Maks antall minutter basal som kan bli SMB ved UAM</string>
-    <string name="carbsReqThreshold">Minimumsgrense for KH forslag</string>
+    <string name="carbsReqThreshold">Minimumsgrense for KH-forslag</string>
     <string name="carbsReqThreshold_summary">Minimum mengde karbohydrater i gram for å vise advarsel. Behov under denne grenseverdien vil ikke vises som et varsel.</string>
-    <string name="dexcomg5_xdripupload_title">Send BS data til xDrip+</string>
+    <string name="dexcomg5_xdripupload_title">Send BS-data til xDrip+</string>
-    <string name="dexcomg5_xdripupload_summary">I xDrip+ velg 640G/Eversens som datakilde</string>
+    <string name="dexcomg5_xdripupload_summary">I xDrip+, velg 640G/Eversens som datakilde</string>
     <string name="nsclientbg">NSClient BS</string>
     <string name="nsclientbgshort">NS BS</string>
-    <string name="overview_editquickwizard_usebg">BS beregning</string>
+    <string name="overview_editquickwizard_usebg">BS-beregning</string>
-    <string name="overview_editquickwizard_usebolusiob">Bolus IOB beregning</string>
+    <string name="overview_editquickwizard_usebolusiob">Bolus IOB-beregning</string>
-    <string name="overview_editquickwizard_usebasaliob">Basal IOB beregning</string>
+    <string name="overview_editquickwizard_usebasaliob">Basal IOB-beregning</string>
-    <string name="overview_editquickwizard_usetrend">Trend beregning</string>
+    <string name="overview_editquickwizard_usetrend">Trendberegning</string>
-    <string name="overview_editquickwizard_usesuperbolus">Superbolus beregning</string>
+    <string name="overview_editquickwizard_usesuperbolus">Superbolus-beregning</string>
     <string name="positiveonly">Bare positive</string>
     <string name="negativeonly">Bare negative</string>
-    <string name="overview_editquickwizard_usecob">COB beregning</string>
+    <string name="overview_editquickwizard_usecob">COB-beregning</string>
-    <string name="overview_editquickwizard_usetemptarget">Temp target beregning</string>
+    <string name="overview_editquickwizard_usetemptarget">Beregning av temp target</string>
-    <string name="overview_editquickwizard_usepercentage">Prosent beregning</string>
+    <string name="overview_editquickwizard_usepercentage">Prosentvis beregning</string>
     <string name="loopenabled">Loop er aktivert</string>
     <string name="apsselected">APS valgt</string>
-    <string name="nsclienthaswritepermission">NSClient har skrive rettigheter</string>
+    <string name="nsclienthaswritepermission">NSClient har skriverettigheter</string>
     <string name="closedmodeenabled">Lukket loop aktivert</string>
     <string name="maxiobset">Maks IOB er angitt riktig</string>
     <string name="hasbgdata">BS tilgjengelig fra valgt kilde</string>
     <string name="extendedbolusdeliveryerror">Forlenget bolus feilet</string>
-    <string name="enablesmbalways">Aktiverer alltid SMB</string>
+    <string name="enablesmbalways">Aktiver alltid SMB</string>
     <string name="enablesmbalways_summary">Aktiver alltid SMB uavhengig av boluser. Bare mulig med en bra filtrert BS kilde som f.eks. Dexcom G5/G6</string>
     <string name="enablesmbaftercarbs">Aktiver SMB etter karbohydrater</string>
-    <string name="enablesmbaftercarbs_summary">Aktiver SMB i 6t etter karbohydrat inntak, selv med 0 IOB. Bare mulig med en bra filtrert BS kilde som f. eks. Dexcom G5/G6</string>
+    <string name="enablesmbaftercarbs_summary">Aktiver SMB i 6t etter karbohydratinntak, selv med 0 IOB. Bare mulig med en bra filtrert BS kilde som f. eks. Dexcom G5/G6</string>
     <string name="enablesmbwithcob">Aktiver SMB med COB</string>
     <string name="enablesmbwithcob_summary">Aktiver SMB når COB er aktiv.</string>
     <string name="enablesmbwithtemptarget">Aktiver SMB med temp målverdi</string>
@@ -522,7 +524,7 @@
     <string name="overview_insulin_label">Insulin</string>
     <string name="overview_buttons_selection">Knapper</string>
     <string name="show_calibration_button_summary">Sender en kalibrering til xDrip+ eller åpne kalibreringsdialogen i BYODA</string>
-    <string name="show_cgm_button_summary">Åpner xDrip+ eller BYODA, tilbake knappen får deg tilbake til AAPS</string>
+    <string name="show_cgm_button_summary">Åpner xDrip+ eller BYODA, tilbake-knappen får deg tilbake til AAPS</string>
     <string name="carb_increment_button_message">Antall karbohydrater som skal legges til når knappen trykkes</string>
     <string name="insulin_increment_button_message">Mengde insulin som skal legges til når knappen trykkes inn</string>
     <string name="error_starting_cgm">Kunne ikke starte CGM-programmet. Kontroller at det er installert.</string>
@@ -564,7 +566,7 @@
     <string name="start_hypo_tt">Start Hypo TT</string>
     <string name="closed_loop_disabled_on_dev_branch">Du kjører dev-versjonen. Lukket loop ikke aktivert.</string>
     <string name="engineering_mode_enabled">Engineering Mode aktivert</string>
-    <string name="profileswitch_ismissing">Profil bytte mangler. Utfør et profil bytte og trykk på \"Aktiver profil\" i din lokale profil.</string>
+    <string name="profileswitch_ismissing">Profilbytte mangler. Utfør et profilbytte og trykk på \"Aktiver profil\" i din lokale profil.</string>
     <string name="pumpisnottempbasalcapable">Pumpen støtter ikke temp basaler</string>
     <string name="closedmodedisabledinpreferences">Lukket Loop deaktivert i innstillinger</string>
     <string name="autosensdisabledinpreferences">Autosens deaktivert i innstillinger</string>
@@ -968,6 +970,7 @@
     <string name="wear_action_tempt_max_bg_error">Maks-BS utenfor område!</string>
     <string name="wear_action_tempt_manual_range_message">Temp target:\nMin: %1$s\nMaks: %2$s\nVarighet: %3$s</string>
     <string name="wear_action_tempt_manual_message">TempTarget:\nMål: %1$s\nVarighet: %2$s</string>
+    <string name="wear_action_tempt_preset_message">TempTarget:\nÅrsak: %1$s\nMål: %2$s\nVarighet: %3$s</string>
     <string name="quick_wizard_message">QuickWizard: %1$s\ninsulin: %2$.2fE\nKarbo: %3$dg</string>
     <string name="wizard_result">Kalk. Wizard:\nInsulin: %1$.2fE\nKarbo: %2$dg</string>
     <string name="overview_editquickwizard_show_on_device">Vis oppføring på enhet:</string>
@@ -997,7 +1000,7 @@
     <string name="refresh_from_nightscout">Oppdater fra Nightscout</string>
     <string name="remove_selected_items">Fjern valgte elementer</string>
     <string name="select_for_removal">Velg hva som skal fjernes</string>
-    <string name="profile_changes">Profil endringer</string>
+    <string name="profile_changes">Profilendringer</string>
     <string name="tempt_targets">Temp Target</string>
     <string name="carbs_and_bolus">Karbohydrater og bolus</string>
     <string name="confirm_remove_multiple_items">Er du sikker på at du vil fjerne %1$d elementer</string>
@@ -1040,4 +1043,5 @@
     <string name="description_source_aidex">Motta BS verdier fra GlucoRx Aidex CGM.</string>
     <string name="blocked_by_charging">Blokkert på grunn av ladealternativer</string>
     <string name="blocked_by_connectivity">Blokkert på grunn av tilkoblingsalternativer</string>
+    <string name="no_watch_connected">(Ingen klokke tilkoblet)</string>
 </resources>

app/src/main/res/values-pl-rPL/exam.xml

@@ -134,7 +134,6 @@
     <string name="wronginsulin_prime">Podaj obliczoną dawkę „pominiętej” insuliny za pomocą strzykawki / wstrzykiwacza lub za pomocą pompy funkcji wypełnienia.</string>
     <string name="wronginsulin_donothing">Nie rób nic i pozwól AndroidAPS na skorygowanie każdego uzyskanego wysokiego stężenia glukozy we krwi.</string>
     <string name="iob_label">Aktywna insulina (IOB)</string>
-    <string name="iob_which">Sprawdź/Zaznacz wszystkie prawidłowe odpowiedzi.</string>
     <string name="iob_value">Na wartość IOB mają wpływ wykonane tymczasowe dawki bazowe.</string>
     <string name="iob_hightemp">Wysoka tymczasowa dawka bazowa nie zostanie podana, gdy twóje poziom cukru we krwi jest poniżej poziomu docelowego.</string>
     <string name="iob_negiob">Negatywne IOB utrzymujące się przez znaczny okres czasu bez wysiłku fizycznego sugeruje, że Twój profil jest zbyt silny i mniej insuliny jest wymagane w Twoich ustawieniach.</string>

app/src/main/res/values-pt-rBR/exam.xml

@@ -136,7 +136,6 @@
     <string name="wronginsulin_prime">Dê uma porção do bolus calculado não administrado por meio de seringa/caneta ou usando o menu ações -> purgar/preencher.</string>
     <string name="wronginsulin_donothing">Não faça nada e permita que o AndroidAPS corrija qualquer nível de glicose elevado resultante.</string>
     <string name="iob_label">Insulina ativa (IA)</string>
-    <string name="iob_which">Marque todas as respostas corretas.</string>
     <string name="iob_value">O valor de IA é afetado por basais temporárias efetuadas.</string>
     <string name="iob_hightemp">Um basal alto temporário não será efetuado quando sua glicose estiver abaixo do alvo.</string>
     <string name="iob_negiob">Insulina Ativa (IA) negativa por um período substancial na ausência de exercícios, sugere que seu perfil é muito agressivo e menos insulina deve ser considerada nas suas configurações.</string>

app/src/main/res/values-pt-rPT/exam.xml

@@ -134,7 +134,6 @@
     <string name="wronginsulin_prime">Bólus uma proporção de insulina calculada \'não administrada\' ou com seringa/caneta ou purgando.</string>
     <string name="wronginsulin_donothing">Faça nada e permita que o AndroidAPS corrija qualquer nível de glicose elevado que daí resulte.</string>
     <string name="iob_label">Insulina ativa (IA )</string>
-    <string name="iob_which">Marque todas as respostas corretas.</string>
     <string name="iob_value">O valor do IA é afectado por basais temporárias emitidas.</string>
     <string name="iob_hightemp">Basal temporária alta não será dada quando a sua glicose estiver abaixo do alvo.</string>
     <string name="iob_negiob">IA negativa por um período substancial na ausência de exercício, sugere que o seu perfil é muito alto e é necessária menos insulina nas suas configurações.</string>

app/src/main/res/values-ro-rRO/exam.xml

@@ -134,7 +134,6 @@
     <string name="wronginsulin_prime">Bolusati o cantitate parțiala de insulina din insulina calculata ca fiind lipsa utilizând seringa/penul sau amorsarea.</string>
     <string name="wronginsulin_donothing">Nu faceți nimic și permiteți AndroidAPS să corecteze valorile mari ale glicemiei.</string>
     <string name="iob_label">Insulină activă (IOB)</string>
-    <string name="iob_which">Bifați toate răspunsurile corecte.</string>
     <string name="iob_value">Valoarea IOB este afectată de bazalele temporare emise.</string>
     <string name="iob_hightemp">Rata bazala ridicata temporara nu va fi livrata atunci când glicemia este sub nivelul țintă.</string>
     <string name="iob_negiob">Un IOB negativ pentru o perioadă substanțială în absența exercițiilor fizice sugerează că profilul tău este prea puternic și este nevoie de mai puţină insulină în setările inițiale.</string>

app/src/main/res/values-ru-rRU/exam.xml

@@ -137,7 +137,6 @@
     <string name="wronginsulin_prime">Рассчитать и ввести «пропущенный» вами инсулин шприцем/ручкой или через кнопку заполнения канюли.</string>
     <string name="wronginsulin_donothing">Ничего не делать и позволить AndroidAPS исправить возможный высокий уровень ГК.</string>
     <string name="iob_label">Активный инсулин (IOB)</string>
-    <string name="iob_which">Отметьте все правильные ответы.</string>
     <string name="iob_value">На величину IOB влияют устанавливаемые ВБС.</string>
     <string name="iob_hightemp">Высокая ВБС не будет применяться, если уровень сахара в крови ниже целевого.</string>
     <string name="iob_negiob">Отрицательный IOB в течение длительного периода при отсутствии физнагрузки указывает на то, что ваш профиль завышен и требуется снизить кол-во инсулина в настройках.</string>

app/src/main/res/values-ru-rRU/objectives.xml

@@ -6,7 +6,7 @@
     <string name="objectivenotstarted">Цель %1$d не начата</string>
     <string name="objectivenotfinished">Цель %1$d не завершена</string>
     <string name="objectives_0_objective">Настройка визуализации и мониторинга, анализ базала и коэффициентов</string>
-    <string name="objectives_0_gate">Убедитесь, что BG доступен в Nightscut, и данные инсулина помпы загружаются</string>
+    <string name="objectives_0_gate">Убедитесь, что значения ГК и данные по инсулину помпы передаются в Nightscout</string>
     <string name="objectives_openloop_objective">Старт незамкнутого цикла</string>
     <string name="objectives_openloop_gate">Начинайте работу в режиме незамкнутого цикла и ручной подстройки величины временного базала. Установите и применяйте временные цели и временные цели по умолчанию (напр. углеводы при нагрузке или купировании гипо)</string>
     <string name="objectives_maxbasal_objective">Глубже понимаем незакольцованную систему Open Loop, включая ее рекомендации по временным базалам</string>

app/src/main/res/values-ru-rRU/strings.xml

@@ -6,6 +6,7 @@
     <string name="treatmentssafety_title">Безопасность терапии</string>
     <string name="treatmentssafety_maxbolus_title">Макс разрешенный болюс [U] ед.</string>
     <string name="treatmentssafety_maxcarbs_title">Макс разрешенные углеводы (г)</string>
+    <string name="treatmentssafety_lgsThreshold_title">Уровень ГК, ниже которого происходит остановка подачи инсулина</string>
     <string name="nav_preferences_plugin">Настройки %1$s</string>
     <string name="nav_preferences">Настройки</string>
     <string name="nav_refreshtreatments">Синхронизировать назначения с NS</string>
@@ -432,6 +433,8 @@
     <string name="ns_localbroadcasts_title">Активировать локальную передачу</string>
     <string name="openapssmb">Супер микро болюс OpenAPS</string>
     <string name="openaps_smb_dynamic_isf">Динамический ISF</string>
+    <string name="DynISFAdjust_title" formatted="false">Коэффициент регулировки динамического диапазона чувствительности ISF %</string>
+    <string name="DynISFAdjust_summary" formatted="false">Коэффициент корректировки динамического диапазона чувствительности ISF. Установите более 100% для агрессивных доз коррекции и менее 100% для менее агрессивной коррекции.</string>
     <string name="enableuam">Включить непредвиденный прием пищи UAM</string>
     <string name="enablesmb">Включить супер микро болюс SMB</string>
     <string name="enablesmb_summary">Для ускорения действия используйте супер микро болюсы SMB вместо временного базала</string>
@@ -590,6 +593,7 @@
     <string name="openapssmb_maxiob_summary">Эта величина называется Max IOB в OpenAPS context\nOpenAPS не будет добавлять инсулин если текущий активный инсулин ее превысит</string>
     <string name="absorption_cutoff_title">Максимальное время усваимости пищи [h]</string>
     <string name="absorption_cutoff_summary">Время, за которое любая еда считается усвоившейся. Оставшиеся углеводы не будут учтены.</string>
+    <string name="treatmentssafety_lgsThreshold_summary">Значение уровня ГК, на котором происходит приостановка подачи инсулина. Значения по умолчанию являются стандартными для целевого диапазона. Пользователь может установить значения между 60 мг/дл (3.3 ммоль/л) и 100 мг/дл (5.5 ммоль/л) Параметры, заданные ниже 65/3.6 приводят к использованию значений по умолчанию</string>
     <string name="overview_show_notes_field_in_dialogs_title">Показать поле примечаний в диалогах назначений</string>
     <string name="next_button">Далее</string>
     <string name="previous_button">Назад</string>
@@ -965,6 +969,7 @@
     <string name="wear_action_tempt_max_bg_error">Макс ГК вне диапазона!</string>
     <string name="wear_action_tempt_manual_range_message">ВремЦель:\nМин: %1$s\nМакс.: %2$s\nДлительность: %3$s</string>
     <string name="wear_action_tempt_manual_message">ВремЦель:\nЦель: %1$s\nДлительность: %2$s</string>
+    <string name="wear_action_tempt_preset_message">ВремЦель:\nПричина: %1$s\nЦель.: %2$s\nДлительность: %3$s</string>
     <string name="quick_wizard_message">Мастер: %1$s\nИнсулин: %2$.2fЕд\nУгл: %3$dg</string>
     <string name="wizard_result">Мастер:\nИнсулин: %1$.2fЕд\nУгл: %2$dg</string>
     <string name="overview_editquickwizard_show_on_device">Показать запись на устройстве:</string>

app/src/main/res/values-sk-rSK/exam.xml

@@ -137,7 +137,6 @@
     <string name="wronginsulin_prime">Pošlite bolus na vypočítaný „chýbajúci“ inzulín buď injekčnou striekačkou, alebo perom, alebo pomocou plnenia na pumpe.</string>
     <string name="wronginsulin_donothing">Nerobte nič a dovoľte AndroidAPS upraviť akúkoľvek výslednú vysokú hladinu glukózy v krvi.</string>
     <string name="iob_label">Aktívny inzulín (IOB)</string>
-    <string name="iob_which">Zaškrtnite všetky správne odpovede.</string>
     <string name="iob_value">Hodnota IOB je ovplyvnená vydanými dočasnými bazálmi.</string>
     <string name="iob_hightemp">Vysoký dočasný bazál nebude spustený, pokiaľ je Vaša glykémia nižšia, ako cieľ.</string>
     <string name="iob_negiob">Negatívne IOB po značnú dobu bez cvičenia naznačuje, že váš profil je príliš \"silný\" a vo vašom profile je potrebného menej inzulínu.</string>

app/src/main/res/values-sk-rSK/strings.xml

@@ -970,6 +970,7 @@
     <string name="wear_action_tempt_max_bg_error">Maximálna glykémia mimo rozsah!</string>
     <string name="wear_action_tempt_manual_range_message">Doč. cieľ:\nMin: %1$s\nMax: %2$s\nTrvanie: %3$s</string>
     <string name="wear_action_tempt_manual_message">Doč. cieľ:\nCieľ: %1$s\nTrvanie: %2$s</string>
+    <string name="wear_action_tempt_preset_message">Doč. cieľ:\nDôvod: %1$s\nCieľ: %2$s\nTrvanie: %3$s</string>
     <string name="quick_wizard_message">Rýchly bolus: %1$s\nInzulín: %2$.2fJI\nSacharidy: %3$dg</string>
     <string name="wizard_result">Kalkulačka: \nInzulín: %1$.2fJI\nSacharidy: %2$dg</string>
     <string name="overview_editquickwizard_show_on_device">Zobraziť záznam na zariadení:</string>

app/src/main/res/values-sv-rSE/exam.xml

@@ -134,7 +134,6 @@
     <string name="wronginsulin_prime">Ge en bolus med en del av det insulin du saknar antingen med penna eller genom att använda förfyllningsfunktionen.</string>
     <string name="wronginsulin_donothing">Gör ingenting och låt AndroidAPS korrigera eventuella höga blodglukosnivåer.</string>
     <string name="iob_label">Aktivt Insulin (IOB)</string>
-    <string name="iob_which">Markera ett eller flera alternativ.</string>
     <string name="iob_value">IOB-värdet påverkas av temp basaler.</string>
     <string name="iob_hightemp">Hög temp basal kommer inte att ges när ditt BG-värde är under målet.</string>
     <string name="iob_negiob">Negativ IOB under en längre period även om du inte motionerat, tyder på att din profil ger för mycket insulin.</string>

app/src/main/res/values-tr-rTR/exam.xml

@@ -136,16 +136,22 @@
     <string name="wronginsulin_compare">AndroidAPS ve pompa geçmişindeki değerleri karşılaştırın (pompa bunu destekliyorsa).</string>
     <string name="wronginsulin_prime">Şırınga/kalem veya başlatma kullanarak hesaplanan \"eksik\" insülininizi bolus olarak karşılayın.</string>
     <string name="wronginsulin_donothing">Hiçbir şey yapmayın ve AndroidAPS\'in ortaya çıkabilecek yüksek kan şekeri seviyesini düzeltmesine müsade edin.</string>
-    <string name="iob_label">Aktif İnsülin (IOB)</string>
+    <string name="cob_label">Aktif Karbonhidrat (AKRB)</string>
-    <string name="iob_which">Tüm doğru cevapları kontrol edin.</string>
+    <string name="cob_question">İDF değerinin değiştirilmesi AKRB (Aktif karbonhidrat) hesaplamasını nasıl etkiler?</string>
-    <string name="iob_value">IOB değeri, verilen geçici bazallardan etkilenir.</string>
+    <string name="cob_no_effect">Artan İDF, hesaplanan karbonhidrat emilimini etkilemez</string>
+    <string name="cob2_question">Değişen Kİ değeri AKRB hesaplamasını nasıl etkiler?</string>
+    <string name="cob2_no_effect">Artan Kİ oranı, hesaplanan karbonhidrat emilimini etkilemez</string>
+    <string name="cob3_question">Değişen profil yüzdesi AKRB hesaplamasını nasıl etkiler?</string>
+    <string name="cob3_no_effect">Profili %150\'ye ayarlamak hesaplanan karbonhidrat emilimini etkilemez</string>
+    <string name="iob_label">Aktif İnsülin (AİNS)</string>
+    <string name="iob_value">AİNS değeri, verilen geçici bazallardan etkilenir.</string>
     <string name="iob_hightemp">Kan şekeriniz hedefin altına düştüğünde yüksek geçici bazal verilmeyecektir.</string>
-    <string name="iob_negiob">Egzersiz yapmadığınız halde uzun bir dönem için negatif IOB, profilinizin çok güçlü olduğunu ve ayarlarınızda daha az insüline ihtiyaç duyulduğunu gösterir.</string>
+    <string name="iob_negiob">Egzersiz yapmadığınız halde uzun bir dönem için negatif AİNS, profilinizin çok güçlü olduğunu ve ayarlarınızda daha az insüline ihtiyaç duyulduğunu gösterir.</string>
     <string name="iob_posiob">Önemli bir süre için pozitif IOB, insülin direncini veya habersiz öğünleri gösterir.</string>
     <string name="breadgrams_label">Karbonhidrat girişi ve boluslar</string>
     <string name="breadgrams_grams">Tüketilen karbonhidratları tahmin etmek ve kaydetmek için sadece gram kullanılmalıdır.</string>
     <string name="breadgrams_exchange">Tüketilen karbonhidratlar uygun bir değişim sistemi kullanılarak kaydedilebilir (örn. DAFNE \"CHO\" değişimleri veya Avrupa \"Ekmek Birimleri\").</string>
-    <string name="breadgrams_decay">AndroidAPS, karbonhidrat \"çözünmesini\" tahmin etmek ve COB\'ı hesaplamak için dinamik bir model kullanır.</string>
+    <string name="breadgrams_decay">AndroidAPS, karbonhidrat \"çözünmesini\" tahmin etmek ve AKRB\'ı hesaplamak için dinamik bir model kullanır.</string>
     <string name="breadgrams_calc">Kan şekeri seviyeleri kabul edilebilir değerlerin dışındaysa (çok düşük veya çok yüksek), karbonhidrat veya insülin düzeltmeleri için öneriler sağlamak için bolus hesaplayıcı kullanılabilir.</string>
     <string name="breadgrams_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#insulin-to-carb-ratio-ic-g-u</string>
     <string name="extendedcarbs_label">yayma-karbonhidratlar</string>
@@ -158,11 +164,11 @@
     <string name="nsclient_label">Uzaktan İzleme</string>
     <string name="nsclient_howcanyou">AndroidAPS\'i (örneğin çocuğunuz için) uzaktan nasıl izleyebilirsiniz?</string>
     <string name="nsclient_nightscout">NS Client uygulaması, Nightscout uygulaması ve Nightscout web sayfasının tümü, AndroidAPS\'i uzaktan takip etmenize olanak tanır.</string>
-    <string name="nsclient_dexcomfollow">Diğer uygulamalar (ör. Dexcom takip, xDrip) bazı parametreleri (ör. kan şekeri/sensör değerleri) uzaktan takip etmenize izin verir, ancak farklı algoritma kullanımı, hatalı IOB veya COB değerlerine sebep olabilir.</string>
+    <string name="nsclient_dexcomfollow">Diğer uygulamalar (ör. Dexcom takip, xDrip) bazı parametreleri (ör. kan şekeri/sensör değerleri) uzaktan takip etmenize izin verir, ancak farklı algoritma kullanımı, hatalı AİNS veya AKRB değerlerine sebep olabilir.</string>
     <string name="nsclient_data">AndroidAPS\'yi uzaktan takip etmek için her iki cihazın da internet erişimine sahip olması gerekir (ör. Wi-Fi veya mobil/hücresel ağ verileri aracılığıyla).</string>
     <string name="nsclient_fullcontrol">Uzak takipçi olarak kullanılan NS İstemcisi, AndroidAPS\'i hem izleyecek hem de tam kontrol sağlayacaktır.</string>
     <string name="nsclient_hint1">https://androidaps.readthedocs.io/en/latest/EN/Children/Children.html</string>
-    <string name="isf_label_exam">İnsülin Duyarlılık Faktörü (ISF)</string>
+    <string name="isf_label_exam">İnsülin Duyarlılık Faktörü (İDF)</string>
     <string name="isf_increasingvalue">ISF değerlerini yükseltmek, belirli bir karbonhidrat miktarını karşılamak için daha fazla insülin verilmesine yol açacaktır.</string>
     <string name="isf_decreasingvalue">ISF değerinin düşürülmesi, hedeflenen kan şekerinin üzerinde bir düzeltme için daha fazla insülin verilmesine yol açar.</string>
     <string name="isf_noeffect">Kan şekeri seviyeleri hedefin altında olduğunda ISF\'yi yükseltmenin veya düşürmenin insülin iletimi üzerinde hiçbir etkisi yoktur.</string>
@@ -175,7 +181,7 @@
     <string name="ic_label_exam">Karbonhidrat insülin Oranı (I:C oranı)</string>
     <string name="ic_increasingvalue">Daha yüksek I:C oranları, belirli bir miktarda karbonhidrat için daha az insülin verilmesine yol açar.</string>
     <string name="ic_decreasingvalue">Daha düşük I:C oranları, belirli bir miktarda karbonhidrat için daha az insülin verilmesine yol açar.</string>
-    <string name="ic_noeffect">0 COB\'niz varsa, IC oranını değiştirmek, belirli bir KŞ değerini düzeltmek için farklı insülin miktarına sebep olur.</string>
+    <string name="ic_noeffect">0 AKRB varsa, Kİ oranını değiştirmek, belirli bir KŞ değerini düzeltmek için farklı insülin miktarına sebep olur.</string>
     <string name="ic_different">Ekmek (değişim) birimini 10g veya 12g olarak sayarsanız IC farklı olacaktır.</string>
     <string name="ic_meaning">IC anlamı şudur: 1Ü insülin kaç ekmek birimi (değişim) kapsar.</string>
     <string name="ic_hint1">https://androidaps.readthedocs.io/en/latest/EN/Getting-Started/FAQ.html#carbohydrate-to-insulin-ratio-cr-g-u</string>

app/src/main/res/values-tr-rTR/objectives.xml

@@ -11,7 +11,7 @@
     <string name="objectives_openloop_gate">Birkaç gün boyunca Açık Döngü modunda çalıştırın ve birçok geçici bazalı el yordamı ile girin. Geçici ve varsayılan geçici hedefleri düzenleyin ve kullanın (örn. egzersiz ve hipo-tedaviyi desteklemek için)</string>
     <string name="objectives_maxbasal_objective">Geçici bazal tavsiyeleri de dahil olmak üzere Açık Döngüyü anlamak</string>
     <string name="objectives_maxbasal_gate">Bu deneyime dayanarak, max bazalın ne olması gerektiğine karar vermeli ve bunu pompa ve tercihlere koymalısınız</string>
-    <string name="objectives_maxiobzero_objective">Kapalı Döngü, (LGS) Düşük Glikoz Süspansiyonu modunda başlatılıyor</string>
+    <string name="objectives_maxiobzero_objective">Kapalı Döngü, (LGS) Düşük Glikoz Duraklatma modunda başlatılıyor</string>
     <string name="objectives_maxiobzero_gate">Kapalı Döngüyü, maks IOB = 0 olacak şekilde çok sayıda LGS (düşük KŞ) olmadan birkaç gün boyunca deneyin</string>
     <string name="objectives_maxiob_objective">Kapalı Döngü\'de ince ayarlar, maks (IOB) Aktif İnsülini 0\'ın üzerine yükseltme ve yavaş yavaş KŞ hedeflerini aşağıya çekme</string>
     <string name="objectives_maxiob_gate">KŞ hedefini azaltmadan önce birkaç gün ve en az bir gece düşük KŞ (Hipo) alarmı olmadan deneyin</string>

app/src/main/res/values-tr-rTR/strings.xml

@@ -6,6 +6,7 @@
     <string name="treatmentssafety_title">Tedavi güvenliği</string>
     <string name="treatmentssafety_maxbolus_title">Maks izin verilen bolus [U]</string>
     <string name="treatmentssafety_maxcarbs_title">Maks izin verilen karbonhidrat [g]</string>
+    <string name="treatmentssafety_lgsThreshold_title">KŞ seviyesi altında düşük glikoz duraklatma meydana gelir</string>
     <string name="nav_preferences_plugin">%1$s Tercihler</string>
     <string name="nav_preferences">Tercihler</string>
     <string name="nav_refreshtreatments">NS\'tan tedavileri güncelle</string>
@@ -44,27 +45,27 @@
     <string name="description_sms_communicator">SMS komutlarını kullanarak uzaktan AndroidAPS kontrolü.</string>
     <string name="treatments_insulin_label_string">İnsülin:</string>
     <string name="treatments_carbs_label_string">Karbonhidrat:</string>
-    <string name="treatments_iob_label_string">IOB:</string>
+    <string name="treatments_iob_label_string">AİNS:</string>
-    <string name="sms_iob">IOB:</string>
+    <string name="sms_iob">AİNS:</string>
-    <string name="treatments_iobtotal_label_string">Toplam IOB:</string>
+    <string name="treatments_iobtotal_label_string">Toplam AİNS:</string>
-    <string name="treatments_iobactivitytotal_label_string">Toplam IOB etkinliği:</string>
+    <string name="treatments_iobactivitytotal_label_string">Toplam AİNS etkinliği:</string>
     <string name="tempbasals_realduration_label_string">Süre:</string>
     <string name="tempbasals_netratio_label_string">Oran:</string>
     <string name="tempbasals_netinsulin_label_string">İns:</string>
-    <string name="tempbasals_iob_label_string">IOB:</string>
+    <string name="tempbasals_iob_label_string">AİNS:</string>
-    <string name="tempbasals_iobtotal_label_string">Toplam IOB:</string>
+    <string name="tempbasals_iobtotal_label_string">Toplam AİNS:</string>
     <string name="treatments_wizard_bg_label">KŞ</string>
     <string name="treatments_wizard_tt_label">GH</string>
     <string name="treatments_wizard_carbs_label">Karbonhidrat</string>
     <string name="treatments_wizard_correction_label">Düzeltme</string>
-    <string name="bolus_iob_label">Bolus IOB</string>
+    <string name="bolus_iob_label">Bolus AİNS</string>
     <string name="openapsma_run">Şimdi Çalıştır</string>
     <string name="vitualpump_label">SANAL POMPA</string>
     <string name="openapsma_lastrun_label">Son Çalıştırma</string>
     <string name="openapsma_inputparameters_label">Girdi Parametreleri</string>
     <string name="openapsma_glucosestatus_label">Glikoz durumu</string>
     <string name="openapsma_currenttemp_label">Mevcut Geçici Bazal</string>
-    <string name="openapsma_iobdata_label">IOB Verisi</string>
+    <string name="openapsma_iobdata_label">AİNS Verisi</string>
     <string name="openapsma_profile_label">Profil</string>
     <string name="openapsma_mealdata_label">Yemek Verisi</string>
     <string name="result">Sonuç</string>
@@ -110,12 +111,12 @@
     <string name="apsmode_title">APS modu</string>
     <string name="closedloop">Kapalı Döngü</string>
     <string name="openloop">Açık Döngü</string>
-    <string name="lowglucosesuspend">Düşük Glikoz Süspansiyonu</string>
+    <string name="lowglucosesuspend">Düşük Glikoz Duraklatma (LGS)</string>
     <string name="disabledloop">Döngü devre dışı</string>
     <string name="openloop_newsuggestion">Yeni öneri mevcut</string>
     <string name="carbssuggestion">Karbonhidrat Önerisi</string>
     <string name="unsupportednsversion">Nightscout\'un desteklenmeyen sürümü</string>
-    <string name="treatments_wizard_basaliob_label">Bazal IOB</string>
+    <string name="treatments_wizard_basaliob_label">Bazal AİNS</string>
     <string name="bolusconstraintapplied">Bolus kısıtlaması uygulandı</string>
     <string name="carbsconstraintapplied">Karbonhidrat kısıtlaması uygulandı</string>
     <string name="careportal_newnstreatment_other">Diğer</string>
@@ -139,8 +140,8 @@
     <string name="nav_import">İçe aktarma ayarları</string>
     <string name="openapsma_maxbasal_title">Maks Ü/s geçici Bazal ayarlanabilir</string>
     <string name="openapsma_maxbasal_summary">Bu değer OpenAPS\'te \"maksimum bazal\" olarak adlandırılır</string>
-    <string name="openapsma_maxiob_title">OpenAPS\'nin vermesine izin verilen maksimum bazal IOB (Aktif insülin) [U]</string>
+    <string name="openapsma_maxiob_title">OpenAPS\'in gönderebileceği maksimum bazal AİNS (Aktif insülin) [U]</string>
-    <string name="openapsma_maxiob_summary">Bu değere OpenAPS bağlamında Maks IOB denir.\nAPS\'de bir kerede verilebilen maksimum insülin [U] ü.</string>
+    <string name="openapsma_maxiob_summary">Bu değere OpenAPS bağlamında Maks AİNS denir.\nAPS\'de bir kerede verilebilen maksimum insülin [U] ü.</string>
     <string name="password_preferences_encrypt_prompt">Dışa aktarılan tercihleri şifrelemek için kullanılacak ana parola sorulacaktır.</string>
     <string name="password_preferences_decrypt_prompt">İçe aktarılan tercihlerin şifresini çözmek için gerekli olan ana parola sorulacaktır.</string>
     <string name="preferences_export_canceled">Aktarım iptal edildi! Tercihler dışa aktarılmadı!</string>
@@ -316,8 +317,8 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="clearlog">Günlüğü temizle</string>
     <string name="nowritepermission">NSCLIENT yazma izni yok. Yanlış API Anahtarı?</string>
     <string name="wear_settings">Wear ayarları</string>
-    <string name="wear_detailedIOB_title">Ayrıntılı IOB göster</string>
+    <string name="wear_detailedIOB_title">Ayrıntılı AİNS göster</string>
-    <string name="wear_detailedIOB_summary">Saat arayüzü üzerinde IOB\'yi bolus ve bazal olarak ayırın</string>
+    <string name="wear_detailedIOB_summary">Saat arayüzü üzerinde AİNS\'i bolus ve bazal olarak ayırın</string>
     <string name="nosuccess">başarısız - lütfen telefonu kontrol edin</string>
     <string name="notavailable">n/a</string>
     <string name="patientage">Hasta tipi</string>
@@ -356,7 +357,7 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="smscommunicator_loopsuspended">Döngü duraklatıldı</string>
     <string name="smscommunicator_loopresumed">Döngü devam ettirildi</string>
     <string name="bg_trend_label">15 dk eğilim</string>
-    <string name="treatments_wizard_cob_label">COB</string>
+    <string name="treatments_wizard_cob_label">AKRB</string>
     <string name="superbolus">Süperbolus</string>
     <string name="ns_logappstartedevent">NS\'a uygulama başlangıcını kaydet</string>
     <string name="restartingapp">Ayarları uygulamak için uygulamadan çıkılıyor.</string>
@@ -439,7 +440,7 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="enablesmb">SMB (Super Micro Bolus) etkinleştir</string>
     <string name="enablesmb_summary">Daha hızlı bir etki için geçici bazal yerine Super Micro Bolus kullanın</string>
     <string name="enableuam_summary">(Uam) Bildirilmemiş öğünlerin tespiti</string>
-    <string name="insulin_oref_peak">IOB Eğrisi Tepe Zamanı</string>
+    <string name="insulin_oref_peak">AİNS Eğrisi Tepe Zamanı</string>
     <string name="insulin_peak_time">Tepe zamanı [min]</string>
     <string name="insulin_peak">Tepe</string>
     <string name="free_peak_oref">Serbest tepe Oref</string>
@@ -495,28 +496,28 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="nsclientbg">Nightscout Client KŞ</string>
     <string name="nsclientbgshort">NS KŞ</string>
     <string name="overview_editquickwizard_usebg">KŞ Hesaplaması</string>
-    <string name="overview_editquickwizard_usebolusiob">Bolus IOB (Aktif İnsülin) hesaplaması</string>
+    <string name="overview_editquickwizard_usebolusiob">Bolus AİNS hesaplaması</string>
-    <string name="overview_editquickwizard_usebasaliob">Bazal IOB (Aktif İnsülin) hesaplaması</string>
+    <string name="overview_editquickwizard_usebasaliob">Bazal AİNS hesaplaması</string>
     <string name="overview_editquickwizard_usetrend">Trend hesapla</string>
     <string name="overview_editquickwizard_usesuperbolus">Süperbolus hesapla</string>
     <string name="positiveonly">Sadece pozitif</string>
     <string name="negativeonly">Sadece negatif</string>
-    <string name="overview_editquickwizard_usecob">COB (Aktif Karbonhidrat) hesaplaması</string>
+    <string name="overview_editquickwizard_usecob">AKRB (Aktif Karbonhidrat) hesaplaması</string>
     <string name="overview_editquickwizard_usetemptarget">Geçici hedef hesaplaması</string>
     <string name="overview_editquickwizard_usepercentage">Yüzde Hesaplaması</string>
     <string name="loopenabled">Döngü etkin</string>
     <string name="apsselected">APS Seçildi</string>
     <string name="nsclienthaswritepermission">NSClient\'in yazma izni var</string>
     <string name="closedmodeenabled">Kapalı mod etkin</string>
-    <string name="maxiobset">Maksimal IOB doğru şekilde ayarlandı</string>
+    <string name="maxiobset">Maksimal AİNS doğru şekilde ayarlandı</string>
     <string name="hasbgdata">Seçili kaynaktan KŞ kullanılabilir</string>
     <string name="extendedbolusdeliveryerror">Yayma bolus iletim hatası</string>
     <string name="enablesmbalways">SMB\'yi her zaman etkinleştir</string>
     <string name="enablesmbalways_summary">SMB\'yi her zaman bağımsız olarak boluslarla etkinleştirin. G5 gibi verilerin yalnızca filtrelenmesiyle yalnızca KŞ kaynağıyla mümkündür</string>
     <string name="enablesmbaftercarbs">Yemeklerden sonra SMB\'yi etkinleştir</string>
-    <string name="enablesmbaftercarbs_summary">Karbonhidrat alındıktan sonra 6 saat süreyle SMB\'yi (Super Micro Bolus) etkinleştirin.0 COB (Aktif Karbonhidrat) ile de çalışır, Şayet KŞ kaynağıyla kullanılacaksa verilerin iyice filtrelenmesiyle mümkündür.örn. Dexcom G5 gibi</string>
+    <string name="enablesmbaftercarbs_summary">0 AKRB (Aktif Karbonhidrat) olsa dahi, karbonhidrat alındıktan sonra 6 saat süreyle SMB\'yi (Süper Mikro Bolus) etkinleştirir. Şayet KŞ kaynağıyla kullanılacaksa verilerin iyice filtrelenmesiyle (Dexcom G5-G6 gibi) mümkündür.</string>
-    <string name="enablesmbwithcob">SMB\'yi COB ile etkinleştir</string>
+    <string name="enablesmbwithcob">SMB\'yi AKRB ile etkinleştir</string>
-    <string name="enablesmbwithcob_summary">COB (Aktif Karbonhidrat) aktif olduğunda SMB\'yi (Super Micro Bolus) etkinleştirin.</string>
+    <string name="enablesmbwithcob_summary">AKRB (Aktif Karbonhidrat) aktif olduğunda SMB\'yi (Süper Mikro Bolus) etkinleştirin.</string>
     <string name="enablesmbwithtemptarget">Geçici hedeflerle SMB\'yi etkinleştir</string>
     <string name="enablesmbwithtemptarget_summary">Geçici hedef aktif olduğunda SMB\'yi etkinleştir (yakında yeme, egzersiz)</string>
     <string name="enablesmbwithhightemptarget">Yüksek geçici hedeflerle SMB\'yi etkinleştir</string>
@@ -579,7 +580,7 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="basal_set_correctly">Bazal doğru ayarlanmış</string>
     <string name="limitingextendedbolus">%2$s\'den dolayı yayma bolus %1$.1f Ü ile sınırlandırılıyor</string>
     <string name="limitingcarbs">%2$s\'den dolayı karbonhidratlar %1$d g ile sınırlandırılıyor</string>
-    <string name="limitingiob">%2$s\'den dolayı IOB (Aktif İnsülin)%1$.1f Ü ile sınırlandırılıyor</string>
+    <string name="limitingiob">%2$s\'den dolayı AİNS %1$.1f Ü ile sınırlandırılıyor</string>
     <string name="maxvalueinpreferences">tercihlerde maksimum değer</string>
     <string name="hardlimit">sert sınır</string>
     <string name="readstatusfailed">Durumu okumak başarısız oldu</string>
@@ -589,8 +590,8 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="smbnotallowedinopenloopmode">Açık Döngü modunda SMB\'ye (Super Micro Bolus) izin verilmiyor</string>
     <string name="food_short">Yiyecek</string>
     <string name="reset">sıfırla</string>
-    <string name="openapssmb_maxiob_title">OpenAPS tarafından aşılmayacak, maksimum toplam IOB(Aktif İnsülin)[U]</string>
+    <string name="openapssmb_maxiob_title">OpenAPS tarafından aşılamayacak maksimum toplam AİNS (Aktif İnsülin)[U]</string>
-    <string name="openapssmb_maxiob_summary">Bu değer OpenAPS bağlamında Max IOB (Aktif İnsülin) olarak adlandırılır\nOpenAPS, mevcut IOB bu değerden daha büyükse daha fazla insülin eklemez</string>
+    <string name="openapssmb_maxiob_summary">Bu değer OpenAPS bağlamında Max AİNS (Aktif İnsülin) olarak adlandırılır\nOpenAPS, mevcut AİNS bu değerden daha büyükse daha fazla insülin vermez</string>
     <string name="absorption_cutoff_title">Besinin maksimum emilim süresi [h]</string>
     <string name="absorption_cutoff_summary">Herhangi bir öğünün emildiği kabul edilen zaman. Kalan karbonhidratlar kesilecek.</string>
     <string name="treatmentssafety_lgsThreshold_summary">Altına düştüğünde insülinin askıya alındığı KŞ değeri. Varsayılan değer, standart hedef modeli kullanır. Kullanıcı değeri 60mg/dl (3,3mmol/l) ile 100mg/dl(5.5mmol/l) arasında ayarlayabilir. 65/3,6\'nın altındaki değerler varsayılan modelin kullanılmasına neden olur</string>
@@ -632,7 +633,7 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="readstatus">Durum oku</string>
     <string name="exitwizard">Kurulum sihirbazını atla</string>
     <string name="setupwizard_loop_description">AndroidAPS\'ın bazal değişiklikleri önerme/yapmasını sağlamak için aşağıdaki düğmeye basın</string>
-    <string name="setupwizard_sensitivity_description">Duyarlılık eklentisi, duyarlılık tespiti ve COB hesaplaması için kullanılır. Daha fazla bilgi için ziyaret edin:</string>
+    <string name="setupwizard_sensitivity_description">Duyarlılık eklentisi, duyarlılık tespiti ve AKRB hesaplaması için kullanılır. Daha fazla bilgi için ziyaret edin:</string>
     <string name="setupwizard_sensitivity_url">https://androidaps.readthedocs.io/en/latest/Configuration/Sensitivity-detection-and-COB.html</string>
     <string name="nsclientinfotext">NSClient, Nightscout\'a bağlantıyı sağlar. Şimdi bu kısmı atlayabilirsiniz, ancak ayarlamadan görevleri geçemezsiniz.</string>
     <string name="diawarning">Lütfen unutmayın: yeni insülin profilleri en az 5 saat DIA gerektirir. Yeni profildeki DIA 5–6 saat, eski insülin profillerinde DIA 3saat\'e eşittir.</string>
@@ -736,9 +737,9 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="dexcom_app_patched">BYODA</string>
     <string name="dexcom_short">BYODA</string>
     <string name="description_source_dexcom">\'Kendi Dexcom Uygulamanızı Oluşturun\' uygulamasından KŞ değerlerini alın.</string>
-    <string name="cobvsiob">COB vs IOB</string>
+    <string name="cobvsiob">AKRB vs AİNS</string>
     <string name="bolusconstraintappliedwarn">Bolus kısıtlaması uygulandı: %1$.2f Ü ile %2$.2f Ü</string>
-    <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Yavaş karbonhidrat emilimi tespit edildi: zamanın %2$d%% si. Hesaplamanızı iki kez kontrol edin. Aktif Karbonhidrat (COB) olduğundan fazla tahmin edilebilir, bu nedenle daha fazla insülin verilebilir !!!!!</font>]]></string>
+    <string name="slowabsorptiondetected"><![CDATA[<font color=\'%1$s\'>!!!!! Yavaş karbonhidrat emilimi tespit edildi: zamanın %2$d%% si. Hesaplamanızı iki kez kontrol edin. Aktif Karbonhidrat (AKRB) olduğundan fazla tahmin edilebilir, bu nedenle daha fazla insülin verilebilir !!!!!</font>]]></string>
     <string name="partialboluswizard">Bolus sihirbazı sonucunun bu kadarını ilet [%]</string>
     <string name="deliverpartofboluswizard">Bolus sihirbazı hesaplamayı gerçekleştirir ancak hesaplanan insülinin yalnızca bu kısmı iletilir. SMB algoritması ile kullanışlıdır.</string>
     <string name="snooze">Ertele</string>
@@ -746,7 +747,7 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="smscommunicator_messagebody">Geçersiz mesaj</string>
     <string name="format_bg_isf">%1$s ISF: %2$.1f</string>
     <string name="format_carbs_ic">%1$.0fg IC: %2$.1f</string>
-    <string name="format_cob_ic">%1$.1fg IC: %2$.1f</string>
+    <string name="format_cob_ic">%1$.1fg Kİ: %2$.1f</string>
     <string name="format_percent">%1$d%%</string>
     <string name="unit_minute_short">dk.</string>
     <string name="profile_name">Profil adı:</string>
@@ -897,7 +898,7 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="ns_receive_tbr_eb">GBO ve EB (Yayma Bolus) alın</string>
     <string name="ns_receive_tbr_eb_summary">Başka bir örnek üzerinden girilen GBO ve EB (Yayma Bolusu) kabul edin</string>
     <string name="ns_receive_insulin">İnsülinleri alın</string>
-    <string name="ns_receive_insulin_summary">NS veya NSClient aracılığıyla girilen insülini kabul edin (iletilmez, yalnızca aktif insüline göre (IOB) hesaplanır)</string>
+    <string name="ns_receive_insulin_summary">NS veya NSClient aracılığıyla girilen insülini kabul edin (iletilmez, yalnızca AİNS\'e göre hesaplanır)</string>
     <string name="ns_receive_carbs">Karbonhidratları alın</string>
     <string name="ns_receive_carbs_summary">NS veya NSClient aracılığıyla girilen karbonhidratları kabul edin</string>
     <string name="ns_receive_therapy_events">Terapi etkinlikleri alın</string>
@@ -970,19 +971,20 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="wear_action_tempt_max_bg_error">Maks-KŞ aralık dışında!</string>
     <string name="wear_action_tempt_manual_range_message">Geçici Hedef:\nMin: %1$s\nMaks: %2$s\nSüre: %3$s</string>
     <string name="wear_action_tempt_manual_message">Geçici Hedef:\nHedef: %1$s\nSüre: %2$s</string>
+    <string name="wear_action_tempt_preset_message">Geçicihedef:\nNeden: %1$s\nHedef: %2$s\nSüre: %3$s</string>
     <string name="quick_wizard_message">Hızlı Asistan: %1$s\nİnsülin: %2$.2fU\nKarb: %3$dg</string>
     <string name="wizard_result">Hesap Mak.:\nİnsulin: %1$.2fÜ\nKarb: %2$dg</string>
     <string name="overview_editquickwizard_show_on_device">Girişi cihazda göster:</string>
     <string name="quick_wizard_not_available">Seçili hızlı asistan artık mevcut değil, lütfen kutucuğu yenileyin</string>
     <string name="wizard_no_actual_bg">Hesaplamayı temel alacak yeni bir KŞ yok!</string>
     <string name="wizard_no_active_profile">Etkin profil ayarlanmadı!</string>
-    <string name="wizard_no_cob">Aktif karbonhidrat bilinmiyor! KŞ okuması eksik veya son uygulama yeniden başlatılsın mı?</string>
+    <string name="wizard_no_cob">Aktif karbonhidrat (AKRB) bilinmiyor! KŞ okuması eksik veya son uygulama yeniden başlatılsın mı?</string>
     <string name="wizard_carbs_constraint">Karbonhidrat kısıtlaması ihlali!</string>
     <string name="wizard_explain_calc">Hesap (KİO: %1$.1f, İDF: %2$.1f)</string>
     <string name="wizard_explain_carbs">Karb: %1$.2fÜ</string>
-    <string name="wizard_explain_cob">COB: %1$.0fg %2$.2fÜ</string>
+    <string name="wizard_explain_cob">AKRB: %1$.0fg %2$.2fÜ</string>
     <string name="wizard_explain_bg">KŞ: %1$.2fÜ</string>
-    <string name="wizard_explain_iob">Aktif İnsülin: %1$.2fÜ</string>
+    <string name="wizard_explain_iob">AİNS: %1$.2fÜ</string>
     <string name="wizard_explain_superbolus">Süperbolus: %1$.2fÜ</string>
     <string name="wizard_explain_trend">15\' trend: %1$.2fÜ</string>
     <string name="wizard_explain_percent">Yüzde: %1$.2fÜ x %2$d%% ≈ %3$.2fÜ</string>
@@ -1042,4 +1044,5 @@ Aktif Karbonhidratın ne kadar hızlı sindirildiğine ve KŞ\'nin beklenenden d
     <string name="description_source_aidex">GlucoRx Aidex CGMS\'den KŞ değerleri alır.</string>
     <string name="blocked_by_charging">Şarj seçenekleri tarafından engellendi</string>
     <string name="blocked_by_connectivity">Bağlantı seçenekleri tarafından engellendi</string>
+    <string name="no_watch_connected">(Saat Bağlı Değil)</string>
 </resources>

app/src/main/res/values-zh-rCN/exam.xml

@@ -137,7 +137,6 @@
     <string name="wronginsulin_prime">通过注射器或胰岛素笔输注你计算出的“遗漏”胰岛素的一部分。</string>
     <string name="wronginsulin_donothing">不做任何事情，允许AndroidAPS纠正高血糖导致的任何结果。</string>
     <string name="iob_label">活性胰岛素(IOB)</string>
-    <string name="iob_which">选择所有正确的答案。</string>
     <string name="iob_value">活性胰岛素IOB数值受发布的临时基础率影响。</string>
     <string name="iob_hightemp">当您的血糖低于目标值时，不会被给予高临时基础率。</string>
     <string name="iob_negiob">在没有运动的情况下，活性胰岛素IOB长时间负数表明你的个人配置太强，你需要在配置中减少的胰岛素用量。</string>

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

@@ -136,8 +136,20 @@
     <string name="wronginsulin_compare">Compare values in AndroidAPS and pump history (if pump supports this).</string>
     <string name="wronginsulin_prime">Bolus a proportion of your calculated ‘missed’ insulin by either syringe/pen or using a prime.</string>
     <string name="wronginsulin_donothing">Do nothing and allow AndroidAPS to correct any resulting high blood glucose level.</string>
+    <string name="cob_label">Carbs on Board (COB)</string>
+    <string name="cob_question">How changing ISF value affects COB calculation?</string>
+    <string name="cob_longer">Increasing ISF will take absorbing carbs a longer time</string>
+    <string name="cob_shorter">Increasing ISF will take absorbing carbs a shorter time</string>
+    <string name="cob_no_effect">Increasing ISF will not affect calculated carbs absorption</string>
+    <string name="cob2_question">How changing IC value affects COB calculation?</string>
+    <string name="cob2_longer">Increasing IC will take absorbing carbs a longer time</string>
+    <string name="cob2_shorter">Increasing IC will take absorbing carbs a shorter time</string>
+    <string name="cob2_no_effect">Increasing IC will not affect calculated carbs absorption</string>
+    <string name="cob3_question">How changing profile percentage affects COB calculation?</string>
+    <string name="cob3_longer">Setting profile to 150% will take absorbing carbs a longer time</string>
+    <string name="cob3_shorter">Setting profile to 150% will take absorbing carbs a shorter time</string>
+    <string name="cob3_no_effect">Setting profile to 150% will not affect calculated carbs absorption</string>
     <string name="iob_label">Insulin on Board (IOB)</string>
-    <string name="iob_which">Check all the correct answers.</string>
     <string name="iob_value">IOB value is affected by issued temporary basals.</string>
     <string name="iob_hightemp">High temp basal will not be given when your blood sugar is below target.</string>
     <string name="iob_negiob">Negative IOB for a substantial period in the absence of exercise suggests your profile is too strong and less insulin is needed in your settings.</string>

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

@@ -1242,13 +1242,15 @@
     <string name="a11y_only_on_watch">only on watch</string>
     <string name="a11y_only_on_phone">only on phone</string>
     <string name="a11y_drag_and_drop_handle">drag and drop handle</string>
+    <string name="search">Search</string>
 
-  <!-- Aidex Cgms -->
+    <!-- Aidex Cgms -->
     <string name="aidex">GlucoRx Aidex</string>
     <string name="aidex_short">Aidex</string>
     <string name="description_source_aidex">Receive BG values from GlucoRx Aidex CGMS.</string>
     <string name="blocked_by_charging">Blocked by charging options</string>
     <string name="blocked_by_connectivity">Blocked by connectivity options</string>
+    <string name="no_watch_connected">(No Watch Connected)</string>
 
 
 </resources>

app/src/test/java/info/nightscout/androidaps/TestBaseWithProfile.kt

@@ -23,6 +23,7 @@ import org.mockito.ArgumentMatchers.anyInt
 import org.mockito.ArgumentMatchers.anyString
 import org.mockito.Mock
 import org.mockito.Mockito
+import org.mockito.Mockito.`when`
 import org.mockito.invocation.InvocationOnMock
 
 @Suppress("SpellCheckingInspection")
@@ -52,7 +53,8 @@ open class TestBaseWithProfile : TestBase() {
         validProfileJSON = "{\"dia\":\"5\",\"carbratio\":[{\"time\":\"00:00\",\"value\":\"30\"}],\"carbs_hr\":\"20\",\"delay\":\"20\",\"sens\":[{\"time\":\"00:00\",\"value\":\"3\"}," +
             "{\"time\":\"2:00\",\"value\":\"3.4\"}],\"timezone\":\"UTC\",\"basal\":[{\"time\":\"00:00\",\"value\":\"1\"}],\"target_low\":[{\"time\":\"00:00\",\"value\":\"4.5\"}]," +
             "\"target_high\":[{\"time\":\"00:00\",\"value\":\"7\"}],\"startDate\":\"1970-01-01T00:00:00.000Z\",\"units\":\"mmol\"}"
-        dateUtil = DateUtil(context)
+        dateUtil = Mockito.spy(DateUtil(context))
+        `when`(dateUtil.now()).thenReturn(1656358822000)
         validProfile = ProfileSealed.Pure(pureProfileFromJson(JSONObject(validProfileJSON), dateUtil)!!)
         effectiveProfileSwitch = EffectiveProfileSwitch(
             timestamp = dateUtil.now(),

app/src/test/java/info/nightscout/androidaps/plugins/general/autotune/AutotuneCoreTest.kt

@@ -25,49 +25,74 @@ import java.io.File
 import java.util.*
 
 class AutotuneCoreTest : TestBaseWithProfile() {
+
     @Mock lateinit var sp: SP
     @Mock lateinit var autotuneFS: AutotuneFS
     @Mock lateinit var injector: HasAndroidInjector
     @Mock lateinit var activePlugin: ActivePlugin
-    lateinit var autotuneCore: AutotuneCore
+    private lateinit var autotuneCore: AutotuneCore
-    var min5mCarbImpact = 0.0
+    private var min5mCarbImpact = 0.0
-    var autotuneMin = 0.0
+    private var autotuneMin = 0.0
-    var autotuneMax = 0.0
+    private var autotuneMax = 0.0
 
-        @Before
+    @Before
     fun initData() {
-        autotuneCore = AutotuneCore(sp,autotuneFS)
+        autotuneCore = AutotuneCore(sp, autotuneFS)
         TimeZone.setDefault(TimeZone.getTimeZone("GMT+2"))
     }
 
+    @Suppress("SpellCheckingInspection")
     @Test
-    fun autotuneCoreTest() { // Test if load from file of OpenAPS categorisation is Ok
+    fun autotuneCoreTest1() { // Test if AutotuneCore with input files of OpenAPS categorisation gives correct output profile
-        val prepjson = File("src/test/res/autotune/test1/autotune.2022-05-21.json").readText()
+        val prepJson = File("src/test/res/autotune/test1/autotune.2022-05-21.json").readText()
         val inputProfileJson = File("src/test/res/autotune/test1/profile.pump.json").readText()
         val inputProfile = atProfileFromOapsJson(JSONObject(inputProfileJson), dateUtil)!!
-        val prep = PreppedGlucose(JSONObject(prepjson), dateUtil)
+        val prep = PreppedGlucose(JSONObject(prepJson), dateUtil)
 
         `when`(sp.getDouble(R.string.key_openapsama_autosens_max, 1.2)).thenReturn(autotuneMax)
         `when`(sp.getDouble(R.string.key_openapsama_autosens_min, 0.7)).thenReturn(autotuneMin)
         `when`(sp.getDouble(R.string.key_openapsama_min_5m_carbimpact, 3.0)).thenReturn(min5mCarbImpact)
-        val OapsOutputProfileJson = File("src/test/res/autotune/test1/aapsorefprofile.json").readText()
+        val oapsOutputProfileJson = File("src/test/res/autotune/test1/aapsorefprofile.json").readText()
-        val OapsOutputProfile = atProfileFromOapsJson(JSONObject(OapsOutputProfileJson),dateUtil)
+        val oapsOutputProfile = atProfileFromOapsJson(JSONObject(oapsOutputProfileJson), dateUtil)
         val outProfile = autotuneCore.tuneAllTheThings(prep, inputProfile, inputProfile)
-        OapsOutputProfile?.let {
+        oapsOutputProfile?.let {
-            Assert.assertEquals(OapsOutputProfile.isf, outProfile.isf, 0.0)
+            Assert.assertEquals(oapsOutputProfile.isf, outProfile.isf, 0.0)
-            Assert.assertEquals(OapsOutputProfile.ic, outProfile.ic, 0.0)
+            Assert.assertEquals(oapsOutputProfile.ic, outProfile.ic, 0.0)
             for (i in 0..23)
-                Assert.assertEquals(OapsOutputProfile.basal[i], outProfile.basal[i], 0.0)
+                Assert.assertEquals(oapsOutputProfile.basal[i], outProfile.basal[i], 0.0)
         }
-            ?:Assert.fail()
+            ?: Assert.fail()
     }
 
-
+    @Suppress("SpellCheckingInspection")
+    @Test
+    fun autotuneCoreTest4() { // Test if limiting modification with Min Max Autosens parameter works (18h on basal and on ISF value)
+        val prepJson = File("src/test/res/autotune/test4/autotune.2022-05-30.json").readText()
+        val inputProfileJson = File("src/test/res/autotune/test4/profile.2022-05-30.json").readText()
+        val inputProfile = atProfileFromOapsJson(JSONObject(inputProfileJson), dateUtil)!!
+        val pumpProfileJson = File("src/test/res/autotune/test4/profile.pump.json").readText()
+        val pumpProfile = atProfileFromOapsJson(JSONObject(pumpProfileJson), dateUtil)!!
+        val prep = PreppedGlucose(JSONObject(prepJson), dateUtil)
+        `when`(sp.getDouble(R.string.key_openapsama_autosens_max, 1.2)).thenReturn(autotuneMax)
+        `when`(sp.getDouble(R.string.key_openapsama_autosens_min, 0.7)).thenReturn(autotuneMin)
+        `when`(sp.getDouble(R.string.key_openapsama_min_5m_carbimpact, 3.0)).thenReturn(min5mCarbImpact)
+        val oapsOutputProfileJson = File("src/test/res/autotune/test4/newprofile.2022-05-30.json").readText()
+        val oapsOutputProfile = atProfileFromOapsJson(JSONObject(oapsOutputProfileJson), dateUtil)
+        val outProfile = autotuneCore.tuneAllTheThings(prep, inputProfile, pumpProfile)
+        oapsOutputProfile?.let {
+            Assert.assertEquals(oapsOutputProfile.isf, outProfile.isf, 0.0)
+            Assert.assertEquals(oapsOutputProfile.ic, outProfile.ic, 0.0)
+            for (i in 0..23)
+                Assert.assertEquals(oapsOutputProfile.basal[i], outProfile.basal[i], 0.0)
+        }
+            ?: Assert.fail()
+    }
 
     /**
      * OpenAPS profile for Autotune only have one ISF value and one IC value
      */
-    fun atProfileFromOapsJson(jsonObject: JSONObject, dateUtil: DateUtil, defaultUnits: String? = null): ATProfile? {
+    @Suppress("SpellCheckingInspection")
+    private fun atProfileFromOapsJson(jsonObject: JSONObject, dateUtil: DateUtil, defaultUnits: String? = null): ATProfile? {
         try {
             min5mCarbImpact = JsonHelper.safeGetDoubleAllowNull(jsonObject, "min_5m_carbimpact") ?: return null
             autotuneMin = JsonHelper.safeGetDoubleAllowNull(jsonObject, "autosens_min") ?: return null
@@ -82,13 +107,13 @@ class AutotuneCoreTest : TestBaseWithProfile() {
             val isfBlocks = ArrayList<Block>(1).also {
                 val isfJsonArray = isfJson.getJSONArray("sensitivities")
                 val value = isfJsonArray.getJSONObject(0).getDouble("sensitivity")
-                it.add(0,Block((T.hours(24).secs()) * 1000L, value))
+                it.add(0, Block((T.hours(24).secs()) * 1000L, value))
             }
             val icBlocks = ArrayList<Block>(1).also {
                 val value = jsonObject.getDouble("carb_ratio")
-                it.add(0,Block((T.hours(24).secs()) * 1000L, value))
+                it.add(0, Block((T.hours(24).secs()) * 1000L, value))
             }
-            val basalBlocks = blockFromJsonArray(jsonObject.getJSONArray("basalprofile"), dateUtil)
+            val basalBlocks = blockFromJsonArray(jsonObject.getJSONArray("basalprofile"))
                 ?: return null
             val targetBlocks = ArrayList<TargetBlock>(1).also {
                 it.add(0, TargetBlock((T.hours(24).secs()) * 1000L, 100.0, 100.0))
@@ -104,14 +129,13 @@ class AutotuneCoreTest : TestBaseWithProfile() {
                 timeZone = timezone,
                 dia = dia
             )
-            return ATProfile(ProfileSealed.Pure(pure), localInsulin, profileInjector).also { it.dateUtil = dateUtil}
+            return ATProfile(ProfileSealed.Pure(pure), localInsulin, profileInjector).also { it.dateUtil = dateUtil }
         } catch (ignored: Exception) {
             return null
         }
     }
 
-
+    private fun blockFromJsonArray(jsonArray: JSONArray?): List<Block>? {
-    fun blockFromJsonArray(jsonArray: JSONArray?, dateUtil: DateUtil): List<Block>? {
         val size = jsonArray?.length() ?: return null
         val ret = ArrayList<Block>(size)
         try {

app/src/test/java/info/nightscout/androidaps/plugins/general/autotune/AutotunePrepTest.kt

@@ -13,6 +13,7 @@ import info.nightscout.androidaps.database.data.TargetBlock
 import info.nightscout.androidaps.database.entities.Bolus
 import info.nightscout.androidaps.database.entities.Carbs
 import info.nightscout.androidaps.database.entities.GlucoseValue
+import info.nightscout.androidaps.extensions.shiftBlock
 import info.nightscout.androidaps.interfaces.*
 import info.nightscout.androidaps.plugins.general.autotune.data.*
 import info.nightscout.androidaps.utils.DateUtil
@@ -29,45 +30,44 @@ import org.mockito.Mock
 import org.mockito.Mockito.`when`
 import java.io.File
 import java.util.*
-import kotlin.collections.ArrayList
 
 class AutotunePrepTest : TestBaseWithProfile() {
+
     @Mock lateinit var sp: SP
     @Mock lateinit var autotuneFS: AutotuneFS
     @Mock lateinit var injector: HasAndroidInjector
     @Mock lateinit var activePlugin: ActivePlugin
     @Mock lateinit var repository: AppRepository
-    lateinit var autotunePrep: AutotunePrep
+    private lateinit var autotunePrep: AutotunePrep
-    lateinit var autotuneIob: TestAutotuneIob
+    private lateinit var autotuneIob: TestAutotuneIob
-    lateinit var inputProfile: ATProfile
+    private var ts = 0
-    var min5mCarbImpact = 0.0
+    private var min5mCarbImpact = 0.0
-    var autotuneMin = 0.0
+    private var autotuneMin = 0.0
-    var autotuneMax = 0.0
+    private var autotuneMax = 0.0
-    var startDayTime = 0L
+    private var startDayTime = 0L
-
 
     @Before
     fun initData() {
-        TimeZone.setDefault(TimeZone.getTimeZone("GMT+2"))
+        ts = T.msecs(TimeZone.getDefault().getOffset(System.currentTimeMillis()).toLong()).hours().toInt() - 2
-        val inputProfileJson = File("src/test/res/autotune/test1/profile.pump.json").readText()
-        inputProfile = atProfileFromOapsJson(JSONObject(inputProfileJson), dateUtil)!!
-        val inputIobJson = File("src/test/res/autotune/test1/oaps-iobCalc.2022-05-21.json").readText() //json files build with iob/activity calculated by OAPS
-        val iobOapsCalcul = buildIobOaps(JSONArray(inputIobJson))
-        autotuneIob = TestAutotuneIob(aapsLogger, repository, profileFunction, sp, dateUtil, activePlugin, autotuneFS, iobOapsCalcul)
-        autotunePrep = AutotunePrep(sp, dateUtil, autotuneFS, autotuneIob)
     }
 
     @Test
-    fun autotunePrepTest() { // Test if load from file of OpenAPS categorisation is Ok
+    fun autotunePrepTest1() { // Test if categorisation with standard treatments with carbs is Ok
-        val prepjson = File("src/test/res/autotune/test1/autotune.2022-05-21.json").readText()
+        val inputIobJson = File("src/test/res/autotune/test1/oaps-iobCalc.2022-05-21.json").readText() //json files build with iob/activity calculated by OAPS
-        val oapsPreppedGlucose = PreppedGlucose(JSONObject(prepjson), dateUtil) //prep data calculated by OpenAPS autotune
+        val iobOapsCalculation = buildIobOaps(JSONArray(inputIobJson))
+        autotuneIob = TestAutotuneIob(aapsLogger, repository, profileFunction, sp, dateUtil, activePlugin, autotuneFS, iobOapsCalculation)
+        autotunePrep = AutotunePrep(aapsLogger, sp, dateUtil, autotuneFS, autotuneIob)
+        val inputProfileJson = File("src/test/res/autotune/test1/profile.pump.json").readText()
+        val inputProfile = atProfileFromOapsJson(JSONObject(inputProfileJson), dateUtil)!!
+        val prepJson = File("src/test/res/autotune/test1/autotune.2022-05-21.json").readText()
+        val oapsPreppedGlucose = PreppedGlucose(JSONObject(prepJson), dateUtil) //prep data calculated by OpenAPS autotune
         val oapsEntriesJson = File("src/test/res/autotune/test1/aaps-entries.2022-05-21.json").readText()
-        autotuneIob.glucose =  buildGlucose(JSONArray(oapsEntriesJson))
+        autotuneIob.glucose = buildGlucose(JSONArray(oapsEntriesJson))
         val oapsTreatmentsJson = File("src/test/res/autotune/test1/aaps-treatments.2022-05-21.json").readText()
-        autotuneIob.meals =  buildMeals(JSONArray(oapsTreatmentsJson))  //Only meals is used in unit test, Insulin only used for iob calculation
+        autotuneIob.meals = buildMeals(JSONArray(oapsTreatmentsJson))  //Only meals is used in unit test, Insulin only used for iob calculation
         autotuneIob.boluses = buildBoluses(oapsPreppedGlucose) //Values from oapsPrepData because linked to iob calculation method for TBR
         `when`(sp.getDouble(R.string.key_openapsama_min_5m_carbimpact, 3.0)).thenReturn(min5mCarbImpact)
-
+        `when`(sp.getBoolean(R.string.key_autotune_categorize_uam_as_basal, false)).thenReturn(false)
         val aapsPreppedGlucose = autotunePrep.categorizeBGDatums(inputProfile, inputProfile.localInsulin, false)
         try {
             aapsPreppedGlucose?.let {       // compare all categorization calculated by aaps plugin (aapsPreppedGlucose) with categorization calculated by OpenAPS (oapsPreppedGlucose)
@@ -75,8 +75,12 @@ class AutotunePrepTest : TestBaseWithProfile() {
                     Assert.assertTrue(oapsPreppedGlucose.crData[i].equals(aapsPreppedGlucose.crData[i]))
                 for (i in aapsPreppedGlucose.csfGlucoseData.indices)
                     Assert.assertTrue(oapsPreppedGlucose.csfGlucoseData[i].equals(aapsPreppedGlucose.csfGlucoseData[i]))
+                oapsPreppedGlucose.isfGlucoseData = oapsPreppedGlucose.isfGlucoseData.sortedBy { it.date }
+                aapsPreppedGlucose.isfGlucoseData = aapsPreppedGlucose.isfGlucoseData.sortedBy { it.date }
                 for (i in aapsPreppedGlucose.isfGlucoseData.indices)
                     Assert.assertTrue(oapsPreppedGlucose.isfGlucoseData[i].equals(aapsPreppedGlucose.isfGlucoseData[i]))
+                oapsPreppedGlucose.basalGlucoseData = oapsPreppedGlucose.basalGlucoseData.sortedBy { it.date }
+                aapsPreppedGlucose.basalGlucoseData = aapsPreppedGlucose.basalGlucoseData.sortedBy { it.date }
                 for (i in aapsPreppedGlucose.basalGlucoseData.indices)
                     Assert.assertTrue(oapsPreppedGlucose.basalGlucoseData[i].equals(aapsPreppedGlucose.basalGlucoseData[i]))
             }
@@ -86,12 +90,89 @@ class AutotunePrepTest : TestBaseWithProfile() {
         }
     }
 
+    @Test
+    fun autotunePrepTest2() { // Test if categorisation without carbs (full UAM) and categorize UAM as basal false is Ok
+        val inputIobJson = File("src/test/res/autotune/test2/oaps-iobCalc.2022-05-21.json").readText() //json files build with iob/activity calculated by OAPS
+        val iobOapsCalculation = buildIobOaps(JSONArray(inputIobJson))
+        autotuneIob = TestAutotuneIob(aapsLogger, repository, profileFunction, sp, dateUtil, activePlugin, autotuneFS, iobOapsCalculation)
+        autotunePrep = AutotunePrep(aapsLogger, sp, dateUtil, autotuneFS, autotuneIob)
+        val inputProfileJson = File("src/test/res/autotune/test2/profile.pump.json").readText()
+        val inputProfile = atProfileFromOapsJson(JSONObject(inputProfileJson), dateUtil)!!
+        val prepJson = File("src/test/res/autotune/test2/autotune.2022-05-21.json").readText()
+        val oapsPreppedGlucose = PreppedGlucose(JSONObject(prepJson), dateUtil) //prep data calculated by OpenAPS autotune
+        val oapsEntriesJson = File("src/test/res/autotune/test2/aaps-entries.2022-05-21.json").readText()
+        autotuneIob.glucose = buildGlucose(JSONArray(oapsEntriesJson))
+        val oapsTreatmentsJson = File("src/test/res/autotune/test2/aaps-treatments.2022-05-21.json").readText()
+        autotuneIob.meals = buildMeals(JSONArray(oapsTreatmentsJson))  //Only meals is used in unit test, Insulin only used for iob calculation
+        autotuneIob.boluses = buildBoluses(oapsPreppedGlucose) //Values from oapsPrepData because linked to iob calculation method for TBR
+        `when`(sp.getDouble(R.string.key_openapsama_min_5m_carbimpact, 3.0)).thenReturn(min5mCarbImpact)
+        `when`(sp.getBoolean(R.string.key_autotune_categorize_uam_as_basal, false)).thenReturn(false)           // CategorizeUAM as Basal = False
+        val aapsPreppedGlucose = autotunePrep.categorizeBGDatums(inputProfile, inputProfile.localInsulin, false)
+        try {
+            aapsPreppedGlucose?.let {       // compare all categorization calculated by aaps plugin (aapsPreppedGlucose) with categorization calculated by OpenAPS (oapsPreppedGlucose)
+                for (i in aapsPreppedGlucose.crData.indices)
+                    Assert.assertTrue(oapsPreppedGlucose.crData[i].equals(aapsPreppedGlucose.crData[i]))
+                for (i in aapsPreppedGlucose.csfGlucoseData.indices)
+                    Assert.assertTrue(oapsPreppedGlucose.csfGlucoseData[i].equals(aapsPreppedGlucose.csfGlucoseData[i]))
+                oapsPreppedGlucose.isfGlucoseData = oapsPreppedGlucose.isfGlucoseData.sortedBy { it.date }
+                aapsPreppedGlucose.isfGlucoseData = aapsPreppedGlucose.isfGlucoseData.sortedBy { it.date }
+                for (i in aapsPreppedGlucose.isfGlucoseData.indices)
+                    Assert.assertTrue(oapsPreppedGlucose.isfGlucoseData[i].equals(aapsPreppedGlucose.isfGlucoseData[i]))
+                oapsPreppedGlucose.basalGlucoseData = oapsPreppedGlucose.basalGlucoseData.sortedBy { it.date }
+                aapsPreppedGlucose.basalGlucoseData = aapsPreppedGlucose.basalGlucoseData.sortedBy { it.date }
+                for (i in aapsPreppedGlucose.basalGlucoseData.indices)
+                    Assert.assertTrue(oapsPreppedGlucose.basalGlucoseData[i].equals(aapsPreppedGlucose.basalGlucoseData[i]))
+            }
+                ?: Assert.fail()
+        } catch (e: Exception) {
+            Assert.fail()
+        }
+    }
 
+    @Test
+    fun autotunePrepTest3() { // Test if categorisation without carbs (full UAM) and categorize UAM as basal true is Ok
+        val inputIobJson = File("src/test/res/autotune/test3/oaps-iobCalc.2022-05-21.json").readText() //json files build with iob/activity calculated by OAPS
+        val iobOapsCalculation = buildIobOaps(JSONArray(inputIobJson))
+        autotuneIob = TestAutotuneIob(aapsLogger, repository, profileFunction, sp, dateUtil, activePlugin, autotuneFS, iobOapsCalculation)
+        autotunePrep = AutotunePrep(aapsLogger, sp, dateUtil, autotuneFS, autotuneIob)
+        val inputProfileJson = File("src/test/res/autotune/test3/profile.pump.json").readText()
+        val inputProfile = atProfileFromOapsJson(JSONObject(inputProfileJson), dateUtil)!!
+        val prepJson = File("src/test/res/autotune/test3/autotune.2022-05-21.json").readText()
+        val oapsPreppedGlucose = PreppedGlucose(JSONObject(prepJson), dateUtil) //prep data calculated by OpenAPS autotune
+        val oapsEntriesJson = File("src/test/res/autotune/test3/aaps-entries.2022-05-21.json").readText()
+        autotuneIob.glucose = buildGlucose(JSONArray(oapsEntriesJson))
+        val oapsTreatmentsJson = File("src/test/res/autotune/test3/aaps-treatments.2022-05-21.json").readText()
+        autotuneIob.meals = buildMeals(JSONArray(oapsTreatmentsJson))  //Only meals is used in unit test, Insulin only used for iob calculation
+        autotuneIob.boluses = buildBoluses(oapsPreppedGlucose) //Values from oapsPrepData because linked to iob calculation method for TBR
+        `when`(sp.getDouble(R.string.key_openapsama_min_5m_carbimpact, 3.0)).thenReturn(min5mCarbImpact)
+        `when`(sp.getBoolean(R.string.key_autotune_categorize_uam_as_basal, false)).thenReturn(true)           // CategorizeUAM as Basal = True
+        val aapsPreppedGlucose = autotunePrep.categorizeBGDatums(inputProfile, inputProfile.localInsulin, false)
+        try {
+            aapsPreppedGlucose?.let {       // compare all categorization calculated by aaps plugin (aapsPreppedGlucose) with categorization calculated by OpenAPS (oapsPreppedGlucose)
+                for (i in aapsPreppedGlucose.crData.indices)
+                    Assert.assertTrue(oapsPreppedGlucose.crData[i].equals(aapsPreppedGlucose.crData[i]))
+                for (i in aapsPreppedGlucose.csfGlucoseData.indices)
+                    Assert.assertTrue(oapsPreppedGlucose.csfGlucoseData[i].equals(aapsPreppedGlucose.csfGlucoseData[i]))
+                oapsPreppedGlucose.isfGlucoseData = oapsPreppedGlucose.isfGlucoseData.sortedBy { it.date }
+                aapsPreppedGlucose.isfGlucoseData = aapsPreppedGlucose.isfGlucoseData.sortedBy { it.date }
+                for (i in aapsPreppedGlucose.isfGlucoseData.indices)
+                    Assert.assertTrue(oapsPreppedGlucose.isfGlucoseData[i].equals(aapsPreppedGlucose.isfGlucoseData[i]))
+                oapsPreppedGlucose.basalGlucoseData = oapsPreppedGlucose.basalGlucoseData.sortedBy { it.date }
+                aapsPreppedGlucose.basalGlucoseData = aapsPreppedGlucose.basalGlucoseData.sortedBy { it.date }
+                for (i in aapsPreppedGlucose.basalGlucoseData.indices)
+                    Assert.assertTrue(oapsPreppedGlucose.basalGlucoseData[i].equals(aapsPreppedGlucose.basalGlucoseData[i]))
+            }
+                ?: Assert.fail()
+        } catch (e: Exception) {
+            Assert.fail()
+        }
+    }
 
-    /**
+    /*************************************************************************************************************************************************************************************
      * OpenAPS profile for Autotune only have one ISF value and one IC value
      */
-    fun atProfileFromOapsJson(jsonObject: JSONObject, dateUtil: DateUtil, defaultUnits: String? = null): ATProfile? {
+    @Suppress("SpellCheckingInspection")
+    private fun atProfileFromOapsJson(jsonObject: JSONObject, dateUtil: DateUtil, defaultUnits: String? = null): ATProfile? {
         try {
             min5mCarbImpact = JsonHelper.safeGetDoubleAllowNull(jsonObject, "min_5m_carbimpact") ?: return null
             autotuneMin = JsonHelper.safeGetDoubleAllowNull(jsonObject, "autosens_min") ?: return null
@@ -106,13 +187,13 @@ class AutotunePrepTest : TestBaseWithProfile() {
             val isfBlocks = ArrayList<Block>(1).also {
                 val isfJsonArray = isfJson.getJSONArray("sensitivities")
                 val value = isfJsonArray.getJSONObject(0).getDouble("sensitivity")
-                it.add(0,Block((T.hours(24).secs()) * 1000L, value))
+                it.add(0, Block((T.hours(24).secs()) * 1000L, value))
             }
             val icBlocks = ArrayList<Block>(1).also {
                 val value = jsonObject.getDouble("carb_ratio")
-                it.add(0,Block((T.hours(24).secs()) * 1000L, value))
+                it.add(0, Block((T.hours(24).secs()) * 1000L, value))
             }
-            val basalBlocks = blockFromJsonArray(jsonObject.getJSONArray("basalprofile"), dateUtil)
+            val basalBlocks = blockFromJsonArray(jsonObject.getJSONArray("basalprofile"))
                 ?: return null
             val targetBlocks = ArrayList<TargetBlock>(1).also {
                 it.add(0, TargetBlock((T.hours(24).secs()) * 1000L, 100.0, 100.0))
@@ -120,7 +201,7 @@ class AutotunePrepTest : TestBaseWithProfile() {
 
             val pure = PureProfile(
                 jsonObject = jsonObject,
-                basalBlocks = basalBlocks,
+                basalBlocks = basalBlocks.shiftBlock(1.0,ts),
                 isfBlocks = isfBlocks,
                 icBlocks = icBlocks,
                 targetBlocks = targetBlocks,
@@ -128,14 +209,13 @@ class AutotunePrepTest : TestBaseWithProfile() {
                 timeZone = timezone,
                 dia = dia
             )
-            return ATProfile(ProfileSealed.Pure(pure), localInsulin, profileInjector).also { it.dateUtil = dateUtil}
+            return ATProfile(ProfileSealed.Pure(pure), localInsulin, profileInjector).also { it.dateUtil = dateUtil }
         } catch (ignored: Exception) {
             return null
         }
     }
 
-
+    private fun blockFromJsonArray(jsonArray: JSONArray?): List<Block>? {
-    fun blockFromJsonArray(jsonArray: JSONArray?, dateUtil: DateUtil): List<Block>? {
         val size = jsonArray?.length() ?: return null
         val ret = ArrayList<Block>(size)
         try {
@@ -159,57 +239,59 @@ class AutotunePrepTest : TestBaseWithProfile() {
         return ret
     }
 
-    fun buildBoluses(preppedGlucose: PreppedGlucose): ArrayList<Bolus> { //if categorization is correct then I return for dose function the crInsulin calculated in Oaps
+    private fun buildBoluses(preppedGlucose: PreppedGlucose): ArrayList<Bolus> { //if categorization is correct then I return for dose function the crInsulin calculated in Oaps
         val boluses: ArrayList<Bolus> = ArrayList()
-        try {
+        for (i in preppedGlucose.crData.indices) {
-            for (i in preppedGlucose.crData.indices) {
+            boluses.add(
-                boluses.add(
+                Bolus(
-                    Bolus(
+                    timestamp = preppedGlucose.crData[i].crEndTime,
-                        timestamp = preppedGlucose.crData[i].crEndTime,
+                    amount = preppedGlucose.crData[i].crInsulin,
-                        amount = preppedGlucose.crData[i].crInsulin,
+                    type = Bolus.Type.NORMAL
-                        type = Bolus.Type.NORMAL
-                    )
                 )
-            }
+            )
-        } catch (e: Exception) { }
+        }
+        if (boluses.size == 0)  //Add at least one insulin treatment for tests to avoid return null in categorization
+            boluses.add(
+                Bolus(
+                    timestamp = startDayTime,
+                    amount = 1.0,
+                    type = Bolus.Type.NORMAL
+                )
+            )
         return boluses
     }
 
-    fun buildMeals(jsonArray: JSONArray): ArrayList<Carbs> {
+    private fun buildMeals(jsonArray: JSONArray): ArrayList<Carbs> {
         val list: ArrayList<Carbs> = ArrayList()
-        try {
+        for (index in 0 until jsonArray.length()) {
-            for (index in 0 until jsonArray.length()) {
+            val json = jsonArray.getJSONObject(index)
-                val json = jsonArray.getJSONObject(index)
+            val value = JsonHelper.safeGetDouble(json, "carbs", 0.0)
-                val value = JsonHelper.safeGetDouble(json, "carbs", 0.0)
+            val timestamp = JsonHelper.safeGetLong(json, "date")
-                val timestamp = JsonHelper.safeGetLong(json, "date")
+            if (value > 0.0 && timestamp > startDayTime) {
-                if (value > 0.0 && timestamp > startDayTime) {
+                list.add(Carbs(timestamp = timestamp, amount = value, duration = 0))
-                    list.add(Carbs(timestamp=timestamp, amount = value, duration = 0))
-                }
             }
-        } catch (e: Exception) { }
+        }
         return list
     }
 
-    fun buildGlucose(jsonArray: JSONArray): List<GlucoseValue> {
+    private fun buildGlucose(jsonArray: JSONArray): List<GlucoseValue> {
         val list: ArrayList<GlucoseValue> = ArrayList()
-        try {
+        for (index in 0 until jsonArray.length()) {
-            for (index in 0 until jsonArray.length()) {
+            val json = jsonArray.getJSONObject(index)
-                val json = jsonArray.getJSONObject(index)
+            val value = JsonHelper.safeGetDouble(json, "sgv")
-                val value = JsonHelper.safeGetDouble(json, "sgv")
+            val timestamp = JsonHelper.safeGetLong(json, "date")
-                val timestamp = JsonHelper.safeGetLong(json, "date")
+            list.add(GlucoseValue(raw = value, noise = 0.0, value = value, timestamp = timestamp, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN, trendArrow = GlucoseValue.TrendArrow.FLAT))
-                list.add(GlucoseValue(raw = value, noise = 0.0, value = value, timestamp = timestamp, sourceSensor = GlucoseValue.SourceSensor.UNKNOWN, trendArrow = GlucoseValue.TrendArrow.FLAT))
+        }
-            }
-        } catch (e: Exception) { }
         if (list.size > 0)
-            startDayTime = list[list.size-1].timestamp
+            startDayTime = list[list.size - 1].timestamp
         return list
     }
 
-    fun buildIobOaps(jsonArray: JSONArray): ArrayList<IobTotal> { //if categorization is correct then I return for dose function the crInsulin calculated in Oaps
+    private fun buildIobOaps(jsonArray: JSONArray): ArrayList<IobTotal> { //if categorization is correct then I return for dose function the crInsulin calculated in Oaps
         val list: ArrayList<IobTotal> = ArrayList()
         for (index in 0 until jsonArray.length()) {
             val json = jsonArray.getJSONObject(index)
-            val time = JsonHelper.safeGetLong(json,"date")
+            val time = JsonHelper.safeGetLong(json, "date")
             val iob = JsonHelper.safeGetDouble(json, "iob")
             val activity = JsonHelper.safeGetDouble(json, "activity")
             val iobTotal = IobTotal(time)
@@ -228,7 +310,7 @@ class AutotunePrepTest : TestBaseWithProfile() {
         val dateUtil: DateUtil,
         val activePlugin: ActivePlugin,
         autotuneFS: AutotuneFS,
-        val iobOapsCalcul: ArrayList<IobTotal>
+        private val iobOapsCalculation: ArrayList<IobTotal>
     ) : AutotuneIob(
         aapsLogger,
         repository,
@@ -238,9 +320,10 @@ class AutotunePrepTest : TestBaseWithProfile() {
         activePlugin,
         autotuneFS
     ) {
+
         override fun getIOB(time: Long, localInsulin: LocalInsulin): IobTotal {
-            var bolusIob = IobTotal(time)
+            val bolusIob = IobTotal(time)
-            iobOapsCalcul.forEach {
+            iobOapsCalculation.forEach {
                 if (it.time == time)
                     return it
             }

app/src/test/java/info/nightscout/androidaps/plugins/general/autotune/PreppedGlucoseTest.kt

@@ -1,35 +1,48 @@
 package info.nightscout.androidaps.plugins.general.autotune
 
-import android.content.Context
+import info.nightscout.androidaps.TestBaseWithProfile
-import info.nightscout.androidaps.TestBase
+import info.nightscout.androidaps.plugins.general.autotune.data.BGDatum
-import info.nightscout.androidaps.plugins.general.autotune.data.*
+import info.nightscout.androidaps.plugins.general.autotune.data.CRDatum
-import info.nightscout.androidaps.utils.DateUtil
+import info.nightscout.androidaps.plugins.general.autotune.data.PreppedGlucose
 import org.json.JSONObject
 import org.junit.Assert
 import org.junit.Before
 import org.junit.Test
-import org.mockito.Mock
 import java.io.File
 
-class PreppedGlucoseTest : TestBase() {
+class PreppedGlucoseTest : TestBaseWithProfile() {
-    @Mock lateinit var context: Context
+
-    lateinit var dateUtil: DateUtil
+    private lateinit var prep1: PreppedGlucose
-    lateinit var prep1: PreppedGlucose
+    private lateinit var prepJson1: String
-    lateinit var prepjson1: String
 
     @Before
     fun initData() {
-        dateUtil = DateUtil(context)
+        prepJson1 = File("src/test/res/autotune/test1/autotune.2022-05-21.json").readText()
-        prepjson1 = File("src/test/res/autotune/test1/autotune.2022-05-21.json").readText()
+        prep1 = PreppedGlucose(JSONObject(prepJson1), dateUtil)
-        prep1 = PreppedGlucose(JSONObject(prepjson1), dateUtil)
     }
 
     @Test
     fun preppedGlucoseLoadTest() { // Test if load from file of OpenAPS categorisation is Ok
-        val crData0 = CRDatum(JSONObject("{\"CRInitialIOB\":13.594,\"CRInitialBG\":123,\"CRInitialCarbTime\":\"2022-05-21T07:54:09.000Z\",\"CREndIOB\":-0.155,\"CREndBG\":98,\"CREndTime\":\"2022-05-21T11:19:08.000Z\",\"CRCarbs\":70,\"CRInsulin\":-2.13}"), dateUtil)
+        val crData0 =
-        val csfDataEnd = BGDatum(JSONObject("{\"device\":\"AndroidAPS-DexcomG6\",\"date\":1653176050000,\"dateString\":\"2022-05-21T23:34:10.000Z\",\"isValid\":true,\"sgv\":127,\"direction\":\"Flat\",\"type\":\"sgv\",\"_id\":\"6289771371a363000480abc1\",\"glucose\":127,\"avgDelta\":\"2.50\",\"BGI\":-2.93,\"deviation\":\"5.43\",\"mealCarbs\":0,\"mealAbsorption\":\"end\"}"), dateUtil)
+            CRDatum(
-        val isfData0 = BGDatum(JSONObject("{\"device\":\"AndroidAPS-DexcomG6\",\"date\":1653108249000,\"dateString\":\"2022-05-21T04:44:09.000Z\",\"isValid\":true,\"sgv\":123,\"direction\":\"FortyFiveDown\",\"type\":\"sgv\",\"_id\":\"62886e2919e2e60004989bba\",\"glucose\":123,\"avgDelta\":\"-7.50\",\"BGI\":-7.59,\"deviation\":\"0.09\"}"), dateUtil)
+                JSONObject("{\"CRInitialIOB\":13.594,\"CRInitialBG\":123,\"CRInitialCarbTime\":\"2022-05-21T07:54:09.000Z\",\"CREndIOB\":-0.155,\"CREndBG\":98,\"CREndTime\":\"2022-05-21T11:19:08.000Z\",\"CRCarbs\":70,\"CRInsulin\":-2.13}"),
-        val basalDataEnd = BGDatum(JSONObject("{\"device\":\"AndroidAPS-DexcomG6\",\"date\":1653180549000,\"dateString\":\"2022-05-22T00:49:09.000Z\",\"isValid\":true,\"sgv\":121,\"direction\":\"FortyFiveDown\",\"type\":\"sgv\",\"_id\":\"628988a3da46aa0004d1e0f5\",\"glucose\":121,\"avgDelta\":\"-5.25\",\"BGI\":-3.32,\"deviation\":\"-1.93\"}"), dateUtil)
+                dateUtil
+            )
+        val csfDataEnd =
+            BGDatum(
+                JSONObject("{\"device\":\"AndroidAPS-DexcomG6\",\"date\":1653176050000,\"dateString\":\"2022-05-21T23:34:10.000Z\",\"isValid\":true,\"sgv\":127,\"direction\":\"Flat\",\"type\":\"sgv\",\"_id\":\"6289771371a363000480abc1\",\"glucose\":127,\"avgDelta\":\"2.50\",\"BGI\":-2.93,\"deviation\":\"5.43\",\"mealCarbs\":0,\"mealAbsorption\":\"end\"}"),
+                dateUtil
+            )
+        val isfData0 =
+            BGDatum(
+                JSONObject("{\"device\":\"AndroidAPS-DexcomG6\",\"date\":1653108249000,\"dateString\":\"2022-05-21T04:44:09.000Z\",\"isValid\":true,\"sgv\":123,\"direction\":\"FortyFiveDown\",\"type\":\"sgv\",\"_id\":\"62886e2919e2e60004989bba\",\"glucose\":123,\"avgDelta\":\"-7.50\",\"BGI\":-7.59,\"deviation\":\"0.09\"}"),
+                dateUtil
+            )
+        val basalDataEnd =
+            BGDatum(
+                JSONObject("{\"device\":\"AndroidAPS-DexcomG6\",\"date\":1653180549000,\"dateString\":\"2022-05-22T00:49:09.000Z\",\"isValid\":true,\"sgv\":121,\"direction\":\"FortyFiveDown\",\"type\":\"sgv\",\"_id\":\"628988a3da46aa0004d1e0f5\",\"glucose\":121,\"avgDelta\":\"-5.25\",\"BGI\":-3.32,\"deviation\":\"-1.93\"}"),
+                dateUtil
+            )
         Assert.assertEquals(3, prep1.crData.size)
         Assert.assertTrue(crData0.equals(prep1.crData[0]))
         Assert.assertTrue(csfDataEnd.equals(prep1.csfGlucoseData[prep1.csfGlucoseData.size - 1]))

app/src/test/res/autotune/test2/aapsorefautotune_recommendations.log

@@ -0,0 +1,53 @@
+Parameter      | Pump        | Autotune    | Days Missing
+---------------------------------------------------------
+ISF [mg/dL/U]  | 86.200      | 82.222      |
+Carb Ratio[g/U]| 5.750       | 5.750       |
+Basals [U/hr]  | -           |             |             
+  00:00        | 0.966       | 1.009       | 0           
+  00:30        |             |             |             
+  01:00        | 0.977       | 0.984       | 0           
+  01:30        |             |             |             
+  02:00        | 0.971       | 0.988       | 0           
+  02:30        |             |             |             
+  03:00        | 1.111       | 1.158       | 0           
+  03:30        |             |             |             
+  04:00        | 0.974       | 1.028       | 0           
+  04:30        |             |             |             
+  05:00        | 0.923       | 0.933       | 0           
+  05:30        |             |             |             
+  06:00        | 0.823       | 0.824       | 0           
+  06:30        |             |             |             
+  07:00        | 0.855       | 0.849       | 0           
+  07:30        |             |             |             
+  08:00        | 0.902       | 0.909       | 0           
+  08:30        |             |             |             
+  09:00        | 0.934       | 0.954       | 0           
+  09:30        |             |             |             
+  10:00        | 0.938       | 0.961       | 0           
+  10:30        |             |             |             
+  11:00        | 0.903       | 0.926       | 0           
+  11:30        |             |             |             
+  12:00        | 0.882       | 0.885       | 0           
+  12:30        |             |             |             
+  13:00        | 0.874       | 0.876       | 1           
+  13:30        |             |             |             
+  14:00        | 0.866       | 0.869       | 1           
+  14:30        |             |             |             
+  15:00        | 0.848       | 0.881       | 0           
+  15:30        |             |             |             
+  16:00        | 0.758       | 0.798       | 0           
+  16:30        |             |             |             
+  17:00        | 0.650       | 0.683       | 0           
+  17:30        |             |             |             
+  18:00        | 0.648       | 0.634       | 0           
+  18:30        |             |             |             
+  19:00        | 0.738       | 0.725       | 0           
+  19:30        |             |             |             
+  20:00        | 0.847       | 0.838       | 0           
+  20:30        |             |             |             
+  21:00        | 0.861       | 0.881       | 0           
+  21:30        |             |             |             
+  22:00        | 0.863       | 0.910       | 0           
+  22:30        |             |             |             
+  23:00        | 0.843       | 0.910       | 0           
+  23:30        |             |             |             

app/src/test/res/autotune/test2/aapsorefprofile.2022-05-21.json

@@ -0,0 +1,147 @@
+{
+  "name": "Tuned Dyn2",
+  "min_5m_carbimpact": 8,
+  "dia": 6,
+  "curve": "ultra-rapid",
+  "useCustomPeakTime": true,
+  "insulinPeakTime": 45,
+  "basalprofile": [
+    {
+      "start": "00:00:00",
+      "minutes": 0,
+      "rate": 0.966
+    },
+    {
+      "start": "01:00:00",
+      "minutes": 60,
+      "rate": 0.977
+    },
+    {
+      "start": "02:00:00",
+      "minutes": 120,
+      "rate": 0.971
+    },
+    {
+      "start": "03:00:00",
+      "minutes": 180,
+      "rate": 1.111
+    },
+    {
+      "start": "04:00:00",
+      "minutes": 240,
+      "rate": 0.974
+    },
+    {
+      "start": "05:00:00",
+      "minutes": 300,
+      "rate": 0.923
+    },
+    {
+      "start": "06:00:00",
+      "minutes": 360,
+      "rate": 0.823
+    },
+    {
+      "start": "07:00:00",
+      "minutes": 420,
+      "rate": 0.855
+    },
+    {
+      "start": "08:00:00",
+      "minutes": 480,
+      "rate": 0.902
+    },
+    {
+      "start": "09:00:00",
+      "minutes": 540,
+      "rate": 0.934
+    },
+    {
+      "start": "10:00:00",
+      "minutes": 600,
+      "rate": 0.938
+    },
+    {
+      "start": "11:00:00",
+      "minutes": 660,
+      "rate": 0.903
+    },
+    {
+      "start": "12:00:00",
+      "minutes": 720,
+      "rate": 0.882
+    },
+    {
+      "start": "13:00:00",
+      "minutes": 780,
+      "rate": 0.874
+    },
+    {
+      "start": "14:00:00",
+      "minutes": 840,
+      "rate": 0.866
+    },
+    {
+      "start": "15:00:00",
+      "minutes": 900,
+      "rate": 0.848
+    },
+    {
+      "start": "16:00:00",
+      "minutes": 960,
+      "rate": 0.758
+    },
+    {
+      "start": "17:00:00",
+      "minutes": 1020,
+      "rate": 0.65
+    },
+    {
+      "start": "18:00:00",
+      "minutes": 1080,
+      "rate": 0.648
+    },
+    {
+      "start": "19:00:00",
+      "minutes": 1140,
+      "rate": 0.738
+    },
+    {
+      "start": "20:00:00",
+      "minutes": 1200,
+      "rate": 0.847
+    },
+    {
+      "start": "21:00:00",
+      "minutes": 1260,
+      "rate": 0.861
+    },
+    {
+      "start": "22:00:00",
+      "minutes": 1320,
+      "rate": 0.863
+    },
+    {
+      "start": "23:00:00",
+      "minutes": 1380,
+      "rate": 0.843
+    }
+  ],
+  "isfProfile": {
+    "sensitivities": [
+      {
+        "i": 0,
+        "start": "00:00:00",
+        "sensitivity": 86.2,
+        "offset": 0,
+        "x": 0,
+        "endoffset": 1440
+      }
+    ]
+  },
+  "carb_ratio": 5.75,
+  "autosens_max": 1.3,
+  "autosens_min": 0.7,
+  "units": "mg/dl",
+  "timezone": "Europe/Paris"
+}

app/src/test/res/autotune/test2/aapsorefprofile.json

@@ -0,0 +1,175 @@
+{
+   "autosens_max": 1.3,
+   "autosens_min": 0.7,
+   "basalprofile": [
+      {
+         "i": 0,
+         "minutes": 0,
+         "rate": 1.009,
+         "start": "00:00:00"
+      },
+      {
+         "i": 1,
+         "minutes": 60,
+         "rate": 0.984,
+         "start": "01:00:00"
+      },
+      {
+         "i": 2,
+         "minutes": 120,
+         "rate": 0.988,
+         "start": "02:00:00"
+      },
+      {
+         "i": 3,
+         "minutes": 180,
+         "rate": 1.158,
+         "start": "03:00:00"
+      },
+      {
+         "i": 4,
+         "minutes": 240,
+         "rate": 1.028,
+         "start": "04:00:00"
+      },
+      {
+         "i": 5,
+         "minutes": 300,
+         "rate": 0.933,
+         "start": "05:00:00"
+      },
+      {
+         "i": 6,
+         "minutes": 360,
+         "rate": 0.824,
+         "start": "06:00:00"
+      },
+      {
+         "i": 7,
+         "minutes": 420,
+         "rate": 0.849,
+         "start": "07:00:00"
+      },
+      {
+         "i": 8,
+         "minutes": 480,
+         "rate": 0.909,
+         "start": "08:00:00"
+      },
+      {
+         "i": 9,
+         "minutes": 540,
+         "rate": 0.954,
+         "start": "09:00:00"
+      },
+      {
+         "i": 10,
+         "minutes": 600,
+         "rate": 0.961,
+         "start": "10:00:00"
+      },
+      {
+         "i": 11,
+         "minutes": 660,
+         "rate": 0.926,
+         "start": "11:00:00"
+      },
+      {
+         "i": 12,
+         "minutes": 720,
+         "rate": 0.885,
+         "start": "12:00:00"
+      },
+      {
+         "i": 13,
+         "minutes": 780,
+         "rate": 0.876,
+         "start": "13:00:00",
+         "untuned": 1
+      },
+      {
+         "i": 14,
+         "minutes": 840,
+         "rate": 0.869,
+         "start": "14:00:00",
+         "untuned": 1
+      },
+      {
+         "i": 15,
+         "minutes": 900,
+         "rate": 0.881,
+         "start": "15:00:00"
+      },
+      {
+         "i": 16,
+         "minutes": 960,
+         "rate": 0.798,
+         "start": "16:00:00"
+      },
+      {
+         "i": 17,
+         "minutes": 1020,
+         "rate": 0.683,
+         "start": "17:00:00"
+      },
+      {
+         "i": 18,
+         "minutes": 1080,
+         "rate": 0.634,
+         "start": "18:00:00"
+      },
+      {
+         "i": 19,
+         "minutes": 1140,
+         "rate": 0.725,
+         "start": "19:00:00"
+      },
+      {
+         "i": 20,
+         "minutes": 1200,
+         "rate": 0.838,
+         "start": "20:00:00"
+      },
+      {
+         "i": 21,
+         "minutes": 1260,
+         "rate": 0.881,
+         "start": "21:00:00"
+      },
+      {
+         "i": 22,
+         "minutes": 1320,
+         "rate": 0.91,
+         "start": "22:00:00"
+      },
+      {
+         "i": 23,
+         "minutes": 1380,
+         "rate": 0.91,
+         "start": "23:00:00"
+      }
+   ],
+   "carb_ratio": 5.75,
+   "csf": 14.991,
+   "curve": "ultra-rapid",
+   "dia": 6,
+   "insulinPeakTime": 45,
+   "isfProfile": {
+      "sensitivities": [
+         {
+            "endoffset": 1440,
+            "i": 0,
+            "offset": 0,
+            "sensitivity": 82.222,
+            "start": "00:00:00",
+            "x": 0
+         }
+      ]
+   },
+   "min_5m_carbimpact": 8,
+   "name": "Tuned Dyn2",
+   "sens": 82.222,
+   "timezone": "Europe/Paris",
+   "units": "mg/dl",
+   "useCustomPeakTime": true
+}

app/src/test/res/autotune/test2/autotune.2022-06-25-111214.log

@@ -0,0 +1,420 @@
+Autotune disk usage:
+160K	.
+Overall disk used/avail:
+Filesystem      Size  Used Avail Use% Mounted on
+rootfs          930G  431G  500G  47% /
+Grabbing AAPS treatments.json and entries/sgv.json for date range...
+oref0-autotune-prep   ns-treatments.2022-05-21.json profile.json ns-entries.2022-05-21.json profile.pump.json > autotune.2022-05-21.json
+start uannnounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -16.9 IOB: 5.249 Activity: 0.0391 at 04:24:08 dev: 26.10 avgDelta: 9.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -18.9 IOB: 5.292 Activity: 0.0438 at 04:29:08 dev: 27.88 avgDelta: 9.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -20.3 IOB: 4.964 Activity: 0.047 at 04:34:09 dev: 24.01 avgDelta: 3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -21.1 IOB: 4.674 Activity: 0.0489 at 04:39:08 dev: 17.83 avgDelta: -3.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -21.5 IOB: 4.377 Activity: 0.0498 at 04:44:08 dev: 11.21 avgDelta: -10.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -21.5 IOB: 4.077 Activity: 0.0498 at 04:49:08 dev: 7.96 avgDelta: -13.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -21.2 IOB: 3.73 Activity: 0.0491 at 04:54:08 dev: 7.16 avgDelta: -14.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -20.5 IOB: 3.389 Activity: 0.0476 at 04:59:08 dev: 6.77 avgDelta: -13.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -19.7 IOB: 3.055 Activity: 0.0457 at 05:04:09 dev: 6.95 avgDelta: -12.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -18.8 IOB: 2.782 Activity: 0.0436 at 05:09:08 dev: 6.54 avgDelta: -12.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -17.7 IOB: 2.47 Activity: 0.0411 at 05:14:08 dev: 5.71 avgDelta: -12.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -16.6 IOB: 2.22 Activity: 0.0386 at 05:19:09 dev: 5.14 avgDelta: -11.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -15.4 IOB: 1.935 Activity: 0.0358 at 05:24:08 dev: 4.93 avgDelta: -10.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -14.3 IOB: 1.711 Activity: 0.0332 at 05:29:08 dev: 6.06 avgDelta: -8.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -13.1 IOB: 1.452 Activity: 0.0304 at 05:34:09 dev: 7.35 avgDelta: -5.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -12.1 IOB: 1.927 Activity: 0.028 at 05:39:09 dev: 8.32 avgDelta: -3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -11.6 IOB: 1.84 Activity: 0.027 at 05:44:08 dev: 8.64 avgDelta: -3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -11.1 IOB: 1.658 Activity: 0.0258 at 05:49:09 dev: 7.12 avgDelta: -4.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -10.6 IOB: 1.482 Activity: 0.0245 at 05:54:08 dev: 5.31 avgDelta: -5.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -9.9 IOB: 1.264 Activity: 0.0229 at 05:59:09 dev: 4.62 avgDelta: -5.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -9.1 IOB: 1.104 Activity: 0.0212 at 06:04:08 dev: 5.14 avgDelta: -4.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -8.4 IOB: 0.952 Activity: 0.0194 at 06:09:09 dev: 7.36 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -7.8 IOB: 1.619 Activity: 0.0181 at 06:14:09 dev: 9.30 avgDelta: 1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -7.9 IOB: 1.678 Activity: 0.0184 at 06:19:09 dev: 10.68 avgDelta: 2.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -8.1 IOB: 1.775 Activity: 0.0187 at 06:24:08 dev: 9.81 avgDelta: 1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -8.2 IOB: 1.581 Activity: 0.019 at 06:29:08 dev: 6.44 avgDelta: -1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -8.1 IOB: 1.437 Activity: 0.0188 at 06:34:08 dev: 2.35 avgDelta: -5.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -7.9 IOB: 1.294 Activity: 0.0183 at 06:39:08 dev: -0.36 avgDelta: -8.25 uam
+end unannounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -7.6 IOB: 1.153 Activity: 0.0176 at 06:44:09 dev: 0.09 avgDelta: -7.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -7.2 IOB: 1.017 Activity: 0.0167 at 06:49:08 dev: 3.20 avgDelta: -4.00 ISF
+start uannnounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -6.7 IOB: 0.887 Activity: 0.0156 at 06:54:08 dev: 6.22 avgDelta: -0.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -6.3 IOB: 1.011 Activity: 0.0147 at 06:59:08 dev: 7.59 avgDelta: 1.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -6.1 IOB: 0.889 Activity: 0.0141 at 07:04:08 dev: 6.58 avgDelta: 0.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -5.7 IOB: 0.771 Activity: 0.0133 at 07:09:08 dev: 2.98 avgDelta: -2.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -5.3 IOB: 0.656 Activity: 0.0124 at 07:14:09 dev: 0.09 avgDelta: -5.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -4.9 IOB: 0.547 Activity: 0.0114 at 07:19:08 dev: -1.84 avgDelta: -6.75 uam
+end unannounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -4.4 IOB: 0.392 Activity: 0.0103 at 07:24:09 dev: -2.31 avgDelta: -6.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -3.9 IOB: 0.294 Activity: 0.0091 at 07:29:09 dev: -1.08 avgDelta: -5.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -3.5 IOB: 0.2 Activity: 0.008 at 07:34:09 dev: 0.45 avgDelta: -3.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -2.8 IOB: 0.065 Activity: 0.0066 at 07:39:09 dev: 2.34 avgDelta: -0.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -2.4 IOB: 0.034 Activity: 0.0055 at 07:44:09 dev: 3.37 avgDelta: 1.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -2.1 IOB: 0.549 Activity: 0.0048 at 07:49:08 dev: 3.57 avgDelta: 1.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -2.3 IOB: 0.674 Activity: 0.0053 at 07:54:09 dev: 3.53 avgDelta: 1.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -2.5 IOB: 0.597 Activity: 0.0057 at 07:59:09 dev: 2.71 avgDelta: 0.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -2.5 IOB: 0.468 Activity: 0.0058 at 08:04:09 dev: 1.50 avgDelta: -1.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -2.5 IOB: 0.389 Activity: 0.0057 at 08:09:09 dev: 0.21 avgDelta: -2.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -2.3 IOB: 0.262 Activity: 0.0053 at 08:14:09 dev: -0.47 avgDelta: -2.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -2.1 IOB: 0.186 Activity: 0.0048 at 08:19:09 dev: -0.93 avgDelta: -3.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -1.8 IOB: 0.064 Activity: 0.0041 at 08:24:09 dev: -1.48 avgDelta: -3.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -1.5 IOB: -0.005 Activity: 0.0034 at 08:29:09 dev: -2.03 avgDelta: -3.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -1.1 IOB: -0.12 Activity: 0.0026 at 08:34:09 dev: -2.13 avgDelta: -3.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -0.8 IOB: -0.181 Activity: 0.0018 at 08:39:09 dev: -2.47 avgDelta: -3.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -0.3 IOB: -0.287 Activity: 0.0008 at 08:44:09 dev: -2.41 avgDelta: -2.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: 0.0 IOB: -0.34 Activity: 0 at 08:49:09 dev: -2.50 avgDelta: -2.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: 0.4 IOB: -0.436 Activity: -0.001 at 08:54:09 dev: -2.68 avgDelta: -2.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: 0.8 IOB: -0.48 Activity: -0.0018 at 08:59:09 dev: -2.28 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 1.1 IOB: -0.519 Activity: -0.0026 at 09:04:09 dev: -1.12 avgDelta: 0.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 1.5 IOB: -0.554 Activity: -0.0034 at 09:09:09 dev: 0.00 avgDelta: 1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 1.8 IOB: -0.585 Activity: -0.0041 at 09:14:09 dev: 0.00 avgDelta: 2.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 2.1 IOB: -0.662 Activity: -0.0049 at 09:19:09 dev: 0.39 avgDelta: 2.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 2.4 IOB: -0.687 Activity: -0.0055 at 09:24:08 dev: -0.37 avgDelta: 2.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 2.6 IOB: -0.708 Activity: -0.0061 at 09:29:09 dev: -0.13 avgDelta: 2.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 2.8 IOB: -0.726 Activity: -0.0066 at 09:34:09 dev: 0.41 avgDelta: 3.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 3.1 IOB: -0.351 Activity: -0.0071 at 09:39:08 dev: 1.19 avgDelta: 4.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 2.8 IOB: -0.218 Activity: -0.0064 at 09:44:09 dev: 2.99 avgDelta: 5.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 2.4 IOB: -0.088 Activity: -0.0055 at 09:49:09 dev: 4.63 avgDelta: 7.00 basal
+start uannnounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -1.0 IOB: 13.594 Activity: 0.0023 at 09:54:09 dev: 8.74 avgDelta: 7.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -14.3 IOB: 13.552 Activity: 0.0331 at 09:59:09 dev: 23.02 avgDelta: 8.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -24.7 IOB: 13.224 Activity: 0.0573 at 10:04:09 dev: 33.70 avgDelta: 9.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -32.8 IOB: 12.838 Activity: 0.076 at 10:09:08 dev: 40.76 avgDelta: 8.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -38.8 IOB: 12.322 Activity: 0.09 at 10:14:09 dev: 45.04 avgDelta: 6.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -43.1 IOB: 11.794 Activity: 0.1001 at 10:19:09 dev: 46.89 avgDelta: 3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -46.0 IOB: 11.177 Activity: 0.1068 at 10:24:09 dev: 47.03 avgDelta: 1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -47.8 IOB: 10.58 Activity: 0.111 at 10:29:09 dev: 45.84 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -48.7 IOB: 9.919 Activity: 0.1129 at 10:34:09 dev: 43.66 avgDelta: -5.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -48.7 IOB: 9.254 Activity: 0.1129 at 10:39:09 dev: 41.41 avgDelta: -7.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -48.0 IOB: 8.643 Activity: 0.1114 at 10:44:09 dev: 39.51 avgDelta: -8.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -46.9 IOB: 7.992 Activity: 0.1088 at 10:49:09 dev: 39.39 avgDelta: -7.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -45.4 IOB: 7.406 Activity: 0.1053 at 10:54:08 dev: 40.13 avgDelta: -5.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -43.6 IOB: 7.111 Activity: 0.1012 at 10:59:09 dev: 41.37 avgDelta: -2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -41.9 IOB: 6.515 Activity: 0.0971 at 11:04:09 dev: 42.35 avgDelta: 0.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -40.0 IOB: 5.99 Activity: 0.0927 at 11:09:09 dev: 42.70 avgDelta: 2.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -37.8 IOB: 5.439 Activity: 0.0878 at 11:14:08 dev: 42.09 avgDelta: 4.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -35.7 IOB: 4.962 Activity: 0.0828 at 11:19:09 dev: 39.69 avgDelta: 4.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -33.4 IOB: 4.462 Activity: 0.0775 at 11:24:08 dev: 35.65 avgDelta: 2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -31.2 IOB: 4.036 Activity: 0.0724 at 11:29:09 dev: 31.45 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -29.0 IOB: 3.638 Activity: 0.0672 at 11:34:09 dev: 27.46 avgDelta: -1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -26.8 IOB: 3.214 Activity: 0.0621 at 11:39:08 dev: 25.02 avgDelta: -1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -24.6 IOB: 2.866 Activity: 0.0571 at 11:44:09 dev: 23.61 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -22.5 IOB: 2.494 Activity: 0.0522 at 11:49:09 dev: 21.75 avgDelta: -0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -20.5 IOB: 2.193 Activity: 0.0476 at 11:54:09 dev: 20.52 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -18.6 IOB: 1.867 Activity: 0.0431 at 11:59:09 dev: 18.83 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -16.7 IOB: 1.563 Activity: 0.0388 at 12:04:09 dev: 16.97 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -15.0 IOB: 1.329 Activity: 0.0347 at 12:09:08 dev: 14.46 avgDelta: -0.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -13.3 IOB: 1.115 Activity: 0.0309 at 12:14:09 dev: 11.32 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -11.7 IOB: 0.87 Activity: 0.0272 at 12:19:09 dev: 7.97 avgDelta: -3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -10.3 IOB: 0.692 Activity: 0.0239 at 12:24:09 dev: 5.80 avgDelta: -4.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -8.9 IOB: 0.482 Activity: 0.0206 at 12:29:08 dev: 4.88 avgDelta: -4.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -7.6 IOB: 0.287 Activity: 0.0176 at 12:34:09 dev: 4.09 avgDelta: -3.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -6.4 IOB: 0.156 Activity: 0.0148 at 12:39:08 dev: 3.88 avgDelta: -2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -5.3 IOB: 0.038 Activity: 0.0122 at 12:44:08 dev: 3.26 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -4.3 IOB: -0.067 Activity: 0.0099 at 12:49:09 dev: 2.27 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -3.4 IOB: -0.161 Activity: 0.0078 at 12:54:08 dev: 1.36 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -2.6 IOB: -0.195 Activity: 0.006 at 12:59:08 dev: 0.09 avgDelta: -2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -1.9 IOB: -0.271 Activity: 0.0044 at 13:04:09 dev: -1.10 avgDelta: -3.00 uam
+end unannounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -1.3 IOB: -0.339 Activity: 0.0029 at 13:09:09 dev: -1.00 avgDelta: -2.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -0.7 IOB: -0.4 Activity: 0.0015 at 13:14:09 dev: 0.90 avgDelta: 0.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -0.3 IOB: -0.155 Activity: 0.0007 at 13:19:08 dev: 3.80 avgDelta: 3.50 basal
+start uannnounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -1.9 IOB: 8.11 Activity: 0.0045 at 13:24:09 dev: 8.94 avgDelta: 7.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -9.6 IOB: 7.992 Activity: 0.0222 at 13:29:09 dev: 18.57 avgDelta: 9.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -15.5 IOB: 7.745 Activity: 0.0359 at 13:34:09 dev: 23.47 avgDelta: 8.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -20.0 IOB: 7.488 Activity: 0.0465 at 13:39:09 dev: 24.04 avgDelta: 4.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -23.3 IOB: 7.136 Activity: 0.0541 at 13:44:09 dev: 21.32 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -25.7 IOB: 6.8 Activity: 0.0596 at 13:49:09 dev: 17.94 avgDelta: -7.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -27.3 IOB: 6.441 Activity: 0.0633 at 13:54:09 dev: 0.00 avgDelta: -10.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -28.1 IOB: 6.022 Activity: 0.0651 at 13:59:09 dev: 0.00 avgDelta: -9.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -28.3 IOB: 5.644 Activity: 0.0657 at 14:04:09 dev: 0.00 avgDelta: -6.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -28.1 IOB: 5.216 Activity: 0.0653 at 14:09:09 dev: 0.00 avgDelta: -2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -27.8 IOB: 4.962 Activity: 0.0644 at 14:14:09 dev: 0.00 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -27.0 IOB: 4.544 Activity: 0.0627 at 14:19:09 dev: 0.00 avgDelta: 0.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -26.1 IOB: 4.185 Activity: 0.0606 at 14:24:09 dev: 0.00 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -25.0 IOB: 3.839 Activity: 0.058 at 14:29:09 dev: 0.00 avgDelta: -1.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -23.7 IOB: 3.456 Activity: 0.055 at 14:34:09 dev: 0.00 avgDelta: -2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -22.4 IOB: 3.139 Activity: 0.0519 at 14:39:09 dev: 0.00 avgDelta: -2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -20.9 IOB: 2.788 Activity: 0.0486 at 14:44:09 dev: 0.00 avgDelta: -1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -19.5 IOB: 2.503 Activity: 0.0453 at 14:49:10 dev: 0.00 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -18.0 IOB: 2.186 Activity: 0.0418 at 14:54:09 dev: 0.00 avgDelta: 2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -17.5 IOB: 3.17 Activity: 0.0407 at 14:59:09 dev: 22.04 avgDelta: 4.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -17.8 IOB: 3.956 Activity: 0.0413 at 15:04:09 dev: 23.80 avgDelta: 6.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.1 IOB: 3.648 Activity: 0.042 at 15:09:09 dev: 23.85 avgDelta: 5.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.5 IOB: 4.126 Activity: 0.043 at 15:14:09 dev: 22.28 avgDelta: 3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.8 IOB: 3.81 Activity: 0.0437 at 15:19:10 dev: 20.58 avgDelta: 1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.8 IOB: 3.541 Activity: 0.0437 at 15:24:10 dev: 19.08 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.6 IOB: 3.272 Activity: 0.0431 at 15:29:09 dev: 19.33 avgDelta: 0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.4 IOB: 3.588 Activity: 0.0428 at 15:34:09 dev: 21.20 avgDelta: 2.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.6 IOB: 3.875 Activity: 0.0431 at 15:39:09 dev: 23.83 avgDelta: 5.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.7 IOB: 3.608 Activity: 0.0434 at 15:44:08 dev: 25.46 avgDelta: 6.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -19.1 IOB: 4.271 Activity: 0.0442 at 15:49:09 dev: 26.05 avgDelta: 7.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -19.5 IOB: 3.996 Activity: 0.0452 at 15:54:09 dev: 25.98 avgDelta: 6.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -19.9 IOB: 4.298 Activity: 0.0462 at 15:59:08 dev: 26.16 avgDelta: 6.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -20.2 IOB: 4.015 Activity: 0.0468 at 16:04:09 dev: 26.67 avgDelta: 6.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -20.7 IOB: 4.538 Activity: 0.0481 at 16:09:09 dev: 27.98 avgDelta: 7.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -21.1 IOB: 4.245 Activity: 0.0489 at 16:14:09 dev: 28.33 avgDelta: 7.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -21.6 IOB: 4.729 Activity: 0.05 at 16:19:09 dev: 28.30 avgDelta: 6.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -21.9 IOB: 4.426 Activity: 0.0508 at 16:24:09 dev: 28.64 avgDelta: 6.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -22.0 IOB: 4.353 Activity: 0.051 at 16:29:09 dev: 28.73 avgDelta: 6.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -21.9 IOB: 4.049 Activity: 0.0507 at 16:34:10 dev: 28.10 avgDelta: 6.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -21.5 IOB: 3.747 Activity: 0.0498 at 16:39:09 dev: 25.96 avgDelta: 4.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -20.8 IOB: 3.402 Activity: 0.0483 at 16:44:09 dev: 22.32 avgDelta: 1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -20.0 IOB: 3.115 Activity: 0.0464 at 16:49:10 dev: 19.00 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -19.0 IOB: 2.788 Activity: 0.0441 at 16:54:09 dev: 17.01 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -18.0 IOB: 2.524 Activity: 0.0417 at 16:59:09 dev: 15.97 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -16.9 IOB: 2.271 Activity: 0.0391 at 17:04:09 dev: 16.10 avgDelta: -0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -15.7 IOB: 2.033 Activity: 0.0365 at 17:09:10 dev: 15.48 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -14.6 IOB: 1.807 Activity: 0.0338 at 17:14:10 dev: 14.57 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -13.4 IOB: 1.594 Activity: 0.0312 at 17:19:09 dev: 13.70 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -12.3 IOB: 1.395 Activity: 0.0286 at 17:24:10 dev: 12.58 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -11.3 IOB: 1.258 Activity: 0.0262 at 17:29:09 dev: 11.54 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -10.2 IOB: 1.034 Activity: 0.0236 at 17:34:09 dev: 10.17 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -9.3 IOB: 0.971 Activity: 0.0215 at 17:39:09 dev: 9.02 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -8.5 IOB: 1.008 Activity: 0.0197 at 17:44:09 dev: 7.74 avgDelta: -0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -7.9 IOB: 0.963 Activity: 0.0183 at 17:49:09 dev: 6.89 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -7.4 IOB: 1.046 Activity: 0.0171 at 17:54:10 dev: 7.12 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -6.9 IOB: 0.912 Activity: 0.0161 at 17:59:09 dev: 6.94 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -6.7 IOB: 1.254 Activity: 0.0156 at 18:04:09 dev: 6.97 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -6.6 IOB: 1.176 Activity: 0.0154 at 18:09:09 dev: 6.64 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -6.4 IOB: 1.051 Activity: 0.0149 at 18:14:10 dev: 5.67 avgDelta: -0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -6.1 IOB: 0.928 Activity: 0.0142 at 18:19:09 dev: 5.12 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -6.0 IOB: 1.008 Activity: 0.0138 at 18:24:09 dev: 4.45 avgDelta: -1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -5.7 IOB: 0.89 Activity: 0.0133 at 18:29:09 dev: 3.48 avgDelta: -2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -5.5 IOB: 0.775 Activity: 0.0127 at 18:34:09 dev: 2.47 avgDelta: -3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -5.1 IOB: 0.664 Activity: 0.0118 at 18:39:09 dev: 1.59 avgDelta: -3.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -4.7 IOB: 0.606 Activity: 0.011 at 18:44:09 dev: 1.74 avgDelta: -3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -4.5 IOB: 0.703 Activity: 0.0105 at 18:49:09 dev: 3.03 avgDelta: -1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -4.3 IOB: 0.702 Activity: 0.0101 at 18:54:09 dev: 4.10 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -4.3 IOB: 0.902 Activity: 0.0101 at 18:59:09 dev: 4.35 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -4.3 IOB: 0.801 Activity: 0.0101 at 19:04:09 dev: 2.10 avgDelta: -2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -4.2 IOB: 0.701 Activity: 0.0098 at 19:09:09 dev: -1.03 avgDelta: -5.25 uam
+end unannounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -4.0 IOB: 0.603 Activity: 0.0094 at 19:14:09 dev: -4.95 avgDelta: -9.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -3.8 IOB: 0.508 Activity: 0.0088 at 19:19:09 dev: -8.21 avgDelta: -12.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -3.5 IOB: 0.415 Activity: 0.0081 at 19:24:09 dev: -9.76 avgDelta: -13.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -3.2 IOB: 0.327 Activity: 0.0074 at 19:29:09 dev: -8.06 avgDelta: -11.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -2.8 IOB: 0.242 Activity: 0.0066 at 19:34:09 dev: -3.91 avgDelta: -6.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -2.5 IOB: 0.161 Activity: 0.0058 at 19:39:09 dev: 2.00 avgDelta: -0.50 ISF
+start uannnounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -2.2 IOB: 0.134 Activity: 0.005 at 19:44:09 dev: 7.16 avgDelta: 5.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -2.1 IOB: 0.4 Activity: 0.0048 at 19:49:09 dev: 9.57 avgDelta: 7.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -2.1 IOB: 0.475 Activity: 0.0049 at 19:54:09 dev: 8.86 avgDelta: 6.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -2.2 IOB: 0.401 Activity: 0.005 at 19:59:10 dev: 5.91 avgDelta: 3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -2.1 IOB: 0.327 Activity: 0.0048 at 20:04:10 dev: 2.82 avgDelta: 0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -1.9 IOB: 0.203 Activity: 0.0044 at 20:09:09 dev: -0.35 avgDelta: -2.25 uam
+end unannounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -1.7 IOB: 0.132 Activity: 0.004 at 20:14:09 dev: -1.78 avgDelta: -3.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -1.5 IOB: 0.064 Activity: 0.0034 at 20:19:09 dev: -2.28 avgDelta: -3.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -1.2 IOB: -0.002 Activity: 0.0028 at 20:24:09 dev: -1.54 avgDelta: -2.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -0.9 IOB: -0.064 Activity: 0.0022 at 20:29:10 dev: -1.05 avgDelta: -2.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -0.7 IOB: -0.073 Activity: 0.0016 at 20:34:09 dev: -0.81 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -0.5 IOB: -0.08 Activity: 0.0011 at 20:39:09 dev: -1.03 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -0.3 IOB: -0.085 Activity: 0.0007 at 20:44:09 dev: -1.45 avgDelta: -1.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -0.2 IOB: -0.087 Activity: 0.0004 at 20:49:09 dev: -1.33 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -0.0 IOB: -0.088 Activity: 0.0001 at 20:54:09 dev: -1.21 avgDelta: -1.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: 0.0 IOB: -0.088 Activity: -0.0001 at 20:59:09 dev: -0.79 avgDelta: -0.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.2 IOB: -0.137 Activity: -0.0004 at 21:04:09 dev: -0.92 avgDelta: -0.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.3 IOB: -0.184 Activity: -0.0007 at 21:09:10 dev: -0.80 avgDelta: -0.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.4 IOB: -0.18 Activity: -0.001 at 21:14:09 dev: -0.68 avgDelta: -0.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.5 IOB: -0.175 Activity: -0.0012 at 21:19:09 dev: -1.02 avgDelta: -0.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.6 IOB: -0.168 Activity: -0.0014 at 21:24:09 dev: -1.35 avgDelta: -0.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.7 IOB: -0.211 Activity: -0.0015 at 21:29:10 dev: -1.65 avgDelta: -1.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.7 IOB: -0.203 Activity: -0.0017 at 21:34:09 dev: -1.98 avgDelta: -1.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.9 IOB: -0.243 Activity: -0.002 at 21:39:10 dev: -2.36 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.0 IOB: -0.282 Activity: -0.0023 at 21:44:10 dev: -2.49 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.1 IOB: -0.32 Activity: -0.0026 at 21:49:09 dev: -2.62 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.3 IOB: -0.357 Activity: -0.0029 at 21:54:10 dev: -2.25 avgDelta: -1.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.4 IOB: -0.391 Activity: -0.0032 at 21:59:10 dev: -1.38 avgDelta: 0.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.5 IOB: -0.375 Activity: -0.0035 at 22:04:09 dev: -0.01 avgDelta: 1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.6 IOB: -0.357 Activity: -0.0036 at 22:09:09 dev: 1.45 avgDelta: 3.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.5 IOB: -0.149 Activity: -0.0035 at 22:14:09 dev: 3.49 avgDelta: 5.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.3 IOB: -0.132 Activity: -0.0031 at 22:19:10 dev: 5.91 avgDelta: 7.25 basal
+start uannnounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -6.5 IOB: 9.296 Activity: 0.015 at 22:24:09 dev: 15.96 avgDelta: 9.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -14.3 IOB: 9.123 Activity: 0.0332 at 22:29:10 dev: 25.06 avgDelta: 10.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -20.4 IOB: 8.96 Activity: 0.0474 at 22:34:09 dev: 29.43 avgDelta: 9.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -25.2 IOB: 8.644 Activity: 0.0584 at 22:39:10 dev: 29.92 avgDelta: 4.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -28.6 IOB: 8.282 Activity: 0.0664 at 22:44:10 dev: 27.37 avgDelta: -1.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -30.9 IOB: 7.835 Activity: 0.0718 at 22:49:09 dev: 24.70 avgDelta: -6.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -32.5 IOB: 7.416 Activity: 0.0753 at 22:54:10 dev: 23.70 avgDelta: -8.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -33.3 IOB: 6.984 Activity: 0.0772 at 22:59:09 dev: 24.52 avgDelta: -8.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -33.5 IOB: 6.547 Activity: 0.0776 at 23:04:09 dev: 26.70 avgDelta: -6.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -33.1 IOB: 6.061 Activity: 0.0769 at 23:09:10 dev: 28.39 avgDelta: -4.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -32.5 IOB: 5.68 Activity: 0.0754 at 23:14:10 dev: 29.50 avgDelta: -3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -31.6 IOB: 5.458 Activity: 0.0734 at 23:19:09 dev: 30.14 avgDelta: -1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -30.7 IOB: 5.046 Activity: 0.0712 at 23:24:10 dev: 29.94 avgDelta: -0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -29.7 IOB: 4.925 Activity: 0.069 at 23:29:09 dev: 29.49 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -28.6 IOB: 4.487 Activity: 0.0663 at 23:34:09 dev: 29.08 avgDelta: 0.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -27.3 IOB: 4.113 Activity: 0.0633 at 23:39:10 dev: 28.28 avgDelta: 1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -25.8 IOB: 3.706 Activity: 0.0599 at 23:44:09 dev: 27.57 avgDelta: 1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -24.4 IOB: 3.363 Activity: 0.0566 at 23:49:09 dev: 26.64 avgDelta: 2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -22.8 IOB: 3.039 Activity: 0.053 at 23:54:09 dev: 25.34 avgDelta: 2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -21.3 IOB: 2.733 Activity: 0.0494 at 23:59:10 dev: 23.79 avgDelta: 2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -19.7 IOB: 2.395 Activity: 0.0457 at 00:04:10 dev: 22.20 avgDelta: 2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -18.1 IOB: 2.126 Activity: 0.0421 at 00:09:10 dev: 20.65 avgDelta: 2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -16.6 IOB: 1.824 Activity: 0.0385 at 00:14:10 dev: 18.59 avgDelta: 2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -15.1 IOB: 1.64 Activity: 0.0351 at 00:19:09 dev: 17.13 avgDelta: 2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -13.8 IOB: 1.473 Activity: 0.0319 at 00:24:09 dev: 15.50 avgDelta: 1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -12.4 IOB: 1.273 Activity: 0.0288 at 00:29:10 dev: 14.16 avgDelta: 1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -11.2 IOB: 1.136 Activity: 0.026 at 00:34:10 dev: 12.71 avgDelta: 1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -10.1 IOB: 1.011 Activity: 0.0235 at 00:39:09 dev: 10.13 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -9.1 IOB: 0.852 Activity: 0.021 at 00:44:10 dev: 7.30 avgDelta: -1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -8.2 IOB: 0.752 Activity: 0.0189 at 00:49:10 dev: 4.65 avgDelta: -3.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -7.3 IOB: 0.662 Activity: 0.0169 at 00:54:10 dev: 3.28 avgDelta: -4.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -6.4 IOB: 0.534 Activity: 0.0149 at 00:59:09 dev: 3.42 avgDelta: -3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -5.7 IOB: 0.463 Activity: 0.0132 at 01:04:09 dev: 4.69 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -5.0 IOB: 0.352 Activity: 0.0115 at 01:09:10 dev: 5.96 avgDelta: 1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.3 IOB: 0.298 Activity: 0.0101 at 01:14:10 dev: 6.60 avgDelta: 2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.8 IOB: 0.25 Activity: 0.0089 at 01:19:09 dev: 6.84 avgDelta: 3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.4 IOB: 0.329 Activity: 0.0079 at 01:24:10 dev: 6.40 avgDelta: 3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.2 IOB: 0.34 Activity: 0.0074 at 01:29:10 dev: 5.69 avgDelta: 2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -2.9 IOB: 0.304 Activity: 0.0068 at 01:34:10 dev: 5.43 avgDelta: 2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -2.7 IOB: 0.272 Activity: 0.0062 at 01:39:10 dev: 5.67 avgDelta: 3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -2.6 IOB: 0.512 Activity: 0.006 at 01:44:10 dev: 6.59 avgDelta: 4.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -2.6 IOB: 0.581 Activity: 0.0061 at 01:49:10 dev: 7.38 avgDelta: 4.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.2 IOB: 1.238 Activity: 0.0075 at 01:54:10 dev: 7.98 avgDelta: 4.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.8 IOB: 1.147 Activity: 0.0088 at 01:59:10 dev: 7.54 avgDelta: 3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.2 IOB: 1.151 Activity: 0.0098 at 02:04:10 dev: 6.72 avgDelta: 2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.5 IOB: 1.05 Activity: 0.0104 at 02:09:09 dev: 5.98 avgDelta: 1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.6 IOB: 0.947 Activity: 0.0107 at 02:14:09 dev: 4.86 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.6 IOB: 0.844 Activity: 0.0106 at 02:19:10 dev: 3.82 avgDelta: -0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.5 IOB: 0.741 Activity: 0.0104 at 02:24:10 dev: 2.73 avgDelta: -1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.3 IOB: 0.59 Activity: 0.0099 at 02:29:10 dev: 2.52 avgDelta: -1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.0 IOB: 0.542 Activity: 0.0093 at 02:34:09 dev: 3.01 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.8 IOB: 0.497 Activity: 0.0087 at 02:39:09 dev: 3.50 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.5 IOB: 0.456 Activity: 0.0081 at 02:44:10 dev: 1.74 avgDelta: -1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.3 IOB: 0.516 Activity: 0.0077 at 02:49:09 dev: -1.93 avgDelta: -5.25 uam
+end unannounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.1 IOB: 0.429 Activity: 0.0072 at 02:54:09 dev: -6.40 avgDelta: -9.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -2.8 IOB: 0.294 Activity: 0.0066 at 02:59:10 dev: -8.66 avgDelta: -11.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: -2.5 IOB: 0.163 Activity: 0.0058 at 03:04:10 dev: -8.25 avgDelta: -10.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: -2.1 IOB: 0.037 Activity: 0.0049 at 03:09:10 dev: -6.39 avgDelta: -8.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: -1.7 IOB: -0.085 Activity: 0.0039 at 03:14:10 dev: -4.32 avgDelta: -6.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: -1.3 IOB: -0.153 Activity: 0.0029 at 03:19:09 dev: -3.75 avgDelta: -5.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: -0.8 IOB: -0.265 Activity: 0.0018 at 03:24:10 dev: -3.72 avgDelta: -4.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: -0.3 IOB: -0.371 Activity: 0.0007 at 03:29:09 dev: -3.45 avgDelta: -3.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: 0.2 IOB: -0.471 Activity: -0.0005 at 03:34:09 dev: -2.22 avgDelta: -2.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: 0.7 IOB: -0.566 Activity: -0.0016 at 03:39:10 dev: -0.94 avgDelta: -0.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: 1.1 IOB: -0.606 Activity: -0.0026 at 03:44:10 dev: 0.00 avgDelta: 1.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: 1.6 IOB: -0.64 Activity: -0.0036 at 03:49:10 dev: 0.45 avgDelta: 2.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: 1.9 IOB: -0.67 Activity: -0.0044 at 03:54:10 dev: -0.15 avgDelta: 1.75 basal
+Warning: too many deviations categorized as UnAnnounced Meals
+Adding 203 UAM deviations to 54 basal ones
+and selecting the lowest 50%, leaving 128 basal+UAM ones
+Adding 203 UAM deviations to 26 ISF ones
+and selecting the lowest 50%, leaving 114 ISF+UAM ones
+oref0-autotune-core autotune.2022-05-21.json profile.json profile.pump.json > newprofile.2022-05-21.json
+CRTotalCarbs: 0 CRTotalInsulin: 0 totalCR: NaN
+Hour 0 total deviations: 11.35 mg/dL
+Hour 0 basal adjustment needed: 0.03 U/hr
+Hour 1 total deviations: 47.03 mg/dL
+Hour 1 basal adjustment needed: 0.11 U/hr
+Hour 2 total deviations: 26.23 mg/dL
+Hour 2 basal adjustment needed: 0.06 U/hr
+Hour 3 total deviations: -18.1 mg/dL
+Hour 3 basal adjustment needed: -0.04 U/hr
+Hour 4 total deviations: 0 mg/dL
+Hour 4 basal adjustment needed: 0 U/hr
+Hour 5 total deviations: 38.31 mg/dL
+Hour 5 basal adjustment needed: 0.09 U/hr
+Hour 6 total deviations: 19.79 mg/dL
+Hour 6 basal adjustment needed: 0.05 U/hr
+Hour 7 total deviations: 7.81 mg/dL
+Hour 7 basal adjustment needed: 0.02 U/hr
+Hour 8 total deviations: -16.5 mg/dL
+Hour 8 basal adjustment needed: -0.04 U/hr
+Hour 9 total deviations: 7.99 mg/dL
+Hour 9 basal adjustment needed: 0.02 U/hr
+Hour 10 total deviations: 0 mg/dL
+Hour 10 basal adjustment needed: 0 U/hr
+Hour 11 total deviations: 0 mg/dL
+Hour 11 basal adjustment needed: 0 U/hr
+Hour 12 total deviations: 25.63 mg/dL
+Hour 12 basal adjustment needed: 0.06 U/hr
+Hour 13 total deviations: 2.6 mg/dL
+Hour 13 basal adjustment needed: 0.01 U/hr
+Hour 14 total deviations: 0 mg/dL
+Hour 14 basal adjustment needed: 0 U/hr
+Hour 15 total deviations: 0 mg/dL
+Hour 15 basal adjustment needed: 0 U/hr
+Hour 16 total deviations: 0 mg/dL
+Hour 16 basal adjustment needed: 0 U/hr
+Hour 17 total deviations: 0 mg/dL
+Hour 17 basal adjustment needed: 0 U/hr
+Hour 18 total deviations: 42.64 mg/dL
+Hour 18 basal adjustment needed: 0.1 U/hr
+Hour 19 total deviations: 6.98 mg/dL
+Hour 19 basal adjustment needed: 0.02 U/hr
+Hour 20 total deviations: -9.02 mg/dL
+Hour 20 basal adjustment needed: -0.02 U/hr
+Hour 21 total deviations: -19.5 mg/dL
+Hour 21 basal adjustment needed: -0.05 U/hr
+Hour 22 total deviations: 10.84 mg/dL
+Hour 22 basal adjustment needed: 0.03 U/hr
+Hour 23 total deviations: 0 mg/dL
+Hour 23 basal adjustment needed: 0 U/hr
+Adjusting hour 13 basal from 0.874 to 0.876 based on hour 12 = 0.885 and hour 15 = 0.881
+Adjusting hour 14 basal from 0.866 to 0.869 based on hour 12 = 0.885 and hour 15 = 0.881
+[ { start: '00:00:00', minutes: 0, rate: 1.009, i: 0 },
+  { start: '01:00:00', minutes: 60, rate: 0.984, i: 1 },
+  { start: '02:00:00', minutes: 120, rate: 0.988, i: 2 },
+  { start: '03:00:00', minutes: 180, rate: 1.158, i: 3 },
+  { start: '04:00:00', minutes: 240, rate: 1.028, i: 4 },
+  { start: '05:00:00', minutes: 300, rate: 0.933, i: 5 },
+  { start: '06:00:00', minutes: 360, rate: 0.824, i: 6 },
+  { start: '07:00:00', minutes: 420, rate: 0.849, i: 7 },
+  { start: '08:00:00', minutes: 480, rate: 0.909, i: 8 },
+  { start: '09:00:00', minutes: 540, rate: 0.954, i: 9 },
+  { start: '10:00:00', minutes: 600, rate: 0.961, i: 10 },
+  { start: '11:00:00', minutes: 660, rate: 0.926, i: 11 },
+  { start: '12:00:00', minutes: 720, rate: 0.885, i: 12 },
+  { start: '13:00:00', minutes: 780, rate: 0.876, i: 13, untuned: 1 },
+  { start: '14:00:00', minutes: 840, rate: 0.869, i: 14, untuned: 1 },
+  { start: '15:00:00', minutes: 900, rate: 0.881, i: 15 },
+  { start: '16:00:00', minutes: 960, rate: 0.798, i: 16 },
+  { start: '17:00:00', minutes: 1020, rate: 0.683, i: 17 },
+  { start: '18:00:00', minutes: 1080, rate: 0.634, i: 18 },
+  { start: '19:00:00', minutes: 1140, rate: 0.725, i: 19 },
+  { start: '20:00:00', minutes: 1200, rate: 0.838, i: 20 },
+  { start: '21:00:00', minutes: 1260, rate: 0.881, i: 21 },
+  { start: '22:00:00', minutes: 1320, rate: 0.91, i: 22 },
+  { start: '23:00:00', minutes: 1380, rate: 0.91, i: 23 } ]
+totalMealCarbs: 0 totalDeviations: 0 oldCSF 14.991 fullNewCSF: 14.991304347826087 newCSF: 14.991
+oldCR: 5.75 fullNewCR: NaN newCR: NaN
+Limiting adjusted ISF of 43.19 to 66.31 (which is pump ISF of 86.2 / 1.3 )
+p50deviation: 3.2 p50BGI -4.96 p50ratios: 0.501 Old ISF: 86.2 fullNewISF: 43.186 adjustedISF: 66.308 newISF: 82.222 newDIA: 6 newPeak: 45
+
+Autotune pump profile recommendations:
+---------------------------------------------------------
+Recommendations Log File: /home/titi/aaps/autotune/aapsorefautotune_recommendations.log
+
+Parameter      | Pump        | Autotune    | Days Missing
+---------------------------------------------------------
+ISF [mg/dL/U]  | 86.200      | 82.222      |
+Carb Ratio[g/U]| 5.750       | 5.750       |
+  00:00        | 0.966       | 1.009       | 0           
+  01:00        | 0.977       | 0.984       | 0           
+  02:00        | 0.971       | 0.988       | 0           
+  03:00        | 1.111       | 1.158       | 0           
+  04:00        | 0.974       | 1.028       | 0           
+  05:00        | 0.923       | 0.933       | 0           
+  06:00        | 0.823       | 0.824       | 0           
+  07:00        | 0.855       | 0.849       | 0           
+  08:00        | 0.902       | 0.909       | 0           
+  09:00        | 0.934       | 0.954       | 0           
+  10:00        | 0.938       | 0.961       | 0           
+  11:00        | 0.903       | 0.926       | 0           
+  12:00        | 0.882       | 0.885       | 0           
+  13:00        | 0.874       | 0.876       | 1           
+  14:00        | 0.866       | 0.869       | 1           
+  15:00        | 0.848       | 0.881       | 0           
+  16:00        | 0.758       | 0.798       | 0           
+  17:00        | 0.650       | 0.683       | 0           
+  18:00        | 0.648       | 0.634       | 0           
+  19:00        | 0.738       | 0.725       | 0           
+  20:00        | 0.847       | 0.838       | 0           
+  21:00        | 0.861       | 0.881       | 0           
+  22:00        | 0.863       | 0.910       | 0           
+  23:00        | 0.843       | 0.910       | 0           

app/src/test/res/autotune/test2/newaapsorefprofile.2022-05-21.json

@@ -0,0 +1,175 @@
+{
+   "autosens_max": 1.3,
+   "autosens_min": 0.7,
+   "basalprofile": [
+      {
+         "i": 0,
+         "minutes": 0,
+         "rate": 1.009,
+         "start": "00:00:00"
+      },
+      {
+         "i": 1,
+         "minutes": 60,
+         "rate": 0.984,
+         "start": "01:00:00"
+      },
+      {
+         "i": 2,
+         "minutes": 120,
+         "rate": 0.988,
+         "start": "02:00:00"
+      },
+      {
+         "i": 3,
+         "minutes": 180,
+         "rate": 1.158,
+         "start": "03:00:00"
+      },
+      {
+         "i": 4,
+         "minutes": 240,
+         "rate": 1.028,
+         "start": "04:00:00"
+      },
+      {
+         "i": 5,
+         "minutes": 300,
+         "rate": 0.933,
+         "start": "05:00:00"
+      },
+      {
+         "i": 6,
+         "minutes": 360,
+         "rate": 0.824,
+         "start": "06:00:00"
+      },
+      {
+         "i": 7,
+         "minutes": 420,
+         "rate": 0.849,
+         "start": "07:00:00"
+      },
+      {
+         "i": 8,
+         "minutes": 480,
+         "rate": 0.909,
+         "start": "08:00:00"
+      },
+      {
+         "i": 9,
+         "minutes": 540,
+         "rate": 0.954,
+         "start": "09:00:00"
+      },
+      {
+         "i": 10,
+         "minutes": 600,
+         "rate": 0.961,
+         "start": "10:00:00"
+      },
+      {
+         "i": 11,
+         "minutes": 660,
+         "rate": 0.926,
+         "start": "11:00:00"
+      },
+      {
+         "i": 12,
+         "minutes": 720,
+         "rate": 0.885,
+         "start": "12:00:00"
+      },
+      {
+         "i": 13,
+         "minutes": 780,
+         "rate": 0.876,
+         "start": "13:00:00",
+         "untuned": 1
+      },
+      {
+         "i": 14,
+         "minutes": 840,
+         "rate": 0.869,
+         "start": "14:00:00",
+         "untuned": 1
+      },
+      {
+         "i": 15,
+         "minutes": 900,
+         "rate": 0.881,
+         "start": "15:00:00"
+      },
+      {
+         "i": 16,
+         "minutes": 960,
+         "rate": 0.798,
+         "start": "16:00:00"
+      },
+      {
+         "i": 17,
+         "minutes": 1020,
+         "rate": 0.683,
+         "start": "17:00:00"
+      },
+      {
+         "i": 18,
+         "minutes": 1080,
+         "rate": 0.634,
+         "start": "18:00:00"
+      },
+      {
+         "i": 19,
+         "minutes": 1140,
+         "rate": 0.725,
+         "start": "19:00:00"
+      },
+      {
+         "i": 20,
+         "minutes": 1200,
+         "rate": 0.838,
+         "start": "20:00:00"
+      },
+      {
+         "i": 21,
+         "minutes": 1260,
+         "rate": 0.881,
+         "start": "21:00:00"
+      },
+      {
+         "i": 22,
+         "minutes": 1320,
+         "rate": 0.91,
+         "start": "22:00:00"
+      },
+      {
+         "i": 23,
+         "minutes": 1380,
+         "rate": 0.91,
+         "start": "23:00:00"
+      }
+   ],
+   "carb_ratio": 5.75,
+   "csf": 14.991,
+   "curve": "ultra-rapid",
+   "dia": 6,
+   "insulinPeakTime": 45,
+   "isfProfile": {
+      "sensitivities": [
+         {
+            "endoffset": 1440,
+            "i": 0,
+            "offset": 0,
+            "sensitivity": 82.222,
+            "start": "00:00:00",
+            "x": 0
+         }
+      ]
+   },
+   "min_5m_carbimpact": 8,
+   "name": "Tuned Dyn2",
+   "sens": 82.222,
+   "timezone": "Europe/Paris",
+   "units": "mg/dl",
+   "useCustomPeakTime": true
+}

app/src/test/res/autotune/test2/oaps-iobCalc.2022-05-21.json

@@ -0,0 +1,286 @@
+[
+  { "iob":  5.249, "activity": 0.0391, "date": 1653099848000},
+  { "iob":  5.292, "activity": 0.0438, "date": 1653100148000},
+  { "iob":  4.964, "activity": 0.047, "date": 1653100449000},
+  { "iob":  4.674, "activity": 0.0489, "date": 1653100748000},
+  { "iob":  4.377, "activity": 0.0498, "date": 1653101048000},
+  { "iob":  4.077, "activity": 0.0498, "date": 1653101348000},
+  { "iob":  3.73, "activity": 0.0491, "date": 1653101648000},
+  { "iob":  3.389, "activity": 0.0476, "date": 1653101948000},
+  { "iob":  3.055, "activity": 0.0457, "date": 1653102249000},
+  { "iob":  2.782, "activity": 0.0436, "date": 1653102548000},
+  { "iob":  2.47, "activity": 0.0411, "date": 1653102848000},
+  { "iob":  2.22, "activity": 0.0386, "date": 1653103149000},
+  { "iob":  1.935, "activity": 0.0358, "date": 1653103448000},
+  { "iob":  1.711, "activity": 0.0332, "date": 1653103748000},
+  { "iob":  1.452, "activity": 0.0304, "date": 1653104049000},
+  { "iob":  1.927, "activity": 0.028, "date": 1653104349000},
+  { "iob":  1.84, "activity": 0.027, "date": 1653104648000},
+  { "iob":  1.658, "activity": 0.0258, "date": 1653104949000},
+  { "iob":  1.482, "activity": 0.0245, "date": 1653105248000},
+  { "iob":  1.264, "activity": 0.0229, "date": 1653105549000},
+  { "iob":  1.104, "activity": 0.0212, "date": 1653105848000},
+  { "iob":  0.952, "activity": 0.0194, "date": 1653106149000},
+  { "iob":  1.619, "activity": 0.0181, "date": 1653106449000},
+  { "iob":  1.678, "activity": 0.0184, "date": 1653106749000},
+  { "iob":  1.775, "activity": 0.0187, "date": 1653107048000},
+  { "iob":  1.581, "activity": 0.019, "date": 1653107348000},
+  { "iob":  1.437, "activity": 0.0188, "date": 1653107648000},
+  { "iob":  1.294, "activity": 0.0183, "date": 1653107948000},
+  { "iob":  1.153, "activity": 0.0176, "date": 1653108249000},
+  { "iob":  1.017, "activity": 0.0167, "date": 1653108548000},
+  { "iob":  0.887, "activity": 0.0156, "date": 1653108848000},
+  { "iob":  1.011, "activity": 0.0147, "date": 1653109148000},
+  { "iob":  0.889, "activity": 0.0141, "date": 1653109448000},
+  { "iob":  0.771, "activity": 0.0133, "date": 1653109748000},
+  { "iob":  0.656, "activity": 0.0124, "date": 1653110049000},
+  { "iob":  0.547, "activity": 0.0114, "date": 1653110348000},
+  { "iob":  0.392, "activity": 0.0103, "date": 1653110649000},
+  { "iob":  0.294, "activity": 0.0091, "date": 1653110949000},
+  { "iob":  0.2, "activity": 0.008, "date": 1653111249000},
+  { "iob":  0.065, "activity": 0.0066, "date": 1653111549000},
+  { "iob":  0.034, "activity": 0.0055, "date": 1653111849000},
+  { "iob":  0.549, "activity": 0.0048, "date": 1653112148000},
+  { "iob":  0.674, "activity": 0.0053, "date": 1653112449000},
+  { "iob":  0.597, "activity": 0.0057, "date": 1653112749000},
+  { "iob":  0.468, "activity": 0.0058, "date": 1653113049000},
+  { "iob":  0.389, "activity": 0.0057, "date": 1653113349000},
+  { "iob":  0.262, "activity": 0.0053, "date": 1653113649000},
+  { "iob":  0.186, "activity": 0.0048, "date": 1653113949000},
+  { "iob":  0.064, "activity": 0.0041, "date": 1653114249000},
+  { "iob":  -0.005, "activity": 0.0034, "date": 1653114549000},
+  { "iob":  -0.12, "activity": 0.0026, "date": 1653114849000},
+  { "iob":  -0.181, "activity": 0.0018, "date": 1653115149000},
+  { "iob":  -0.287, "activity": 0.0008, "date": 1653115449000},
+  { "iob":  -0.34, "activity": 0, "date": 1653115749000},
+  { "iob":  -0.436, "activity": -0.001, "date": 1653116049000},
+  { "iob":  -0.48, "activity": -0.0018, "date": 1653116349000},
+  { "iob":  -0.519, "activity": -0.0026, "date": 1653116649000},
+  { "iob":  -0.554, "activity": -0.0034, "date": 1653116949000},
+  { "iob":  -0.585, "activity": -0.0041, "date": 1653117249000},
+  { "iob":  -0.662, "activity": -0.0049, "date": 1653117549000},
+  { "iob":  -0.687, "activity": -0.0055, "date": 1653117848000},
+  { "iob":  -0.708, "activity": -0.0061, "date": 1653118149000},
+  { "iob":  -0.726, "activity": -0.0066, "date": 1653118449000},
+  { "iob":  -0.351, "activity": -0.0071, "date": 1653118748000},
+  { "iob":  -0.218, "activity": -0.0064, "date": 1653119049000},
+  { "iob":  -0.088, "activity": -0.0055, "date": 1653119349000},
+  { "iob":  13.594, "activity": 0.0023, "date": 1653119649000},
+  { "iob":  13.552, "activity": 0.0331, "date": 1653119949000},
+  { "iob":  13.224, "activity": 0.0573, "date": 1653120249000},
+  { "iob":  12.838, "activity": 0.076, "date": 1653120548000},
+  { "iob":  12.322, "activity": 0.09, "date": 1653120849000},
+  { "iob":  11.794, "activity": 0.1001, "date": 1653121149000},
+  { "iob":  11.177, "activity": 0.1068, "date": 1653121449000},
+  { "iob":  10.58, "activity": 0.111, "date": 1653121749000},
+  { "iob":  9.919, "activity": 0.1129, "date": 1653122049000},
+  { "iob":  9.254, "activity": 0.1129, "date": 1653122349000},
+  { "iob":  8.643, "activity": 0.1114, "date": 1653122649000},
+  { "iob":  7.992, "activity": 0.1088, "date": 1653122949000},
+  { "iob":  7.406, "activity": 0.1053, "date": 1653123248000},
+  { "iob":  7.111, "activity": 0.1012, "date": 1653123549000},
+  { "iob":  6.515, "activity": 0.0971, "date": 1653123849000},
+  { "iob":  5.99, "activity": 0.0927, "date": 1653124149000},
+  { "iob":  5.439, "activity": 0.0878, "date": 1653124448000},
+  { "iob":  4.962, "activity": 0.0828, "date": 1653124749000},
+  { "iob":  4.462, "activity": 0.0775, "date": 1653125048000},
+  { "iob":  4.036, "activity": 0.0724, "date": 1653125349000},
+  { "iob":  3.638, "activity": 0.0672, "date": 1653125649000},
+  { "iob":  3.214, "activity": 0.0621, "date": 1653125948000},
+  { "iob":  2.866, "activity": 0.0571, "date": 1653126249000},
+  { "iob":  2.494, "activity": 0.0522, "date": 1653126549000},
+  { "iob":  2.193, "activity": 0.0476, "date": 1653126849000},
+  { "iob":  1.867, "activity": 0.0431, "date": 1653127149000},
+  { "iob":  1.563, "activity": 0.0388, "date": 1653127449000},
+  { "iob":  1.329, "activity": 0.0347, "date": 1653127748000},
+  { "iob":  1.115, "activity": 0.0309, "date": 1653128049000},
+  { "iob":  0.87, "activity": 0.0272, "date": 1653128349000},
+  { "iob":  0.692, "activity": 0.0239, "date": 1653128649000},
+  { "iob":  0.482, "activity": 0.0206, "date": 1653128948000},
+  { "iob":  0.287, "activity": 0.0176, "date": 1653129249000},
+  { "iob":  0.156, "activity": 0.0148, "date": 1653129548000},
+  { "iob":  0.038, "activity": 0.0122, "date": 1653129848000},
+  { "iob":  -0.067, "activity": 0.0099, "date": 1653130149000},
+  { "iob":  -0.161, "activity": 0.0078, "date": 1653130448000},
+  { "iob":  -0.195, "activity": 0.006, "date": 1653130748000},
+  { "iob":  -0.271, "activity": 0.0044, "date": 1653131049000},
+  { "iob":  -0.339, "activity": 0.0029, "date": 1653131349000},
+  { "iob":  -0.4, "activity": 0.0015, "date": 1653131649000},
+  { "iob":  -0.155, "activity": 0.0007, "date": 1653131948000},
+  { "iob":  8.11, "activity": 0.0045, "date": 1653132249000},
+  { "iob":  7.992, "activity": 0.0222, "date": 1653132549000},
+  { "iob":  7.745, "activity": 0.0359, "date": 1653132849000},
+  { "iob":  7.488, "activity": 0.0465, "date": 1653133149000},
+  { "iob":  7.136, "activity": 0.0541, "date": 1653133449000},
+  { "iob":  6.8, "activity": 0.0596, "date": 1653133749000},
+  { "iob":  6.441, "activity": 0.0633, "date": 1653134049000},
+  { "iob":  6.022, "activity": 0.0651, "date": 1653134349000},
+  { "iob":  5.644, "activity": 0.0657, "date": 1653134649000},
+  { "iob":  5.216, "activity": 0.0653, "date": 1653134949000},
+  { "iob":  4.962, "activity": 0.0644, "date": 1653135249000},
+  { "iob":  4.544, "activity": 0.0627, "date": 1653135549000},
+  { "iob":  4.185, "activity": 0.0606, "date": 1653135849000},
+  { "iob":  3.839, "activity": 0.058, "date": 1653136149000},
+  { "iob":  3.456, "activity": 0.055, "date": 1653136449000},
+  { "iob":  3.139, "activity": 0.0519, "date": 1653136749000},
+  { "iob":  2.788, "activity": 0.0486, "date": 1653137049000},
+  { "iob":  2.503, "activity": 0.0453, "date": 1653137350000},
+  { "iob":  2.186, "activity": 0.0418, "date": 1653137649000},
+  { "iob":  3.17, "activity": 0.0407, "date": 1653137949000},
+  { "iob":  3.956, "activity": 0.0413, "date": 1653138249000},
+  { "iob":  3.648, "activity": 0.042, "date": 1653138549000},
+  { "iob":  4.126, "activity": 0.043, "date": 1653138849000},
+  { "iob":  3.81, "activity": 0.0437, "date": 1653139150000},
+  { "iob":  3.541, "activity": 0.0437, "date": 1653139450000},
+  { "iob":  3.272, "activity": 0.0431, "date": 1653139749000},
+  { "iob":  3.588, "activity": 0.0428, "date": 1653140049000},
+  { "iob":  3.875, "activity": 0.0431, "date": 1653140349000},
+  { "iob":  3.608, "activity": 0.0434, "date": 1653140648000},
+  { "iob":  4.271, "activity": 0.0442, "date": 1653140949000},
+  { "iob":  3.996, "activity": 0.0452, "date": 1653141249000},
+  { "iob":  4.298, "activity": 0.0462, "date": 1653141548000},
+  { "iob":  4.015, "activity": 0.0468, "date": 1653141849000},
+  { "iob":  4.538, "activity": 0.0481, "date": 1653142149000},
+  { "iob":  4.245, "activity": 0.0489, "date": 1653142449000},
+  { "iob":  4.729, "activity": 0.05, "date": 1653142749000},
+  { "iob":  4.426, "activity": 0.0508, "date": 1653143049000},
+  { "iob":  4.353, "activity": 0.051, "date": 1653143349000},
+  { "iob":  4.049, "activity": 0.0507, "date": 1653143650000},
+  { "iob":  3.747, "activity": 0.0498, "date": 1653143949000},
+  { "iob":  3.402, "activity": 0.0483, "date": 1653144249000},
+  { "iob":  3.115, "activity": 0.0464, "date": 1653144550000},
+  { "iob":  2.788, "activity": 0.0441, "date": 1653144849000},
+  { "iob":  2.524, "activity": 0.0417, "date": 1653145149000},
+  { "iob":  2.271, "activity": 0.0391, "date": 1653145449000},
+  { "iob":  2.033, "activity": 0.0365, "date": 1653145750000},
+  { "iob":  1.807, "activity": 0.0338, "date": 1653146050000},
+  { "iob":  1.594, "activity": 0.0312, "date": 1653146349000},
+  { "iob":  1.395, "activity": 0.0286, "date": 1653146650000},
+  { "iob":  1.258, "activity": 0.0262, "date": 1653146949000},
+  { "iob":  1.034, "activity": 0.0236, "date": 1653147249000},
+  { "iob":  0.971, "activity": 0.0215, "date": 1653147549000},
+  { "iob":  1.008, "activity": 0.0197, "date": 1653147849000},
+  { "iob":  0.963, "activity": 0.0183, "date": 1653148149000},
+  { "iob":  1.046, "activity": 0.0171, "date": 1653148450000},
+  { "iob":  0.912, "activity": 0.0161, "date": 1653148749000},
+  { "iob":  1.254, "activity": 0.0156, "date": 1653149049000},
+  { "iob":  1.176, "activity": 0.0154, "date": 1653149349000},
+  { "iob":  1.051, "activity": 0.0149, "date": 1653149650000},
+  { "iob":  0.928, "activity": 0.0142, "date": 1653149949000},
+  { "iob":  1.008, "activity": 0.0138, "date": 1653150249000},
+  { "iob":  0.89, "activity": 0.0133, "date": 1653150549000},
+  { "iob":  0.775, "activity": 0.0127, "date": 1653150849000},
+  { "iob":  0.664, "activity": 0.0118, "date": 1653151149000},
+  { "iob":  0.606, "activity": 0.011, "date": 1653151449000},
+  { "iob":  0.703, "activity": 0.0105, "date": 1653151749000},
+  { "iob":  0.702, "activity": 0.0101, "date": 1653152049000},
+  { "iob":  0.902, "activity": 0.0101, "date": 1653152349000},
+  { "iob":  0.801, "activity": 0.0101, "date": 1653152649000},
+  { "iob":  0.701, "activity": 0.0098, "date": 1653152949000},
+  { "iob":  0.603, "activity": 0.0094, "date": 1653153249000},
+  { "iob":  0.508, "activity": 0.0088, "date": 1653153549000},
+  { "iob":  0.415, "activity": 0.0081, "date": 1653153849000},
+  { "iob":  0.327, "activity": 0.0074, "date": 1653154149000},
+  { "iob":  0.242, "activity": 0.0066, "date": 1653154449000},
+  { "iob":  0.161, "activity": 0.0058, "date": 1653154749000},
+  { "iob":  0.134, "activity": 0.005, "date": 1653155049000},
+  { "iob":  0.4, "activity": 0.0048, "date": 1653155349000},
+  { "iob":  0.475, "activity": 0.0049, "date": 1653155649000},
+  { "iob":  0.401, "activity": 0.005, "date": 1653155950000},
+  { "iob":  0.327, "activity": 0.0048, "date": 1653156250000},
+  { "iob":  0.203, "activity": 0.0044, "date": 1653156549000},
+  { "iob":  0.132, "activity": 0.004, "date": 1653156849000},
+  { "iob":  0.064, "activity": 0.0034, "date": 1653157149000},
+  { "iob":  -0.002, "activity": 0.0028, "date": 1653157449000},
+  { "iob":  -0.064, "activity": 0.0022, "date": 1653157750000},
+  { "iob":  -0.073, "activity": 0.0016, "date": 1653158049000},
+  { "iob":  -0.08, "activity": 0.0011, "date": 1653158349000},
+  { "iob":  -0.085, "activity": 0.0007, "date": 1653158649000},
+  { "iob":  -0.087, "activity": 0.0004, "date": 1653158949000},
+  { "iob":  -0.088, "activity": 0.0001, "date": 1653159249000},
+  { "iob":  -0.088, "activity": -0.0001, "date": 1653159549000},
+  { "iob":  -0.137, "activity": -0.0004, "date": 1653159849000},
+  { "iob":  -0.184, "activity": -0.0007, "date": 1653160150000},
+  { "iob":  -0.18, "activity": -0.001, "date": 1653160449000},
+  { "iob":  -0.175, "activity": -0.0012, "date": 1653160749000},
+  { "iob":  -0.168, "activity": -0.0014, "date": 1653161049000},
+  { "iob":  -0.211, "activity": -0.0015, "date": 1653161350000},
+  { "iob":  -0.203, "activity": -0.0017, "date": 1653161649000},
+  { "iob":  -0.243, "activity": -0.002, "date": 1653161950000},
+  { "iob":  -0.282, "activity": -0.0023, "date": 1653162250000},
+  { "iob":  -0.32, "activity": -0.0026, "date": 1653162549000},
+  { "iob":  -0.357, "activity": -0.0029, "date": 1653162850000},
+  { "iob":  -0.391, "activity": -0.0032, "date": 1653163150000},
+  { "iob":  -0.375, "activity": -0.0035, "date": 1653163449000},
+  { "iob":  -0.357, "activity": -0.0036, "date": 1653163749000},
+  { "iob":  -0.149, "activity": -0.0035, "date": 1653164049000},
+  { "iob":  -0.132, "activity": -0.0031, "date": 1653164350000},
+  { "iob":  9.296, "activity": 0.015, "date": 1653164649000},
+  { "iob":  9.123, "activity": 0.0332, "date": 1653164950000},
+  { "iob":  8.96, "activity": 0.0474, "date": 1653165249000},
+  { "iob":  8.644, "activity": 0.0584, "date": 1653165550000},
+  { "iob":  8.282, "activity": 0.0664, "date": 1653165850000},
+  { "iob":  7.835, "activity": 0.0718, "date": 1653166149000},
+  { "iob":  7.416, "activity": 0.0753, "date": 1653166450000},
+  { "iob":  6.984, "activity": 0.0772, "date": 1653166749000},
+  { "iob":  6.547, "activity": 0.0776, "date": 1653167049000},
+  { "iob":  6.061, "activity": 0.0769, "date": 1653167350000},
+  { "iob":  5.68, "activity": 0.0754, "date": 1653167650000},
+  { "iob":  5.458, "activity": 0.0734, "date": 1653167949000},
+  { "iob":  5.046, "activity": 0.0712, "date": 1653168250000},
+  { "iob":  4.925, "activity": 0.069, "date": 1653168549000},
+  { "iob":  4.487, "activity": 0.0663, "date": 1653168849000},
+  { "iob":  4.113, "activity": 0.0633, "date": 1653169150000},
+  { "iob":  3.706, "activity": 0.0599, "date": 1653169449000},
+  { "iob":  3.363, "activity": 0.0566, "date": 1653169749000},
+  { "iob":  3.039, "activity": 0.053, "date": 1653170049000},
+  { "iob":  2.733, "activity": 0.0494, "date": 1653170350000},
+  { "iob":  2.395, "activity": 0.0457, "date": 1653170650000},
+  { "iob":  2.126, "activity": 0.0421, "date": 1653170950000},
+  { "iob":  1.824, "activity": 0.0385, "date": 1653171250000},
+  { "iob":  1.64, "activity": 0.0351, "date": 1653171549000},
+  { "iob":  1.473, "activity": 0.0319, "date": 1653171849000},
+  { "iob":  1.273, "activity": 0.0288, "date": 1653172150000},
+  { "iob":  1.136, "activity": 0.026, "date": 1653172450000},
+  { "iob":  1.011, "activity": 0.0235, "date": 1653172749000},
+  { "iob":  0.852, "activity": 0.021, "date": 1653173050000},
+  { "iob":  0.752, "activity": 0.0189, "date": 1653173350000},
+  { "iob":  0.662, "activity": 0.0169, "date": 1653173650000},
+  { "iob":  0.534, "activity": 0.0149, "date": 1653173949000},
+  { "iob":  0.463, "activity": 0.0132, "date": 1653174249000},
+  { "iob":  0.352, "activity": 0.0115, "date": 1653174550000},
+  { "iob":  0.298, "activity": 0.0101, "date": 1653174850000},
+  { "iob":  0.25, "activity": 0.0089, "date": 1653175149000},
+  { "iob":  0.329, "activity": 0.0079, "date": 1653175450000},
+  { "iob":  0.34, "activity": 0.0074, "date": 1653175750000},
+  { "iob":  0.304, "activity": 0.0068, "date": 1653176050000},
+  { "iob":  0.272, "activity": 0.0062, "date": 1653176350000},
+  { "iob":  0.512, "activity": 0.006, "date": 1653176650000},
+  { "iob":  0.581, "activity": 0.0061, "date": 1653176950000},
+  { "iob":  1.238, "activity": 0.0075, "date": 1653177250000},
+  { "iob":  1.147, "activity": 0.0088, "date": 1653177550000},
+  { "iob":  1.151, "activity": 0.0098, "date": 1653177850000},
+  { "iob":  1.05, "activity": 0.0104, "date": 1653178149000},
+  { "iob":  0.947, "activity": 0.0107, "date": 1653178449000},
+  { "iob":  0.844, "activity": 0.0106, "date": 1653178750000},
+  { "iob":  0.741, "activity": 0.0104, "date": 1653179050000},
+  { "iob":  0.59, "activity": 0.0099, "date": 1653179350000},
+  { "iob":  0.542, "activity": 0.0093, "date": 1653179649000},
+  { "iob":  0.497, "activity": 0.0087, "date": 1653179949000},
+  { "iob":  0.456, "activity": 0.0081, "date": 1653180250000},
+  { "iob":  0.516, "activity": 0.0077, "date": 1653180549000},
+  { "iob":  0.429, "activity": 0.0072, "date": 1653180849000},
+  { "iob":  0.294, "activity": 0.0066, "date": 1653181150000},
+  { "iob":  0.163, "activity": 0.0058, "date": 1653181450000},
+  { "iob":  0.037, "activity": 0.0049, "date": 1653181750000},
+  { "iob":  -0.085, "activity": 0.0039, "date": 1653182050000},
+  { "iob":  -0.153, "activity": 0.0029, "date": 1653182349000},
+  { "iob":  -0.265, "activity": 0.0018, "date": 1653182650000},
+  { "iob":  -0.371, "activity": 0.0007, "date": 1653182949000},
+  { "iob":  -0.471, "activity": -0.0005, "date": 1653183249000},
+  { "iob":  -0.566, "activity": -0.0016, "date": 1653183550000},
+  { "iob":  -0.606, "activity": -0.0026, "date": 1653183850000},
+  { "iob":  -0.64, "activity": -0.0036, "date": 1653184150000},
+  { "iob":  -0.67, "activity": -0.0044, "date": 1653184450000}
+]
+

app/src/test/res/autotune/test2/profile.pump.json

@@ -0,0 +1,147 @@
+{
+  "name": "Tuned Dyn2",
+  "min_5m_carbimpact": 8,
+  "dia": 6,
+  "curve": "ultra-rapid",
+  "useCustomPeakTime": true,
+  "insulinPeakTime": 45,
+  "basalprofile": [
+    {
+      "start": "00:00:00",
+      "minutes": 0,
+      "rate": 0.966
+    },
+    {
+      "start": "01:00:00",
+      "minutes": 60,
+      "rate": 0.977
+    },
+    {
+      "start": "02:00:00",
+      "minutes": 120,
+      "rate": 0.971
+    },
+    {
+      "start": "03:00:00",
+      "minutes": 180,
+      "rate": 1.111
+    },
+    {
+      "start": "04:00:00",
+      "minutes": 240,
+      "rate": 0.974
+    },
+    {
+      "start": "05:00:00",
+      "minutes": 300,
+      "rate": 0.923
+    },
+    {
+      "start": "06:00:00",
+      "minutes": 360,
+      "rate": 0.823
+    },
+    {
+      "start": "07:00:00",
+      "minutes": 420,
+      "rate": 0.855
+    },
+    {
+      "start": "08:00:00",
+      "minutes": 480,
+      "rate": 0.902
+    },
+    {
+      "start": "09:00:00",
+      "minutes": 540,
+      "rate": 0.934
+    },
+    {
+      "start": "10:00:00",
+      "minutes": 600,
+      "rate": 0.938
+    },
+    {
+      "start": "11:00:00",
+      "minutes": 660,
+      "rate": 0.903
+    },
+    {
+      "start": "12:00:00",
+      "minutes": 720,
+      "rate": 0.882
+    },
+    {
+      "start": "13:00:00",
+      "minutes": 780,
+      "rate": 0.874
+    },
+    {
+      "start": "14:00:00",
+      "minutes": 840,
+      "rate": 0.866
+    },
+    {
+      "start": "15:00:00",
+      "minutes": 900,
+      "rate": 0.848
+    },
+    {
+      "start": "16:00:00",
+      "minutes": 960,
+      "rate": 0.758
+    },
+    {
+      "start": "17:00:00",
+      "minutes": 1020,
+      "rate": 0.65
+    },
+    {
+      "start": "18:00:00",
+      "minutes": 1080,
+      "rate": 0.648
+    },
+    {
+      "start": "19:00:00",
+      "minutes": 1140,
+      "rate": 0.738
+    },
+    {
+      "start": "20:00:00",
+      "minutes": 1200,
+      "rate": 0.847
+    },
+    {
+      "start": "21:00:00",
+      "minutes": 1260,
+      "rate": 0.861
+    },
+    {
+      "start": "22:00:00",
+      "minutes": 1320,
+      "rate": 0.863
+    },
+    {
+      "start": "23:00:00",
+      "minutes": 1380,
+      "rate": 0.843
+    }
+  ],
+  "isfProfile": {
+    "sensitivities": [
+      {
+        "i": 0,
+        "start": "00:00:00",
+        "sensitivity": 86.2,
+        "offset": 0,
+        "x": 0,
+        "endoffset": 1440
+      }
+    ]
+  },
+  "carb_ratio": 5.75,
+  "autosens_max": 1.3,
+  "autosens_min": 0.7,
+  "units": "mg/dl",
+  "timezone": "Europe/Paris"
+}

app/src/test/res/autotune/test3/aapsorefautotune_recommendations.log

@@ -0,0 +1,53 @@
+Parameter      | Pump        | Autotune    | Days Missing
+---------------------------------------------------------
+ISF [mg/dL/U]  | 86.200      | 93.589      |
+Carb Ratio[g/U]| 5.750       | 5.750       |
+Basals [U/hr]  | -           |             |             
+  00:00        | 0.966       | 1.039       | 0           
+  00:30        |             |             |             
+  01:00        | 0.977       | 1.091       | 0           
+  01:30        |             |             |             
+  02:00        | 0.971       | 1.118       | 0           
+  02:30        |             |             |             
+  03:00        | 1.111       | 1.321       | 0           
+  03:30        |             |             |             
+  04:00        | 0.974       | 1.091       | 0           
+  04:30        |             |             |             
+  05:00        | 0.923       | 0.965       | 0           
+  05:30        |             |             |             
+  06:00        | 0.823       | 0.848       | 0           
+  06:30        |             |             |             
+  07:00        | 0.855       | 1.112       | 0           
+  07:30        |             |             |             
+  08:00        | 0.902       | 1.173       | 0           
+  08:30        |             |             |             
+  09:00        | 0.934       | 1.214       | 0           
+  09:30        |             |             |             
+  10:00        | 0.938       | 1.219       | 0           
+  10:30        |             |             |             
+  11:00        | 0.903       | 1.070       | 0           
+  11:30        |             |             |             
+  12:00        | 0.882       | 1.147       | 0           
+  12:30        |             |             |             
+  13:00        | 0.874       | 1.136       | 0           
+  13:30        |             |             |             
+  14:00        | 0.866       | 1.126       | 0           
+  14:30        |             |             |             
+  15:00        | 0.848       | 1.102       | 0           
+  15:30        |             |             |             
+  16:00        | 0.758       | 0.928       | 0           
+  16:30        |             |             |             
+  17:00        | 0.650       | 0.710       | 0           
+  17:30        |             |             |             
+  18:00        | 0.648       | 0.654       | 0           
+  18:30        |             |             |             
+  19:00        | 0.738       | 0.878       | 0           
+  19:30        |             |             |             
+  20:00        | 0.847       | 1.101       | 0           
+  20:30        |             |             |             
+  21:00        | 0.861       | 1.119       | 0           
+  21:30        |             |             |             
+  22:00        | 0.863       | 1.122       | 0           
+  22:30        |             |             |             
+  23:00        | 0.843       | 1.047       | 0           
+  23:30        |             |             |             

app/src/test/res/autotune/test3/aapsorefprofile.2022-05-21.json

@@ -0,0 +1,147 @@
+{
+  "name": "Tuned Dyn2",
+  "min_5m_carbimpact": 8,
+  "dia": 6,
+  "curve": "ultra-rapid",
+  "useCustomPeakTime": true,
+  "insulinPeakTime": 45,
+  "basalprofile": [
+    {
+      "start": "00:00:00",
+      "minutes": 0,
+      "rate": 0.966
+    },
+    {
+      "start": "01:00:00",
+      "minutes": 60,
+      "rate": 0.977
+    },
+    {
+      "start": "02:00:00",
+      "minutes": 120,
+      "rate": 0.971
+    },
+    {
+      "start": "03:00:00",
+      "minutes": 180,
+      "rate": 1.111
+    },
+    {
+      "start": "04:00:00",
+      "minutes": 240,
+      "rate": 0.974
+    },
+    {
+      "start": "05:00:00",
+      "minutes": 300,
+      "rate": 0.923
+    },
+    {
+      "start": "06:00:00",
+      "minutes": 360,
+      "rate": 0.823
+    },
+    {
+      "start": "07:00:00",
+      "minutes": 420,
+      "rate": 0.855
+    },
+    {
+      "start": "08:00:00",
+      "minutes": 480,
+      "rate": 0.902
+    },
+    {
+      "start": "09:00:00",
+      "minutes": 540,
+      "rate": 0.934
+    },
+    {
+      "start": "10:00:00",
+      "minutes": 600,
+      "rate": 0.938
+    },
+    {
+      "start": "11:00:00",
+      "minutes": 660,
+      "rate": 0.903
+    },
+    {
+      "start": "12:00:00",
+      "minutes": 720,
+      "rate": 0.882
+    },
+    {
+      "start": "13:00:00",
+      "minutes": 780,
+      "rate": 0.874
+    },
+    {
+      "start": "14:00:00",
+      "minutes": 840,
+      "rate": 0.866
+    },
+    {
+      "start": "15:00:00",
+      "minutes": 900,
+      "rate": 0.848
+    },
+    {
+      "start": "16:00:00",
+      "minutes": 960,
+      "rate": 0.758
+    },
+    {
+      "start": "17:00:00",
+      "minutes": 1020,
+      "rate": 0.65
+    },
+    {
+      "start": "18:00:00",
+      "minutes": 1080,
+      "rate": 0.648
+    },
+    {
+      "start": "19:00:00",
+      "minutes": 1140,
+      "rate": 0.738
+    },
+    {
+      "start": "20:00:00",
+      "minutes": 1200,
+      "rate": 0.847
+    },
+    {
+      "start": "21:00:00",
+      "minutes": 1260,
+      "rate": 0.861
+    },
+    {
+      "start": "22:00:00",
+      "minutes": 1320,
+      "rate": 0.863
+    },
+    {
+      "start": "23:00:00",
+      "minutes": 1380,
+      "rate": 0.843
+    }
+  ],
+  "isfProfile": {
+    "sensitivities": [
+      {
+        "i": 0,
+        "start": "00:00:00",
+        "sensitivity": 86.2,
+        "offset": 0,
+        "x": 0,
+        "endoffset": 1440
+      }
+    ]
+  },
+  "carb_ratio": 5.75,
+  "autosens_max": 1.3,
+  "autosens_min": 0.7,
+  "units": "mg/dl",
+  "timezone": "Europe/Paris"
+}

app/src/test/res/autotune/test3/aapsorefprofile.json

@@ -0,0 +1,173 @@
+{
+   "autosens_max": 1.3,
+   "autosens_min": 0.7,
+   "basalprofile": [
+      {
+         "i": 0,
+         "minutes": 0,
+         "rate": 1.039,
+         "start": "00:00:00"
+      },
+      {
+         "i": 1,
+         "minutes": 60,
+         "rate": 1.091,
+         "start": "01:00:00"
+      },
+      {
+         "i": 2,
+         "minutes": 120,
+         "rate": 1.118,
+         "start": "02:00:00"
+      },
+      {
+         "i": 3,
+         "minutes": 180,
+         "rate": 1.321,
+         "start": "03:00:00"
+      },
+      {
+         "i": 4,
+         "minutes": 240,
+         "rate": 1.091,
+         "start": "04:00:00"
+      },
+      {
+         "i": 5,
+         "minutes": 300,
+         "rate": 0.965,
+         "start": "05:00:00"
+      },
+      {
+         "i": 6,
+         "minutes": 360,
+         "rate": 0.848,
+         "start": "06:00:00"
+      },
+      {
+         "i": 7,
+         "minutes": 420,
+         "rate": 1.112,
+         "start": "07:00:00"
+      },
+      {
+         "i": 8,
+         "minutes": 480,
+         "rate": 1.173,
+         "start": "08:00:00"
+      },
+      {
+         "i": 9,
+         "minutes": 540,
+         "rate": 1.214,
+         "start": "09:00:00"
+      },
+      {
+         "i": 10,
+         "minutes": 600,
+         "rate": 1.219,
+         "start": "10:00:00"
+      },
+      {
+         "i": 11,
+         "minutes": 660,
+         "rate": 1.07,
+         "start": "11:00:00"
+      },
+      {
+         "i": 12,
+         "minutes": 720,
+         "rate": 1.147,
+         "start": "12:00:00"
+      },
+      {
+         "i": 13,
+         "minutes": 780,
+         "rate": 1.136,
+         "start": "13:00:00"
+      },
+      {
+         "i": 14,
+         "minutes": 840,
+         "rate": 1.126,
+         "start": "14:00:00"
+      },
+      {
+         "i": 15,
+         "minutes": 900,
+         "rate": 1.102,
+         "start": "15:00:00"
+      },
+      {
+         "i": 16,
+         "minutes": 960,
+         "rate": 0.928,
+         "start": "16:00:00"
+      },
+      {
+         "i": 17,
+         "minutes": 1020,
+         "rate": 0.71,
+         "start": "17:00:00"
+      },
+      {
+         "i": 18,
+         "minutes": 1080,
+         "rate": 0.654,
+         "start": "18:00:00"
+      },
+      {
+         "i": 19,
+         "minutes": 1140,
+         "rate": 0.878,
+         "start": "19:00:00"
+      },
+      {
+         "i": 20,
+         "minutes": 1200,
+         "rate": 1.101,
+         "start": "20:00:00"
+      },
+      {
+         "i": 21,
+         "minutes": 1260,
+         "rate": 1.119,
+         "start": "21:00:00"
+      },
+      {
+         "i": 22,
+         "minutes": 1320,
+         "rate": 1.122,
+         "start": "22:00:00"
+      },
+      {
+         "i": 23,
+         "minutes": 1380,
+         "rate": 1.047,
+         "start": "23:00:00"
+      }
+   ],
+   "carb_ratio": 5.75,
+   "csf": 14.991,
+   "curve": "ultra-rapid",
+   "dia": 6,
+   "insulinPeakTime": 45,
+   "isfProfile": {
+      "sensitivities": [
+         {
+            "endoffset": 1440,
+            "i": 0,
+            "offset": 0,
+            "sensitivity": 93.589,
+            "start": "00:00:00",
+            "x": 0
+         }
+      ]
+   },
+   "min_5m_carbimpact": 8,
+   "name": "Tuned Dyn2",
+   "sens": 93.589,
+   "timezone": "Europe/Paris",
+   "units": "mg/dl",
+   "useCustomPeakTime": true
+}

app/src/test/res/autotune/test3/autotune.2022-06-25-111350.log

@@ -0,0 +1,425 @@
+Autotune disk usage:
+160K	.
+Overall disk used/avail:
+Filesystem      Size  Used Avail Use% Mounted on
+rootfs          930G  431G  500G  47% /
+Grabbing AAPS treatments.json and entries/sgv.json for date range...
+oref0-autotune-prep --categorize_uam_as_basal  ns-treatments.2022-05-21.json profile.json ns-entries.2022-05-21.json profile.pump.json > autotune.2022-05-21.json
+start uannnounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -16.9 IOB: 5.249 Activity: 0.0391 at 04:24:08 dev: 26.10 avgDelta: 9.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -18.9 IOB: 5.292 Activity: 0.0438 at 04:29:08 dev: 27.88 avgDelta: 9.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -20.3 IOB: 4.964 Activity: 0.047 at 04:34:09 dev: 24.01 avgDelta: 3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -21.1 IOB: 4.674 Activity: 0.0489 at 04:39:08 dev: 17.83 avgDelta: -3.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -21.5 IOB: 4.377 Activity: 0.0498 at 04:44:08 dev: 11.21 avgDelta: -10.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -21.5 IOB: 4.077 Activity: 0.0498 at 04:49:08 dev: 7.96 avgDelta: -13.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -21.2 IOB: 3.73 Activity: 0.0491 at 04:54:08 dev: 7.16 avgDelta: -14.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -20.5 IOB: 3.389 Activity: 0.0476 at 04:59:08 dev: 6.77 avgDelta: -13.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -19.7 IOB: 3.055 Activity: 0.0457 at 05:04:09 dev: 6.95 avgDelta: -12.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -18.8 IOB: 2.782 Activity: 0.0436 at 05:09:08 dev: 6.54 avgDelta: -12.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -17.7 IOB: 2.47 Activity: 0.0411 at 05:14:08 dev: 5.71 avgDelta: -12.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -16.6 IOB: 2.22 Activity: 0.0386 at 05:19:09 dev: 5.14 avgDelta: -11.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -15.4 IOB: 1.935 Activity: 0.0358 at 05:24:08 dev: 4.93 avgDelta: -10.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -14.3 IOB: 1.711 Activity: 0.0332 at 05:29:08 dev: 6.06 avgDelta: -8.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -13.1 IOB: 1.452 Activity: 0.0304 at 05:34:09 dev: 7.35 avgDelta: -5.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -12.1 IOB: 1.927 Activity: 0.028 at 05:39:09 dev: 8.32 avgDelta: -3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -11.6 IOB: 1.84 Activity: 0.027 at 05:44:08 dev: 8.64 avgDelta: -3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -11.1 IOB: 1.658 Activity: 0.0258 at 05:49:09 dev: 7.12 avgDelta: -4.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -10.6 IOB: 1.482 Activity: 0.0245 at 05:54:08 dev: 5.31 avgDelta: -5.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.6 BGI: -9.9 IOB: 1.264 Activity: 0.0229 at 05:59:09 dev: 4.62 avgDelta: -5.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -9.1 IOB: 1.104 Activity: 0.0212 at 06:04:08 dev: 5.14 avgDelta: -4.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -8.4 IOB: 0.952 Activity: 0.0194 at 06:09:09 dev: 7.36 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -7.8 IOB: 1.619 Activity: 0.0181 at 06:14:09 dev: 9.30 avgDelta: 1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -7.9 IOB: 1.678 Activity: 0.0184 at 06:19:09 dev: 10.68 avgDelta: 2.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -8.1 IOB: 1.775 Activity: 0.0187 at 06:24:08 dev: 9.81 avgDelta: 1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -8.2 IOB: 1.581 Activity: 0.019 at 06:29:08 dev: 6.44 avgDelta: -1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -8.1 IOB: 1.437 Activity: 0.0188 at 06:34:08 dev: 2.35 avgDelta: -5.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -7.9 IOB: 1.294 Activity: 0.0183 at 06:39:08 dev: -0.36 avgDelta: -8.25 uam
+end unannounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -7.6 IOB: 1.153 Activity: 0.0176 at 06:44:09 dev: 0.09 avgDelta: -7.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -7.2 IOB: 1.017 Activity: 0.0167 at 06:49:08 dev: 3.20 avgDelta: -4.00 ISF
+start uannnounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -6.7 IOB: 0.887 Activity: 0.0156 at 06:54:08 dev: 6.22 avgDelta: -0.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -6.3 IOB: 1.011 Activity: 0.0147 at 06:59:08 dev: 7.59 avgDelta: 1.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -6.1 IOB: 0.889 Activity: 0.0141 at 07:04:08 dev: 6.58 avgDelta: 0.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -5.7 IOB: 0.771 Activity: 0.0133 at 07:09:08 dev: 2.98 avgDelta: -2.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -5.3 IOB: 0.656 Activity: 0.0124 at 07:14:09 dev: 0.09 avgDelta: -5.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -4.9 IOB: 0.547 Activity: 0.0114 at 07:19:08 dev: -1.84 avgDelta: -6.75 uam
+end unannounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -4.4 IOB: 0.392 Activity: 0.0103 at 07:24:09 dev: -2.31 avgDelta: -6.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -3.9 IOB: 0.294 Activity: 0.0091 at 07:29:09 dev: -1.08 avgDelta: -5.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -3.5 IOB: 0.2 Activity: 0.008 at 07:34:09 dev: 0.45 avgDelta: -3.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -2.8 IOB: 0.065 Activity: 0.0066 at 07:39:09 dev: 2.34 avgDelta: -0.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -2.4 IOB: 0.034 Activity: 0.0055 at 07:44:09 dev: 3.37 avgDelta: 1.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -2.1 IOB: 0.549 Activity: 0.0048 at 07:49:08 dev: 3.57 avgDelta: 1.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -2.3 IOB: 0.674 Activity: 0.0053 at 07:54:09 dev: 3.53 avgDelta: 1.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -2.5 IOB: 0.597 Activity: 0.0057 at 07:59:09 dev: 2.71 avgDelta: 0.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -2.5 IOB: 0.468 Activity: 0.0058 at 08:04:09 dev: 1.50 avgDelta: -1.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -2.5 IOB: 0.389 Activity: 0.0057 at 08:09:09 dev: 0.21 avgDelta: -2.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -2.3 IOB: 0.262 Activity: 0.0053 at 08:14:09 dev: -0.47 avgDelta: -2.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -2.1 IOB: 0.186 Activity: 0.0048 at 08:19:09 dev: -0.93 avgDelta: -3.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -1.8 IOB: 0.064 Activity: 0.0041 at 08:24:09 dev: -1.48 avgDelta: -3.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -1.5 IOB: -0.005 Activity: 0.0034 at 08:29:09 dev: -2.03 avgDelta: -3.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -1.1 IOB: -0.12 Activity: 0.0026 at 08:34:09 dev: -2.13 avgDelta: -3.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -0.8 IOB: -0.181 Activity: 0.0018 at 08:39:09 dev: -2.47 avgDelta: -3.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -0.3 IOB: -0.287 Activity: 0.0008 at 08:44:09 dev: -2.41 avgDelta: -2.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: 0.0 IOB: -0.34 Activity: 0 at 08:49:09 dev: -2.50 avgDelta: -2.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: 0.4 IOB: -0.436 Activity: -0.001 at 08:54:09 dev: -2.68 avgDelta: -2.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: 0.8 IOB: -0.48 Activity: -0.0018 at 08:59:09 dev: -2.28 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 1.1 IOB: -0.519 Activity: -0.0026 at 09:04:09 dev: -1.12 avgDelta: 0.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 1.5 IOB: -0.554 Activity: -0.0034 at 09:09:09 dev: 0.00 avgDelta: 1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 1.8 IOB: -0.585 Activity: -0.0041 at 09:14:09 dev: 0.00 avgDelta: 2.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 2.1 IOB: -0.662 Activity: -0.0049 at 09:19:09 dev: 0.39 avgDelta: 2.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 2.4 IOB: -0.687 Activity: -0.0055 at 09:24:08 dev: -0.37 avgDelta: 2.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 2.6 IOB: -0.708 Activity: -0.0061 at 09:29:09 dev: -0.13 avgDelta: 2.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 2.8 IOB: -0.726 Activity: -0.0066 at 09:34:09 dev: 0.41 avgDelta: 3.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 3.1 IOB: -0.351 Activity: -0.0071 at 09:39:08 dev: 1.19 avgDelta: 4.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 2.8 IOB: -0.218 Activity: -0.0064 at 09:44:09 dev: 2.99 avgDelta: 5.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: 2.4 IOB: -0.088 Activity: -0.0055 at 09:49:09 dev: 4.63 avgDelta: 7.00 basal
+start uannnounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -1.0 IOB: 13.594 Activity: 0.0023 at 09:54:09 dev: 8.74 avgDelta: 7.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -14.3 IOB: 13.552 Activity: 0.0331 at 09:59:09 dev: 23.02 avgDelta: 8.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -24.7 IOB: 13.224 Activity: 0.0573 at 10:04:09 dev: 33.70 avgDelta: 9.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -32.8 IOB: 12.838 Activity: 0.076 at 10:09:08 dev: 40.76 avgDelta: 8.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -38.8 IOB: 12.322 Activity: 0.09 at 10:14:09 dev: 45.04 avgDelta: 6.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -43.1 IOB: 11.794 Activity: 0.1001 at 10:19:09 dev: 46.89 avgDelta: 3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -46.0 IOB: 11.177 Activity: 0.1068 at 10:24:09 dev: 47.03 avgDelta: 1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -47.8 IOB: 10.58 Activity: 0.111 at 10:29:09 dev: 45.84 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -48.7 IOB: 9.919 Activity: 0.1129 at 10:34:09 dev: 43.66 avgDelta: -5.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -48.7 IOB: 9.254 Activity: 0.1129 at 10:39:09 dev: 41.41 avgDelta: -7.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -48.0 IOB: 8.643 Activity: 0.1114 at 10:44:09 dev: 39.51 avgDelta: -8.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -46.9 IOB: 7.992 Activity: 0.1088 at 10:49:09 dev: 39.39 avgDelta: -7.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -45.4 IOB: 7.406 Activity: 0.1053 at 10:54:08 dev: 40.13 avgDelta: -5.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.7 BGI: -43.6 IOB: 7.111 Activity: 0.1012 at 10:59:09 dev: 41.37 avgDelta: -2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -41.9 IOB: 6.515 Activity: 0.0971 at 11:04:09 dev: 42.35 avgDelta: 0.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -40.0 IOB: 5.99 Activity: 0.0927 at 11:09:09 dev: 42.70 avgDelta: 2.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -37.8 IOB: 5.439 Activity: 0.0878 at 11:14:08 dev: 42.09 avgDelta: 4.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -35.7 IOB: 4.962 Activity: 0.0828 at 11:19:09 dev: 39.69 avgDelta: 4.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -33.4 IOB: 4.462 Activity: 0.0775 at 11:24:08 dev: 35.65 avgDelta: 2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -31.2 IOB: 4.036 Activity: 0.0724 at 11:29:09 dev: 31.45 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -29.0 IOB: 3.638 Activity: 0.0672 at 11:34:09 dev: 27.46 avgDelta: -1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -26.8 IOB: 3.214 Activity: 0.0621 at 11:39:08 dev: 25.02 avgDelta: -1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -24.6 IOB: 2.866 Activity: 0.0571 at 11:44:09 dev: 23.61 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -22.5 IOB: 2.494 Activity: 0.0522 at 11:49:09 dev: 21.75 avgDelta: -0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -20.5 IOB: 2.193 Activity: 0.0476 at 11:54:09 dev: 20.52 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: -18.6 IOB: 1.867 Activity: 0.0431 at 11:59:09 dev: 18.83 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -16.7 IOB: 1.563 Activity: 0.0388 at 12:04:09 dev: 16.97 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -15.0 IOB: 1.329 Activity: 0.0347 at 12:09:08 dev: 14.46 avgDelta: -0.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -13.3 IOB: 1.115 Activity: 0.0309 at 12:14:09 dev: 11.32 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -11.7 IOB: 0.87 Activity: 0.0272 at 12:19:09 dev: 7.97 avgDelta: -3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -10.3 IOB: 0.692 Activity: 0.0239 at 12:24:09 dev: 5.80 avgDelta: -4.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -8.9 IOB: 0.482 Activity: 0.0206 at 12:29:08 dev: 4.88 avgDelta: -4.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -7.6 IOB: 0.287 Activity: 0.0176 at 12:34:09 dev: 4.09 avgDelta: -3.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -6.4 IOB: 0.156 Activity: 0.0148 at 12:39:08 dev: 3.88 avgDelta: -2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -5.3 IOB: 0.038 Activity: 0.0122 at 12:44:08 dev: 3.26 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -4.3 IOB: -0.067 Activity: 0.0099 at 12:49:09 dev: 2.27 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -3.4 IOB: -0.161 Activity: 0.0078 at 12:54:08 dev: 1.36 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -2.6 IOB: -0.195 Activity: 0.006 at 12:59:08 dev: 0.09 avgDelta: -2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -1.9 IOB: -0.271 Activity: 0.0044 at 13:04:09 dev: -1.10 avgDelta: -3.00 uam
+end unannounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -1.3 IOB: -0.339 Activity: 0.0029 at 13:09:09 dev: -1.00 avgDelta: -2.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -0.7 IOB: -0.4 Activity: 0.0015 at 13:14:09 dev: 0.90 avgDelta: 0.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -0.3 IOB: -0.155 Activity: 0.0007 at 13:19:08 dev: 3.80 avgDelta: 3.50 basal
+start uannnounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -1.9 IOB: 8.11 Activity: 0.0045 at 13:24:09 dev: 8.94 avgDelta: 7.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -9.6 IOB: 7.992 Activity: 0.0222 at 13:29:09 dev: 18.57 avgDelta: 9.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -15.5 IOB: 7.745 Activity: 0.0359 at 13:34:09 dev: 23.47 avgDelta: 8.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -20.0 IOB: 7.488 Activity: 0.0465 at 13:39:09 dev: 24.04 avgDelta: 4.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -23.3 IOB: 7.136 Activity: 0.0541 at 13:44:09 dev: 21.32 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -25.7 IOB: 6.8 Activity: 0.0596 at 13:49:09 dev: 17.94 avgDelta: -7.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -27.3 IOB: 6.441 Activity: 0.0633 at 13:54:09 dev: 0.00 avgDelta: -10.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.3 BGI: -28.1 IOB: 6.022 Activity: 0.0651 at 13:59:09 dev: 0.00 avgDelta: -9.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -28.3 IOB: 5.644 Activity: 0.0657 at 14:04:09 dev: 0.00 avgDelta: -6.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -28.1 IOB: 5.216 Activity: 0.0653 at 14:09:09 dev: 0.00 avgDelta: -2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -27.8 IOB: 4.962 Activity: 0.0644 at 14:14:09 dev: 0.00 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -27.0 IOB: 4.544 Activity: 0.0627 at 14:19:09 dev: 0.00 avgDelta: 0.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -26.1 IOB: 4.185 Activity: 0.0606 at 14:24:09 dev: 0.00 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -25.0 IOB: 3.839 Activity: 0.058 at 14:29:09 dev: 0.00 avgDelta: -1.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -23.7 IOB: 3.456 Activity: 0.055 at 14:34:09 dev: 0.00 avgDelta: -2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -22.4 IOB: 3.139 Activity: 0.0519 at 14:39:09 dev: 0.00 avgDelta: -2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -20.9 IOB: 2.788 Activity: 0.0486 at 14:44:09 dev: 0.00 avgDelta: -1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -19.5 IOB: 2.503 Activity: 0.0453 at 14:49:10 dev: 0.00 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -18.0 IOB: 2.186 Activity: 0.0418 at 14:54:09 dev: 0.00 avgDelta: 2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -17.5 IOB: 3.17 Activity: 0.0407 at 14:59:09 dev: 22.04 avgDelta: 4.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -17.8 IOB: 3.956 Activity: 0.0413 at 15:04:09 dev: 23.80 avgDelta: 6.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.1 IOB: 3.648 Activity: 0.042 at 15:09:09 dev: 23.85 avgDelta: 5.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.5 IOB: 4.126 Activity: 0.043 at 15:14:09 dev: 22.28 avgDelta: 3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.8 IOB: 3.81 Activity: 0.0437 at 15:19:10 dev: 20.58 avgDelta: 1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.8 IOB: 3.541 Activity: 0.0437 at 15:24:10 dev: 19.08 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.6 IOB: 3.272 Activity: 0.0431 at 15:29:09 dev: 19.33 avgDelta: 0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.4 IOB: 3.588 Activity: 0.0428 at 15:34:09 dev: 21.20 avgDelta: 2.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.6 IOB: 3.875 Activity: 0.0431 at 15:39:09 dev: 23.83 avgDelta: 5.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -18.7 IOB: 3.608 Activity: 0.0434 at 15:44:08 dev: 25.46 avgDelta: 6.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -19.1 IOB: 4.271 Activity: 0.0442 at 15:49:09 dev: 26.05 avgDelta: 7.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -19.5 IOB: 3.996 Activity: 0.0452 at 15:54:09 dev: 25.98 avgDelta: 6.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -19.9 IOB: 4.298 Activity: 0.0462 at 15:59:08 dev: 26.16 avgDelta: 6.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -20.2 IOB: 4.015 Activity: 0.0468 at 16:04:09 dev: 26.67 avgDelta: 6.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -20.7 IOB: 4.538 Activity: 0.0481 at 16:09:09 dev: 27.98 avgDelta: 7.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -21.1 IOB: 4.245 Activity: 0.0489 at 16:14:09 dev: 28.33 avgDelta: 7.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -21.6 IOB: 4.729 Activity: 0.05 at 16:19:09 dev: 28.30 avgDelta: 6.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -21.9 IOB: 4.426 Activity: 0.0508 at 16:24:09 dev: 28.64 avgDelta: 6.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -22.0 IOB: 4.353 Activity: 0.051 at 16:29:09 dev: 28.73 avgDelta: 6.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -21.9 IOB: 4.049 Activity: 0.0507 at 16:34:10 dev: 28.10 avgDelta: 6.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -21.5 IOB: 3.747 Activity: 0.0498 at 16:39:09 dev: 25.96 avgDelta: 4.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -20.8 IOB: 3.402 Activity: 0.0483 at 16:44:09 dev: 22.32 avgDelta: 1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -20.0 IOB: 3.115 Activity: 0.0464 at 16:49:10 dev: 19.00 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -19.0 IOB: 2.788 Activity: 0.0441 at 16:54:09 dev: 17.01 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -18.0 IOB: 2.524 Activity: 0.0417 at 16:59:09 dev: 15.97 avgDelta: -2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -16.9 IOB: 2.271 Activity: 0.0391 at 17:04:09 dev: 16.10 avgDelta: -0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -15.7 IOB: 2.033 Activity: 0.0365 at 17:09:10 dev: 15.48 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -14.6 IOB: 1.807 Activity: 0.0338 at 17:14:10 dev: 14.57 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -13.4 IOB: 1.594 Activity: 0.0312 at 17:19:09 dev: 13.70 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -12.3 IOB: 1.395 Activity: 0.0286 at 17:24:10 dev: 12.58 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -11.3 IOB: 1.258 Activity: 0.0262 at 17:29:09 dev: 11.54 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -10.2 IOB: 1.034 Activity: 0.0236 at 17:34:09 dev: 10.17 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -9.3 IOB: 0.971 Activity: 0.0215 at 17:39:09 dev: 9.02 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -8.5 IOB: 1.008 Activity: 0.0197 at 17:44:09 dev: 7.74 avgDelta: -0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -7.9 IOB: 0.963 Activity: 0.0183 at 17:49:09 dev: 6.89 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -7.4 IOB: 1.046 Activity: 0.0171 at 17:54:10 dev: 7.12 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -6.9 IOB: 0.912 Activity: 0.0161 at 17:59:09 dev: 6.94 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -6.7 IOB: 1.254 Activity: 0.0156 at 18:04:09 dev: 6.97 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -6.6 IOB: 1.176 Activity: 0.0154 at 18:09:09 dev: 6.64 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -6.4 IOB: 1.051 Activity: 0.0149 at 18:14:10 dev: 5.67 avgDelta: -0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -6.1 IOB: 0.928 Activity: 0.0142 at 18:19:09 dev: 5.12 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -6.0 IOB: 1.008 Activity: 0.0138 at 18:24:09 dev: 4.45 avgDelta: -1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -5.7 IOB: 0.89 Activity: 0.0133 at 18:29:09 dev: 3.48 avgDelta: -2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -5.5 IOB: 0.775 Activity: 0.0127 at 18:34:09 dev: 2.47 avgDelta: -3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -5.1 IOB: 0.664 Activity: 0.0118 at 18:39:09 dev: 1.59 avgDelta: -3.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -4.7 IOB: 0.606 Activity: 0.011 at 18:44:09 dev: 1.74 avgDelta: -3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -4.5 IOB: 0.703 Activity: 0.0105 at 18:49:09 dev: 3.03 avgDelta: -1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -4.3 IOB: 0.702 Activity: 0.0101 at 18:54:09 dev: 4.10 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 4.7 BGI: -4.3 IOB: 0.902 Activity: 0.0101 at 18:59:09 dev: 4.35 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -4.3 IOB: 0.801 Activity: 0.0101 at 19:04:09 dev: 2.10 avgDelta: -2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -4.2 IOB: 0.701 Activity: 0.0098 at 19:09:09 dev: -1.03 avgDelta: -5.25 uam
+end unannounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -4.0 IOB: 0.603 Activity: 0.0094 at 19:14:09 dev: -4.95 avgDelta: -9.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -3.8 IOB: 0.508 Activity: 0.0088 at 19:19:09 dev: -8.21 avgDelta: -12.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -3.5 IOB: 0.415 Activity: 0.0081 at 19:24:09 dev: -9.76 avgDelta: -13.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -3.2 IOB: 0.327 Activity: 0.0074 at 19:29:09 dev: -8.06 avgDelta: -11.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -2.8 IOB: 0.242 Activity: 0.0066 at 19:34:09 dev: -3.91 avgDelta: -6.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -2.5 IOB: 0.161 Activity: 0.0058 at 19:39:09 dev: 2.00 avgDelta: -0.50 ISF
+start uannnounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -2.2 IOB: 0.134 Activity: 0.005 at 19:44:09 dev: 7.16 avgDelta: 5.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -2.1 IOB: 0.4 Activity: 0.0048 at 19:49:09 dev: 9.57 avgDelta: 7.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -2.1 IOB: 0.475 Activity: 0.0049 at 19:54:09 dev: 8.86 avgDelta: 6.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.3 BGI: -2.2 IOB: 0.401 Activity: 0.005 at 19:59:10 dev: 5.91 avgDelta: 3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -2.1 IOB: 0.327 Activity: 0.0048 at 20:04:10 dev: 2.82 avgDelta: 0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -1.9 IOB: 0.203 Activity: 0.0044 at 20:09:09 dev: -0.35 avgDelta: -2.25 uam
+end unannounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -1.7 IOB: 0.132 Activity: 0.004 at 20:14:09 dev: -1.78 avgDelta: -3.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -1.5 IOB: 0.064 Activity: 0.0034 at 20:19:09 dev: -2.28 avgDelta: -3.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -1.2 IOB: -0.002 Activity: 0.0028 at 20:24:09 dev: -1.54 avgDelta: -2.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -0.9 IOB: -0.064 Activity: 0.0022 at 20:29:10 dev: -1.05 avgDelta: -2.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -0.7 IOB: -0.073 Activity: 0.0016 at 20:34:09 dev: -0.81 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -0.5 IOB: -0.08 Activity: 0.0011 at 20:39:09 dev: -1.03 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -0.3 IOB: -0.085 Activity: 0.0007 at 20:44:09 dev: -1.45 avgDelta: -1.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -0.2 IOB: -0.087 Activity: 0.0004 at 20:49:09 dev: -1.33 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -0.0 IOB: -0.088 Activity: 0.0001 at 20:54:09 dev: -1.21 avgDelta: -1.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: 0.0 IOB: -0.088 Activity: -0.0001 at 20:59:09 dev: -0.79 avgDelta: -0.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.2 IOB: -0.137 Activity: -0.0004 at 21:04:09 dev: -0.92 avgDelta: -0.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.3 IOB: -0.184 Activity: -0.0007 at 21:09:10 dev: -0.80 avgDelta: -0.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.4 IOB: -0.18 Activity: -0.001 at 21:14:09 dev: -0.68 avgDelta: -0.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.5 IOB: -0.175 Activity: -0.0012 at 21:19:09 dev: -1.02 avgDelta: -0.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.6 IOB: -0.168 Activity: -0.0014 at 21:24:09 dev: -1.35 avgDelta: -0.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.7 IOB: -0.211 Activity: -0.0015 at 21:29:10 dev: -1.65 avgDelta: -1.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.7 IOB: -0.203 Activity: -0.0017 at 21:34:09 dev: -1.98 avgDelta: -1.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 0.9 IOB: -0.243 Activity: -0.002 at 21:39:10 dev: -2.36 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.0 IOB: -0.282 Activity: -0.0023 at 21:44:10 dev: -2.49 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.1 IOB: -0.32 Activity: -0.0026 at 21:49:09 dev: -2.62 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.3 IOB: -0.357 Activity: -0.0029 at 21:54:10 dev: -2.25 avgDelta: -1.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.4 IOB: -0.391 Activity: -0.0032 at 21:59:10 dev: -1.38 avgDelta: 0.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.5 IOB: -0.375 Activity: -0.0035 at 22:04:09 dev: -0.01 avgDelta: 1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.6 IOB: -0.357 Activity: -0.0036 at 22:09:09 dev: 1.45 avgDelta: 3.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.5 IOB: -0.149 Activity: -0.0035 at 22:14:09 dev: 3.49 avgDelta: 5.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: 1.3 IOB: -0.132 Activity: -0.0031 at 22:19:10 dev: 5.91 avgDelta: 7.25 basal
+start uannnounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -6.5 IOB: 9.296 Activity: 0.015 at 22:24:09 dev: 15.96 avgDelta: 9.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -14.3 IOB: 9.123 Activity: 0.0332 at 22:29:10 dev: 25.06 avgDelta: 10.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -20.4 IOB: 8.96 Activity: 0.0474 at 22:34:09 dev: 29.43 avgDelta: 9.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -25.2 IOB: 8.644 Activity: 0.0584 at 22:39:10 dev: 29.92 avgDelta: 4.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -28.6 IOB: 8.282 Activity: 0.0664 at 22:44:10 dev: 27.37 avgDelta: -1.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -30.9 IOB: 7.835 Activity: 0.0718 at 22:49:09 dev: 24.70 avgDelta: -6.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -32.5 IOB: 7.416 Activity: 0.0753 at 22:54:10 dev: 23.70 avgDelta: -8.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.2 BGI: -33.3 IOB: 6.984 Activity: 0.0772 at 22:59:09 dev: 24.52 avgDelta: -8.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -33.5 IOB: 6.547 Activity: 0.0776 at 23:04:09 dev: 26.70 avgDelta: -6.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -33.1 IOB: 6.061 Activity: 0.0769 at 23:09:10 dev: 28.39 avgDelta: -4.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -32.5 IOB: 5.68 Activity: 0.0754 at 23:14:10 dev: 29.50 avgDelta: -3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -31.6 IOB: 5.458 Activity: 0.0734 at 23:19:09 dev: 30.14 avgDelta: -1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -30.7 IOB: 5.046 Activity: 0.0712 at 23:24:10 dev: 29.94 avgDelta: -0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -29.7 IOB: 4.925 Activity: 0.069 at 23:29:09 dev: 29.49 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -28.6 IOB: 4.487 Activity: 0.0663 at 23:34:09 dev: 29.08 avgDelta: 0.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -27.3 IOB: 4.113 Activity: 0.0633 at 23:39:10 dev: 28.28 avgDelta: 1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -25.8 IOB: 3.706 Activity: 0.0599 at 23:44:09 dev: 27.57 avgDelta: 1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -24.4 IOB: 3.363 Activity: 0.0566 at 23:49:09 dev: 26.64 avgDelta: 2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -22.8 IOB: 3.039 Activity: 0.053 at 23:54:09 dev: 25.34 avgDelta: 2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -21.3 IOB: 2.733 Activity: 0.0494 at 23:59:10 dev: 23.79 avgDelta: 2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -19.7 IOB: 2.395 Activity: 0.0457 at 00:04:10 dev: 22.20 avgDelta: 2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -18.1 IOB: 2.126 Activity: 0.0421 at 00:09:10 dev: 20.65 avgDelta: 2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -16.6 IOB: 1.824 Activity: 0.0385 at 00:14:10 dev: 18.59 avgDelta: 2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -15.1 IOB: 1.64 Activity: 0.0351 at 00:19:09 dev: 17.13 avgDelta: 2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -13.8 IOB: 1.473 Activity: 0.0319 at 00:24:09 dev: 15.50 avgDelta: 1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -12.4 IOB: 1.273 Activity: 0.0288 at 00:29:10 dev: 14.16 avgDelta: 1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -11.2 IOB: 1.136 Activity: 0.026 at 00:34:10 dev: 12.71 avgDelta: 1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -10.1 IOB: 1.011 Activity: 0.0235 at 00:39:09 dev: 10.13 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -9.1 IOB: 0.852 Activity: 0.021 at 00:44:10 dev: 7.30 avgDelta: -1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -8.2 IOB: 0.752 Activity: 0.0189 at 00:49:10 dev: 4.65 avgDelta: -3.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -7.3 IOB: 0.662 Activity: 0.0169 at 00:54:10 dev: 3.28 avgDelta: -4.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.9 BGI: -6.4 IOB: 0.534 Activity: 0.0149 at 00:59:09 dev: 3.42 avgDelta: -3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -5.7 IOB: 0.463 Activity: 0.0132 at 01:04:09 dev: 4.69 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -5.0 IOB: 0.352 Activity: 0.0115 at 01:09:10 dev: 5.96 avgDelta: 1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.3 IOB: 0.298 Activity: 0.0101 at 01:14:10 dev: 6.60 avgDelta: 2.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.8 IOB: 0.25 Activity: 0.0089 at 01:19:09 dev: 6.84 avgDelta: 3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.4 IOB: 0.329 Activity: 0.0079 at 01:24:10 dev: 6.40 avgDelta: 3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.2 IOB: 0.34 Activity: 0.0074 at 01:29:10 dev: 5.69 avgDelta: 2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -2.9 IOB: 0.304 Activity: 0.0068 at 01:34:10 dev: 5.43 avgDelta: 2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -2.7 IOB: 0.272 Activity: 0.0062 at 01:39:10 dev: 5.67 avgDelta: 3.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -2.6 IOB: 0.512 Activity: 0.006 at 01:44:10 dev: 6.59 avgDelta: 4.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -2.6 IOB: 0.581 Activity: 0.0061 at 01:49:10 dev: 7.38 avgDelta: 4.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.2 IOB: 1.238 Activity: 0.0075 at 01:54:10 dev: 7.98 avgDelta: 4.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.8 IOB: 1.147 Activity: 0.0088 at 01:59:10 dev: 7.54 avgDelta: 3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.2 IOB: 1.151 Activity: 0.0098 at 02:04:10 dev: 6.72 avgDelta: 2.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.5 IOB: 1.05 Activity: 0.0104 at 02:09:09 dev: 5.98 avgDelta: 1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.6 IOB: 0.947 Activity: 0.0107 at 02:14:09 dev: 4.86 avgDelta: 0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.6 IOB: 0.844 Activity: 0.0106 at 02:19:10 dev: 3.82 avgDelta: -0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.5 IOB: 0.741 Activity: 0.0104 at 02:24:10 dev: 2.73 avgDelta: -1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.3 IOB: 0.59 Activity: 0.0099 at 02:29:10 dev: 2.52 avgDelta: -1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -4.0 IOB: 0.542 Activity: 0.0093 at 02:34:09 dev: 3.01 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.8 IOB: 0.497 Activity: 0.0087 at 02:39:09 dev: 3.50 avgDelta: -0.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.5 IOB: 0.456 Activity: 0.0081 at 02:44:10 dev: 1.74 avgDelta: -1.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.3 IOB: 0.516 Activity: 0.0077 at 02:49:09 dev: -1.93 avgDelta: -5.25 uam
+end unannounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -3.1 IOB: 0.429 Activity: 0.0072 at 02:54:09 dev: -6.40 avgDelta: -9.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 7.0 BGI: -2.8 IOB: 0.294 Activity: 0.0066 at 02:59:10 dev: -8.66 avgDelta: -11.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: -2.5 IOB: 0.163 Activity: 0.0058 at 03:04:10 dev: -8.25 avgDelta: -10.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: -2.1 IOB: 0.037 Activity: 0.0049 at 03:09:10 dev: -6.39 avgDelta: -8.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: -1.7 IOB: -0.085 Activity: 0.0039 at 03:14:10 dev: -4.32 avgDelta: -6.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: -1.3 IOB: -0.153 Activity: 0.0029 at 03:19:09 dev: -3.75 avgDelta: -5.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: -0.8 IOB: -0.265 Activity: 0.0018 at 03:24:10 dev: -3.72 avgDelta: -4.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: -0.3 IOB: -0.371 Activity: 0.0007 at 03:29:09 dev: -3.45 avgDelta: -3.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: 0.2 IOB: -0.471 Activity: -0.0005 at 03:34:09 dev: -2.22 avgDelta: -2.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: 0.7 IOB: -0.566 Activity: -0.0016 at 03:39:10 dev: -0.94 avgDelta: -0.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: 1.1 IOB: -0.606 Activity: -0.0026 at 03:44:10 dev: 0.00 avgDelta: 1.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: 1.6 IOB: -0.64 Activity: -0.0036 at 03:49:10 dev: 0.45 avgDelta: 2.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 8.0 BGI: 1.9 IOB: -0.67 Activity: -0.0044 at 03:54:10 dev: -0.15 avgDelta: 1.75 basal
+--categorize-uam-as-basal=true set: categorizing all UAM data as basal.
+oref0-autotune-core autotune.2022-05-21.json profile.json profile.pump.json > newprofile.2022-05-21.json
+CRTotalCarbs: 0 CRTotalInsulin: 0 totalCR: NaN
+Hour 0 total deviations: 149.72 mg/dL
+Hour 0 basal adjustment needed: 0.35 U/hr
+Hour 1 total deviations: 76.77 mg/dL
+Hour 1 basal adjustment needed: 0.18 U/hr
+Hour 2 total deviations: 32.95 mg/dL
+Hour 2 basal adjustment needed: 0.08 U/hr
+Hour 3 total deviations: -18.1 mg/dL
+Hour 3 basal adjustment needed: -0.04 U/hr
+Hour 4 total deviations: 128.92 mg/dL
+Hour 4 basal adjustment needed: 0.3 U/hr
+Hour 5 total deviations: 76.69 mg/dL
+Hour 5 basal adjustment needed: 0.18 U/hr
+Hour 6 total deviations: 64.53 mg/dL
+Hour 6 basal adjustment needed: 0.15 U/hr
+Hour 7 total deviations: 7.81 mg/dL
+Hour 7 basal adjustment needed: 0.02 U/hr
+Hour 8 total deviations: -16.5 mg/dL
+Hour 8 basal adjustment needed: -0.04 U/hr
+Hour 9 total deviations: 39.75 mg/dL
+Hour 9 basal adjustment needed: 0.09 U/hr
+Hour 10 total deviations: 504.73 mg/dL
+Hour 10 basal adjustment needed: 1.17 U/hr
+Hour 11 total deviations: 371.12 mg/dL
+Hour 11 basal adjustment needed: 0.86 U/hr
+Hour 12 total deviations: 76.35 mg/dL
+Hour 12 basal adjustment needed: 0.18 U/hr
+Hour 13 total deviations: 116.88 mg/dL
+Hour 13 basal adjustment needed: 0.27 U/hr
+Hour 14 total deviations: 22.04 mg/dL
+Hour 14 basal adjustment needed: 0.05 U/hr
+Hour 15 total deviations: 277.6 mg/dL
+Hour 15 basal adjustment needed: 0.64 U/hr
+Hour 16 total deviations: 297.01 mg/dL
+Hour 16 basal adjustment needed: 0.69 U/hr
+Hour 17 total deviations: 131.85 mg/dL
+Hour 17 basal adjustment needed: 0.31 U/hr
+Hour 18 total deviations: 49.61 mg/dL
+Hour 18 basal adjustment needed: 0.12 U/hr
+Hour 19 total deviations: 32.57 mg/dL
+Hour 19 basal adjustment needed: 0.08 U/hr
+Hour 20 total deviations: -9.02 mg/dL
+Hour 20 basal adjustment needed: -0.02 U/hr
+Hour 21 total deviations: -19.5 mg/dL
+Hour 21 basal adjustment needed: -0.05 U/hr
+Hour 22 total deviations: 211.5 mg/dL
+Hour 22 basal adjustment needed: 0.49 U/hr
+Hour 23 total deviations: 334.86 mg/dL
+Hour 23 basal adjustment needed: 0.78 U/hr
+Limiting hour 7 basal to 1.11 (which is 1.3 * pump basal of 0.855 )
+Limiting hour 8 basal to 1.17 (which is 1.3 * pump basal of 0.902 )
+Limiting hour 9 basal to 1.21 (which is 1.3 * pump basal of 0.934 )
+Limiting hour 10 basal to 1.22 (which is 1.3 * pump basal of 0.938 )
+Limiting hour 12 basal to 1.15 (which is 1.3 * pump basal of 0.882 )
+Limiting hour 13 basal to 1.14 (which is 1.3 * pump basal of 0.874 )
+Limiting hour 14 basal to 1.13 (which is 1.3 * pump basal of 0.866 )
+Limiting hour 15 basal to 1.10 (which is 1.3 * pump basal of 0.848 )
+Limiting hour 20 basal to 1.10 (which is 1.3 * pump basal of 0.847 )
+Limiting hour 21 basal to 1.12 (which is 1.3 * pump basal of 0.861 )
+Limiting hour 22 basal to 1.12 (which is 1.3 * pump basal of 0.863 )
+[ { start: '00:00:00', minutes: 0, rate: 1.039, i: 0 },
+  { start: '01:00:00', minutes: 60, rate: 1.091, i: 1 },
+  { start: '02:00:00', minutes: 120, rate: 1.118, i: 2 },
+  { start: '03:00:00', minutes: 180, rate: 1.321, i: 3 },
+  { start: '04:00:00', minutes: 240, rate: 1.091, i: 4 },
+  { start: '05:00:00', minutes: 300, rate: 0.965, i: 5 },
+  { start: '06:00:00', minutes: 360, rate: 0.848, i: 6 },
+  { start: '07:00:00', minutes: 420, rate: 1.112, i: 7 },
+  { start: '08:00:00', minutes: 480, rate: 1.173, i: 8 },
+  { start: '09:00:00', minutes: 540, rate: 1.214, i: 9 },
+  { start: '10:00:00', minutes: 600, rate: 1.219, i: 10 },
+  { start: '11:00:00', minutes: 660, rate: 1.07, i: 11 },
+  { start: '12:00:00', minutes: 720, rate: 1.147, i: 12 },
+  { start: '13:00:00', minutes: 780, rate: 1.136, i: 13 },
+  { start: '14:00:00', minutes: 840, rate: 1.126, i: 14 },
+  { start: '15:00:00', minutes: 900, rate: 1.102, i: 15 },
+  { start: '16:00:00', minutes: 960, rate: 0.928, i: 16 },
+  { start: '17:00:00', minutes: 1020, rate: 0.71, i: 17 },
+  { start: '18:00:00', minutes: 1080, rate: 0.654, i: 18 },
+  { start: '19:00:00', minutes: 1140, rate: 0.878, i: 19 },
+  { start: '20:00:00', minutes: 1200, rate: 1.101, i: 20 },
+  { start: '21:00:00', minutes: 1260, rate: 1.119, i: 21 },
+  { start: '22:00:00', minutes: 1320, rate: 1.122, i: 22 },
+  { start: '23:00:00', minutes: 1380, rate: 1.047, i: 23 } ]
+totalMealCarbs: 0 totalDeviations: 0 oldCSF 14.991 fullNewCSF: 14.991304347826087 newCSF: 14.991
+oldCR: 5.75 fullNewCR: NaN newCR: NaN
+Limiting adjusted ISF of 124.90 to 123.14 (which is pump ISF of 86.2 / 0.7 )
+p50deviation: -0.93 p50BGI -2.5 p50ratios: 1.449 Old ISF: 86.2 fullNewISF: 124.904 adjustedISF: 123.143 newISF: 93.589 newDIA: 6 newPeak: 45
+
+Autotune pump profile recommendations:
+---------------------------------------------------------
+Recommendations Log File: /home/titi/aaps/autotune/aapsorefautotune_recommendations.log
+
+Parameter      | Pump        | Autotune    | Days Missing
+---------------------------------------------------------
+ISF [mg/dL/U]  | 86.200      | 93.589      |
+Carb Ratio[g/U]| 5.750       | 5.750       |
+  00:00        | 0.966       | 1.039       | 0           
+  01:00        | 0.977       | 1.091       | 0           
+  02:00        | 0.971       | 1.118       | 0           
+  03:00        | 1.111       | 1.321       | 0           
+  04:00        | 0.974       | 1.091       | 0           
+  05:00        | 0.923       | 0.965       | 0           
+  06:00        | 0.823       | 0.848       | 0           
+  07:00        | 0.855       | 1.112       | 0           
+  08:00        | 0.902       | 1.173       | 0           
+  09:00        | 0.934       | 1.214       | 0           
+  10:00        | 0.938       | 1.219       | 0           
+  11:00        | 0.903       | 1.070       | 0           
+  12:00        | 0.882       | 1.147       | 0           
+  13:00        | 0.874       | 1.136       | 0           
+  14:00        | 0.866       | 1.126       | 0           
+  15:00        | 0.848       | 1.102       | 0           
+  16:00        | 0.758       | 0.928       | 0           
+  17:00        | 0.650       | 0.710       | 0           
+  18:00        | 0.648       | 0.654       | 0           
+  19:00        | 0.738       | 0.878       | 0           
+  20:00        | 0.847       | 1.101       | 0           
+  21:00        | 0.861       | 1.119       | 0           
+  22:00        | 0.863       | 1.122       | 0           
+  23:00        | 0.843       | 1.047       | 0           

app/src/test/res/autotune/test3/newaapsorefprofile.2022-05-21.json

@@ -0,0 +1,173 @@
+{
+   "autosens_max": 1.3,
+   "autosens_min": 0.7,
+   "basalprofile": [
+      {
+         "i": 0,
+         "minutes": 0,
+         "rate": 1.039,
+         "start": "00:00:00"
+      },
+      {
+         "i": 1,
+         "minutes": 60,
+         "rate": 1.091,
+         "start": "01:00:00"
+      },
+      {
+         "i": 2,
+         "minutes": 120,
+         "rate": 1.118,
+         "start": "02:00:00"
+      },
+      {
+         "i": 3,
+         "minutes": 180,
+         "rate": 1.321,
+         "start": "03:00:00"
+      },
+      {
+         "i": 4,
+         "minutes": 240,
+         "rate": 1.091,
+         "start": "04:00:00"
+      },
+      {
+         "i": 5,
+         "minutes": 300,
+         "rate": 0.965,
+         "start": "05:00:00"
+      },
+      {
+         "i": 6,
+         "minutes": 360,
+         "rate": 0.848,
+         "start": "06:00:00"
+      },
+      {
+         "i": 7,
+         "minutes": 420,
+         "rate": 1.112,
+         "start": "07:00:00"
+      },
+      {
+         "i": 8,
+         "minutes": 480,
+         "rate": 1.173,
+         "start": "08:00:00"
+      },
+      {
+         "i": 9,
+         "minutes": 540,
+         "rate": 1.214,
+         "start": "09:00:00"
+      },
+      {
+         "i": 10,
+         "minutes": 600,
+         "rate": 1.219,
+         "start": "10:00:00"
+      },
+      {
+         "i": 11,
+         "minutes": 660,
+         "rate": 1.07,
+         "start": "11:00:00"
+      },
+      {
+         "i": 12,
+         "minutes": 720,
+         "rate": 1.147,
+         "start": "12:00:00"
+      },
+      {
+         "i": 13,
+         "minutes": 780,
+         "rate": 1.136,
+         "start": "13:00:00"
+      },
+      {
+         "i": 14,
+         "minutes": 840,
+         "rate": 1.126,
+         "start": "14:00:00"
+      },
+      {
+         "i": 15,
+         "minutes": 900,
+         "rate": 1.102,
+         "start": "15:00:00"
+      },
+      {
+         "i": 16,
+         "minutes": 960,
+         "rate": 0.928,
+         "start": "16:00:00"
+      },
+      {
+         "i": 17,
+         "minutes": 1020,
+         "rate": 0.71,
+         "start": "17:00:00"
+      },
+      {
+         "i": 18,
+         "minutes": 1080,
+         "rate": 0.654,
+         "start": "18:00:00"
+      },
+      {
+         "i": 19,
+         "minutes": 1140,
+         "rate": 0.878,
+         "start": "19:00:00"
+      },
+      {
+         "i": 20,
+         "minutes": 1200,
+         "rate": 1.101,
+         "start": "20:00:00"
+      },
+      {
+         "i": 21,
+         "minutes": 1260,
+         "rate": 1.119,
+         "start": "21:00:00"
+      },
+      {
+         "i": 22,
+         "minutes": 1320,
+         "rate": 1.122,
+         "start": "22:00:00"
+      },
+      {
+         "i": 23,
+         "minutes": 1380,
+         "rate": 1.047,
+         "start": "23:00:00"
+      }
+   ],
+   "carb_ratio": 5.75,
+   "csf": 14.991,
+   "curve": "ultra-rapid",
+   "dia": 6,
+   "insulinPeakTime": 45,
+   "isfProfile": {
+      "sensitivities": [
+         {
+            "endoffset": 1440,
+            "i": 0,
+            "offset": 0,
+            "sensitivity": 93.589,
+            "start": "00:00:00",
+            "x": 0
+         }
+      ]
+   },
+   "min_5m_carbimpact": 8,
+   "name": "Tuned Dyn2",
+   "sens": 93.589,
+   "timezone": "Europe/Paris",
+   "units": "mg/dl",
+   "useCustomPeakTime": true
+}

app/src/test/res/autotune/test3/oaps-iobCalc.2022-05-21.json

@@ -0,0 +1,286 @@
+[
+  { "iob":  5.249, "activity": 0.0391, "date": 1653099848000},
+  { "iob":  5.292, "activity": 0.0438, "date": 1653100148000},
+  { "iob":  4.964, "activity": 0.047, "date": 1653100449000},
+  { "iob":  4.674, "activity": 0.0489, "date": 1653100748000},
+  { "iob":  4.377, "activity": 0.0498, "date": 1653101048000},
+  { "iob":  4.077, "activity": 0.0498, "date": 1653101348000},
+  { "iob":  3.73, "activity": 0.0491, "date": 1653101648000},
+  { "iob":  3.389, "activity": 0.0476, "date": 1653101948000},
+  { "iob":  3.055, "activity": 0.0457, "date": 1653102249000},
+  { "iob":  2.782, "activity": 0.0436, "date": 1653102548000},
+  { "iob":  2.47, "activity": 0.0411, "date": 1653102848000},
+  { "iob":  2.22, "activity": 0.0386, "date": 1653103149000},
+  { "iob":  1.935, "activity": 0.0358, "date": 1653103448000},
+  { "iob":  1.711, "activity": 0.0332, "date": 1653103748000},
+  { "iob":  1.452, "activity": 0.0304, "date": 1653104049000},
+  { "iob":  1.927, "activity": 0.028, "date": 1653104349000},
+  { "iob":  1.84, "activity": 0.027, "date": 1653104648000},
+  { "iob":  1.658, "activity": 0.0258, "date": 1653104949000},
+  { "iob":  1.482, "activity": 0.0245, "date": 1653105248000},
+  { "iob":  1.264, "activity": 0.0229, "date": 1653105549000},
+  { "iob":  1.104, "activity": 0.0212, "date": 1653105848000},
+  { "iob":  0.952, "activity": 0.0194, "date": 1653106149000},
+  { "iob":  1.619, "activity": 0.0181, "date": 1653106449000},
+  { "iob":  1.678, "activity": 0.0184, "date": 1653106749000},
+  { "iob":  1.775, "activity": 0.0187, "date": 1653107048000},
+  { "iob":  1.581, "activity": 0.019, "date": 1653107348000},
+  { "iob":  1.437, "activity": 0.0188, "date": 1653107648000},
+  { "iob":  1.294, "activity": 0.0183, "date": 1653107948000},
+  { "iob":  1.153, "activity": 0.0176, "date": 1653108249000},
+  { "iob":  1.017, "activity": 0.0167, "date": 1653108548000},
+  { "iob":  0.887, "activity": 0.0156, "date": 1653108848000},
+  { "iob":  1.011, "activity": 0.0147, "date": 1653109148000},
+  { "iob":  0.889, "activity": 0.0141, "date": 1653109448000},
+  { "iob":  0.771, "activity": 0.0133, "date": 1653109748000},
+  { "iob":  0.656, "activity": 0.0124, "date": 1653110049000},
+  { "iob":  0.547, "activity": 0.0114, "date": 1653110348000},
+  { "iob":  0.392, "activity": 0.0103, "date": 1653110649000},
+  { "iob":  0.294, "activity": 0.0091, "date": 1653110949000},
+  { "iob":  0.2, "activity": 0.008, "date": 1653111249000},
+  { "iob":  0.065, "activity": 0.0066, "date": 1653111549000},
+  { "iob":  0.034, "activity": 0.0055, "date": 1653111849000},
+  { "iob":  0.549, "activity": 0.0048, "date": 1653112148000},
+  { "iob":  0.674, "activity": 0.0053, "date": 1653112449000},
+  { "iob":  0.597, "activity": 0.0057, "date": 1653112749000},
+  { "iob":  0.468, "activity": 0.0058, "date": 1653113049000},
+  { "iob":  0.389, "activity": 0.0057, "date": 1653113349000},
+  { "iob":  0.262, "activity": 0.0053, "date": 1653113649000},
+  { "iob":  0.186, "activity": 0.0048, "date": 1653113949000},
+  { "iob":  0.064, "activity": 0.0041, "date": 1653114249000},
+  { "iob":  -0.005, "activity": 0.0034, "date": 1653114549000},
+  { "iob":  -0.12, "activity": 0.0026, "date": 1653114849000},
+  { "iob":  -0.181, "activity": 0.0018, "date": 1653115149000},
+  { "iob":  -0.287, "activity": 0.0008, "date": 1653115449000},
+  { "iob":  -0.34, "activity": 0, "date": 1653115749000},
+  { "iob":  -0.436, "activity": -0.001, "date": 1653116049000},
+  { "iob":  -0.48, "activity": -0.0018, "date": 1653116349000},
+  { "iob":  -0.519, "activity": -0.0026, "date": 1653116649000},
+  { "iob":  -0.554, "activity": -0.0034, "date": 1653116949000},
+  { "iob":  -0.585, "activity": -0.0041, "date": 1653117249000},
+  { "iob":  -0.662, "activity": -0.0049, "date": 1653117549000},
+  { "iob":  -0.687, "activity": -0.0055, "date": 1653117848000},
+  { "iob":  -0.708, "activity": -0.0061, "date": 1653118149000},
+  { "iob":  -0.726, "activity": -0.0066, "date": 1653118449000},
+  { "iob":  -0.351, "activity": -0.0071, "date": 1653118748000},
+  { "iob":  -0.218, "activity": -0.0064, "date": 1653119049000},
+  { "iob":  -0.088, "activity": -0.0055, "date": 1653119349000},
+  { "iob":  13.594, "activity": 0.0023, "date": 1653119649000},
+  { "iob":  13.552, "activity": 0.0331, "date": 1653119949000},
+  { "iob":  13.224, "activity": 0.0573, "date": 1653120249000},
+  { "iob":  12.838, "activity": 0.076, "date": 1653120548000},
+  { "iob":  12.322, "activity": 0.09, "date": 1653120849000},
+  { "iob":  11.794, "activity": 0.1001, "date": 1653121149000},
+  { "iob":  11.177, "activity": 0.1068, "date": 1653121449000},
+  { "iob":  10.58, "activity": 0.111, "date": 1653121749000},
+  { "iob":  9.919, "activity": 0.1129, "date": 1653122049000},
+  { "iob":  9.254, "activity": 0.1129, "date": 1653122349000},
+  { "iob":  8.643, "activity": 0.1114, "date": 1653122649000},
+  { "iob":  7.992, "activity": 0.1088, "date": 1653122949000},
+  { "iob":  7.406, "activity": 0.1053, "date": 1653123248000},
+  { "iob":  7.111, "activity": 0.1012, "date": 1653123549000},
+  { "iob":  6.515, "activity": 0.0971, "date": 1653123849000},
+  { "iob":  5.99, "activity": 0.0927, "date": 1653124149000},
+  { "iob":  5.439, "activity": 0.0878, "date": 1653124448000},
+  { "iob":  4.962, "activity": 0.0828, "date": 1653124749000},
+  { "iob":  4.462, "activity": 0.0775, "date": 1653125048000},
+  { "iob":  4.036, "activity": 0.0724, "date": 1653125349000},
+  { "iob":  3.638, "activity": 0.0672, "date": 1653125649000},
+  { "iob":  3.214, "activity": 0.0621, "date": 1653125948000},
+  { "iob":  2.866, "activity": 0.0571, "date": 1653126249000},
+  { "iob":  2.494, "activity": 0.0522, "date": 1653126549000},
+  { "iob":  2.193, "activity": 0.0476, "date": 1653126849000},
+  { "iob":  1.867, "activity": 0.0431, "date": 1653127149000},
+  { "iob":  1.563, "activity": 0.0388, "date": 1653127449000},
+  { "iob":  1.329, "activity": 0.0347, "date": 1653127748000},
+  { "iob":  1.115, "activity": 0.0309, "date": 1653128049000},
+  { "iob":  0.87, "activity": 0.0272, "date": 1653128349000},
+  { "iob":  0.692, "activity": 0.0239, "date": 1653128649000},
+  { "iob":  0.482, "activity": 0.0206, "date": 1653128948000},
+  { "iob":  0.287, "activity": 0.0176, "date": 1653129249000},
+  { "iob":  0.156, "activity": 0.0148, "date": 1653129548000},
+  { "iob":  0.038, "activity": 0.0122, "date": 1653129848000},
+  { "iob":  -0.067, "activity": 0.0099, "date": 1653130149000},
+  { "iob":  -0.161, "activity": 0.0078, "date": 1653130448000},
+  { "iob":  -0.195, "activity": 0.006, "date": 1653130748000},
+  { "iob":  -0.271, "activity": 0.0044, "date": 1653131049000},
+  { "iob":  -0.339, "activity": 0.0029, "date": 1653131349000},
+  { "iob":  -0.4, "activity": 0.0015, "date": 1653131649000},
+  { "iob":  -0.155, "activity": 0.0007, "date": 1653131948000},
+  { "iob":  8.11, "activity": 0.0045, "date": 1653132249000},
+  { "iob":  7.992, "activity": 0.0222, "date": 1653132549000},
+  { "iob":  7.745, "activity": 0.0359, "date": 1653132849000},
+  { "iob":  7.488, "activity": 0.0465, "date": 1653133149000},
+  { "iob":  7.136, "activity": 0.0541, "date": 1653133449000},
+  { "iob":  6.8, "activity": 0.0596, "date": 1653133749000},
+  { "iob":  6.441, "activity": 0.0633, "date": 1653134049000},
+  { "iob":  6.022, "activity": 0.0651, "date": 1653134349000},
+  { "iob":  5.644, "activity": 0.0657, "date": 1653134649000},
+  { "iob":  5.216, "activity": 0.0653, "date": 1653134949000},
+  { "iob":  4.962, "activity": 0.0644, "date": 1653135249000},
+  { "iob":  4.544, "activity": 0.0627, "date": 1653135549000},
+  { "iob":  4.185, "activity": 0.0606, "date": 1653135849000},
+  { "iob":  3.839, "activity": 0.058, "date": 1653136149000},
+  { "iob":  3.456, "activity": 0.055, "date": 1653136449000},
+  { "iob":  3.139, "activity": 0.0519, "date": 1653136749000},
+  { "iob":  2.788, "activity": 0.0486, "date": 1653137049000},
+  { "iob":  2.503, "activity": 0.0453, "date": 1653137350000},
+  { "iob":  2.186, "activity": 0.0418, "date": 1653137649000},
+  { "iob":  3.17, "activity": 0.0407, "date": 1653137949000},
+  { "iob":  3.956, "activity": 0.0413, "date": 1653138249000},
+  { "iob":  3.648, "activity": 0.042, "date": 1653138549000},
+  { "iob":  4.126, "activity": 0.043, "date": 1653138849000},
+  { "iob":  3.81, "activity": 0.0437, "date": 1653139150000},
+  { "iob":  3.541, "activity": 0.0437, "date": 1653139450000},
+  { "iob":  3.272, "activity": 0.0431, "date": 1653139749000},
+  { "iob":  3.588, "activity": 0.0428, "date": 1653140049000},
+  { "iob":  3.875, "activity": 0.0431, "date": 1653140349000},
+  { "iob":  3.608, "activity": 0.0434, "date": 1653140648000},
+  { "iob":  4.271, "activity": 0.0442, "date": 1653140949000},
+  { "iob":  3.996, "activity": 0.0452, "date": 1653141249000},
+  { "iob":  4.298, "activity": 0.0462, "date": 1653141548000},
+  { "iob":  4.015, "activity": 0.0468, "date": 1653141849000},
+  { "iob":  4.538, "activity": 0.0481, "date": 1653142149000},
+  { "iob":  4.245, "activity": 0.0489, "date": 1653142449000},
+  { "iob":  4.729, "activity": 0.05, "date": 1653142749000},
+  { "iob":  4.426, "activity": 0.0508, "date": 1653143049000},
+  { "iob":  4.353, "activity": 0.051, "date": 1653143349000},
+  { "iob":  4.049, "activity": 0.0507, "date": 1653143650000},
+  { "iob":  3.747, "activity": 0.0498, "date": 1653143949000},
+  { "iob":  3.402, "activity": 0.0483, "date": 1653144249000},
+  { "iob":  3.115, "activity": 0.0464, "date": 1653144550000},
+  { "iob":  2.788, "activity": 0.0441, "date": 1653144849000},
+  { "iob":  2.524, "activity": 0.0417, "date": 1653145149000},
+  { "iob":  2.271, "activity": 0.0391, "date": 1653145449000},
+  { "iob":  2.033, "activity": 0.0365, "date": 1653145750000},
+  { "iob":  1.807, "activity": 0.0338, "date": 1653146050000},
+  { "iob":  1.594, "activity": 0.0312, "date": 1653146349000},
+  { "iob":  1.395, "activity": 0.0286, "date": 1653146650000},
+  { "iob":  1.258, "activity": 0.0262, "date": 1653146949000},
+  { "iob":  1.034, "activity": 0.0236, "date": 1653147249000},
+  { "iob":  0.971, "activity": 0.0215, "date": 1653147549000},
+  { "iob":  1.008, "activity": 0.0197, "date": 1653147849000},
+  { "iob":  0.963, "activity": 0.0183, "date": 1653148149000},
+  { "iob":  1.046, "activity": 0.0171, "date": 1653148450000},
+  { "iob":  0.912, "activity": 0.0161, "date": 1653148749000},
+  { "iob":  1.254, "activity": 0.0156, "date": 1653149049000},
+  { "iob":  1.176, "activity": 0.0154, "date": 1653149349000},
+  { "iob":  1.051, "activity": 0.0149, "date": 1653149650000},
+  { "iob":  0.928, "activity": 0.0142, "date": 1653149949000},
+  { "iob":  1.008, "activity": 0.0138, "date": 1653150249000},
+  { "iob":  0.89, "activity": 0.0133, "date": 1653150549000},
+  { "iob":  0.775, "activity": 0.0127, "date": 1653150849000},
+  { "iob":  0.664, "activity": 0.0118, "date": 1653151149000},
+  { "iob":  0.606, "activity": 0.011, "date": 1653151449000},
+  { "iob":  0.703, "activity": 0.0105, "date": 1653151749000},
+  { "iob":  0.702, "activity": 0.0101, "date": 1653152049000},
+  { "iob":  0.902, "activity": 0.0101, "date": 1653152349000},
+  { "iob":  0.801, "activity": 0.0101, "date": 1653152649000},
+  { "iob":  0.701, "activity": 0.0098, "date": 1653152949000},
+  { "iob":  0.603, "activity": 0.0094, "date": 1653153249000},
+  { "iob":  0.508, "activity": 0.0088, "date": 1653153549000},
+  { "iob":  0.415, "activity": 0.0081, "date": 1653153849000},
+  { "iob":  0.327, "activity": 0.0074, "date": 1653154149000},
+  { "iob":  0.242, "activity": 0.0066, "date": 1653154449000},
+  { "iob":  0.161, "activity": 0.0058, "date": 1653154749000},
+  { "iob":  0.134, "activity": 0.005, "date": 1653155049000},
+  { "iob":  0.4, "activity": 0.0048, "date": 1653155349000},
+  { "iob":  0.475, "activity": 0.0049, "date": 1653155649000},
+  { "iob":  0.401, "activity": 0.005, "date": 1653155950000},
+  { "iob":  0.327, "activity": 0.0048, "date": 1653156250000},
+  { "iob":  0.203, "activity": 0.0044, "date": 1653156549000},
+  { "iob":  0.132, "activity": 0.004, "date": 1653156849000},
+  { "iob":  0.064, "activity": 0.0034, "date": 1653157149000},
+  { "iob":  -0.002, "activity": 0.0028, "date": 1653157449000},
+  { "iob":  -0.064, "activity": 0.0022, "date": 1653157750000},
+  { "iob":  -0.073, "activity": 0.0016, "date": 1653158049000},
+  { "iob":  -0.08, "activity": 0.0011, "date": 1653158349000},
+  { "iob":  -0.085, "activity": 0.0007, "date": 1653158649000},
+  { "iob":  -0.087, "activity": 0.0004, "date": 1653158949000},
+  { "iob":  -0.088, "activity": 0.0001, "date": 1653159249000},
+  { "iob":  -0.088, "activity": -0.0001, "date": 1653159549000},
+  { "iob":  -0.137, "activity": -0.0004, "date": 1653159849000},
+  { "iob":  -0.184, "activity": -0.0007, "date": 1653160150000},
+  { "iob":  -0.18, "activity": -0.001, "date": 1653160449000},
+  { "iob":  -0.175, "activity": -0.0012, "date": 1653160749000},
+  { "iob":  -0.168, "activity": -0.0014, "date": 1653161049000},
+  { "iob":  -0.211, "activity": -0.0015, "date": 1653161350000},
+  { "iob":  -0.203, "activity": -0.0017, "date": 1653161649000},
+  { "iob":  -0.243, "activity": -0.002, "date": 1653161950000},
+  { "iob":  -0.282, "activity": -0.0023, "date": 1653162250000},
+  { "iob":  -0.32, "activity": -0.0026, "date": 1653162549000},
+  { "iob":  -0.357, "activity": -0.0029, "date": 1653162850000},
+  { "iob":  -0.391, "activity": -0.0032, "date": 1653163150000},
+  { "iob":  -0.375, "activity": -0.0035, "date": 1653163449000},
+  { "iob":  -0.357, "activity": -0.0036, "date": 1653163749000},
+  { "iob":  -0.149, "activity": -0.0035, "date": 1653164049000},
+  { "iob":  -0.132, "activity": -0.0031, "date": 1653164350000},
+  { "iob":  9.296, "activity": 0.015, "date": 1653164649000},
+  { "iob":  9.123, "activity": 0.0332, "date": 1653164950000},
+  { "iob":  8.96, "activity": 0.0474, "date": 1653165249000},
+  { "iob":  8.644, "activity": 0.0584, "date": 1653165550000},
+  { "iob":  8.282, "activity": 0.0664, "date": 1653165850000},
+  { "iob":  7.835, "activity": 0.0718, "date": 1653166149000},
+  { "iob":  7.416, "activity": 0.0753, "date": 1653166450000},
+  { "iob":  6.984, "activity": 0.0772, "date": 1653166749000},
+  { "iob":  6.547, "activity": 0.0776, "date": 1653167049000},
+  { "iob":  6.061, "activity": 0.0769, "date": 1653167350000},
+  { "iob":  5.68, "activity": 0.0754, "date": 1653167650000},
+  { "iob":  5.458, "activity": 0.0734, "date": 1653167949000},
+  { "iob":  5.046, "activity": 0.0712, "date": 1653168250000},
+  { "iob":  4.925, "activity": 0.069, "date": 1653168549000},
+  { "iob":  4.487, "activity": 0.0663, "date": 1653168849000},
+  { "iob":  4.113, "activity": 0.0633, "date": 1653169150000},
+  { "iob":  3.706, "activity": 0.0599, "date": 1653169449000},
+  { "iob":  3.363, "activity": 0.0566, "date": 1653169749000},
+  { "iob":  3.039, "activity": 0.053, "date": 1653170049000},
+  { "iob":  2.733, "activity": 0.0494, "date": 1653170350000},
+  { "iob":  2.395, "activity": 0.0457, "date": 1653170650000},
+  { "iob":  2.126, "activity": 0.0421, "date": 1653170950000},
+  { "iob":  1.824, "activity": 0.0385, "date": 1653171250000},
+  { "iob":  1.64, "activity": 0.0351, "date": 1653171549000},
+  { "iob":  1.473, "activity": 0.0319, "date": 1653171849000},
+  { "iob":  1.273, "activity": 0.0288, "date": 1653172150000},
+  { "iob":  1.136, "activity": 0.026, "date": 1653172450000},
+  { "iob":  1.011, "activity": 0.0235, "date": 1653172749000},
+  { "iob":  0.852, "activity": 0.021, "date": 1653173050000},
+  { "iob":  0.752, "activity": 0.0189, "date": 1653173350000},
+  { "iob":  0.662, "activity": 0.0169, "date": 1653173650000},
+  { "iob":  0.534, "activity": 0.0149, "date": 1653173949000},
+  { "iob":  0.463, "activity": 0.0132, "date": 1653174249000},
+  { "iob":  0.352, "activity": 0.0115, "date": 1653174550000},
+  { "iob":  0.298, "activity": 0.0101, "date": 1653174850000},
+  { "iob":  0.25, "activity": 0.0089, "date": 1653175149000},
+  { "iob":  0.329, "activity": 0.0079, "date": 1653175450000},
+  { "iob":  0.34, "activity": 0.0074, "date": 1653175750000},
+  { "iob":  0.304, "activity": 0.0068, "date": 1653176050000},
+  { "iob":  0.272, "activity": 0.0062, "date": 1653176350000},
+  { "iob":  0.512, "activity": 0.006, "date": 1653176650000},
+  { "iob":  0.581, "activity": 0.0061, "date": 1653176950000},
+  { "iob":  1.238, "activity": 0.0075, "date": 1653177250000},
+  { "iob":  1.147, "activity": 0.0088, "date": 1653177550000},
+  { "iob":  1.151, "activity": 0.0098, "date": 1653177850000},
+  { "iob":  1.05, "activity": 0.0104, "date": 1653178149000},
+  { "iob":  0.947, "activity": 0.0107, "date": 1653178449000},
+  { "iob":  0.844, "activity": 0.0106, "date": 1653178750000},
+  { "iob":  0.741, "activity": 0.0104, "date": 1653179050000},
+  { "iob":  0.59, "activity": 0.0099, "date": 1653179350000},
+  { "iob":  0.542, "activity": 0.0093, "date": 1653179649000},
+  { "iob":  0.497, "activity": 0.0087, "date": 1653179949000},
+  { "iob":  0.456, "activity": 0.0081, "date": 1653180250000},
+  { "iob":  0.516, "activity": 0.0077, "date": 1653180549000},
+  { "iob":  0.429, "activity": 0.0072, "date": 1653180849000},
+  { "iob":  0.294, "activity": 0.0066, "date": 1653181150000},
+  { "iob":  0.163, "activity": 0.0058, "date": 1653181450000},
+  { "iob":  0.037, "activity": 0.0049, "date": 1653181750000},
+  { "iob":  -0.085, "activity": 0.0039, "date": 1653182050000},
+  { "iob":  -0.153, "activity": 0.0029, "date": 1653182349000},
+  { "iob":  -0.265, "activity": 0.0018, "date": 1653182650000},
+  { "iob":  -0.371, "activity": 0.0007, "date": 1653182949000},
+  { "iob":  -0.471, "activity": -0.0005, "date": 1653183249000},
+  { "iob":  -0.566, "activity": -0.0016, "date": 1653183550000},
+  { "iob":  -0.606, "activity": -0.0026, "date": 1653183850000},
+  { "iob":  -0.64, "activity": -0.0036, "date": 1653184150000},
+  { "iob":  -0.67, "activity": -0.0044, "date": 1653184450000}
+]
+

app/src/test/res/autotune/test3/profile.pump.json

@@ -0,0 +1,147 @@
+{
+  "name": "Tuned Dyn2",
+  "min_5m_carbimpact": 8,
+  "dia": 6,
+  "curve": "ultra-rapid",
+  "useCustomPeakTime": true,
+  "insulinPeakTime": 45,
+  "basalprofile": [
+    {
+      "start": "00:00:00",
+      "minutes": 0,
+      "rate": 0.966
+    },
+    {
+      "start": "01:00:00",
+      "minutes": 60,
+      "rate": 0.977
+    },
+    {
+      "start": "02:00:00",
+      "minutes": 120,
+      "rate": 0.971
+    },
+    {
+      "start": "03:00:00",
+      "minutes": 180,
+      "rate": 1.111
+    },
+    {
+      "start": "04:00:00",
+      "minutes": 240,
+      "rate": 0.974
+    },
+    {
+      "start": "05:00:00",
+      "minutes": 300,
+      "rate": 0.923
+    },
+    {
+      "start": "06:00:00",
+      "minutes": 360,
+      "rate": 0.823
+    },
+    {
+      "start": "07:00:00",
+      "minutes": 420,
+      "rate": 0.855
+    },
+    {
+      "start": "08:00:00",
+      "minutes": 480,
+      "rate": 0.902
+    },
+    {
+      "start": "09:00:00",
+      "minutes": 540,
+      "rate": 0.934
+    },
+    {
+      "start": "10:00:00",
+      "minutes": 600,
+      "rate": 0.938
+    },
+    {
+      "start": "11:00:00",
+      "minutes": 660,
+      "rate": 0.903
+    },
+    {
+      "start": "12:00:00",
+      "minutes": 720,
+      "rate": 0.882
+    },
+    {
+      "start": "13:00:00",
+      "minutes": 780,
+      "rate": 0.874
+    },
+    {
+      "start": "14:00:00",
+      "minutes": 840,
+      "rate": 0.866
+    },
+    {
+      "start": "15:00:00",
+      "minutes": 900,
+      "rate": 0.848
+    },
+    {
+      "start": "16:00:00",
+      "minutes": 960,
+      "rate": 0.758
+    },
+    {
+      "start": "17:00:00",
+      "minutes": 1020,
+      "rate": 0.65
+    },
+    {
+      "start": "18:00:00",
+      "minutes": 1080,
+      "rate": 0.648
+    },
+    {
+      "start": "19:00:00",
+      "minutes": 1140,
+      "rate": 0.738
+    },
+    {
+      "start": "20:00:00",
+      "minutes": 1200,
+      "rate": 0.847
+    },
+    {
+      "start": "21:00:00",
+      "minutes": 1260,
+      "rate": 0.861
+    },
+    {
+      "start": "22:00:00",
+      "minutes": 1320,
+      "rate": 0.863
+    },
+    {
+      "start": "23:00:00",
+      "minutes": 1380,
+      "rate": 0.843
+    }
+  ],
+  "isfProfile": {
+    "sensitivities": [
+      {
+        "i": 0,
+        "start": "00:00:00",
+        "sensitivity": 86.2,
+        "offset": 0,
+        "x": 0,
+        "endoffset": 1440
+      }
+    ]
+  },
+  "carb_ratio": 5.75,
+  "autosens_max": 1.3,
+  "autosens_min": 0.7,
+  "units": "mg/dl",
+  "timezone": "Europe/Paris"
+}

app/src/test/res/autotune/test4/autotune.2022-06-25-195325.log

@@ -0,0 +1,454 @@
+Compressing old json and log files to save space...
+gzip: ns-*.json: No such file or directory
+gzip: autotune*.json: No such file or directory
+Autotune disk usage:
+8.0K	.
+Overall disk used/avail:
+Filesystem      Size  Used Avail Use% Mounted on
+rootfs          930G  432G  499G  47% /
+Grabbing NIGHTSCOUT treatments.json and entries/sgv.json for date range...
+Query: https://xxxxxxxxxxxx.com entries/sgv.json find%5Bdate%5D%5B%24gte%5D=1653444000000&find%5Bdate%5D%5B%24lte%5D=1653530400000&count=1500
+-rw-r--r-- 1 titi titi 82011 Jun 25 19:53 ns-entries.2022-05-25.json
+Query: https://xxxxxxxxxxxx.com treatments.json find%5Bcreated_at%5D%5B%24gte%5D=2022-05-24T06:00+02:00&find%5Bcreated_at%5D%5B%24lte%5D=2022-05-26T18:00+02:00
+-rw-r--r-- 1 titi titi 216847 Jun 25 19:53 ns-treatments.2022-05-25.json
+
+Log information from 2022-05-25 to 2022-05-29 removed for unit test
+
+Query: https://xxxxxxxxxxxx.com entries/sgv.json find%5Bdate%5D%5B%24gte%5D=1653876000000&find%5Bdate%5D%5B%24lte%5D=1653962400000&count=1500
+-rw-r--r-- 1 titi titi 75423 Jun 25 19:53 ns-entries.2022-05-30.json
+Query: https://xxxxxxxxxxxx.com treatments.json find%5Bcreated_at%5D%5B%24gte%5D=2022-05-29T06:00+02:00&find%5Bcreated_at%5D%5B%24lte%5D=2022-05-31T18:00+02:00
+-rw-r--r-- 1 titi titi 229319 Jun 25 19:53 ns-treatments.2022-05-30.json
+oref0-autotune-prep   ns-treatments.2022-05-30.json profile.json ns-entries.2022-05-30.json profile.pump.json > autotune.2022-05-30.json
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: 6.5 IOB: -1.341 Activity: -0.0157 at 04:24:21 dev: -4.27 avgDelta: 2.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: 6.6 IOB: -1.362 Activity: -0.0158 at 04:29:21 dev: -4.81 avgDelta: 1.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: 6.6 IOB: -1.333 Activity: -0.0158 at 04:34:21 dev: -4.56 avgDelta: 2.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: 6.6 IOB: -1.304 Activity: -0.0158 at 04:39:21 dev: -3.81 avgDelta: 2.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: 6.5 IOB: -1.275 Activity: -0.0157 at 04:44:21 dev: -2.77 avgDelta: 3.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: 6.3 IOB: -0.888 Activity: -0.0151 at 04:49:21 dev: -1.77 avgDelta: 4.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: 5.8 IOB: -0.715 Activity: -0.0139 at 04:54:21 dev: -0.77 avgDelta: 5.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.5 BGI: 5.1 IOB: -0.279 Activity: -0.0123 at 04:59:21 dev: 0.39 avgDelta: 5.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: 4.2 IOB: -0.073 Activity: -0.0102 at 05:04:21 dev: 1.52 avgDelta: 5.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: 3.3 IOB: 0.233 Activity: -0.008 at 05:09:21 dev: 2.43 avgDelta: 5.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: 2.4 IOB: 0.367 Activity: -0.0058 at 05:14:21 dev: 3.34 avgDelta: 5.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: 1.4 IOB: 1.021 Activity: -0.0033 at 05:19:21 dev: 3.63 avgDelta: 5.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: 0.2 IOB: 0.98 Activity: -0.0004 at 05:24:22 dev: 4.08 avgDelta: 4.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -0.8 IOB: 0.926 Activity: 0.0018 at 05:29:21 dev: 3.75 avgDelta: 3.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -1.6 IOB: 1.122 Activity: 0.0039 at 05:34:21 dev: 3.12 avgDelta: 1.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -2.3 IOB: 1.048 Activity: 0.0056 at 05:39:21 dev: 2.32 avgDelta: 0.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -2.8 IOB: 0.917 Activity: 0.0067 at 05:44:21 dev: 1.53 avgDelta: -1.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -3.1 IOB: 0.832 Activity: 0.0074 at 05:49:21 dev: 1.32 avgDelta: -1.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -3.1 IOB: 0.695 Activity: 0.0076 at 05:54:21 dev: 0.65 avgDelta: -2.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -3.1 IOB: 0.606 Activity: 0.0076 at 05:59:21 dev: 0.90 avgDelta: -2.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -3.1 IOB: 0.518 Activity: 0.0074 at 06:04:21 dev: 0.57 avgDelta: -2.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -3.0 IOB: 0.482 Activity: 0.0071 at 06:09:21 dev: 0.70 avgDelta: -2.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -2.8 IOB: 0.447 Activity: 0.0068 at 06:14:21 dev: 1.07 avgDelta: -1.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -2.8 IOB: 0.584 Activity: 0.0067 at 06:19:21 dev: 1.78 avgDelta: -1.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -2.8 IOB: 0.67 Activity: 0.0068 at 06:24:21 dev: 2.32 avgDelta: -0.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -3.0 IOB: 0.685 Activity: 0.0072 at 06:29:21 dev: 2.24 avgDelta: -0.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -3.0 IOB: 0.649 Activity: 0.0073 at 06:34:21 dev: 2.53 avgDelta: -0.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -3.0 IOB: 0.563 Activity: 0.0072 at 06:39:21 dev: 2.24 avgDelta: -0.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -3.0 IOB: 0.737 Activity: 0.0073 at 06:44:21 dev: 2.53 avgDelta: -0.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -3.1 IOB: 0.65 Activity: 0.0075 at 06:49:21 dev: 2.61 avgDelta: -0.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -3.1 IOB: 0.562 Activity: 0.0074 at 06:54:21 dev: 2.07 avgDelta: -1.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: -3.0 IOB: 0.476 Activity: 0.0071 at 06:59:21 dev: 1.20 avgDelta: -1.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -2.8 IOB: 0.441 Activity: 0.0068 at 07:04:21 dev: 0.32 avgDelta: -2.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -2.7 IOB: 0.358 Activity: 0.0064 at 07:09:21 dev: -0.09 avgDelta: -2.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -2.5 IOB: 0.277 Activity: 0.0059 at 07:14:21 dev: -0.05 avgDelta: -2.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -2.2 IOB: 0.199 Activity: 0.0053 at 07:19:21 dev: 0.70 avgDelta: -1.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -2.0 IOB: 0.274 Activity: 0.0048 at 07:24:21 dev: 1.49 avgDelta: -0.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -2.0 IOB: 0.35 Activity: 0.0048 at 07:29:21 dev: 2.49 avgDelta: 0.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -1.9 IOB: 0.327 Activity: 0.0046 at 07:34:22 dev: 2.16 avgDelta: 0.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -1.8 IOB: 0.254 Activity: 0.0044 at 07:39:21 dev: 1.58 avgDelta: -0.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -1.7 IOB: 0.183 Activity: 0.004 at 07:44:21 dev: 0.66 avgDelta: -1.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -1.5 IOB: 0.114 Activity: 0.0036 at 07:49:21 dev: -0.26 avgDelta: -1.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -1.3 IOB: 0.048 Activity: 0.003 at 07:54:21 dev: -0.50 avgDelta: -1.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -1.1 IOB: 0.034 Activity: 0.0026 at 07:59:21 dev: -0.92 avgDelta: -2.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.1 BGI: -0.8 IOB: -0.028 Activity: 0.002 at 08:04:21 dev: -0.92 avgDelta: -1.75 basal
+CRInitialIOB: -0.087 CRInitialBG: 92 CRInitialCarbTime: 2022-05-30T06:09:21.000Z
+start carb absorption
+0 mealCOB: 74.5 mealCarbs: 75 basalBGI: 6.1 BGI: -0.6 IOB: -0.087 Activity: 0.0015 at 08:09:21 dev: 0.12 avgDelta: -0.50 csf
+0 mealCOB: 74.0 mealCarbs: 75 basalBGI: 6.1 BGI: -0.4 IOB: -0.093 Activity: 0.001 at 08:14:21 dev: 2.67 avgDelta: 2.25 csf
+0 mealCOB: 73.5 mealCarbs: 75 basalBGI: 6.1 BGI: -0.2 IOB: -0.147 Activity: 0.0005 at 08:19:21 dev: 7.21 avgDelta: 7.00 csf
+1 mealCOB: 72.1 mealCarbs: 75 basalBGI: 6.1 BGI: -12.7 IOB: 16.05 Activity: 0.0305 at 08:24:21 dev: 24.66 avgDelta: 12.00 csf
+1 mealCOB: 69.5 mealCarbs: 75 basalBGI: 6.1 BGI: -25.4 IOB: 15.767 Activity: 0.0611 at 08:29:21 dev: 41.61 avgDelta: 16.25 csf
+1 mealCOB: 66.3 mealCarbs: 75 basalBGI: 6.1 BGI: -35.2 IOB: 15.3 Activity: 0.0848 at 08:34:21 dev: 53.20 avgDelta: 18.00 csf
+1 mealCOB: 62.7 mealCarbs: 75 basalBGI: 6.1 BGI: -42.7 IOB: 14.779 Activity: 0.1028 at 08:39:21 dev: 59.42 avgDelta: 16.75 csf
+1 mealCOB: 59.0 mealCarbs: 75 basalBGI: 6.1 BGI: -48.1 IOB: 14.131 Activity: 0.1158 at 08:44:21 dev: 62.07 avgDelta: 14.00 csf
+1 mealCOB: 55.2 mealCarbs: 75 basalBGI: 6.1 BGI: -51.8 IOB: 13.477 Activity: 0.1249 at 08:49:21 dev: 62.09 avgDelta: 10.25 csf
+1 mealCOB: 51.5 mealCarbs: 75 basalBGI: 6.1 BGI: -54.2 IOB: 12.739 Activity: 0.1305 at 08:54:21 dev: 61.17 avgDelta: 7.00 csf
+1 mealCOB: 47.9 mealCarbs: 75 basalBGI: 6.1 BGI: -55.4 IOB: 12.027 Activity: 0.1335 at 08:59:21 dev: 59.91 avgDelta: 4.50 csf
+1 mealCOB: 44.4 mealCarbs: 75 basalBGI: 6.1 BGI: -55.7 IOB: 11.307 Activity: 0.1342 at 09:04:20 dev: 58.20 avgDelta: 2.50 csf
+1 mealCOB: 41.0 mealCarbs: 75 basalBGI: 6.1 BGI: -55.3 IOB: 10.538 Activity: 0.1331 at 09:09:22 dev: 56.25 avgDelta: 1.00 csf
+1 mealCOB: 37.7 mealCarbs: 75 basalBGI: 6.1 BGI: -54.2 IOB: 9.828 Activity: 0.1306 at 09:14:21 dev: 54.21 avgDelta: 0.00 csf
+1 mealCOB: 34.5 mealCarbs: 75 basalBGI: 6.1 BGI: -52.6 IOB: 9.085 Activity: 0.1268 at 09:19:22 dev: 52.38 avgDelta: -0.25 csf
+1 mealCOB: 31.4 mealCarbs: 75 basalBGI: 6.1 BGI: -50.8 IOB: 8.411 Activity: 0.1223 at 09:24:21 dev: 51.01 avgDelta: 0.25 csf
+1 mealCOB: 28.4 mealCarbs: 75 basalBGI: 6.1 BGI: -48.6 IOB: 7.764 Activity: 0.117 at 09:29:21 dev: 50.06 avgDelta: 1.50 csf
+1 mealCOB: 25.4 mealCarbs: 75 basalBGI: 6.1 BGI: -46.2 IOB: 7.193 Activity: 0.1114 at 09:34:21 dev: 49.24 avgDelta: 3.00 csf
+1 mealCOB: 22.6 mealCarbs: 75 basalBGI: 6.1 BGI: -43.9 IOB: 6.65 Activity: 0.1057 at 09:39:21 dev: 47.62 avgDelta: 3.75 csf
+1 mealCOB: 19.8 mealCarbs: 75 basalBGI: 6.1 BGI: -41.5 IOB: 6.136 Activity: 0.0999 at 09:44:22 dev: 44.97 avgDelta: 3.50 csf
+1 mealCOB: 17.3 mealCarbs: 75 basalBGI: 6.1 BGI: -39.1 IOB: 5.651 Activity: 0.0941 at 09:49:21 dev: 41.81 avgDelta: 2.75 csf
+1 mealCOB: 15.0 mealCarbs: 75 basalBGI: 6.1 BGI: -36.7 IOB: 5.194 Activity: 0.0884 at 09:54:22 dev: 38.19 avgDelta: 1.50 csf
+1 mealCOB: 13.0 mealCarbs: 75 basalBGI: 6.1 BGI: -33.2 IOB: 4.302 Activity: 0.08 at 09:59:21 dev: 33.21 avgDelta: 0.00 csf
+1 mealCOB: 11.2 mealCarbs: 75 basalBGI: 6.1 BGI: -30.7 IOB: 3.868 Activity: 0.0739 at 10:04:21 dev: 29.42 avgDelta: -1.25 csf
+1 mealCOB: 9.7 mealCarbs: 75 basalBGI: 6.1 BGI: -28.2 IOB: 3.413 Activity: 0.068 at 10:09:21 dev: 25.72 avgDelta: -2.50 csf
+1 mealCOB: 8.3 mealCarbs: 75 basalBGI: 6.1 BGI: -25.9 IOB: 3.037 Activity: 0.0623 at 10:14:21 dev: 22.86 avgDelta: -3.00 csf
+1 mealCOB: 7.0 mealCarbs: 75 basalBGI: 6.1 BGI: -23.6 IOB: 2.64 Activity: 0.0568 at 10:19:21 dev: 20.83 avgDelta: -2.75 csf
+1 mealCOB: 5.8 mealCarbs: 75 basalBGI: 6.1 BGI: -21.4 IOB: 2.319 Activity: 0.0516 at 10:24:22 dev: 19.42 avgDelta: -2.00 csf
+1 mealCOB: 4.8 mealCarbs: 75 basalBGI: 6.1 BGI: -19.5 IOB: 2.193 Activity: 0.0469 at 10:29:21 dev: 17.72 avgDelta: -1.75 csf
+1 mealCOB: 3.8 mealCarbs: 75 basalBGI: 6.1 BGI: -17.7 IOB: 1.919 Activity: 0.0427 at 10:34:21 dev: 15.72 avgDelta: -2.00 csf
+1 mealCOB: 3.0 mealCarbs: 75 basalBGI: 6.1 BGI: -16.0 IOB: 1.666 Activity: 0.0386 at 10:39:21 dev: 13.77 avgDelta: -2.25 csf
+1 mealCOB: 2.3 mealCarbs: 75 basalBGI: 6.1 BGI: -14.5 IOB: 1.483 Activity: 0.0349 at 10:44:21 dev: 11.99 avgDelta: -2.50 csf
+1 mealCOB: 1.6 mealCarbs: 75 basalBGI: 6.1 BGI: -13.3 IOB: 1.606 Activity: 0.032 at 10:49:21 dev: 11.03 avgDelta: -2.25 csf
+1 mealCOB: 1.0 mealCarbs: 75 basalBGI: 6.1 BGI: -12.2 IOB: 1.452 Activity: 0.0294 at 10:54:21 dev: 9.70 avgDelta: -2.50 csf
+1 mealCOB: 0.5 mealCarbs: 75 basalBGI: 6.1 BGI: -11.2 IOB: 1.311 Activity: 0.027 at 10:59:21 dev: 7.71 avgDelta: -3.50 csf
+1 mealCOB: 0.0 mealCarbs: 75 basalBGI: 6.0 BGI: -10.3 IOB: 1.182 Activity: 0.0248 at 11:04:21 dev: 5.29 avgDelta: -5.00 csf
+1 mealCOB: 0.0 mealCarbs: 75 basalBGI: 6.0 BGI: -9.4 IOB: 1.013 Activity: 0.0226 at 11:09:21 dev: 2.63 avgDelta: -6.75 csf
+1 mealCOB: 0.0 mealCarbs: 75 basalBGI: 6.0 BGI: -8.5 IOB: 0.856 Activity: 0.0204 at 11:14:21 dev: 0.22 avgDelta: -8.25 csf
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: -7.6 IOB: 0.709 Activity: 0.0183 at 11:19:21 dev: -1.65 avgDelta: -9.25 csf
+end carb absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: -6.8 IOB: 0.572 Activity: 0.0163 at 11:24:21 dev: -2.48 avgDelta: -9.25 ISF
+CREndIOB: 0.396 CREndBG: 131 CREndTime: 2022-05-30T09:29:21.000Z
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: -5.9 IOB: 0.396 Activity: 0.0143 at 11:29:21 dev: -2.81 avgDelta: -8.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: -5.2 IOB: 0.278 Activity: 0.0125 at 11:34:21 dev: -2.56 avgDelta: -7.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: -4.4 IOB: 0.17 Activity: 0.0107 at 11:39:21 dev: -2.31 avgDelta: -6.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: -3.6 IOB: 0.022 Activity: 0.0088 at 11:44:21 dev: -2.85 avgDelta: -6.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: -3.0 IOB: -0.068 Activity: 0.0072 at 11:49:21 dev: -3.01 avgDelta: -6.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: -2.3 IOB: -0.15 Activity: 0.0056 at 11:54:21 dev: -3.43 avgDelta: -5.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: -1.7 IOB: -0.274 Activity: 0.004 at 11:59:21 dev: -3.34 avgDelta: -5.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: -1.1 IOB: -0.29 Activity: 0.0027 at 12:04:21 dev: -3.38 avgDelta: -4.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: -0.6 IOB: -0.301 Activity: 0.0015 at 12:09:22 dev: -3.38 avgDelta: -4.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: -0.2 IOB: -0.356 Activity: 0.0005 at 12:14:21 dev: -3.54 avgDelta: -3.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: 0.2 IOB: -0.356 Activity: -0.0004 at 12:19:21 dev: -3.92 avgDelta: -3.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: 0.5 IOB: -0.402 Activity: -0.0011 at 12:24:22 dev: -3.46 avgDelta: -3.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: 0.8 IOB: -0.445 Activity: -0.0019 at 12:29:21 dev: -3.54 avgDelta: -2.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: 1.0 IOB: -0.435 Activity: -0.0024 at 12:34:21 dev: -3.00 avgDelta: -2.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 6.0 BGI: 1.3 IOB: -0.47 Activity: -0.0031 at 12:39:22 dev: -2.79 avgDelta: -1.50 basal
+CRInitialIOB: -0.454 CRInitialBG: 77 CRInitialCarbTime: 2022-05-30T10:44:21.000Z
+start carb absorption
+0 mealCOB: 49.5 mealCarbs: 50 basalBGI: 6.0 BGI: 1.4 IOB: -0.454 Activity: -0.0035 at 12:44:21 dev: -2.70 avgDelta: -1.25 csf
+0 mealCOB: 49.0 mealCarbs: 50 basalBGI: 6.0 BGI: 1.7 IOB: -0.484 Activity: -0.004 at 12:49:22 dev: -2.66 avgDelta: -1.00 csf
+0 mealCOB: 48.5 mealCarbs: 50 basalBGI: 6.0 BGI: 1.8 IOB: -0.464 Activity: -0.0043 at 12:54:22 dev: -2.28 avgDelta: -0.50 csf
+0 mealCOB: 48.1 mealCarbs: 50 basalBGI: 6.0 BGI: 1.9 IOB: -0.442 Activity: -0.0045 at 12:59:21 dev: -1.12 avgDelta: 0.75 csf
+0 mealCOB: 47.6 mealCarbs: 50 basalBGI: 5.9 BGI: 1.9 IOB: -0.469 Activity: -0.0047 at 13:04:22 dev: 0.80 avgDelta: 2.75 csf
+0 mealCOB: 47.1 mealCarbs: 50 basalBGI: 5.9 BGI: 2.0 IOB: -0.445 Activity: -0.0048 at 13:09:22 dev: 4.51 avgDelta: 6.50 csf
+0 mealCOB: 46.5 mealCarbs: 50 basalBGI: 5.9 BGI: 1.7 IOB: 0.287 Activity: -0.004 at 13:14:21 dev: 9.59 avgDelta: 11.25 csf
+1 mealCOB: 45.6 mealCarbs: 50 basalBGI: 5.9 BGI: 1.0 IOB: 0.453 Activity: -0.0024 at 13:19:21 dev: 15.25 avgDelta: 16.25 csf
+1 mealCOB: 44.3 mealCarbs: 50 basalBGI: 5.9 BGI: -0.5 IOB: 1.958 Activity: 0.0011 at 13:24:21 dev: 21.46 avgDelta: 21.00 csf
+1 mealCOB: 42.8 mealCarbs: 50 basalBGI: 5.9 BGI: -2.2 IOB: 1.892 Activity: 0.0053 at 13:29:21 dev: 25.45 avgDelta: 23.25 csf
+1 mealCOB: 41.1 mealCarbs: 50 basalBGI: 5.9 BGI: -3.9 IOB: 2.367 Activity: 0.0093 at 13:34:22 dev: 27.11 avgDelta: 23.25 csf
+1 mealCOB: 39.5 mealCarbs: 50 basalBGI: 5.9 BGI: -5.3 IOB: 2.261 Activity: 0.0127 at 13:39:21 dev: 26.27 avgDelta: 21.00 csf
+1 mealCOB: 37.6 mealCarbs: 50 basalBGI: 5.9 BGI: -14.2 IOB: 12.271 Activity: 0.0343 at 13:44:21 dev: 31.24 avgDelta: 17.00 csf
+1 mealCOB: 35.5 mealCarbs: 50 basalBGI: 5.9 BGI: -23.0 IOB: 11.995 Activity: 0.0554 at 13:49:21 dev: 35.74 avgDelta: 12.75 csf
+1 mealCOB: 33.2 mealCarbs: 50 basalBGI: 5.9 BGI: -29.7 IOB: 11.576 Activity: 0.0716 at 13:54:22 dev: 38.22 avgDelta: 8.50 csf
+1 mealCOB: 30.7 mealCarbs: 50 basalBGI: 5.9 BGI: -34.7 IOB: 11.136 Activity: 0.0836 at 13:59:21 dev: 39.95 avgDelta: 5.25 csf
+1 mealCOB: 28.3 mealCarbs: 50 basalBGI: 5.9 BGI: -38.3 IOB: 10.645 Activity: 0.0922 at 14:04:21 dev: 41.02 avgDelta: 2.75 csf
+1 mealCOB: 25.8 mealCarbs: 50 basalBGI: 5.9 BGI: -40.6 IOB: 10.069 Activity: 0.0979 at 14:09:22 dev: 41.14 avgDelta: 0.50 csf
+1 mealCOB: 23.3 mealCarbs: 50 basalBGI: 5.9 BGI: -42.0 IOB: 9.52 Activity: 0.1013 at 14:14:22 dev: 40.30 avgDelta: -1.75 csf
+1 mealCOB: 21.0 mealCarbs: 50 basalBGI: 5.9 BGI: -42.7 IOB: 9.009 Activity: 0.1028 at 14:19:22 dev: 37.92 avgDelta: -4.75 csf
+1 mealCOB: 18.9 mealCarbs: 50 basalBGI: 5.9 BGI: -42.6 IOB: 8.445 Activity: 0.1027 at 14:24:22 dev: 35.63 avgDelta: -7.00 csf
+1 mealCOB: 16.9 mealCarbs: 50 basalBGI: 5.9 BGI: -42.1 IOB: 7.834 Activity: 0.1014 at 14:29:22 dev: 33.34 avgDelta: -8.75 csf
+1 mealCOB: 15.0 mealCarbs: 50 basalBGI: 5.9 BGI: -41.1 IOB: 7.283 Activity: 0.099 at 14:34:22 dev: 31.34 avgDelta: -9.75 csf
+1 mealCOB: 13.1 mealCarbs: 50 basalBGI: 5.9 BGI: -39.7 IOB: 6.696 Activity: 0.0957 at 14:39:22 dev: 30.47 avgDelta: -9.25 csf
+1 mealCOB: 11.4 mealCarbs: 50 basalBGI: 5.9 BGI: -38.2 IOB: 6.176 Activity: 0.092 at 14:44:21 dev: 29.44 avgDelta: -8.75 csf
+1 mealCOB: 9.6 mealCarbs: 50 basalBGI: 5.9 BGI: -36.4 IOB: 5.676 Activity: 0.0877 at 14:49:22 dev: 28.65 avgDelta: -7.75 csf
+1 mealCOB: 8.0 mealCarbs: 50 basalBGI: 5.9 BGI: -34.4 IOB: 5.152 Activity: 0.0829 at 14:54:22 dev: 27.66 avgDelta: -6.75 csf
+1 mealCOB: 6.4 mealCarbs: 50 basalBGI: 5.9 BGI: -32.4 IOB: 4.65 Activity: 0.0781 at 14:59:21 dev: 26.17 avgDelta: -6.25 csf
+1 mealCOB: 4.9 mealCarbs: 50 basalBGI: 5.9 BGI: -30.4 IOB: 4.222 Activity: 0.0732 at 15:04:22 dev: 24.38 avgDelta: -6.00 csf
+1 mealCOB: 3.5 mealCarbs: 50 basalBGI: 5.9 BGI: -28.3 IOB: 3.769 Activity: 0.0682 at 15:09:22 dev: 22.31 avgDelta: -6.00 csf
+1 mealCOB: 2.3 mealCarbs: 50 basalBGI: 5.9 BGI: -26.2 IOB: 3.39 Activity: 0.0632 at 15:14:21 dev: 20.23 avgDelta: -6.00 csf
+1 mealCOB: 1.2 mealCarbs: 50 basalBGI: 5.9 BGI: -24.2 IOB: 2.987 Activity: 0.0583 at 15:19:22 dev: 18.45 avgDelta: -5.75 csf
+1 mealCOB: 0.2 mealCarbs: 50 basalBGI: 5.9 BGI: -22.2 IOB: 2.657 Activity: 0.0535 at 15:24:22 dev: 16.46 avgDelta: -5.75 csf
+1 mealCOB: 0.0 mealCarbs: 50 basalBGI: 5.9 BGI: -20.3 IOB: 2.351 Activity: 0.049 at 15:29:22 dev: 14.84 avgDelta: -5.50 csf
+1 mealCOB: 0.0 mealCarbs: 50 basalBGI: 5.9 BGI: -18.5 IOB: 2.018 Activity: 0.0445 at 15:34:22 dev: 12.97 avgDelta: -5.50 csf
+1 mealCOB: 0.0 mealCarbs: 50 basalBGI: 5.9 BGI: -16.7 IOB: 1.755 Activity: 0.0403 at 15:39:22 dev: 11.48 avgDelta: -5.25 csf
+1 mealCOB: 0.0 mealCarbs: 50 basalBGI: 5.9 BGI: -15.1 IOB: 1.513 Activity: 0.0364 at 15:44:22 dev: 10.11 avgDelta: -5.00 csf
+1 mealCOB: 0.0 mealCarbs: 50 basalBGI: 5.9 BGI: -13.5 IOB: 1.241 Activity: 0.0325 at 15:49:21 dev: 8.74 avgDelta: -4.75 csf
+1 mealCOB: 0.0 mealCarbs: 50 basalBGI: 5.9 BGI: -12.0 IOB: 1.037 Activity: 0.029 at 15:54:22 dev: 7.79 avgDelta: -4.25 csf
+1 mealCOB: 0.0 mealCarbs: 50 basalBGI: 5.9 BGI: -10.6 IOB: 0.851 Activity: 0.0256 at 15:59:21 dev: 6.63 avgDelta: -4.00 csf
+1 mealCOB: 0.0 mealCarbs: 50 basalBGI: 5.7 BGI: -9.3 IOB: 0.632 Activity: 0.0223 at 16:04:22 dev: 5.51 avgDelta: -3.75 csf
+1 mealCOB: 0.0 mealCarbs: 50 basalBGI: 5.7 BGI: -8.0 IOB: 0.428 Activity: 0.0192 at 16:09:21 dev: 4.47 avgDelta: -3.50 csf
+CREndIOB: 0.339 CREndBG: 100 CREndTime: 2022-05-30T14:14:22.000Z
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -6.8 IOB: 0.339 Activity: 0.0165 at 16:14:22 dev: 3.60 avgDelta: -3.25 csf
+end carb absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -5.8 IOB: 0.262 Activity: 0.0141 at 16:19:21 dev: 2.60 avgDelta: -3.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -5.0 IOB: 0.197 Activity: 0.012 at 16:24:21 dev: 1.73 avgDelta: -3.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -4.2 IOB: 0.142 Activity: 0.0102 at 16:29:21 dev: 0.73 avgDelta: -3.50 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -3.5 IOB: 0.046 Activity: 0.0085 at 16:34:21 dev: 0.28 avgDelta: -3.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -2.8 IOB: -0.093 Activity: 0.0068 at 16:39:21 dev: -0.18 avgDelta: -3.00 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -2.2 IOB: -0.173 Activity: 0.0053 at 16:44:22 dev: -0.05 avgDelta: -2.25 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -1.6 IOB: -0.246 Activity: 0.0039 at 16:49:21 dev: -0.13 avgDelta: -1.75 ISF
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -1.0 IOB: -0.361 Activity: 0.0024 at 16:54:21 dev: -0.50 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.7 BGI: -0.5 IOB: -0.42 Activity: 0.0011 at 16:59:21 dev: -1.04 avgDelta: -1.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: 0.0 IOB: -0.474 Activity: -0.0001 at 17:04:21 dev: -1.29 avgDelta: -1.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: 0.5 IOB: -0.52 Activity: -0.0012 at 17:09:21 dev: -1.25 avgDelta: -0.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: 0.9 IOB: -0.611 Activity: -0.0023 at 17:14:22 dev: -1.20 avgDelta: -0.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: 1.3 IOB: -0.648 Activity: -0.0032 at 17:19:21 dev: -1.08 avgDelta: 0.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: 1.7 IOB: -0.68 Activity: -0.004 at 17:24:22 dev: -1.66 avgDelta: 0.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: 2.1 IOB: -0.755 Activity: -0.005 at 17:29:22 dev: -2.33 avgDelta: -0.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: 2.4 IOB: -0.778 Activity: -0.0058 at 17:34:22 dev: -3.16 avgDelta: -0.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: 2.7 IOB: -0.798 Activity: -0.0065 at 17:39:22 dev: -3.45 avgDelta: -0.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: 3.0 IOB: -0.863 Activity: -0.0072 at 17:44:22 dev: -3.24 avgDelta: -0.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: 3.2 IOB: -0.877 Activity: -0.0078 at 17:49:21 dev: -2.99 avgDelta: 0.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: 3.4 IOB: -0.887 Activity: -0.0082 at 17:54:22 dev: -2.40 avgDelta: 1.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.4 BGI: 3.7 IOB: -0.942 Activity: -0.0089 at 17:59:22 dev: -2.44 avgDelta: 1.25 basal
+CRInitialIOB: -0.947 CRInitialBG: 87 CRInitialCarbTime: 2022-05-30T16:04:22.000Z
+start carb absorption
+0 mealCOB: 9.5 mealCarbs: 10 basalBGI: 5.4 BGI: 3.9 IOB: -0.947 Activity: -0.0093 at 18:04:22 dev: -1.61 avgDelta: 2.25 csf
+0 mealCOB: 9.0 mealCarbs: 10 basalBGI: 5.4 BGI: 4.0 IOB: -0.949 Activity: -0.0097 at 18:09:22 dev: 0.47 avgDelta: 4.50 csf
+0 mealCOB: 8.5 mealCarbs: 10 basalBGI: 5.4 BGI: 4.1 IOB: -0.78 Activity: -0.0098 at 18:14:22 dev: 3.43 avgDelta: 7.50 csf
+0 mealCOB: 8.1 mealCarbs: 10 basalBGI: 5.4 BGI: 3.9 IOB: -0.682 Activity: -0.0095 at 18:19:22 dev: 6.31 avgDelta: 10.25 csf
+0 mealCOB: 7.6 mealCarbs: 10 basalBGI: 5.4 BGI: 3.5 IOB: -0.097 Activity: -0.0084 at 18:24:21 dev: 7.51 avgDelta: 11.00 csf
+0 mealCOB: 7.1 mealCarbs: 10 basalBGI: 5.4 BGI: 2.9 IOB: -0.108 Activity: -0.007 at 18:29:21 dev: 6.09 avgDelta: 9.00 csf
+0 mealCOB: 6.6 mealCarbs: 10 basalBGI: 5.4 BGI: 2.5 IOB: -0.126 Activity: -0.006 at 18:34:22 dev: 2.76 avgDelta: 5.25 csf
+0 mealCOB: 6.1 mealCarbs: 10 basalBGI: 5.4 BGI: 2.2 IOB: -0.198 Activity: -0.0053 at 18:39:21 dev: -0.95 avgDelta: 1.25 csf
+0 mealCOB: 5.6 mealCarbs: 10 basalBGI: 5.4 BGI: 1.9 IOB: -0.223 Activity: -0.0047 at 18:44:22 dev: -3.45 avgDelta: -1.50 csf
+0 mealCOB: 5.2 mealCarbs: 10 basalBGI: 5.4 BGI: 1.8 IOB: -0.25 Activity: -0.0044 at 18:49:21 dev: -4.33 avgDelta: -2.50 csf
+0 mealCOB: 4.7 mealCarbs: 10 basalBGI: 5.4 BGI: 1.8 IOB: -0.328 Activity: -0.0044 at 18:54:22 dev: -4.58 avgDelta: -2.75 csf
+0 mealCOB: 4.2 mealCarbs: 10 basalBGI: 5.4 BGI: 1.8 IOB: -0.356 Activity: -0.0043 at 18:59:22 dev: -3.78 avgDelta: -2.00 csf
+0 mealCOB: 3.7 mealCarbs: 10 basalBGI: 5.6 BGI: 1.8 IOB: -0.386 Activity: -0.0043 at 19:04:21 dev: -3.03 avgDelta: -1.25 csf
+0 mealCOB: 3.2 mealCarbs: 10 basalBGI: 5.6 BGI: 1.9 IOB: -0.463 Activity: -0.0046 at 19:09:22 dev: -2.91 avgDelta: -1.00 csf
+0 mealCOB: 2.7 mealCarbs: 10 basalBGI: 5.6 BGI: 1.9 IOB: -0.44 Activity: -0.0047 at 19:14:22 dev: -2.45 avgDelta: -0.50 csf
+0 mealCOB: 2.3 mealCarbs: 10 basalBGI: 5.6 BGI: 2.0 IOB: -0.416 Activity: -0.0048 at 19:19:22 dev: -2.24 avgDelta: -0.25 csf
+0 mealCOB: 1.8 mealCarbs: 10 basalBGI: 5.6 BGI: 2.0 IOB: -0.392 Activity: -0.0049 at 19:24:22 dev: -1.78 avgDelta: 0.25 csf
+0 mealCOB: 1.3 mealCarbs: 10 basalBGI: 5.6 BGI: 2.0 IOB: -0.368 Activity: -0.0048 at 19:29:21 dev: -0.99 avgDelta: 1.00 csf
+0 mealCOB: 0.8 mealCarbs: 10 basalBGI: 5.6 BGI: 1.9 IOB: -0.344 Activity: -0.0047 at 19:34:21 dev: -0.45 avgDelta: 1.50 csf
+0 mealCOB: 0.3 mealCarbs: 10 basalBGI: 5.6 BGI: 2.0 IOB: -0.37 Activity: -0.0048 at 19:39:22 dev: 0.01 avgDelta: 2.00 csf
+CREndIOB: -0.346 CREndBG: 130 CREndTime: 2022-05-30T17:44:22.000Z
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.6 BGI: 1.9 IOB: -0.346 Activity: -0.0047 at 19:44:22 dev: 0.30 avgDelta: 2.25 csf
+end carb absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.6 BGI: 1.9 IOB: -0.323 Activity: -0.0045 at 19:49:22 dev: 0.63 avgDelta: 2.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.6 BGI: 1.7 IOB: -0.201 Activity: -0.0042 at 19:54:22 dev: 0.76 avgDelta: 2.50 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.6 BGI: 1.6 IOB: -0.18 Activity: -0.0039 at 19:59:22 dev: 0.63 avgDelta: 2.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: 1.6 IOB: -0.261 Activity: -0.0038 at 20:04:22 dev: 0.17 avgDelta: 1.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: 1.5 IOB: -0.242 Activity: -0.0036 at 20:09:22 dev: 0.26 avgDelta: 1.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: 1.4 IOB: -0.225 Activity: -0.0035 at 20:14:21 dev: 0.80 avgDelta: 2.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: 1.4 IOB: -0.208 Activity: -0.0033 at 20:19:21 dev: 1.38 avgDelta: 2.75 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: 1.2 IOB: 0.048 Activity: -0.0028 at 20:24:22 dev: 2.09 avgDelta: 3.25 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: 0.9 IOB: 0.01 Activity: -0.0022 at 20:29:23 dev: 3.09 avgDelta: 4.00 basal
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: 0.6 IOB: 0.269 Activity: -0.0014 at 20:34:23 dev: 4.42 avgDelta: 5.00 basal
+start uannnounced meal absorption
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: 0.1 IOB: 0.474 Activity: -0.0003 at 20:39:22 dev: 6.13 avgDelta: 6.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -1.0 IOB: 1.379 Activity: 0.0025 at 20:44:22 dev: 7.29 avgDelta: 6.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -2.1 IOB: 1.31 Activity: 0.005 at 20:49:23 dev: 7.33 avgDelta: 5.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -2.9 IOB: 1.229 Activity: 0.0069 at 20:54:23 dev: 6.61 avgDelta: 3.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -3.5 IOB: 1.141 Activity: 0.0083 at 20:59:22 dev: 5.45 avgDelta: 2.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -3.8 IOB: 1.048 Activity: 0.0091 at 21:04:22 dev: 5.28 avgDelta: 1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.0 IOB: 1 Activity: 0.0097 at 21:09:22 dev: 5.03 avgDelta: 1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.1 IOB: 0.902 Activity: 0.0099 at 21:14:22 dev: 4.86 avgDelta: 0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.1 IOB: 0.803 Activity: 0.0099 at 21:19:22 dev: 4.86 avgDelta: 0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.2 IOB: 1.047 Activity: 0.0102 at 21:24:21 dev: 4.98 avgDelta: 0.75 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.3 IOB: 0.941 Activity: 0.0104 at 21:29:22 dev: 5.32 avgDelta: 1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.5 IOB: 1.078 Activity: 0.0108 at 21:34:22 dev: 5.48 avgDelta: 1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.6 IOB: 0.978 Activity: 0.011 at 21:39:21 dev: 5.57 avgDelta: 1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.7 IOB: 1.112 Activity: 0.0114 at 21:44:21 dev: 5.23 avgDelta: 0.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.9 IOB: 1.144 Activity: 0.0118 at 21:49:21 dev: 4.90 avgDelta: 0.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -5.0 IOB: 1.034 Activity: 0.012 at 21:54:21 dev: 4.48 avgDelta: -0.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.9 IOB: 0.921 Activity: 0.0119 at 21:59:22 dev: 3.94 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.8 IOB: 0.812 Activity: 0.0115 at 22:04:22 dev: 3.77 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.7 IOB: 0.809 Activity: 0.0112 at 22:09:21 dev: 3.65 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.4 IOB: 0.701 Activity: 0.0107 at 22:14:22 dev: 3.44 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.4 IOB: 0.881 Activity: 0.0105 at 22:19:21 dev: 3.36 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.3 IOB: 0.776 Activity: 0.0104 at 22:24:22 dev: 3.32 avgDelta: -1.00 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.3 IOB: 0.935 Activity: 0.0103 at 22:29:23 dev: 3.03 avgDelta: -1.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.3 IOB: 0.833 Activity: 0.0103 at 22:34:23 dev: 3.03 avgDelta: -1.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.2 IOB: 0.782 Activity: 0.0102 at 22:39:22 dev: 2.98 avgDelta: -1.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.2 IOB: 1.001 Activity: 0.0101 at 22:44:22 dev: 2.94 avgDelta: -1.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.3 IOB: 0.9 Activity: 0.0103 at 22:49:22 dev: 3.03 avgDelta: -1.25 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.3 IOB: 0.919 Activity: 0.0104 at 22:54:22 dev: 2.82 avgDelta: -1.50 uam
+0 mealCOB: 0.0 mealCarbs: 0 basalBGI: 5.9 BGI: -4.3 IOB: 0.816 Activity: 0.0104 at 22:59:22 dev: 2.32 avgDelta: -2.00 uam
+CRInitialIOB: 6.729 CRInitialBG: 163 CRInitialCarbTime: 2022-05-30T21:04:22.000Z
+start carb absorption
+1 mealCOB: 34.5 mealCarbs: 35 basalBGI: 5.8 BGI: -6.6 IOB: 6.729 Activity: 0.016 at 23:04:22 dev: 4.14 avgDelta: -2.50 csf
+1 mealCOB: 34.0 mealCarbs: 35 basalBGI: 5.8 BGI: -11.7 IOB: 6.567 Activity: 0.0282 at 23:09:22 dev: 9.20 avgDelta: -2.50 csf
+1 mealCOB: 33.1 mealCarbs: 35 basalBGI: 5.8 BGI: -15.5 IOB: 6.302 Activity: 0.0374 at 23:14:23 dev: 13.77 avgDelta: -1.75 csf
+1 mealCOB: 32.0 mealCarbs: 35 basalBGI: 5.8 BGI: -18.4 IOB: 6.047 Activity: 0.0443 at 23:19:22 dev: 18.64 avgDelta: 0.25 csf
+1 mealCOB: 30.6 mealCarbs: 35 basalBGI: 5.8 BGI: -20.5 IOB: 5.862 Activity: 0.0494 at 23:24:23 dev: 23.75 avgDelta: 3.25 csf
+1 mealCOB: 28.8 mealCarbs: 35 basalBGI: 5.8 BGI: -21.9 IOB: 5.506 Activity: 0.0527 at 23:29:22 dev: 28.37 avgDelta: 6.50 csf
+1 mealCOB: 27.0 mealCarbs: 35 basalBGI: 5.8 BGI: -22.8 IOB: 5.346 Activity: 0.055 at 23:34:22 dev: 30.33 avgDelta: 7.50 csf
+1 mealCOB: 25.3 mealCarbs: 35 basalBGI: 5.8 BGI: -23.4 IOB: 5.017 Activity: 0.0563 at 23:39:22 dev: 28.62 avgDelta: 5.25 csf
+1 mealCOB: 23.8 mealCarbs: 35 basalBGI: 5.8 BGI: -23.3 IOB: 4.636 Activity: 0.0562 at 23:44:22 dev: 24.58 avgDelta: 1.25 csf
+1 mealCOB: 22.6 mealCarbs: 35 basalBGI: 5.8 BGI: -23.1 IOB: 4.307 Activity: 0.0556 at 23:49:21 dev: 20.58 avgDelta: -2.50 csf
+1 mealCOB: 21.4 mealCarbs: 35 basalBGI: 5.8 BGI: -22.5 IOB: 3.932 Activity: 0.0542 at 23:54:22 dev: 18.75 avgDelta: -3.75 csf
+1 mealCOB: 20.2 mealCarbs: 35 basalBGI: 5.8 BGI: -21.7 IOB: 3.616 Activity: 0.0523 at 23:59:22 dev: 19.96 avgDelta: -1.75 csf
+1 mealCOB: 18.9 mealCarbs: 35 basalBGI: 6.8 BGI: -20.8 IOB: 3.309 Activity: 0.0501 at 00:04:22 dev: 21.80 avgDelta: 1.00 csf
+1 mealCOB: 17.5 mealCarbs: 35 basalBGI: 6.8 BGI: -19.7 IOB: 2.965 Activity: 0.0475 at 00:09:22 dev: 22.47 avgDelta: 2.75 csf
+1 mealCOB: 16.2 mealCarbs: 35 basalBGI: 6.8 BGI: -18.6 IOB: 2.735 Activity: 0.0449 at 00:14:21 dev: 21.64 avgDelta: 3.00 csf
+1 mealCOB: 15.1 mealCarbs: 35 basalBGI: 6.8 BGI: -17.5 IOB: 2.467 Activity: 0.0421 at 00:19:22 dev: 19.22 avgDelta: 1.75 csf
+1 mealCOB: 14.1 mealCarbs: 35 basalBGI: 6.8 BGI: -16.3 IOB: 2.163 Activity: 0.0392 at 00:24:22 dev: 16.52 avgDelta: 0.25 csf
+1 mealCOB: 13.2 mealCarbs: 35 basalBGI: 6.8 BGI: -15.0 IOB: 1.875 Activity: 0.0362 at 00:29:22 dev: 13.78 avgDelta: -1.25 csf
+1 mealCOB: 12.5 mealCarbs: 35 basalBGI: 6.8 BGI: -13.8 IOB: 1.65 Activity: 0.0333 at 00:34:22 dev: 11.57 avgDelta: -2.25 csf
+1 mealCOB: 11.9 mealCarbs: 35 basalBGI: 6.8 BGI: -12.6 IOB: 1.443 Activity: 0.0303 at 00:39:22 dev: 9.83 avgDelta: -2.75 csf
+1 mealCOB: 11.4 mealCarbs: 35 basalBGI: 6.8 BGI: -11.4 IOB: 1.248 Activity: 0.0275 at 00:44:22 dev: 8.41 avgDelta: -3.00 csf
+1 mealCOB: 10.9 mealCarbs: 35 basalBGI: 6.8 BGI: -10.3 IOB: 1.067 Activity: 0.0249 at 00:49:21 dev: 7.59 avgDelta: -2.75 csf
+1 mealCOB: 10.5 mealCarbs: 35 basalBGI: 6.8 BGI: -9.3 IOB: 0.899 Activity: 0.0224 at 00:54:22 dev: 6.80 avgDelta: -2.50 csf
+0 mealCOB: 10.0 mealCarbs: 35 basalBGI: 6.9 BGI: -0.9 IOB: 0.081 Activity: 0.0022 at 02:59:22 dev: -13.09 avgDelta: -14.00 csf
+0 mealCOB: 9.5 mealCarbs: 35 basalBGI: 7.8 BGI: -0.9 IOB: 0.3 Activity: 0.0023 at 03:04:22 dev: -13.30 avgDelta: -14.25 csf
+0 mealCOB: 9.0 mealCarbs: 35 basalBGI: 7.8 BGI: -1.0 IOB: 0.238 Activity: 0.0024 at 03:09:22 dev: -14.00 avgDelta: -15.00 csf
+0 mealCOB: 8.5 mealCarbs: 35 basalBGI: 7.8 BGI: -1.0 IOB: 0.176 Activity: 0.0024 at 03:14:22 dev: -14.50 avgDelta: -15.50 csf
+0 mealCOB: 8.0 mealCarbs: 35 basalBGI: 7.8 BGI: -0.9 IOB: 0.064 Activity: 0.0022 at 03:19:22 dev: -3.09 avgDelta: -4.00 csf
+0 mealCOB: 7.6 mealCarbs: 35 basalBGI: 7.8 BGI: -0.8 IOB: -0.046 Activity: 0.0018 at 03:24:22 dev: -1.75 avgDelta: -2.50 csf
+0 mealCOB: 7.1 mealCarbs: 35 basalBGI: 7.8 BGI: -0.5 IOB: -0.104 Activity: 0.0013 at 03:29:21 dev: 0.54 avgDelta: 0.00 csf
+0 mealCOB: 6.6 mealCarbs: 35 basalBGI: 7.8 BGI: -0.5 IOB: 0.16 Activity: 0.0012 at 03:34:22 dev: 2.50 avgDelta: 2.00 csf
+0 mealCOB: 6.1 mealCarbs: 35 basalBGI: 7.8 BGI: -0.6 IOB: 0.254 Activity: 0.0014 at 03:39:22 dev: 4.08 avgDelta: 3.50 csf
+0 mealCOB: 5.6 mealCarbs: 35 basalBGI: 7.8 BGI: -0.7 IOB: 0.246 Activity: 0.0017 at 03:44:22 dev: 3.21 avgDelta: 2.50 csf
+0 mealCOB: 5.1 mealCarbs: 35 basalBGI: 7.8 BGI: -0.8 IOB: 0.236 Activity: 0.002 at 03:49:23 dev: 0.83 avgDelta: 0.00 csf
+CREndIOB: 0.177 CREndBG: 103 CREndTime: 2022-05-31T01:54:22.000Z
+Ignoring 290 m CR period.
+0 mealCOB: 4.6 mealCarbs: 35 basalBGI: 7.8 BGI: -0.8 IOB: 0.177 Activity: 0.002 at 03:54:22 dev: -2.42 avgDelta: -3.25 csf
+Found at least 1h of carb absorption: assuming all meals were announced, and categorizing UAM data as basal.
+oref0-autotune-core autotune.2022-05-30.json profile.json profile.pump.json > newprofile.2022-05-30.json
+CRTotalCarbs: 125 CRTotalInsulin: 25.516 totalCR: 4.899
+Hour 0 total deviations: 0 mg/dL
+Hour 0 basal adjustment needed: 0 U/hr
+Hour 1 total deviations: 0 mg/dL
+Hour 1 basal adjustment needed: 0 U/hr
+Hour 2 total deviations: 0 mg/dL
+Hour 2 basal adjustment needed: 0 U/hr
+Hour 3 total deviations: 0 mg/dL
+Hour 3 basal adjustment needed: 0 U/hr
+Hour 4 total deviations: -22.37 mg/dL
+Hour 4 basal adjustment needed: -0.05 U/hr
+Hour 5 total deviations: 18.75 mg/dL
+Hour 5 basal adjustment needed: 0.05 U/hr
+Hour 6 total deviations: 0 mg/dL
+Hour 6 basal adjustment needed: 0 U/hr
+Hour 7 total deviations: -1.42 mg/dL
+Hour 7 basal adjustment needed: 0 U/hr
+Hour 8 total deviations: -0.92 mg/dL
+Hour 8 basal adjustment needed: 0 U/hr
+Hour 9 total deviations: 0 mg/dL
+Hour 9 basal adjustment needed: 0 U/hr
+Hour 10 total deviations: 0 mg/dL
+Hour 10 basal adjustment needed: 0 U/hr
+Hour 11 total deviations: 0 mg/dL
+Hour 11 basal adjustment needed: 0 U/hr
+Hour 12 total deviations: -27.01 mg/dL
+Hour 12 basal adjustment needed: -0.07 U/hr
+Hour 13 total deviations: 0 mg/dL
+Hour 13 basal adjustment needed: 0 U/hr
+Hour 14 total deviations: 0 mg/dL
+Hour 14 basal adjustment needed: 0 U/hr
+Hour 15 total deviations: 0 mg/dL
+Hour 15 basal adjustment needed: 0 U/hr
+Hour 16 total deviations: -1.54 mg/dL
+Hour 16 basal adjustment needed: 0 U/hr
+Hour 17 total deviations: -26.49 mg/dL
+Hour 17 basal adjustment needed: -0.06 U/hr
+Hour 18 total deviations: 0 mg/dL
+Hour 18 basal adjustment needed: 0 U/hr
+Hour 19 total deviations: 2.02 mg/dL
+Hour 19 basal adjustment needed: 0 U/hr
+Hour 20 total deviations: 45.02 mg/dL
+Hour 20 basal adjustment needed: 0.11 U/hr
+Hour 21 total deviations: 59.93 mg/dL
+Hour 21 basal adjustment needed: 0.14 U/hr
+Hour 22 total deviations: 37.69 mg/dL
+Hour 22 basal adjustment needed: 0.09 U/hr
+Hour 23 total deviations: 0 mg/dL
+Hour 23 basal adjustment needed: 0 U/hr
+Limiting hour 18 basal to 0.84 (which is 1.3 * pump basal of 0.648 )
+Adjusting hour 0 basal from 0.977 to 0.979 based on hour 0 = 0.979 and hour 1 = 0.995
+Adjusting hour 5 basal from 0.877 to 0.883 based on hour 4 = 0.954 and hour 9 = 0.855
+Adjusting hour 6 basal from 0.779 to 0.804 based on hour 4 = 0.954 and hour 9 = 0.855
+Adjusting hour 7 basal from 0.827 to 0.843 based on hour 4 = 0.954 and hour 9 = 0.855
+Adjusting hour 8 basal from 0.882 to 0.887 based on hour 4 = 0.954 and hour 9 = 0.855
+Adjusting hour 12 basal from 0.86 to 0.856 based on hour 11 = 0.844 and hour 14 = 0.835
+Adjusting hour 13 basal from 0.858 to 0.854 based on hour 11 = 0.844 and hour 14 = 0.835
+Adjusting hour 22 basal from 0.849 to 0.851 based on hour 21 = 0.879 and hour 23 = 0.843
+Adjusting hour 23 basal from 0.843 to 0.847 based on hour 21 = 0.879 and hour 23 = 0.847
+[ { i: 0, minutes: 0, rate: 0.979, start: '00:00:00', untuned: 5 },
+  { i: 1, minutes: 60, rate: 0.995, start: '01:00:00', untuned: 1 },
+  { i: 2, minutes: 120, rate: 0.997, start: '02:00:00' },
+  { i: 3, minutes: 180, rate: 1.129, start: '03:00:00' },
+  { i: 4, minutes: 240, rate: 0.954, start: '04:00:00' },
+  { i: 5, minutes: 300, rate: 0.883, start: '05:00:00', untuned: 1 },
+  { i: 6, minutes: 360, rate: 0.804, start: '06:00:00', untuned: 1 },
+  { i: 7, minutes: 420, rate: 0.843, start: '07:00:00', untuned: 2 },
+  { i: 8, minutes: 480, rate: 0.887, start: '08:00:00', untuned: 2 },
+  { i: 9, minutes: 540, rate: 0.855, start: '09:00:00', untuned: 5 },
+  { i: 10, minutes: 600, rate: 0.856, start: '10:00:00', untuned: 5 },
+  { i: 11, minutes: 660, rate: 0.844, start: '11:00:00', untuned: 5 },
+  { i: 12, minutes: 720, rate: 0.856, start: '12:00:00', untuned: 6 },
+  { i: 13, minutes: 780, rate: 0.854, start: '13:00:00', untuned: 6 },
+  { i: 14, minutes: 840, rate: 0.835, start: '14:00:00', untuned: 5 },
+  { i: 15, minutes: 900, rate: 0.83, start: '15:00:00', untuned: 5 },
+  { i: 16, minutes: 960, rate: 0.801, start: '16:00:00', untuned: 5 },
+  { i: 17,
+    minutes: 1020,
+    rate: 0.821,
+    start: '17:00:00',
+    untuned: 5 },
+  { i: 18,
+    minutes: 1080,
+    rate: 0.842,
+    start: '18:00:00',
+    untuned: 4 },
+  { i: 19,
+    minutes: 1140,
+    rate: 0.929,
+    start: '19:00:00',
+    untuned: 4 },
+  { i: 20,
+    minutes: 1200,
+    rate: 0.931,
+    start: '20:00:00',
+    untuned: 3 },
+  { i: 21,
+    minutes: 1260,
+    rate: 0.879,
+    start: '21:00:00',
+    untuned: 4 },
+  { i: 22,
+    minutes: 1320,
+    rate: 0.851,
+    start: '22:00:00',
+    untuned: 5 },
+  { i: 23,
+    minutes: 1380,
+    rate: 0.847,
+    start: '23:00:00',
+    untuned: 5 } ]
+totalMealCarbs: 135 totalDeviations: 2117.06 oldCSF 16.533 fullNewCSF: 15.68 newCSF: 16.363
+oldCR: 5.021 fullNewCR: 4.899 newCR: 4.997
+Limiting adjusted ISF of 57.94 to 66.31 (which is pump ISF of 86.2 / 1.3 )
+p50deviation: 0.815 p50BGI -2.885 p50ratios: 0.698 Old ISF: 83.014 fullNewISF: 57.944 adjustedISF: 66.308 newISF: 79.673 newDIA: 6 newPeak: 45
+
+Autotune pump profile recommendations:
+---------------------------------------------------------
+Recommendations Log File: /home/titi/aaps/autotune/autotune_recommendations.log
+
+Parameter      | Pump        | Autotune    | Days Missing
+---------------------------------------------------------
+ISF [mg/dL/U]  | 86.200      | 79.673      |
+Carb Ratio[g/U]| 5.750       | 4.997       |
+  00:00        | 0.966       | 0.979       | 5           
+  01:00        | 0.977       | 0.995       | 1           
+  02:00        | 0.971       | 0.997       | 0           
+  03:00        | 1.111       | 1.129       | 0           
+  04:00        | 0.974       | 0.954       | 0           
+  05:00        | 0.923       | 0.883       | 1           
+  06:00        | 0.823       | 0.804       | 1           
+  07:00        | 0.855       | 0.843       | 2           
+  08:00        | 0.902       | 0.887       | 2           
+  09:00        | 0.934       | 0.855       | 5           
+  10:00        | 0.938       | 0.856       | 5           
+  11:00        | 0.903       | 0.844       | 5           
+  12:00        | 0.882       | 0.856       | 6           
+  13:00        | 0.874       | 0.854       | 6           
+  14:00        | 0.866       | 0.835       | 5           
+  15:00        | 0.848       | 0.830       | 5           
+  16:00        | 0.758       | 0.801       | 5           
+  17:00        | 0.650       | 0.821       | 5           
+  18:00        | 0.648       | 0.842       | 4           
+  19:00        | 0.738       | 0.929       | 4           
+  20:00        | 0.847       | 0.931       | 3           
+  21:00        | 0.861       | 0.879       | 4           
+  22:00        | 0.863       | 0.851       | 5           
+  23:00        | 0.843       | 0.847       | 5           
+Query: https://xxxxxxxxxxxx.com entries/sgv.json find%5Bdate%5D%5B%24gte%5D=1653962400000&find%5Bdate%5D%5B%24lte%5D=1654048800000&count=1500
+-rw-r--r-- 1 titi titi 82239 Jun 25 19:54 ns-entries.2022-05-31.json
+Query: https://xxxxxxxxxxxx.com treatments.json find%5Bcreated_at%5D%5B%24gte%5D=2022-05-30T06:00+02:00&find%5Bcreated_at%5D%5B%24lte%5D=2022-06-01T18:00+02:00
+-rw-r--r-- 1 titi titi 231419 Jun 25 19:54 ns-treatments.2022-05-31.json
+
+
+Log information after 2022-05-30 removed for unit test

app/src/test/res/autotune/test4/newprofile.2022-05-30.json

@@ -0,0 +1,194 @@
+{
+   "autosens_max": 1.3,
+   "autosens_min": 0.7,
+   "basalprofile": [
+      {
+         "i": 0,
+         "minutes": 0,
+         "rate": 0.979,
+         "start": "00:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 1,
+         "minutes": 60,
+         "rate": 0.995,
+         "start": "01:00:00",
+         "untuned": 1
+      },
+      {
+         "i": 2,
+         "minutes": 120,
+         "rate": 0.997,
+         "start": "02:00:00"
+      },
+      {
+         "i": 3,
+         "minutes": 180,
+         "rate": 1.129,
+         "start": "03:00:00"
+      },
+      {
+         "i": 4,
+         "minutes": 240,
+         "rate": 0.954,
+         "start": "04:00:00"
+      },
+      {
+         "i": 5,
+         "minutes": 300,
+         "rate": 0.883,
+         "start": "05:00:00",
+         "untuned": 1
+      },
+      {
+         "i": 6,
+         "minutes": 360,
+         "rate": 0.804,
+         "start": "06:00:00",
+         "untuned": 1
+      },
+      {
+         "i": 7,
+         "minutes": 420,
+         "rate": 0.843,
+         "start": "07:00:00",
+         "untuned": 2
+      },
+      {
+         "i": 8,
+         "minutes": 480,
+         "rate": 0.887,
+         "start": "08:00:00",
+         "untuned": 2
+      },
+      {
+         "i": 9,
+         "minutes": 540,
+         "rate": 0.855,
+         "start": "09:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 10,
+         "minutes": 600,
+         "rate": 0.856,
+         "start": "10:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 11,
+         "minutes": 660,
+         "rate": 0.844,
+         "start": "11:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 12,
+         "minutes": 720,
+         "rate": 0.856,
+         "start": "12:00:00",
+         "untuned": 6
+      },
+      {
+         "i": 13,
+         "minutes": 780,
+         "rate": 0.854,
+         "start": "13:00:00",
+         "untuned": 6
+      },
+      {
+         "i": 14,
+         "minutes": 840,
+         "rate": 0.835,
+         "start": "14:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 15,
+         "minutes": 900,
+         "rate": 0.83,
+         "start": "15:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 16,
+         "minutes": 960,
+         "rate": 0.801,
+         "start": "16:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 17,
+         "minutes": 1020,
+         "rate": 0.821,
+         "start": "17:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 18,
+         "minutes": 1080,
+         "rate": 0.842,
+         "start": "18:00:00",
+         "untuned": 4
+      },
+      {
+         "i": 19,
+         "minutes": 1140,
+         "rate": 0.929,
+         "start": "19:00:00",
+         "untuned": 4
+      },
+      {
+         "i": 20,
+         "minutes": 1200,
+         "rate": 0.931,
+         "start": "20:00:00",
+         "untuned": 3
+      },
+      {
+         "i": 21,
+         "minutes": 1260,
+         "rate": 0.879,
+         "start": "21:00:00",
+         "untuned": 4
+      },
+      {
+         "i": 22,
+         "minutes": 1320,
+         "rate": 0.851,
+         "start": "22:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 23,
+         "minutes": 1380,
+         "rate": 0.847,
+         "start": "23:00:00",
+         "untuned": 5
+      }
+   ],
+   "carb_ratio": 4.997,
+   "csf": 16.363,
+   "curve": "ultra-rapid",
+   "dia": 6,
+   "insulinPeakTime": 45,
+   "isfProfile": {
+      "sensitivities": [
+         {
+            "endoffset": 1440,
+            "i": 0,
+            "offset": 0,
+            "sensitivity": 79.673,
+            "start": "00:00:00",
+            "x": 0
+         }
+      ]
+   },
+   "min_5m_carbimpact": 8,
+   "name": "Tuned Dyn2",
+   "sens": 79.673,
+   "timezone": "Europe/Paris",
+   "units": "mg/dl",
+   "useCustomPeakTime": true
+}

app/src/test/res/autotune/test4/profile.2022-05-30.json

@@ -0,0 +1,192 @@
+{
+   "autosens_max": 1.3,
+   "autosens_min": 0.7,
+   "basalprofile": [
+      {
+         "i": 0,
+         "minutes": 0,
+         "rate": 0.977,
+         "start": "00:00:00",
+         "untuned": 4
+      },
+      {
+         "i": 1,
+         "minutes": 60,
+         "rate": 1.011,
+         "start": "01:00:00",
+         "untuned": 1
+      },
+      {
+         "i": 2,
+         "minutes": 120,
+         "rate": 0.996,
+         "start": "02:00:00"
+      },
+      {
+         "i": 3,
+         "minutes": 180,
+         "rate": 1.13,
+         "start": "03:00:00"
+      },
+      {
+         "i": 4,
+         "minutes": 240,
+         "rate": 0.937,
+         "start": "04:00:00"
+      },
+      {
+         "i": 5,
+         "minutes": 300,
+         "rate": 0.877,
+         "start": "05:00:00"
+      },
+      {
+         "i": 6,
+         "minutes": 360,
+         "rate": 0.779,
+         "start": "06:00:00"
+      },
+      {
+         "i": 7,
+         "minutes": 420,
+         "rate": 0.827,
+         "start": "07:00:00",
+         "untuned": 1
+      },
+      {
+         "i": 8,
+         "minutes": 480,
+         "rate": 0.882,
+         "start": "08:00:00",
+         "untuned": 1
+      },
+      {
+         "i": 9,
+         "minutes": 540,
+         "rate": 0.878,
+         "start": "09:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 10,
+         "minutes": 600,
+         "rate": 0.879,
+         "start": "10:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 11,
+         "minutes": 660,
+         "rate": 0.867,
+         "start": "11:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 12,
+         "minutes": 720,
+         "rate": 0.86,
+         "start": "12:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 13,
+         "minutes": 780,
+         "rate": 0.858,
+         "start": "13:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 14,
+         "minutes": 840,
+         "rate": 0.855,
+         "start": "14:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 15,
+         "minutes": 900,
+         "rate": 0.85,
+         "start": "15:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 16,
+         "minutes": 960,
+         "rate": 0.82,
+         "start": "16:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 17,
+         "minutes": 1020,
+         "rate": 0.784,
+         "start": "17:00:00",
+         "untuned": 5
+      },
+      {
+         "i": 18,
+         "minutes": 1080,
+         "rate": 0.778,
+         "start": "18:00:00",
+         "untuned": 4
+      },
+      {
+         "i": 19,
+         "minutes": 1140,
+         "rate": 0.815,
+         "start": "19:00:00",
+         "untuned": 4
+      },
+      {
+         "i": 20,
+         "minutes": 1200,
+         "rate": 0.854,
+         "start": "20:00:00",
+         "untuned": 3
+      },
+      {
+         "i": 21,
+         "minutes": 1260,
+         "rate": 0.849,
+         "start": "21:00:00",
+         "untuned": 4
+      },
+      {
+         "i": 22,
+         "minutes": 1320,
+         "rate": 0.849,
+         "start": "22:00:00",
+         "untuned": 4
+      },
+      {
+         "i": 23,
+         "minutes": 1380,
+         "rate": 0.843,
+         "start": "23:00:00",
+         "untuned": 4
+      }
+   ],
+   "carb_ratio": 5.021,
+   "csf": 15.669,
+   "curve": "ultra-rapid",
+   "dia": 6,
+   "insulinPeakTime": 45,
+   "isfProfile": {
+      "sensitivities": [
+         {
+            "endoffset": 1440,
+            "i": 0,
+            "offset": 0,
+            "sensitivity": 83.014,
+            "start": "00:00:00",
+            "x": 0
+         }
+      ]
+   },
+   "min_5m_carbimpact": 8,
+   "name": "Tuned Dyn2",
+   "sens": 83.014,
+   "timezone": "Europe/Paris",
+   "units": "mg/dl",
+   "useCustomPeakTime": true
+}

app/src/test/res/autotune/test4/profile.pump.json

@@ -0,0 +1,147 @@
+{
+  "name": "Tuned Dyn2",
+  "min_5m_carbimpact": 8,
+  "dia": 6,
+  "curve": "ultra-rapid",
+  "useCustomPeakTime": true,
+  "insulinPeakTime": 45,
+  "basalprofile": [
+    {
+      "start": "00:00:00",
+      "minutes": 0,
+      "rate": 0.966
+    },
+    {
+      "start": "01:00:00",
+      "minutes": 60,
+      "rate": 0.977
+    },
+    {
+      "start": "02:00:00",
+      "minutes": 120,
+      "rate": 0.971
+    },
+    {
+      "start": "03:00:00",
+      "minutes": 180,
+      "rate": 1.111
+    },
+    {
+      "start": "04:00:00",
+      "minutes": 240,
+      "rate": 0.974
+    },
+    {
+      "start": "05:00:00",
+      "minutes": 300,
+      "rate": 0.923
+    },
+    {
+      "start": "06:00:00",
+      "minutes": 360,
+      "rate": 0.823
+    },
+    {
+      "start": "07:00:00",
+      "minutes": 420,
+      "rate": 0.855
+    },
+    {
+      "start": "08:00:00",
+      "minutes": 480,
+      "rate": 0.902
+    },
+    {
+      "start": "09:00:00",
+      "minutes": 540,
+      "rate": 0.934
+    },
+    {
+      "start": "10:00:00",
+      "minutes": 600,
+      "rate": 0.938
+    },
+    {
+      "start": "11:00:00",
+      "minutes": 660,
+      "rate": 0.903
+    },
+    {
+      "start": "12:00:00",
+      "minutes": 720,
+      "rate": 0.882
+    },
+    {
+      "start": "13:00:00",
+      "minutes": 780,
+      "rate": 0.874
+    },
+    {
+      "start": "14:00:00",
+      "minutes": 840,
+      "rate": 0.866
+    },
+    {
+      "start": "15:00:00",
+      "minutes": 900,
+      "rate": 0.848
+    },
+    {
+      "start": "16:00:00",
+      "minutes": 960,
+      "rate": 0.758
+    },
+    {
+      "start": "17:00:00",
+      "minutes": 1020,
+      "rate": 0.65
+    },
+    {
+      "start": "18:00:00",
+      "minutes": 1080,
+      "rate": 0.648
+    },
+    {
+      "start": "19:00:00",
+      "minutes": 1140,
+      "rate": 0.738
+    },
+    {
+      "start": "20:00:00",
+      "minutes": 1200,
+      "rate": 0.847
+    },
+    {
+      "start": "21:00:00",
+      "minutes": 1260,
+      "rate": 0.861
+    },
+    {
+      "start": "22:00:00",
+      "minutes": 1320,
+      "rate": 0.863
+    },
+    {
+      "start": "23:00:00",
+      "minutes": 1380,
+      "rate": 0.843
+    }
+  ],
+  "isfProfile": {
+    "sensitivities": [
+      {
+        "i": 0,
+        "start": "00:00:00",
+        "sensitivity": 86.2,
+        "offset": 0,
+        "x": 0,
+        "endoffset": 1440
+      }
+    ]
+  },
+  "carb_ratio": 5.75,
+  "autosens_max": 1.3,
+  "autosens_min": 0.7,
+  "units": "mg/dl",
+  "timezone": "Europe/Paris"
+}

automation/src/main/java/info/nightscout/androidaps/plugins/general/automation/actions/ActionRunAutotune.kt

@@ -42,13 +42,19 @@ class ActionRunAutotune(injector: HasAndroidInjector) : Action(injector) {
         val profileName = if (inputProfileName.value == rh.gs(R.string.active)) "" else inputProfileName.value
         var message = if (autoSwitch) R.string.autotune_run_with_autoswitch else R.string.autotune_run_without_autoswitch
         Thread {
-            autotunePlugin.atLog("[Automation] Run Autotune $profileName, ${daysBack.value} days, Autoswitch $autoSwitch")
+            if (!autotunePlugin.calculationRunning) {
-            autotunePlugin.aapsAutotune(daysBack.value, autoSwitch, profileName)
+                autotunePlugin.atLog("[Automation] Run Autotune $profileName, ${daysBack.value} days, Autoswitch $autoSwitch")
-            if (!autotunePlugin.lastRunSuccess) {
+                autotunePlugin.aapsAutotune(daysBack.value, autoSwitch, profileName)
-                message = R.string.autotune_run_with_error
+                if (!autotunePlugin.lastRunSuccess) {
-                aapsLogger.error(LTag.AUTOMATION, "Error during Autotune Run")
+                    message = R.string.autotune_run_with_error
+                    aapsLogger.error(LTag.AUTOMATION, "Error during Autotune Run")
+                }
+                callback.result(PumpEnactResult(injector).success(autotunePlugin.lastRunSuccess).comment(message)).run()
+            } else {
+                message = R.string.autotune_run_cancelled
+                aapsLogger.debug(LTag.AUTOMATION, "Autotune run detected, Autotune Run Cancelled")
+                callback.result(PumpEnactResult(injector).success(false).comment(message)).run()
             }
-            callback.result(PumpEnactResult(injector).success(autotunePlugin.lastRunSuccess).comment(message)).run()
         }.start()
         return
     }

automation/src/main/res/values-tr-rTR/strings.xml

@@ -93,8 +93,8 @@
     <string name="target_u">Hedef [%1$s]:</string>
     <string name="lastboluslabel">Son bolus önce</string>
     <string name="lastboluscompared">Son bolus zamanı %1$s %2$s dakika önce</string>
-    <string name="triggercoblabel">COB</string>
+    <string name="triggercoblabel">AKRB</string>
-    <string name="cobcompared">AK (COB) %1$s %2$.0f</string>
+    <string name="cobcompared">AKRB %1$s %2$.0f</string>
     <string name="iob_u">IOB [U]:</string>
     <string name="distance_short">Mesafe [m]:</string>
     <string name="recurringTime">Yinelenen zaman</string>

build.gradle

@@ -2,13 +2,13 @@
 
 buildscript {
     ext {
-        kotlin_version = '1.7.0'
+        kotlin_version = '1.7.10'
         core_version = '1.8.0'
         rxjava_version = '3.1.5'
         rxandroid_version = '3.0.0'
         rxkotlin_version = '3.0.1'
         room_version = '2.4.2'
-        lifecycle_version = '2.4.1'
+        lifecycle_version = '2.5.0'
         dagger_version = '2.42'
         coroutines_version = '1.6.3'
         activity_version = '1.4.0'
@@ -66,7 +66,7 @@ plugins {
     id "io.gitlab.arturbosch.detekt" version "1.20.0"
     id "org.jlleitschuh.gradle.ktlint" version "10.3.0"
     id 'org.barfuin.gradle.jacocolog' version '2.0.0'
-    id 'org.jetbrains.kotlin.android' version '1.7.0' apply false
+    id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
 }
 
 allprojects {

core/src/main/java/info/nightscout/androidaps/interfaces/Autotune.kt

@@ -2,8 +2,9 @@ package info.nightscout.androidaps.interfaces
 
 interface Autotune {
 
-    fun aapsAutotune(daysBack: Int, autoSwitch: Boolean, profileToTune: String = ""): String
+    fun aapsAutotune(daysBack: Int, autoSwitch: Boolean, profileToTune: String = "")
     fun atLog(message: String)
 
     var lastRunSuccess: Boolean
+    var calculationRunning: Boolean
 }

core/src/main/java/info/nightscout/androidaps/utils/userEntry/UserEntryPresentationHelper.kt

@@ -91,9 +91,9 @@ class UserEntryPresentationHelper @Inject constructor(
         Sources.Insight             -> R.drawable.ic_insight_128
         Sources.Combo               -> R.drawable.ic_combo_128
         Sources.Medtronic           -> R.drawable.ic_veo_128
-        Sources.Omnipod             -> R.drawable.ic_pod_128
+        Sources.Omnipod             -> R.drawable.ic_patch_pump_outline
-        Sources.OmnipodEros         -> R.drawable.ic_pod_128
+        Sources.OmnipodEros         -> R.drawable.ic_patch_pump_outline
-        Sources.OmnipodDash         -> R.drawable.ic_pod_128
+        Sources.OmnipodDash         -> R.drawable.ic_patch_pump_outline
         Sources.MDI                 -> R.drawable.ic_ict
         Sources.VirtualPump         -> R.drawable.ic_virtual_pump
         Sources.SMS                 -> R.drawable.ic_sms

core/src/main/res/drawable/ic_close.xml

@@ -1,10 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
     android:viewportWidth="24"
     android:viewportHeight="24">
     <path
-        android:fillColor="@android:color/white"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
 </vector>

core/src/main/res/drawable/ic_generic_cgm.xml

@@ -1,45 +1,21 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="64dp"
     android:height="64dp"
     android:viewportWidth="64"
     android:viewportHeight="64">
-  <path
-      android:pathData="M53.25,24.762c-0,-11.493 -9.331,-20.825 -20.825,-20.825l-0.85,0c-11.494,0 -20.825,9.332 -20.825,20.825l0,14.476c0,11.493 9.331,20.825 20.825,20.825l0.85,-0c11.494,-0 20.825,-9.332 20.825,-20.825l-0,-14.476Z"
-      android:fillColor="@android:color/white"/>
-  <path
-      android:pathData="M52.388,25.056c-0,-11.028 -8.953,-19.98 -19.98,-19.98l-0.816,-0c-11.027,-0 -19.98,8.952 -19.98,19.98l0,13.888c0,11.028 8.953,19.98 19.98,19.98l0.816,0c11.027,0 19.98,-8.952 19.98,-19.98l-0,-13.888Z">
-    <aapt:attr name="android:fillColor">
-      <gradient
-          android:startY="30.4518"
-          android:startX="11.6122"
-          android:endY="30.419544"
-          android:endX="52.3879"
-          android:type="linear">
-        <item android:offset="0" android:color="#FFFFFFFF"/>
-        <item android:offset="1" android:color="#FFB3B3B3"/>
-      </gradient>
-    </aapt:attr>
-  </path>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M30.455,17.453h3.29v1.817h-3.29z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M27.423,51.66a4.467,4.306 0,1 0,8.934 0a4.467,4.306 0,1 0,-8.934 0z"/>
   <path
       android:pathData="M32,32m-27.5,0a27.5,27.5 0,1 1,55 0a27.5,27.5 0,1 1,-55 0"
-      android:fillColor="@android:color/white"/>
+      android:fillColor="?attr/colorControlNormal"/>
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="?attr/colorBackgroundFloating"
       android:pathData="M21.824,34.228l1.704,0.498c-0.358,1.621 -1,2.857 -1.928,3.708c-0.929,0.851 -2.063,1.277 -3.404,1.277c-1.388,-0 -2.517,-0.327 -3.387,-0.982c-0.869,-0.654 -1.531,-1.602 -1.985,-2.843c-0.454,-1.241 -0.681,-2.574 -0.681,-3.998c0,-1.553 0.257,-2.908 0.769,-4.064c0.512,-1.156 1.242,-2.034 2.187,-2.635c0.946,-0.6 1.987,-0.9 3.123,-0.9c1.288,0 2.372,0.38 3.25,1.14c0.879,0.759 1.491,1.827 1.836,3.204l-1.678,0.458c-0.298,-1.085 -0.732,-1.875 -1.3,-2.371c-0.568,-0.495 -1.282,-0.742 -2.143,-0.742c-0.99,-0 -1.817,0.275 -2.482,0.824c-0.664,0.549 -1.131,1.287 -1.401,2.212c-0.269,0.926 -0.404,1.881 -0.404,2.864c0,1.268 0.16,2.375 0.479,3.321c0.319,0.946 0.815,1.653 1.489,2.121c0.673,0.468 1.402,0.702 2.187,0.702c0.955,0 1.763,-0.319 2.425,-0.956c0.661,-0.638 1.109,-1.584 1.344,-2.838Z"
       android:fillType="nonZero"/>
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="?attr/colorBackgroundFloating"
       android:pathData="M31.653,33.607l0,-1.749l5.455,-0.011l-0,5.534c-0.837,0.773 -1.701,1.355 -2.591,1.745c-0.89,0.39 -1.804,0.585 -2.741,0.585c-1.265,-0 -2.414,-0.314 -3.448,-0.941c-1.033,-0.627 -1.814,-1.535 -2.341,-2.721c-0.527,-1.187 -0.79,-2.513 -0.79,-3.978c-0,-1.451 0.262,-2.806 0.786,-4.064c0.524,-1.258 1.278,-2.192 2.262,-2.802c0.984,-0.611 2.117,-0.916 3.399,-0.916c0.931,0 1.773,0.175 2.526,0.524c0.752,0.349 1.342,0.836 1.77,1.46c0.427,0.624 0.752,1.438 0.975,2.441l-1.537,0.489c-0.194,-0.76 -0.434,-1.357 -0.721,-1.791c-0.287,-0.434 -0.697,-0.781 -1.23,-1.042c-0.532,-0.262 -1.124,-0.392 -1.774,-0.392c-0.779,-0 -1.452,0.137 -2.02,0.412c-0.568,0.275 -1.027,0.636 -1.375,1.083c-0.348,0.448 -0.619,0.939 -0.813,1.475c-0.328,0.923 -0.491,1.923 -0.491,3.001c-0,1.329 0.197,2.442 0.592,3.337c0.396,0.895 0.971,1.56 1.727,1.994c0.755,0.434 1.557,0.651 2.406,0.651c0.738,-0 1.459,-0.165 2.161,-0.494c0.703,-0.329 1.236,-0.68 1.599,-1.053l-0,-2.777l-3.786,0Z"
       android:fillType="nonZero"/>
   <path
-      android:fillColor="#FF000000"
+      android:fillColor="?attr/colorBackgroundFloating"
       android:pathData="M39.568,39.456l-0,-14.912l2.565,-0l3.048,10.559c0.281,0.983 0.486,1.719 0.614,2.207c0.147,-0.542 0.375,-1.339 0.686,-2.39l3.083,-10.376l2.293,-0l-0,14.912l-1.643,0l-0,-12.481l-3.742,12.481l-1.537,0l-3.725,-12.695l0,12.695l-1.642,0Z"
       android:fillType="nonZero"/>
 </vector>

core/src/main/res/drawable/ic_glimp.xml

@@ -3,85 +3,86 @@
     android:height="64dp"
     android:viewportWidth="64"
     android:viewportHeight="64">
-  <path
+    <path
-      android:pathData="M60.558,17.9c-0,-7.782 -6.318,-14.1 -14.1,-14.1l-29.149,-0c-7.782,-0 -14.1,6.318 -14.1,14.1l0,28.2c0,7.782 6.318,14.1 14.1,14.1l29.149,0c7.782,0 14.1,-6.318 14.1,-14.1l-0,-28.2Z"
+        android:fillColor="@android:color/transparent"
-      android:strokeAlpha="0.96"
+        android:pathData="M60.558,17.9c-0,-7.782 -6.318,-14.1 -14.1,-14.1l-29.149,-0c-7.782,-0 -14.1,6.318 -14.1,14.1l0,28.2c0,7.782 6.318,14.1 14.1,14.1l29.149,0c7.782,0 14.1,-6.318 14.1,-14.1l-0,-28.2Z"
-      android:strokeWidth="0.84"
+        android:strokeWidth="0.84"
-      android:fillColor="@android:color/transparent"
+        android:strokeAlpha="0.96"
-      android:strokeColor="#fff"/>
+        android:strokeColor="?attr/colorControlNormal" />
-  <path
+    <path
-      android:pathData="M11.708,14.729l0,-1.224l3.819,-0.008l-0,3.874c-0.586,0.541 -1.191,0.948 -1.814,1.221c-0.623,0.273 -1.263,0.41 -1.919,0.41c-0.885,-0 -1.69,-0.22 -2.413,-0.659c-0.724,-0.439 -1.27,-1.074 -1.639,-1.905c-0.369,-0.83 -0.553,-1.759 -0.553,-2.784c-0,-1.016 0.183,-1.964 0.55,-2.845c0.367,-0.88 0.895,-1.534 1.584,-1.961c0.688,-0.428 1.481,-0.641 2.379,-0.641c0.652,-0 1.241,0.122 1.768,0.366c0.527,0.245 0.94,0.586 1.239,1.022c0.299,0.437 0.527,1.007 0.682,1.709l-1.076,0.342c-0.135,-0.532 -0.303,-0.949 -0.504,-1.253c-0.201,-0.304 -0.488,-0.547 -0.861,-0.73c-0.373,-0.183 -0.787,-0.274 -1.242,-0.274c-0.545,-0 -1.016,0.096 -1.414,0.288c-0.398,0.192 -0.718,0.445 -0.962,0.759c-0.244,0.313 -0.434,0.657 -0.569,1.032c-0.23,0.646 -0.344,1.346 -0.344,2.101c-0,0.93 0.138,1.709 0.415,2.335c0.276,0.627 0.679,1.092 1.208,1.396c0.529,0.304 1.09,0.456 1.685,0.456c0.516,-0 1.02,-0.115 1.512,-0.346c0.492,-0.23 0.865,-0.476 1.119,-0.737l0,-1.944l-2.65,0Z"
+        android:fillColor="?attr/colorControlNormal"
-      android:fillColor="#fff"
+        android:fillType="nonZero"
-      android:fillType="nonZero"/>
+        android:pathData="M11.708,14.729l0,-1.224l3.819,-0.008l-0,3.874c-0.586,0.541 -1.191,0.948 -1.814,1.221c-0.623,0.273 -1.263,0.41 -1.919,0.41c-0.885,-0 -1.69,-0.22 -2.413,-0.659c-0.724,-0.439 -1.27,-1.074 -1.639,-1.905c-0.369,-0.83 -0.553,-1.759 -0.553,-2.784c-0,-1.016 0.183,-1.964 0.55,-2.845c0.367,-0.88 0.895,-1.534 1.584,-1.961c0.688,-0.428 1.481,-0.641 2.379,-0.641c0.652,-0 1.241,0.122 1.768,0.366c0.527,0.245 0.94,0.586 1.239,1.022c0.299,0.437 0.527,1.007 0.682,1.709l-1.076,0.342c-0.135,-0.532 -0.303,-0.949 -0.504,-1.253c-0.201,-0.304 -0.488,-0.547 -0.861,-0.73c-0.373,-0.183 -0.787,-0.274 -1.242,-0.274c-0.545,-0 -1.016,0.096 -1.414,0.288c-0.398,0.192 -0.718,0.445 -0.962,0.759c-0.244,0.313 -0.434,0.657 -0.569,1.032c-0.23,0.646 -0.344,1.346 -0.344,2.101c-0,0.93 0.138,1.709 0.415,2.335c0.276,0.627 0.679,1.092 1.208,1.396c0.529,0.304 1.09,0.456 1.685,0.456c0.516,-0 1.02,-0.115 1.512,-0.346c0.492,-0.23 0.865,-0.476 1.119,-0.737l0,-1.944l-2.65,0Z" />
-  <path
+    <path
-      android:pathData="M17.119,8.385h1.107v10.439h-1.107z"
+        android:fillColor="?attr/colorControlNormal"
-      android:fillColor="#fff"
+        android:fillType="nonZero"
-      android:fillType="nonZero"/>
+        android:pathData="M17.119,8.385h1.107v10.439h-1.107z" />
-  <path
+    <path
-      android:pathData="M19.948,9.859l-0,-1.474l1.107,-0l-0,1.474l-1.107,-0ZM19.948,18.824l-0,-7.562l1.107,-0l-0,7.562l-1.107,-0Z"
+        android:fillColor="?attr/colorControlNormal"
-      android:fillColor="#fff"
+        android:fillType="nonZero"
-      android:fillType="nonZero"/>
+        android:pathData="M19.948,9.859l-0,-1.474l1.107,-0l-0,1.474l-1.107,-0ZM19.948,18.824l-0,-7.562l1.107,-0l-0,7.562l-1.107,-0Z" />
-  <path
+    <path
-      android:pathData="M22.739,18.824l0,-7.562l0.99,-0l0,1.061c0.205,-0.371 0.478,-0.669 0.818,-0.894c0.34,-0.226 0.728,-0.338 1.162,-0.338c0.484,-0 0.881,0.116 1.19,0.349c0.31,0.232 0.528,0.557 0.655,0.975c0.517,-0.883 1.189,-1.324 2.017,-1.324c0.648,-0 1.146,0.207 1.494,0.623c0.348,0.415 0.523,1.055 0.523,1.919l-0,5.191l-1.101,-0l0,-4.764c0,-0.513 -0.036,-0.882 -0.108,-1.107c-0.071,-0.226 -0.201,-0.407 -0.39,-0.545c-0.189,-0.138 -0.41,-0.207 -0.664,-0.207c-0.459,0 -0.84,0.177 -1.144,0.531c-0.303,0.354 -0.455,0.92 -0.455,1.698l0,4.394l-1.107,-0l0,-4.914c0,-0.569 -0.09,-0.996 -0.27,-1.281c-0.181,-0.285 -0.476,-0.428 -0.886,-0.428c-0.311,0 -0.599,0.095 -0.864,0.285c-0.264,0.19 -0.456,0.468 -0.574,0.833c-0.119,0.366 -0.179,0.893 -0.179,1.581l0,3.924l-1.107,-0Z"
+        android:fillColor="?attr/colorControlNormal"
-      android:fillColor="#fff"
+        android:fillType="nonZero"
-      android:fillType="nonZero"/>
+        android:pathData="M22.739,18.824l0,-7.562l0.99,-0l0,1.061c0.205,-0.371 0.478,-0.669 0.818,-0.894c0.34,-0.226 0.728,-0.338 1.162,-0.338c0.484,-0 0.881,0.116 1.19,0.349c0.31,0.232 0.528,0.557 0.655,0.975c0.517,-0.883 1.189,-1.324 2.017,-1.324c0.648,-0 1.146,0.207 1.494,0.623c0.348,0.415 0.523,1.055 0.523,1.919l-0,5.191l-1.101,-0l0,-4.764c0,-0.513 -0.036,-0.882 -0.108,-1.107c-0.071,-0.226 -0.201,-0.407 -0.39,-0.545c-0.189,-0.138 -0.41,-0.207 -0.664,-0.207c-0.459,0 -0.84,0.177 -1.144,0.531c-0.303,0.354 -0.455,0.92 -0.455,1.698l0,4.394l-1.107,-0l0,-4.914c0,-0.569 -0.09,-0.996 -0.27,-1.281c-0.181,-0.285 -0.476,-0.428 -0.886,-0.428c-0.311,0 -0.599,0.095 -0.864,0.285c-0.264,0.19 -0.456,0.468 -0.574,0.833c-0.119,0.366 -0.179,0.893 -0.179,1.581l0,3.924l-1.107,-0Z" />
-  <path
+    <path
-      android:pathData="M33.229,21.722l0,-10.46l1.009,-0l-0,0.982c0.238,-0.384 0.506,-0.673 0.805,-0.865c0.3,-0.192 0.662,-0.288 1.089,-0.288c0.557,-0 1.049,0.166 1.475,0.498c0.427,0.332 0.749,0.801 0.966,1.406c0.217,0.606 0.326,1.269 0.326,1.991c-0,0.773 -0.12,1.47 -0.36,2.09c-0.24,0.619 -0.588,1.094 -1.045,1.424c-0.457,0.33 -0.938,0.495 -1.442,0.495c-0.369,-0 -0.7,-0.091 -0.993,-0.271c-0.293,-0.18 -0.534,-0.408 -0.723,-0.683l0,3.681l-1.107,-0ZM34.232,15.085c-0,0.974 0.17,1.693 0.51,2.158c0.34,0.465 0.752,0.698 1.236,0.698c0.492,-0 0.913,-0.241 1.264,-0.723c0.35,-0.482 0.525,-1.228 0.525,-2.239c0,-0.964 -0.171,-1.686 -0.513,-2.165c-0.342,-0.48 -0.751,-0.719 -1.227,-0.719c-0.471,-0 -0.888,0.255 -1.251,0.765c-0.363,0.51 -0.544,1.252 -0.544,2.225Z"
+        android:fillColor="?attr/colorControlNormal"
-      android:fillColor="#fff"
+        android:fillType="nonZero"
-      android:fillType="nonZero"/>
+        android:pathData="M33.229,21.722l0,-10.46l1.009,-0l-0,0.982c0.238,-0.384 0.506,-0.673 0.805,-0.865c0.3,-0.192 0.662,-0.288 1.089,-0.288c0.557,-0 1.049,0.166 1.475,0.498c0.427,0.332 0.749,0.801 0.966,1.406c0.217,0.606 0.326,1.269 0.326,1.991c-0,0.773 -0.12,1.47 -0.36,2.09c-0.24,0.619 -0.588,1.094 -1.045,1.424c-0.457,0.33 -0.938,0.495 -1.442,0.495c-0.369,-0 -0.7,-0.091 -0.993,-0.271c-0.293,-0.18 -0.534,-0.408 -0.723,-0.683l0,3.681l-1.107,-0ZM34.232,15.085c-0,0.974 0.17,1.693 0.51,2.158c0.34,0.465 0.752,0.698 1.236,0.698c0.492,-0 0.913,-0.241 1.264,-0.723c0.35,-0.482 0.525,-1.228 0.525,-2.239c0,-0.964 -0.171,-1.686 -0.513,-2.165c-0.342,-0.48 -0.751,-0.719 -1.227,-0.719c-0.471,-0 -0.888,0.255 -1.251,0.765c-0.363,0.51 -0.544,1.252 -0.544,2.225Z" />
-  <path
+    <path
-      android:pathData="M60.791,44.863c-2.051,7.45 -8.207,10.671 -13.933,10.527c-11.925,-0.301 -19.428,-13.164 -14.134,-23.925c4.992,-10.148 11.928,-21.86 14.035,-21.371c3.527,0.817 10.434,13.456 13.616,19.793c0.148,0.294 0.286,0.588 0.416,0.885l-0,14.091ZM49.999,27.193c2.86,-1.142 8.606,5.779 7.075,12.223c-1.426,6.004 -7.227,12.586 -8.578,12.07c-3.53,-1.35 3.454,-9.987 3.776,-13.618c0.425,-4.784 -3.898,-10.026 -2.273,-10.675Z"
+        android:fillColor="?attr/colorControlNormal"
-      android:fillColor="#fff"/>
+        android:pathData="M60.791,44.863c-2.051,7.45 -8.207,10.671 -13.933,10.527c-11.925,-0.301 -19.428,-13.164 -14.134,-23.925c4.992,-10.148 11.928,-21.86 14.035,-21.371c3.527,0.817 10.434,13.456 13.616,19.793c0.148,0.294 0.286,0.588 0.416,0.885l-0,14.091ZM49.999,27.193c2.86,-1.142 8.606,5.779 7.075,12.223c-1.426,6.004 -7.227,12.586 -8.578,12.07c-3.53,-1.35 3.454,-9.987 3.776,-13.618c0.425,-4.784 -3.898,-10.026 -2.273,-10.675Z" />
-  <path
+    <path
-      android:fillColor="@android:color/white"
+        android:fillAlpha="0.96"
-      android:pathData="M12.872,37.244c0,-0.377 -0.306,-0.683 -0.682,-0.683l-8.585,0l0,2.73l8.585,0c0.376,0 0.682,-0.306 0.682,-0.682l0,-1.365Z"
+        android:fillColor="?attr/colorControlNormal"
-      android:fillAlpha="0.96"/>
+        android:pathData="M12.872,37.244c0,-0.377 -0.306,-0.683 -0.682,-0.683l-8.585,0l0,2.73l8.585,0c0.376,0 0.682,-0.306 0.682,-0.682l0,-1.365Z" />
-  <path
+    <path
-      android:fillColor="@android:color/white"
+        android:fillAlpha="0.96"
-      android:pathData="M16.23,37.057c0.175,-0.709 -0.264,-1.766 -0.52,-2.487c-0.876,-2.463 -1.147,-4.528 -2.246,-4.528c-1.1,-0 -1.588,2.103 -2.243,4.594c-0.216,0.819 -0.59,1.712 -0.416,2.421l5.425,0Z"
+        android:fillColor="?attr/colorControlNormal"
-      android:fillAlpha="0.96"/>
+        android:pathData="M16.23,37.057c0.175,-0.709 -0.264,-1.766 -0.52,-2.487c-0.876,-2.463 -1.147,-4.528 -2.246,-4.528c-1.1,-0 -1.588,2.103 -2.243,4.594c-0.216,0.819 -0.59,1.712 -0.416,2.421l5.425,0Z" />
-  <path
+
-      android:fillColor="@android:color/white"
+    <path
-      android:pathData="M33.746,39.539c-0.188,0.659 0.121,1.556 0.317,2.251c0.649,2.3 1.22,4.269 2.234,4.269c1.013,-0 1.464,-1.954 2.068,-4.269c0.198,-0.761 0.544,-1.592 0.383,-2.251l-5.002,0Z"
+        android:fillAlpha="0.96"
-      android:fillAlpha="0.96"/>
+        android:fillColor="?attr/colorControlNormal"
-  <path
+        android:pathData="M25.479,46.028c-0.161,0.659 0.184,1.555 0.317,2.25c0.448,2.35 1.22,4.269 2.233,4.269c1.014,-0 1.465,-1.954 2.069,-4.269c0.198,-0.761 0.544,-1.591 0.382,-2.25l-5.001,-0Z" />
-      android:fillColor="@android:color/white"
+    <path
-      android:pathData="M25.479,46.028c-0.161,0.659 0.184,1.555 0.317,2.25c0.448,2.35 1.22,4.269 2.233,4.269c1.014,-0 1.465,-1.954 2.069,-4.269c0.198,-0.761 0.544,-1.591 0.382,-2.25l-5.001,-0Z"
+        android:fillAlpha="0.96"
-      android:fillAlpha="0.96"/>
+        android:fillColor="?attr/colorControlNormal"
-  <path
+        android:pathData="M13.897,39.387c-0.019,0.67 0.344,1.417 0.55,2.088c0.697,2.27 1.742,4.511 2.361,4.057c0.791,-0.582 1.589,-2.3 1.883,-4.426c0.106,-0.769 0.453,-1.57 0.696,-2.136l-5.49,0.417Z" />
-      android:fillColor="@android:color/white"
+    <path
-      android:pathData="M13.897,39.387c-0.019,0.67 0.344,1.417 0.55,2.088c0.697,2.27 1.742,4.511 2.361,4.057c0.791,-0.582 1.589,-2.3 1.883,-4.426c0.106,-0.769 0.453,-1.57 0.696,-2.136l-5.49,0.417Z"
+        android:fillAlpha="0.96"
-      android:fillAlpha="0.96"/>
+        android:fillColor="?attr/colorControlNormal"
-  <path
+        android:pathData="M17.757,39.539l-2.302,-5.636l-2.757,0.921l1.872,7.182l3.187,-2.467Z" />
-      android:fillColor="@android:color/white"
+    <path
-      android:pathData="M17.757,39.539l-2.302,-5.636l-2.757,0.921l1.872,7.182l3.187,-2.467Z"
+        android:fillAlpha="0.96"
-      android:fillAlpha="0.96"/>
+        android:fillColor="?attr/colorControlNormal"
-  <path
+        android:pathData="M35.493,36.826c0.161,-0.659 -0.184,-1.556 -0.317,-2.25c-0.447,-2.351 -1.22,-4.269 -2.233,-4.269c-1.014,-0 -1.465,1.954 -2.069,4.269c-0.198,0.761 -0.544,1.591 -0.382,2.25l5.001,-0Z" />
-      android:fillColor="@android:color/white"
+    <path
-      android:pathData="M35.493,36.826c0.161,-0.659 -0.184,-1.556 -0.317,-2.25c-0.447,-2.351 -1.22,-4.269 -2.233,-4.269c-1.014,-0 -1.465,1.954 -2.069,4.269c-0.198,0.761 -0.544,1.591 -0.382,2.25l5.001,-0Z"
+        android:fillAlpha="0.96"
-      android:fillAlpha="0.96"/>
+        android:fillColor="?attr/colorControlNormal"
-  <path
+        android:pathData="M24.043,31.2c0.161,-0.776 -0.184,-1.832 -0.317,-2.65c-0.447,-2.768 -1.22,-5.027 -2.233,-5.027c-1.014,-0 -1.464,2.301 -2.068,5.027c-0.199,0.896 -0.544,1.874 -0.383,2.65l5.001,0Z" />
-      android:fillColor="@android:color/white"
+    <path
-      android:pathData="M24.043,31.2c0.161,-0.776 -0.184,-1.832 -0.317,-2.65c-0.447,-2.768 -1.22,-5.027 -2.233,-5.027c-1.014,-0 -1.464,2.301 -2.068,5.027c-0.199,0.896 -0.544,1.874 -0.383,2.65l5.001,0Z"
+        android:fillAlpha="0.96"
-      android:fillAlpha="0.96"/>
+        android:fillColor="?attr/colorControlNormal"
-  <path
+        android:pathData="M22.914,30.24c0.14,-0.496 -0.38,-0.351 -0.876,-0.491l-1.797,-0.507c-0.496,-0.14 -1.012,0.149 -1.152,0.645l-3.511,12.439c-0.14,0.496 0.148,1.012 0.644,1.152l0.805,0.607c0.495,0.14 0.879,-0.249 1.019,-0.745l4.868,-13.1Z" />
-      android:fillColor="@android:color/white"
+    <path
-      android:pathData="M22.914,30.24c0.14,-0.496 -0.38,-0.351 -0.876,-0.491l-1.797,-0.507c-0.496,-0.14 -1.012,0.149 -1.152,0.645l-3.511,12.439c-0.14,0.496 0.148,1.012 0.644,1.152l0.805,0.607c0.495,0.14 0.879,-0.249 1.019,-0.745l4.868,-13.1Z"
+        android:fillAlpha="0.96"
-      android:fillAlpha="0.96"/>
+        android:fillColor="?attr/colorControlNormal"
-  <path
+        android:pathData="M34.397,36.329c0.14,-0.496 -0.38,-0.351 -0.876,-0.491l-1.797,-0.507c-0.496,-0.14 -1.012,0.149 -1.152,0.645l-3.512,12.439c-0.14,0.496 0.149,1.012 0.645,1.152l0.805,0.606c0.495,0.14 0.879,-0.248 1.019,-0.744l4.868,-13.1Z" />
-      android:fillColor="@android:color/white"
+    <path
-      android:pathData="M34.397,36.329c0.14,-0.496 -0.38,-0.351 -0.876,-0.491l-1.797,-0.507c-0.496,-0.14 -1.012,0.149 -1.152,0.645l-3.512,12.439c-0.14,0.496 0.149,1.012 0.645,1.152l0.805,0.606c0.495,0.14 0.879,-0.248 1.019,-0.744l4.868,-13.1Z"
+        android:fillAlpha="0.96"
-      android:fillAlpha="0.96"/>
+        android:fillColor="?attr/colorControlNormal"
-  <path
+        android:pathData="M25.767,48.159c0.196,0.635 0.53,0.152 1.022,0l1.784,-0.551c0.493,-0.152 0.733,-0.79 0.537,-1.425l-4.917,-15.924c-0.196,-0.635 -0.755,-1.027 -1.247,-0.875l-1.036,-0.173c-0.492,0.152 -0.563,0.818 -0.367,1.453l4.224,17.495Z" />
-      android:fillColor="@android:color/white"
+    <path
-      android:pathData="M25.767,48.159c0.196,0.635 0.53,0.152 1.022,0l1.784,-0.551c0.493,-0.152 0.733,-0.79 0.537,-1.425l-4.917,-15.924c-0.196,-0.635 -0.755,-1.027 -1.247,-0.875l-1.036,-0.173c-0.492,0.152 -0.563,0.818 -0.367,1.453l4.224,17.495Z"
+        android:fillAlpha="0.96"
-      android:fillAlpha="0.96"/>
+        android:fillColor="?attr/colorBackgroundFloating"
-  <path
+        android:pathData="M33.746,39.539c-0.188,0.659 0.121,1.556 0.317,2.251c0.649,2.3 1.22,4.269 2.234,4.269c1.013,-0 1.464,-1.954 2.068,-4.269c0.198,-0.761 0.544,-1.592 0.383,-2.251l-5.002,0Z" />
-      android:fillColor="@android:color/darker_gray"
+    <path
-      android:pathData="M33.81,41.055c0.103,0.291 0.118,0.011 0.604,-0.161l1.76,-0.623c0.486,-0.171 0.797,-0.547 0.693,-0.839l-2.585,-7.307c-0.103,-0.291 -0.581,-0.388 -1.067,-0.217l-0.958,0.107c-0.485,0.172 -0.639,0.53 -0.536,0.821l2.089,8.219Z"
+        android:fillAlpha="0.96"
-      android:fillAlpha="0.96"/>
+        android:fillColor="?attr/colorBackgroundFloating"
-  <path
+        android:pathData="M33.81,41.055c0.103,0.291 0.118,0.011 0.604,-0.161l1.76,-0.623c0.486,-0.171 0.797,-0.547 0.693,-0.839l-2.585,-7.307c-0.103,-0.291 -0.581,-0.388 -1.067,-0.217l-0.958,0.107c-0.485,0.172 -0.639,0.53 -0.536,0.821l2.089,8.219Z" />
-      android:fillColor="@android:color/darker_gray"
+    <path
-      android:pathData="M60.657,36.693l-22.108,0c-0.966,0 -1.751,0.785 -1.751,1.752l-0,0.681c-0,0.447 0.363,0.811 0.811,0.811l23.048,-0l0,-3.244Z"
+        android:fillAlpha="0.96"
-      android:fillAlpha="0.96"/>
+        android:fillColor="?attr/colorBackgroundFloating"
+        android:pathData="M60.657,36.693l-22.108,0c-0.966,0 -1.751,0.785 -1.751,1.752l-0,0.681c-0,0.447 0.363,0.811 0.811,0.811l23.048,-0l0,-3.244Z" />
 </vector>

core/src/main/res/drawable/ic_insulin.xml

@@ -3,28 +3,16 @@
     android:height="64dp"
     android:viewportWidth="64"
     android:viewportHeight="64">
-  <path
+    <path
-      android:pathData="M40.644,18.931l-17.75,-0l4.224,-4.292l9.595,-0l3.931,4.292Z"
+        android:fillColor="?attr/colorControlNormal"
-      android:fillColor="?attr/colorControlNormal"/>
+        android:pathData="M27.061,11.374h9.853v3.277h-9.853z" />
-  <path
+    <path
-      android:pathData="M45.819,52.79c0,2.613 -2.244,4.628 -4.733,4.734c-5.822,0.248 -11.887,0.316 -18.408,-0c-2.715,-0.132 -4.735,-2.121 -4.735,-4.734l0,-30.713c0.687,-2.545 4.794,-4.453 6.303,-4.733l14.905,0c2.03,-0.013 5.653,2.356 6.668,4.733l0,3.536l-17.079,0l0,22.04l17.079,-0l0,5.137Z"
+        android:fillColor="?attr/colorControlNormal"
-      android:fillColor="?attr/colorControlNormal"/>
+        android:pathData="M39.992,7.46c-0,-0.72 -0.585,-1.305 -1.305,-1.305l-13.374,0c-0.72,0 -1.305,0.585 -1.305,1.305l0,2.61c0,0.72 0.585,1.304 1.305,1.304l13.374,0c0.72,0 1.305,-0.584 1.305,-1.304l-0,-2.61Z" />
-  <path
+    <path
-      android:pathData="M27.061,11.374h9.853v3.277h-9.853z"
+        android:fillColor="?attr/colorControlNormal"
-      android:fillColor="?attr/colorControlNormal"/>
+        android:pathData="M45.819,52.79c0,2.613 -2.244,4.628 -4.733,4.734c-5.822,0.248 -11.887,0.316 -18.408,-0c-2.715,-0.132 -4.735,-2.121 -4.735,-4.734l0,-30.713c0.687,-2.545 4.794,-4.453 6.303,-4.733l14.905,0c2.03,-0.013 5.653,2.356 6.668,4.733l0,3.536l-17.079,0l0,22.04l17.079,-0l0,5.137Z" />
-  <path
+    <path
-      android:pathData="M39.992,7.46c-0,-0.72 -0.585,-1.305 -1.305,-1.305l-13.374,0c-0.72,0 -1.305,0.585 -1.305,1.305l0,2.61c0,0.72 0.585,1.304 1.305,1.304l13.374,0c0.72,0 1.305,-0.584 1.305,-1.304l-0,-2.61Z"
+        android:fillColor="?attr/colorControlNormal"
-      android:fillColor="?attr/colorControlNormal"/>
+        android:pathData="M39.151,17.344l-14.905,-0l2.815,-2.693l9.853,-0l2.237,2.693Z" />
-  <path
-      android:pathData="M45.819,52.79c0,2.613 -2.244,4.628 -4.733,4.734c-5.822,0.248 -11.887,0.316 -18.408,-0c-2.715,-0.132 -4.735,-2.121 -4.735,-4.734l0,-30.713c0.687,-2.545 4.794,-4.453 6.303,-4.733l14.905,0c2.03,-0.013 5.653,2.356 6.668,4.733l0,3.536l-17.079,0l0,22.04l17.079,-0l0,5.137Z"
-      android:fillColor="?attr/colorControlNormal"/>
-  <path
-      android:pathData="M27.061,11.374h9.853v3.277h-9.853z"
-      android:fillColor="?attr/colorControlNormal"/>
-  <path
-      android:pathData="M39.992,7.46c-0,-0.72 -0.585,-1.305 -1.305,-1.305l-13.374,0c-0.72,0 -1.305,0.585 -1.305,1.305l0,2.61c0,0.72 0.585,1.304 1.305,1.304l13.374,0c0.72,0 1.305,-0.584 1.305,-1.304l-0,-2.61Z"
-      android:fillColor="?attr/colorControlNormal"/>
-  <path
-      android:pathData="M40.644,18.931l-17.75,-0l4.224,-4.292l9.595,-0l3.931,4.292Z"
-      android:fillColor="?attr/colorControlNormal"/>
 </vector>

core/src/main/res/drawable/ic_nightscout_profile.xml

@@ -1,10 +1,23 @@
-<vector android:height="36dp" android:viewportHeight="64"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="64" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="36dp"
-    <path android:fillColor="?attr/colorControlNormal" android:fillType="nonZero" android:pathData="M38.504,50.81c0,4.133 -7.139,7.573 -16.04,7.729c-8.901,0.156 -16.579,-3.024 -17.251,-7.145c-0.672,-4.122 5.887,-7.802 14.737,-8.269c8.85,-0.467 17.024,2.435 18.364,6.521l0.19,1.164ZM31.825,33.192c-0,4.902 -4.06,8.982 -9.121,9.167c-5.061,0.185 -9.428,-3.587 -9.81,-8.475c-0.382,-4.888 3.348,-9.253 8.38,-9.807c5.033,-0.554 9.68,2.889 10.443,7.734l0.108,1.381Z"/>
+    android:height="36dp"
-    <path android:fillColor="#00000000"
+    android:viewportWidth="64"
+    android:viewportHeight="64">
+    <path
+        android:fillColor="?attr/colorControlNormal"
+        android:fillType="nonZero"
+        android:pathData="M38.504,50.81c0,4.133 -7.139,7.573 -16.04,7.729c-8.901,0.156 -16.579,-3.024 -17.251,-7.145c-0.672,-4.122 5.887,-7.802 14.737,-8.269c8.85,-0.467 17.024,2.435 18.364,6.521l0.19,1.164ZM31.825,33.192c-0,4.902 -4.06,8.982 -9.121,9.167c-5.061,0.185 -9.428,-3.587 -9.81,-8.475c-0.382,-4.888 3.348,-9.253 8.38,-9.807c5.033,-0.554 9.68,2.889 10.443,7.734l0.108,1.381Z" />
+    <path
         android:pathData="M48.482,34.89c1.19,0.985 11.298,-12.07 10.281,-19.108c-0.83,-5.741 -4.429,-10.197 -10.281,-10.324c-5.915,-0.129 -9.748,4.343 -10.28,10.324c-0.628,7.047 8.849,20.079 10.28,19.108Z"
-        android:strokeColor="?attr/colorControlNormal" android:strokeWidth="3.09"/>
+        android:strokeWidth="3.09"
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M53.696,23.303c-1.343,2.486 -3.174,4.943 -5.291,7.381l-1.973,-2.349c0.695,-1.242 1.452,-2.453 2.437,-3.549l4.827,-1.483ZM43.048,23.303l4.208,1.465l-1.84,2.322l-2.368,-3.787ZM49.099,16.153c-0,-1.762 1.426,-3.192 3.182,-3.192c1.756,0 3.182,1.43 3.182,3.192c0,0.526 -0.128,1.024 -0.353,1.461c0.065,0.669 -0.468,2.301 -1.44,3.533c-0.098,0.124 -0.194,0.239 -0.287,0.346c-0.331,0.912 -2.336,1.614 -4.756,1.614c-1.492,0 -2.827,-0.267 -3.708,-0.686c-0.023,-0.01 -0.046,-0.021 -0.069,-0.033c-0.393,-0.196 -0.689,-0.422 -0.86,-0.669c-0.063,-0.065 -0.126,-0.134 -0.189,-0.207c-1.263,-1.458 -2.105,-3.261 -2.117,-3.912c-0.221,-0.435 -0.346,-0.927 -0.346,-1.447c0,-1.762 1.426,-3.192 3.182,-3.192c1.757,0 3.183,1.43 3.183,3.192l-0,3.939c0.102,0.059 0.177,0.123 0.218,0.193l1.754,-0c0,-0 -0.597,-0 -0.597,-0l0,-4.132l0.021,-0ZM43.598,19.208c0.028,0.031 0.054,0.035 0.081,0.023c-0.027,-0.008 -0.054,-0.015 -0.081,-0.023ZM44.52,13.727c1.335,0 2.419,1.087 2.419,2.426c-0,1.338 -1.084,2.425 -2.419,2.425c-1.334,0 -2.418,-1.087 -2.418,-2.425c0,-1.339 1.084,-2.426 2.418,-2.426ZM52.281,13.727c1.335,0 2.418,1.087 2.418,2.426c0,1.338 -1.083,2.425 -2.418,2.425c-1.335,0 -2.419,-1.087 -2.419,-2.425c0,-1.339 1.084,-2.426 2.419,-2.426ZM44.52,14.997c0.635,0 1.151,0.518 1.151,1.156c0,0.637 -0.516,1.155 -1.151,1.155c-0.635,0 -1.15,-0.518 -1.15,-1.155c-0,-0.638 0.515,-1.156 1.15,-1.156ZM52.281,14.997c0.635,0 1.151,0.518 1.151,1.156c-0,0.637 -0.516,1.155 -1.151,1.155c-0.635,0 -1.151,-0.518 -1.151,-1.155c0,-0.638 0.516,-1.156 1.151,-1.156ZM44.743,9.796c0.845,-0.422 2.218,-0.696 3.766,-0.696c2.322,-0 4.249,0.617 4.596,1.423c0.319,0.337 0.568,0.719 0.77,1.103l-1.293,-0.029c-0.015,0.01 -0.03,0.019 -0.045,0.029l-1.756,0l-2.362,1.863l-2.363,-1.863l-1.574,0c-0.004,-0.002 -0.007,-0.004 -0.01,-0.006l-1.482,-0.009c0.378,-0.911 1.008,-1.501 1.741,-1.843l0.012,0.028Z"/>
+        android:strokeColor="?attr/colorControlNormal" />
-    <path android:fillColor="#FF000000" android:pathData="M43.147,16.153a1.373,1.378 0,1 0,2.746 0a1.373,1.378 0,1 0,-2.746 0z"/>
+    <path
-    <path android:fillColor="#FF000000" android:pathData="M50.951,16.153a1.373,1.378 0,1 0,2.746 0a1.373,1.378 0,1 0,-2.746 0z"/>
+        android:fillColor="?attr/colorControlNormal"
+        android:pathData="M53.696,23.303c-1.343,2.486 -3.174,4.943 -5.291,7.381l-1.973,-2.349c0.695,-1.242 1.452,-2.453 2.437,-3.549l4.827,-1.483ZM43.048,23.303l4.208,1.465l-1.84,2.322l-2.368,-3.787ZM49.099,16.153c-0,-1.762 1.426,-3.192 3.182,-3.192c1.756,0 3.182,1.43 3.182,3.192c0,0.526 -0.128,1.024 -0.353,1.461c0.065,0.669 -0.468,2.301 -1.44,3.533c-0.098,0.124 -0.194,0.239 -0.287,0.346c-0.331,0.912 -2.336,1.614 -4.756,1.614c-1.492,0 -2.827,-0.267 -3.708,-0.686c-0.023,-0.01 -0.046,-0.021 -0.069,-0.033c-0.393,-0.196 -0.689,-0.422 -0.86,-0.669c-0.063,-0.065 -0.126,-0.134 -0.189,-0.207c-1.263,-1.458 -2.105,-3.261 -2.117,-3.912c-0.221,-0.435 -0.346,-0.927 -0.346,-1.447c0,-1.762 1.426,-3.192 3.182,-3.192c1.757,0 3.183,1.43 3.183,3.192l-0,3.939c0.102,0.059 0.177,0.123 0.218,0.193l1.754,-0c0,-0 -0.597,-0 -0.597,-0l0,-4.132l0.021,-0ZM43.598,19.208c0.028,0.031 0.054,0.035 0.081,0.023c-0.027,-0.008 -0.054,-0.015 -0.081,-0.023ZM44.52,13.727c1.335,0 2.419,1.087 2.419,2.426c-0,1.338 -1.084,2.425 -2.419,2.425c-1.334,0 -2.418,-1.087 -2.418,-2.425c0,-1.339 1.084,-2.426 2.418,-2.426ZM52.281,13.727c1.335,0 2.418,1.087 2.418,2.426c0,1.338 -1.083,2.425 -2.418,2.425c-1.335,0 -2.419,-1.087 -2.419,-2.425c0,-1.339 1.084,-2.426 2.419,-2.426ZM44.52,14.997c0.635,0 1.151,0.518 1.151,1.156c0,0.637 -0.516,1.155 -1.151,1.155c-0.635,0 -1.15,-0.518 -1.15,-1.155c-0,-0.638 0.515,-1.156 1.15,-1.156ZM52.281,14.997c0.635,0 1.151,0.518 1.151,1.156c-0,0.637 -0.516,1.155 -1.151,1.155c-0.635,0 -1.151,-0.518 -1.151,-1.155c0,-0.638 0.516,-1.156 1.151,-1.156ZM44.743,9.796c0.845,-0.422 2.218,-0.696 3.766,-0.696c2.322,-0 4.249,0.617 4.596,1.423c0.319,0.337 0.568,0.719 0.77,1.103l-1.293,-0.029c-0.015,0.01 -0.03,0.019 -0.045,0.029l-1.756,0l-2.362,1.863l-2.363,-1.863l-1.574,0c-0.004,-0.002 -0.007,-0.004 -0.01,-0.006l-1.482,-0.009c0.378,-0.911 1.008,-1.501 1.741,-1.843l0.012,0.028Z" />
+    <path
+        android:fillColor="?attr/colorBackgroundFloating"
+        android:pathData="M42.6,16.153a1.373,1.378 0,1 0,4 0a1.373,1.378 0,1 0,-4 0z" />
+    <path
+        android:fillColor="?attr/colorBackgroundFloating"
+        android:pathData="M50.3,16.153a1.373,1.378 0,1 0,4 0a1.373,1.378 0,1 0,-4 0z" />
 </vector>

core/src/main/res/drawable/ic_nightscout_syncs.xml

@@ -1,11 +1,27 @@
-<vector android:height="36dp" android:viewportHeight="64"
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="64" android:width="36dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    android:width="36dp"
-    <path android:fillColor="?attr/colorControlNormal" android:pathData="M37.022,34.973c-1.299,2.381 -3.069,4.734 -5.117,7.069l-1.908,-2.25c0.672,-1.189 1.404,-2.349 2.357,-3.399l4.668,-1.42ZM26.725,34.973l4.069,1.404l-1.779,2.223l-2.29,-3.627ZM32.576,28.124c-0,-1.687 1.379,-3.056 3.077,-3.056c1.699,-0 3.077,1.369 3.077,3.056c0,0.505 -0.123,0.981 -0.341,1.401c0.063,0.64 -0.453,2.203 -1.393,3.383c-0.094,0.119 -0.187,0.229 -0.277,0.331c-0.32,0.874 -2.259,1.547 -4.599,1.547c-1.443,-0 -2.734,-0.256 -3.586,-0.657c-0.022,-0.011 -0.045,-0.021 -0.067,-0.033c-0.38,-0.187 -0.666,-0.404 -0.831,-0.64c-0.061,-0.062 -0.122,-0.128 -0.183,-0.198c-1.222,-1.397 -2.036,-3.124 -2.048,-3.748c-0.213,-0.416 -0.334,-0.887 -0.334,-1.386c0,-1.687 1.379,-3.056 3.077,-3.056c1.699,-0 3.078,1.369 3.078,3.056l-0,3.774c0.098,0.056 0.171,0.117 0.211,0.184l1.696,0c0,0 -0.577,0 -0.577,0l0,-3.958l0.02,0ZM27.257,31.051c0.026,0.029 0.052,0.033 0.077,0.022c-0.026,-0.007 -0.052,-0.015 -0.077,-0.022ZM28.148,25.801c1.291,0 2.339,1.041 2.339,2.323c0,1.283 -1.048,2.323 -2.339,2.323c-1.29,0 -2.338,-1.04 -2.338,-2.323c-0,-1.282 1.048,-2.323 2.338,-2.323ZM35.653,25.801c1.291,0 2.339,1.041 2.339,2.323c-0,1.283 -1.048,2.323 -2.339,2.323c-1.291,0 -2.339,-1.04 -2.339,-2.323c0,-1.282 1.048,-2.323 2.339,-2.323ZM28.148,27.018c0.615,-0 1.113,0.496 1.113,1.106c0,0.611 -0.498,1.107 -1.113,1.107c-0.614,0 -1.112,-0.496 -1.112,-1.107c-0,-0.61 0.498,-1.106 1.112,-1.106ZM35.653,27.018c0.614,-0 1.113,0.496 1.113,1.106c-0,0.611 -0.499,1.107 -1.113,1.107c-0.614,0 -1.113,-0.496 -1.113,-1.107c0,-0.61 0.499,-1.106 1.113,-1.106ZM28.363,22.036c0.818,-0.404 2.146,-0.667 3.643,-0.667c2.245,0 4.109,0.592 4.444,1.364c0.309,0.323 0.55,0.688 0.745,1.056l-1.251,-0.028c-0.014,0.01 -0.028,0.019 -0.043,0.028l-1.698,-0l-2.285,1.785l-2.285,-1.785l-1.522,-0c-0.003,-0.002 -0.006,-0.004 -0.009,-0.006l-1.433,-0.008c0.365,-0.873 0.974,-1.438 1.683,-1.765l0.011,0.026Z"/>
+    android:height="36dp"
-    <path android:fillColor="#FF000000" android:pathData="M27.035,28.124a1.113,1.107 0,1 0,2.226 0a1.113,1.107 0,1 0,-2.226 0z"/>
+    android:viewportWidth="64"
-    <path android:fillColor="#FF000000" android:pathData="M34.54,28.124a1.113,1.107 0,1 0,2.226 0a1.113,1.107 0,1 0,-2.226 0z"/>
+    android:viewportHeight="64">
-    <path android:fillColor="?attr/colorControlNormal"
+    <path
         android:pathData="M31.98,46.071c1.15,0.944 10.925,-11.56 9.942,-18.302c-0.803,-5.498 -4.283,-9.766 -9.942,-9.888c-5.72,-0.123 -9.427,4.16 -9.942,9.888c-0.607,6.75 8.558,19.231 9.942,18.302Z"
-        android:strokeColor="?attr/colorControlNormal" android:strokeWidth="3.09"/>
+        android:strokeWidth="3.09"
-    <path android:fillColor="?attr/colorControlNormal" android:fillType="nonZero" android:pathData="M55.254,57.66l-3.611,-4.832c6.807,-5.403 11.187,-13.847 11.187,-23.338c0,-11.854 -6.834,-22.076 -16.694,-26.778c-1.214,2.783 -2.793,6.403 -4.302,9.861c7.648,3.102 13.057,10.732 13.057,19.654c-0,6.253 -2.658,11.87 -6.88,15.74l-3.301,-4.416l-5.98,15.838l16.524,-1.729Z"/>
+        android:strokeColor="?attr/colorControlNormal" />
-    <path android:fillColor="?attr/colorControlNormal" android:fillType="nonZero" android:pathData="M8.537,4.469l3.613,4.832c-6.811,5.403 -11.195,13.847 -11.195,23.338c0,11.855 6.839,22.076 16.706,26.778c1.214,-2.783 2.794,-6.402 4.304,-9.861c-7.653,-3.102 -13.065,-10.732 -13.065,-19.653c0,-6.253 2.659,-11.871 6.885,-15.741l3.302,4.416l5.984,-15.838l-16.534,1.729Z"/>
+    <path
+        android:fillColor="?attr/colorControlNormal"
+        android:pathData="M37.022,34.973c-1.299,2.381 -3.069,4.734 -5.117,7.069l-1.908,-2.25c0.672,-1.189 1.404,-2.349 2.357,-3.399l4.668,-1.42ZM26.725,34.973l4.069,1.404l-1.779,2.223l-2.29,-3.627ZM32.576,28.124c-0,-1.687 1.379,-3.056 3.077,-3.056c1.699,-0 3.077,1.369 3.077,3.056c0,0.505 -0.123,0.981 -0.341,1.401c0.063,0.64 -0.453,2.203 -1.393,3.383c-0.094,0.119 -0.187,0.229 -0.277,0.331c-0.32,0.874 -2.259,1.547 -4.599,1.547c-1.443,-0 -2.734,-0.256 -3.586,-0.657c-0.022,-0.011 -0.045,-0.021 -0.067,-0.033c-0.38,-0.187 -0.666,-0.404 -0.831,-0.64c-0.061,-0.062 -0.122,-0.128 -0.183,-0.198c-1.222,-1.397 -2.036,-3.124 -2.048,-3.748c-0.213,-0.416 -0.334,-0.887 -0.334,-1.386c0,-1.687 1.379,-3.056 3.077,-3.056c1.699,-0 3.078,1.369 3.078,3.056l-0,3.774c0.098,0.056 0.171,0.117 0.211,0.184l1.696,0c0,0 -0.577,0 -0.577,0l0,-3.958l0.02,0ZM27.257,31.051c0.026,0.029 0.052,0.033 0.077,0.022c-0.026,-0.007 -0.052,-0.015 -0.077,-0.022ZM28.148,25.801c1.291,0 2.339,1.041 2.339,2.323c0,1.283 -1.048,2.323 -2.339,2.323c-1.29,0 -2.338,-1.04 -2.338,-2.323c-0,-1.282 1.048,-2.323 2.338,-2.323ZM35.653,25.801c1.291,0 2.339,1.041 2.339,2.323c-0,1.283 -1.048,2.323 -2.339,2.323c-1.291,0 -2.339,-1.04 -2.339,-2.323c0,-1.282 1.048,-2.323 2.339,-2.323ZM28.148,27.018c0.615,-0 1.113,0.496 1.113,1.106c0,0.611 -0.498,1.107 -1.113,1.107c-0.614,0 -1.112,-0.496 -1.112,-1.107c-0,-0.61 0.498,-1.106 1.112,-1.106ZM35.653,27.018c0.614,-0 1.113,0.496 1.113,1.106c-0,0.611 -0.499,1.107 -1.113,1.107c-0.614,0 -1.113,-0.496 -1.113,-1.107c0,-0.61 0.499,-1.106 1.113,-1.106ZM28.363,22.036c0.818,-0.404 2.146,-0.667 3.643,-0.667c2.245,0 4.109,0.592 4.444,1.364c0.309,0.323 0.55,0.688 0.745,1.056l-1.251,-0.028c-0.014,0.01 -0.028,0.019 -0.043,0.028l-1.698,-0l-2.285,1.785l-2.285,-1.785l-1.522,-0c-0.003,-0.002 -0.006,-0.004 -0.009,-0.006l-1.433,-0.008c0.365,-0.873 0.974,-1.438 1.683,-1.765l0.011,0.026Z" />
+    <path
+        android:fillColor="?attr/colorBackgroundFloating"
+        android:pathData="M26.3,28.124a1.113,1.107 0,1 0,4 0a1.113,1.107 0,1 0,-4 0z" />
+    <path
+        android:fillColor="?attr/colorBackgroundFloating"
+        android:pathData="M33.54,28.124a1.113,1.107 0,1 0,4 0a1.113,1.107 0,1 0,-4 0z" />
+    <path
+        android:fillColor="?attr/colorControlNormal"
+        android:fillType="nonZero"
+        android:pathData="M55.254,57.66l-3.611,-4.832c6.807,-5.403 11.187,-13.847 11.187,-23.338c0,-11.854 -6.834,-22.076 -16.694,-26.778c-1.214,2.783 -2.793,6.403 -4.302,9.861c7.648,3.102 13.057,10.732 13.057,19.654c-0,6.253 -2.658,11.87 -6.88,15.74l-3.301,-4.416l-5.98,15.838l16.524,-1.729Z" />
+    <path
+        android:fillColor="?attr/colorControlNormal"
+        android:fillType="nonZero"
+        android:pathData="M8.537,4.469l3.613,4.832c-6.811,5.403 -11.195,13.847 -11.195,23.338c0,11.855 6.839,22.076 16.706,26.778c1.214,-2.783 2.794,-6.402 4.304,-9.861c-7.653,-3.102 -13.065,-10.732 -13.065,-19.653c0,-6.253 2.659,-11.871 6.885,-15.741l3.302,4.416l5.984,-15.838l-16.534,1.729Z" />
 </vector>

core/src/main/res/drawable/ic_nsclient_bg.xml

@@ -3,15 +3,20 @@
     android:height="64dp"
     android:viewportWidth="64"
     android:viewportHeight="64">
-  <path
+    <path
-      android:pathData="M26.974,28.633c2.447,-4.486 5.781,-8.918 9.638,-13.317l3.594,4.239c-1.265,2.24 -2.645,4.425 -4.439,6.402l-8.793,2.676ZM46.37,28.633l-7.664,-2.644l3.351,-4.189l4.313,6.833ZM35.349,41.533c-0,3.178 -2.597,5.758 -5.797,5.758c-3.199,-0 -5.796,-2.58 -5.796,-5.758c-0,-0.951 0.232,-1.848 0.643,-2.638c-0.118,-1.207 0.853,-4.15 2.623,-6.373c0.178,-0.224 0.353,-0.432 0.522,-0.624c0.604,-1.645 4.255,-2.912 8.664,-2.912c2.719,-0 5.149,0.482 6.755,1.237c0.042,0.019 0.084,0.039 0.126,0.061c0.715,0.352 1.254,0.761 1.565,1.206c0.115,0.118 0.23,0.242 0.345,0.374c2.301,2.631 3.834,5.883 3.857,7.058c0.402,0.784 0.629,1.671 0.629,2.611c0,3.178 -2.597,5.758 -5.796,5.758c-3.199,-0 -5.797,-2.58 -5.797,-5.758l0,-7.108c-0.186,-0.106 -0.322,-0.221 -0.397,-0.347l-3.196,-0c0,-0 1.087,-0 1.087,-0l-0,7.455l-0.037,-0ZM45.369,36.021c-0.051,-0.056 -0.098,-0.063 -0.147,-0.042c0.049,0.014 0.098,0.028 0.147,0.042ZM43.689,45.909c-2.432,-0 -4.406,-1.961 -4.406,-4.376c0,-2.415 1.974,-4.376 4.406,-4.376c2.431,0 4.405,1.961 4.405,4.376c0,2.415 -1.974,4.376 -4.405,4.376ZM29.552,45.909c-2.431,-0 -4.405,-1.961 -4.405,-4.376c-0,-2.415 1.974,-4.376 4.405,-4.376c2.432,0 4.406,1.961 4.406,4.376c-0,2.415 -1.974,4.376 -4.406,4.376ZM43.689,43.618c-1.157,-0 -2.096,-0.935 -2.096,-2.085c-0,-1.151 0.939,-2.085 2.096,-2.085c1.157,0 2.096,0.934 2.096,2.085c-0,1.15 -0.939,2.085 -2.096,2.085ZM29.552,43.618c-1.156,-0 -2.096,-0.935 -2.096,-2.085c0,-1.151 0.94,-2.085 2.096,-2.085c1.157,0 2.096,0.934 2.096,2.085c0,1.15 -0.939,2.085 -2.096,2.085ZM43.284,53.001c-1.541,0.761 -4.041,1.256 -6.862,1.256c-4.229,0 -7.739,-1.114 -8.37,-2.568c-0.582,-0.608 -1.036,-1.296 -1.404,-1.99l2.356,0.052c0.027,-0.017 0.054,-0.034 0.081,-0.052l3.199,0l4.304,-3.361l4.303,3.361l2.868,0c0.006,0.004 0.012,0.008 0.018,0.012l2.699,0.015c-0.688,1.644 -1.835,2.709 -3.171,3.325l-0.021,-0.05Z"
+        android:fillColor="?attr/colorControlNormal"
-      android:fillColor="?attr/colorControlNormal"/>
+        android:pathData="M26.974,28.633c2.447,-4.486 5.781,-8.918 9.638,-13.317l3.594,4.239c-1.265,2.24 -2.645,4.425 -4.439,6.402l-8.793,2.676ZM46.37,28.633l-7.664,-2.644l3.351,-4.189l4.313,6.833ZM35.349,41.533c-0,3.178 -2.597,5.758 -5.797,5.758c-3.199,-0 -5.796,-2.58 -5.796,-5.758c-0,-0.951 0.232,-1.848 0.643,-2.638c-0.118,-1.207 0.853,-4.15 2.623,-6.373c0.178,-0.224 0.353,-0.432 0.522,-0.624c0.604,-1.645 4.255,-2.912 8.664,-2.912c2.719,-0 5.149,0.482 6.755,1.237c0.042,0.019 0.084,0.039 0.126,0.061c0.715,0.352 1.254,0.761 1.565,1.206c0.115,0.118 0.23,0.242 0.345,0.374c2.301,2.631 3.834,5.883 3.857,7.058c0.402,0.784 0.629,1.671 0.629,2.611c0,3.178 -2.597,5.758 -5.796,5.758c-3.199,-0 -5.797,-2.58 -5.797,-5.758l0,-7.108c-0.186,-0.106 -0.322,-0.221 -0.397,-0.347l-3.196,-0c0,-0 1.087,-0 1.087,-0l-0,7.455l-0.037,-0ZM45.369,36.021c-0.051,-0.056 -0.098,-0.063 -0.147,-0.042c0.049,0.014 0.098,0.028 0.147,0.042ZM43.689,45.909c-2.432,-0 -4.406,-1.961 -4.406,-4.376c0,-2.415 1.974,-4.376 4.406,-4.376c2.431,0 4.405,1.961 4.405,4.376c0,2.415 -1.974,4.376 -4.405,4.376ZM29.552,45.909c-2.431,-0 -4.405,-1.961 -4.405,-4.376c-0,-2.415 1.974,-4.376 4.405,-4.376c2.432,0 4.406,1.961 4.406,4.376c-0,2.415 -1.974,4.376 -4.406,4.376ZM43.689,43.618c-1.157,-0 -2.096,-0.935 -2.096,-2.085c-0,-1.151 0.939,-2.085 2.096,-2.085c1.157,0 2.096,0.934 2.096,2.085c-0,1.15 -0.939,2.085 -2.096,2.085ZM29.552,43.618c-1.156,-0 -2.096,-0.935 -2.096,-2.085c0,-1.151 0.94,-2.085 2.096,-2.085c1.157,0 2.096,0.934 2.096,2.085c0,1.15 -0.939,2.085 -2.096,2.085ZM43.284,53.001c-1.541,0.761 -4.041,1.256 -6.862,1.256c-4.229,0 -7.739,-1.114 -8.37,-2.568c-0.582,-0.608 -1.036,-1.296 -1.404,-1.99l2.356,0.052c0.027,-0.017 0.054,-0.034 0.081,-0.052l3.199,0l4.304,-3.361l4.303,3.361l2.868,0c0.006,0.004 0.012,0.008 0.018,0.012l2.699,0.015c-0.688,1.644 -1.835,2.709 -3.171,3.325l-0.021,-0.05Z" />
-  <path
+    <path
-      android:pathData="M36.472,7.728c-2.167,-1.778 -20.58,21.776 -18.727,34.474c1.511,10.356 8.067,18.397 18.727,18.626c10.775,0.231 17.757,-7.836 18.727,-18.626c1.144,-12.715 -16.12,-36.225 -18.727,-34.474Z"
+        android:pathData="M36.472,7.728c-2.167,-1.778 -20.58,21.776 -18.727,34.474c1.511,10.356 8.067,18.397 18.727,18.626c10.775,0.231 17.757,-7.836 18.727,-18.626c1.144,-12.715 -16.12,-36.225 -18.727,-34.474Z"
-      android:strokeWidth="3.09"
+        android:strokeWidth="3.09"
-      android:fillColor="#00000000"
+        android:strokeColor="?attr/colorControlNormal" />
-      android:strokeColor="?attr/colorControlNormal"/>
+    <path
-  <path
+        android:fillColor="?attr/colorBackgroundFloating"
-      android:pathData="M15.033,3.173c0.86,-0.187 3.831,4.041 5.767,7.976c1.97,4.005 -1.144,9.071 -5.767,9.169c-3.916,0.084 -8.031,-5.067 -5.515,-9.774c1.298,-2.429 4.076,-7.057 5.515,-7.371ZM13.751,9.511c-1.167,-0.437 -3.511,2.215 -2.886,4.685c0.582,2.301 2.948,4.824 3.5,4.626c1.44,-0.517 -1.41,-3.828 -1.541,-5.219c-0.174,-1.834 1.591,-3.843 0.927,-4.092Z"
+        android:pathData="M26,42a1.113,1.107 0,1 0,7 0a1.113,1.107 0,1 0,-7 0z" />
-      android:fillColor="?attr/colorControlNormal"/>
+    <path
+        android:fillColor="?attr/colorBackgroundFloating"
+        android:pathData="M40,42a1.113,1.107 0,1 0,7 0a1.113,1.107 0,1 0,-7 0z" />
+    <path
+        android:fillColor="?attr/colorControlNormal"
+        android:pathData="M15.033,3.173c0.86,-0.187 3.831,4.041 5.767,7.976c1.97,4.005 -1.144,9.071 -5.767,9.169c-3.916,0.084 -8.031,-5.067 -5.515,-9.774c1.298,-2.429 4.076,-7.057 5.515,-7.371ZM13.751,9.511c-1.167,-0.437 -3.511,2.215 -2.886,4.685c0.582,2.301 2.948,4.824 3.5,4.626c1.44,-0.517 -1.41,-3.828 -1.541,-5.219c-0.174,-1.834 1.591,-3.843 0.927,-4.092Z" />
 </vector>

core/src/main/res/drawable/ic_patch_pump_outline.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="80"
+    android:viewportHeight="80">
+
+    <path
+        android:fillAlpha="0.5"
+        android:fillColor="?attr/colorControlNormal"
+        android:pathData="M 18 54 a 3 3 0 0 0 3 3 L 45 57 A 19 19 0 0 0 62 40 A 19 19 0 0 0 45 24 L 21 24 a 3 3 0 0 0 -3 3 Z M 67 40 A 22 22 0 0 1 45 62 L 19 62 a 6 6 0 0 1 -6 -6 L 13 25 a 6 6 0 0 1 6 -6 L 45 19 A 22 22 0 0 1 67 40"
+        android:strokeAlpha="0.5" />
+
+</vector>

core/src/main/res/drawable/ic_refresh.xml

@@ -4,6 +4,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="?attr/colorControlNormal"
         android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
 </vector>