Optional scaling of Prediction Curves by DynISF

.gitignore

@@ -19,3 +19,8 @@ app/.classpath
 app/.settings/org.eclipse.buildship.core.prefs
 wear/.classpath
 wear/.settings/org.eclipse.buildship.core.prefs
+*/output-metadata.json!/nsclient/release/output-metadata.json
+/nsclient2/release/output-metadata.json
+/nsclient/release/output-metadata.json
+/app/nsclient/release/output-metadata.json
+/app/nsclient2/release/output-metadata.json

ENTT_Notes.patch

@@ -0,0 +1,52 @@
+Index: app/src/main/java/info/nightscout/androidaps/dialogs/ENTempTargetDialog.kt
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/app/src/main/java/info/nightscout/androidaps/dialogs/ENTempTargetDialog.kt b/app/src/main/java/info/nightscout/androidaps/dialogs/ENTempTargetDialog.kt
+--- a/app/src/main/java/info/nightscout/androidaps/dialogs/ENTempTargetDialog.kt	(revision 2085d94769ffcc20f276ac99245d489abf323b6d)
++++ b/app/src/main/java/info/nightscout/androidaps/dialogs/ENTempTargetDialog.kt	(revision af526fe31aa68725ebdbe8a04235c405f47de9c5)
+@@ -185,6 +185,11 @@
+             actions.add(rh.gs(R.string.stoptemptarget))
+             reason = rh.gs(R.string.stoptemptarget)
+         }
++
++        val notes = binding.notesLayout.notes.text.toString()
++        if (notes.isNotEmpty())
++            actions.add(rh.gs(R.string.notes_label) + ": " + notes)
++
+         if (eventTimeChanged)
+             actions.add(rh.gs(R.string.time) + ": " + dateUtil.dateAndTimeString(eventTime))
+
+@@ -227,6 +232,10 @@
+                     })
+                 }
+
++                // attempt to log a notes entry also
++                //uel.log(Action.CAREPORTAL, CareDialog.EventType.NOTE, notes, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged })
++                uel.log(Action.CAREPORTAL, Sources.Note, notes, ValueWithUnit.Timestamp(eventTime).takeIf { eventTimeChanged }, ValueWithUnit.TherapyEventTTReason(TemporaryTarget.Reason.EATING_NOW), ValueWithUnit.fromGlucoseUnit(target, units.asText), ValueWithUnit.Minute(duration))
++
+                 if (duration == 10) sp.putBoolean(R.string.key_objectiveusetemptarget, true)
+             })
+         }
+Index: app/src/main/res/layout/dialog_en_temptarget.xml
+IDEA additional info:
+Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
+<+>UTF-8
+===================================================================
+diff --git a/app/src/main/res/layout/dialog_en_temptarget.xml b/app/src/main/res/layout/dialog_en_temptarget.xml
+--- a/app/src/main/res/layout/dialog_en_temptarget.xml	(revision 2085d94769ffcc20f276ac99245d489abf323b6d)
++++ b/app/src/main/res/layout/dialog_en_temptarget.xml	(revision af526fe31aa68725ebdbe8a04235c405f47de9c5)
+@@ -196,7 +196,11 @@
+                 android:visibility="gone" />
+
+         </LinearLayout>
+-        
++
++        <include
++            android:id="@+id/notes_layout"
++            layout="@layout/notes" />
++
+         <include
+             android:id="@+id/datetime"
+             layout="@layout/datetime" />

README.md

@@ -1,19 +1,86 @@
 # AndroidAPS
+
 * Check the wiki: https://androidaps.readthedocs.io
 *  Everyone who’s been looping with AndroidAPS needs to fill out the form after 3 days of looping  https://docs.google.com/forms/d/14KcMjlINPMJHVt28MDRupa4sz4DDIooI4SrW0P3HSN8/viewform?c=0&w=1
 
-[![Support Server](https://img.shields.io/discord/629952586895851530.svg?label=Discord&logo=Discord&colorB=7289da&style=for-the-badge)](https://discord.gg/4fQUWHZ4Mw)
+[![Support Server](https://img.shields.io/discord/629952586895851530.svg?label=Discord&logo=Discord&colorB=7289da&style=for-the-badge)](https://discord.gg/zHA3rKHbRE)
 
-[![CircleCI](https://circleci.com/gh/nightscout/AndroidAPS/tree/master.svg?style=svg)](https://circleci.com/gh/nightscout/AndroidAPS/tree/master)
+[![Build status](https://travis-ci.org/nightscout/AndroidAPS.svg?branch=master)](https://travis-ci.org/nightscout/AndroidAPS)
 [![Crowdin](https://d322cqt584bo4o.cloudfront.net/androidaps/localized.svg)](https://translations.androidaps.org/project/androidaps)
 [![Documentation Status](https://readthedocs.org/projects/androidaps/badge/?version=latest)](https://androidaps.readthedocs.io/en/latest/?badge=latest)
-[![codecov](https://codecov.io/gh/nightscout/AndroidAPS/branch/master/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
+[![codecov](https://codecov.io/gh/MilosKozak/AndroidAPS/branch/master/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
+dev: [![codecov](https://codecov.io/gh/MilosKozak/AndroidAPS/branch/dev/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
+
+
+![BTC](https://bitit.io/assets/coins/icon-btc-1e5a37bc0eb730ac83130d7aa859052bd4b53ac3f86f99966627801f7b0410be.svg) 3KawK8aQe48478s6fxJ8Ms6VTWkwjgr9f2
+
+########################################
+This version of AAPS has evolved over time using elements from AIMI and Boost.
+This AAPS variation is called "Eating Now" (EN) as it is a reactive operating mode without needing to inform the system.
+The intent of this plugin is the same, to deliver insulin earlier using mostly openAPS predictions.
+This has been tested successfully with a blend of Fiasp 80% and Novorapid 20% (F80N).
+The code can be used with or without bolusing or COB entries.
+However it will not become active until a treatment has been performed after the active start time.
+Allowing a delayed start time for example if you sleep in. :)
+This treatment can be 1g or 0.1U for example.
+After this the EN mode is active until the end time specified in the preferences.
+It is recommended to set maxSMBBasalMinutes and maxUAMSMBBasalMinutes to 60 minutes max as these will be used when EN is not active.
+
+These are the methods utilised within this version:
+
+UAM:
+This is based upon Boost and is used when there is a sudden increase in BGL of >=9 (0.5 mmol)
+UAMBoost will only operate when there are no COB.
+TDD is used as a reference point for initial insulin dose that can be scaled within preferences.
+
+COB:
+When carbs are entered there is a time window like AIMI.
+The COBpredBG prediction uses the dynamic ISF from Boost to increase insulinReq.
+If within the COBBoost Window the calculated insulinReq may be delivered via a larger SMB using the COBBoost maxBolus.
+Once the time window has elapsed COBBoost maxBolus is no longer used.
+
+Predictions leverage the dynamic ISF concept within the Boost plugin.
+Using the eventualBG mostly to determine the insulinReq.
+The main difference is the initial ISF used to determine the predictions is based on the profile ISF.
+If BG is currently the normalTarget BG from the profile the ISF will be the same as the profile.
+Once BG rises the ISF number reduces, and as BG lowers the ISF number will increase.
+ISF scaling can be adjusted and eventualBG weighting for UAM and COB predictions can be applied.
+
+These are the preferences utilised for EN mode:
 
-DEV: 
-[![CircleCI](https://circleci.com/gh/nightscout/AndroidAPS/tree/dev.svg?style=svg)](https://circleci.com/gh/nightscout/AndroidAPS/tree/dev)
-[![codecov](https://codecov.io/gh/nightscout/AndroidAPS/branch/dev/graph/badge.svg)](https://codecov.io/gh/MilosKozak/AndroidAPS)
+General:
+    Start Time:         The time the EN mode will start in hours as 24h clock format
+                        EN mode will be active after this time when there has been a COB or manual bolus entry of any size
+    End Time:           The time that EN mode will finish. Normal maxBolus of 65% is resumed.
+                        If there are COB or a TT of normalTarget EN will be active after this time, however AAPS maxBolus will be used.
+                        No SMB will be given when inactive unless there is COB, detected resistance from autosens or BG is above SMB BG Threshold.
+    InsulinReqPct:      Percentage that will be used for EN insulinReq as SMB to utilise prior to maxBolus restriction.
+                        This will be 65% when EN is not active.
+    Max IOB:            The percentage of current max-iob setting that will be used as the limit for EN.
+                        EN will not add insulin when above this limit.
+    SMB BG Offset:      There will be no SMB when below this BG offset at night without COB or detected resistance.
+                        e.g. if target bg is 99/5.5 and this setting is 27/1.5 there will be no SMB below 126/7.0
+    ISF BG Scaler:      As BG increases ISF will become stronger. The level of scaling can be adjusted.
+                        0 = normal scaling, 5 is 5% stronger, -5 is 5% weaker ISF scaling. Additional scaling does not happen when EN is not active.
+    ISF BG Offset:      As BG increases ISF will become stronger. ISF will no longer scale when above this level.
+                        e.g. if target bg is 99/5.5 and this setting is 27/1.5 there will be no scaling above 126/7.0
 
+UAM:
+    UAMBoost Bolus Scale:       Multiply the initial UAMBoost bolus by this amount. 0 will disable UAMBoost.
+    UAM maxBolus:               maxBolus to use for all BG rises without COB.  0 will use maxSMBBasalMinutes or maxUAMSMBBasalMinutes.
 
-<img src="https://cdn.iconscout.com/icon/free/png-256/bitcoin-384-920569.png" srcset="https://cdn.iconscout.com/icon/free/png-512/bitcoin-384-920569.png 2x" alt="Bitcoin Icon" width="100">
+COB:
+    Use GhostCOB:               Ignore COB predictions after the COBBoost Window and rely purely on UAM. This setting can be handy when COB lingers for too long.
+    COBBoost InsulinReqPct:     Percentage that will be used for EN insulinReq within the COBBoost Window.
+    COBBoost Window:            If within the COBBoost Window the calculated insulinReq from COBPredBG may be delivered via a larger SMB using the COBBoost maxBolus.
+                                Once the time window has elapsed COBBoost maxBolus is no longer used.
+                                0 minutes will disable this functionality.
+    COBBoost maxBolus:          maxBolus to use within the COBBoost Window. 0 will use AAPS maxBolus.
+    COB maxBolus:               maxBolus to use with COB outside of the initial COBBoost Window. 0 will use AAPS maxBolus.
 
-3KawK8aQe48478s6fxJ8Ms6VTWkwjgr9f2
+EXPERIMENTAL:
+•	Use 3PM Basal ISF Variance:     Use 3PM Basal as the basis for ISF changes. The basal at 3PM is taken as the basis for baseline ISF.
+                                    Basal variation from this point is used to scale the ISF, stronger basal will make ISF weaker.
+                                    Only use when the profile uses a single ISF for 24 hours and the basal profile is fully populated.
+•	Use TDD for ISF:                Use the last 24H TDD for ISF. This will override the profile ISF and can be used with 3PM basal ISF variance.
+•	TDD ISF Scaling:                This will use a percentage of the calculated TDD ISF. If TDD ISF is too strong it can be reduced e.g. 50 will make TDD ISF 50% weaker.

app/build.gradle

@@ -105,15 +105,46 @@ android {
     defaultConfig {
         multiDexEnabled true
         versionCode 1500
-        version "3.1.0"
+        version "3.1.0.3-EatingNow-Angel"
         buildConfigField "String", "VERSION", '"' + version + '"'
-        buildConfigField "String", "BUILDVERSION", '"' + generateGitBuild() + '-' + generateDate() + '"'
+        buildConfigField "String", "BUILDVERSION",   '"' + 'EN-' + generateGitBuild()[0..7] + '-' + generateDate() + '"'
         buildConfigField "String", "REMOTE", '"' + generateGitRemote() + '"'
         buildConfigField "String", "HEAD", '"' + generateGitBuild() + '"'
         buildConfigField "String", "COMMITTED", '"' + allCommitted() + '"'
 
     }
-
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            testCoverageEnabled(project.hasProperty('coverage'))
+        }
+        firebaseDisable {
+            System.setProperty("disableFirebase", "true")
+            ext.enableCrashlytics = false
+        }
+        applicationVariants.all{
+                // this method is use to rename your all apk weather
+                // it may be signed or unsigned(debug apk)
+            variant ->
+                variant.outputs.each{
+                        // on below line we are setting a name to our apk
+                    output->
+                        // on below line we are adding the formatted date to our apk file name.
+                        def formattedDate = new Date().format('YYMMdd')
+                        // on below line we are creating a new name for our apk.
+                        def newName = output.outputFile.name
+                        newName = newName.replace("-release", "")
+                        newName = newName.replace("app-", "")
+                        // on below line we are replacing -release with our formatted date and ID.
+                        newName = formattedDate + "-" + generateGitBuild()[0..7] + "-en-" + newName
+                        // at last we are setting our apk name to it.
+                        output.outputFileName  = newName
+                }
+        }
+    }
     flavorDimensions "standard"
     productFlavors {
         full {
@@ -244,6 +275,6 @@ if (isMaster() && !gitAvailable()) {
     throw new GradleException('GIT system is not available. On Windows try to run Android Studio as an Administrator. Check if GIT is installed and Studio have permissions to use it')
 }
 if (isMaster() && !allCommitted()) {
-    throw new GradleException('There are uncommitted changes. Clone sources again as described in wiki and do not allow gradle update')
+    //throw new GradleException('There are uncommitted changes. Clone sources again as described in wiki and do not allow gradle update')
 }
 

app/src/main/assets/EN/latest/basal-set-temp.js

@@ -0,0 +1,60 @@
+'use strict';
+
+function reason(rT, msg) {
+  rT.reason = (rT.reason ? rT.reason + '. ' : '') + msg;
+  console.error(msg);
+}
+
+var tempBasalFunctions = {};
+
+tempBasalFunctions.getMaxSafeBasal = function getMaxSafeBasal(profile) {
+
+    var max_daily_safety_multiplier = (isNaN(profile.max_daily_safety_multiplier) || profile.max_daily_safety_multiplier == null) ? 3 : profile.max_daily_safety_multiplier;
+    var current_basal_safety_multiplier = (isNaN(profile.current_basal_safety_multiplier) || profile.current_basal_safety_multiplier == null) ? 4 : profile.current_basal_safety_multiplier;
+
+    return Math.min(profile.max_basal, max_daily_safety_multiplier * profile.max_daily_basal, current_basal_safety_multiplier * profile.current_basal);
+};
+
+tempBasalFunctions.setTempBasal = function setTempBasal(rate, duration, profile, rT, currenttemp) {
+    //var maxSafeBasal = Math.min(profile.max_basal, 3 * profile.max_daily_basal, 4 * profile.current_basal);
+
+    var maxSafeBasal = tempBasalFunctions.getMaxSafeBasal(profile);
+    var round_basal = require('./round-basal');
+
+    if (rate < 0) {
+        rate = 0;
+    } else if (rate > maxSafeBasal) {
+        rate = maxSafeBasal;
+    }
+
+    var suggestedRate = round_basal(rate, profile);
+    if (typeof(currenttemp) !== 'undefined' && typeof(currenttemp.duration) !== 'undefined' && typeof(currenttemp.rate) !== 'undefined' && currenttemp.duration > (duration-10) && currenttemp.duration <= 120 && suggestedRate <= currenttemp.rate * 1.2 && suggestedRate >= currenttemp.rate * 0.8 && duration > 0 ) {
+        rT.reason += " "+currenttemp.duration+"m left and " +  round_basal(currenttemp.rate, profile) + " ~ req " + suggestedRate + "U/hr: no temp required";
+        return rT;
+    }
+
+    if (suggestedRate === profile.current_basal) {
+      if (profile.skip_neutral_temps === true) {
+        if (typeof(currenttemp) !== 'undefined' && typeof(currenttemp.duration) !== 'undefined' && currenttemp.duration > 0) {
+          reason(rT, 'Suggested rate is same as profile rate, a temp basal is active, canceling current temp');
+          rT.duration = 0;
+          rT.rate = 0;
+          return rT;
+        } else {
+          reason(rT, 'Suggested rate is same as profile rate, no temp basal is active, doing nothing');
+          return rT;
+        }
+      } else {
+        reason(rT, 'Setting neutral temp basal of ' + profile.current_basal + 'U/hr');
+        rT.duration = duration;
+        rT.rate = suggestedRate;
+        return rT;
+      }
+    } else {
+      rT.duration = duration;
+      rT.rate = suggestedRate;
+      return rT;
+    }
+};
+
+module.exports = tempBasalFunctions;