From 063d3685e1d68698593b2e39013c94129906278e Mon Sep 17 00:00:00 2001
From: Brian Quinion <git@brian.quinion.co.uk>
Date: Tue, 10 Mar 2020 11:24:40 +0000
Subject: [PATCH 1/3] Show carb suggestions from OpenAPS

---
 .../main/assets/OpenAPSSMB/determine-basal.js |  2 +
 .../plugins/aps/loop/APSResult.java           | 39 ++++++++-
 .../plugins/aps/loop/LoopPlugin.java          | 83 ++++++++++++-------
 .../openAPSSMB/DetermineBasalResultSMB.java   | 10 ++-
 app/src/main/res/values/strings.xml           |  9 ++
 app/src/main/res/xml/pref_openapssmb.xml      | 19 +++++
 6 files changed, 127 insertions(+), 35 deletions(-)

diff --git a/app/src/main/assets/OpenAPSSMB/determine-basal.js b/app/src/main/assets/OpenAPSSMB/determine-basal.js
index c2db0f270b..11a66df891 100644
--- a/app/src/main/assets/OpenAPSSMB/determine-basal.js
+++ b/app/src/main/assets/OpenAPSSMB/determine-basal.js
@@ -862,8 +862,10 @@ var determine_basal = function determine_basal(glucose_status, currenttemp, iob_
     console.error("naive_eventualBG:",naive_eventualBG,"bgUndershoot:",bgUndershoot,"zeroTempDuration:",zeroTempDuration,"zeroTempEffect:",zeroTempEffect,"carbsReq:",carbsReq);
     if ( carbsReq >= profile.carbsReqThreshold && minutesAboveThreshold <= 45 ) {
         rT.carbsReq = carbsReq;
+        rT.carbsReqWithin = minutesAboveThreshold;
         rT.reason += carbsReq + " add'l carbs req w/in " + minutesAboveThreshold + "m; ";
     }
+
     // don't low glucose suspend if IOB is already super negative and BG is rising faster than predicted
     if (bg < threshold && iob_data.iob < -profile.current_basal*20/60 && minDelta > 0 && minDelta > expectedDelta) {
         rT.reason += "IOB "+iob_data.iob+" < " + round(-profile.current_basal*20/60,2);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
index 0c91d0723c..27ebb5dd84 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/APSResult.java
@@ -62,6 +62,9 @@ public class APSResult {
     public double smb = 0d; // super micro bolus in units
     public long deliverAt = 0;
 
+    public int carbsReq = 0;
+    public int carbsReqWithin = 0;
+
     public Constraint<Double> inputConstraints;
 
     public Constraint<Double> rateConstraint;
@@ -98,6 +101,10 @@ public class APSResult {
         return this;
     }
 
+    public String getCarbsRequiredText() {
+        return String.format(resourceHelper.gs(R.string.carbsreq), carbsReq, carbsReqWithin);
+    }
+
     @Override
     public String toString() {
         final PumpInterface pump = activePluginProvider.getActivePump();
@@ -121,11 +128,20 @@ public class APSResult {
             if (smb != 0)
                 ret += ("SMB: " + DecimalFormatter.toPumpSupportedBolus(smb) + " U\n");
 
+            if (isCarbsRequired()) {
+                ret += getCarbsRequiredText()+"\n";
+            }
+
             // reason
             ret += resourceHelper.gs(R.string.reason) + ": " + reason;
             return ret;
-        } else
-            return resourceHelper.gs(R.string.nochangerequested);
+        }
+
+        if (isCarbsRequired()) {
+            return getCarbsRequiredText();
+        }
+
+        return resourceHelper.gs(R.string.nochangerequested);
     }
 
     public Spanned toSpanned() {
@@ -150,11 +166,20 @@ public class APSResult {
             if (smb != 0)
                 ret += ("<b>" + "SMB" + "</b>: " + DecimalFormatter.toPumpSupportedBolus(smb) + " U<br>");
 
+            if (isCarbsRequired()) {
+                ret += getCarbsRequiredText()+"<br>";
+            }
+
             // reason
             ret += "<b>" + resourceHelper.gs(R.string.reason) + "</b>: " + reason.replace("<", "&lt;").replace(">", "&gt;");
             return Html.fromHtml(ret);
-        } else
-            return Html.fromHtml(resourceHelper.gs(R.string.nochangerequested));
+        }
+
+        if (isCarbsRequired()) {
+            return Html.fromHtml(getCarbsRequiredText());
+        }
+
+        return Html.fromHtml(resourceHelper.gs(R.string.nochangerequested));
     }
 
     public APSResult newAndClone(HasAndroidInjector injector) {
@@ -183,6 +208,8 @@ public class APSResult {
         newResult.smbConstraint = smbConstraint;
         newResult.percent = percent;
         newResult.usePercent = usePercent;
+        newResult.carbsReq = carbsReq;
+        newResult.carbsReqWithin = carbsReqWithin;
     }
 
 
@@ -297,6 +324,10 @@ public class APSResult {
         return latest;
     }
 
+    public boolean isCarbsRequired() {
+        return carbsReq > 0;
+    }
+
     public boolean isChangeRequested() {
         Constraint<Boolean> closedLoopEnabled = constraintChecker.isClosedLoopAllowed();
         // closed loop mode: handle change at driver level
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index 40ba607cd1..c386ce6f0a 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -405,6 +405,24 @@ public class LoopPlugin extends PluginBase {
             Constraint<Boolean> closedLoopEnabled = constraintChecker.isClosedLoopAllowed();
 
             if (closedLoopEnabled.value()) {
+
+                if (allowNotification) {
+                    if (resultAfterConstraints.isCarbsRequired()) {
+                        NotificationCompat.Builder builder =
+                                new NotificationCompat.Builder(MainApp.instance().getApplicationContext(), CHANNEL_ID);
+                        builder.setSmallIcon(R.drawable.notif_icon)
+                                .setContentTitle(MainApp.gs(R.string.carbssuggestion))
+                                .setContentText(resultAfterConstraints.getCarbsRequiredText())
+                                .setAutoCancel(true)
+                                .setPriority(Notification.PRIORITY_MAX)
+                                .setCategory(Notification.CATEGORY_ALARM)
+                                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
+                        presentSuggestion(builder);
+                    } else {
+                        dismissSuggestion();
+                    }
+                }
+
                 if (resultAfterConstraints.isChangeRequested()
                         && !commandQueue.bolusInQueue()
                         && !commandQueue.isRunning(Command.CommandType.BOLUS)) {
@@ -463,36 +481,9 @@ public class LoopPlugin extends PluginBase {
                     if (sp.getBoolean("wearcontrol", false)) {
                         builder.setLocalOnly(true);
                     }
-
-                    // Creates an explicit intent for an Activity in your app
-                    Intent resultIntent = new Intent(context, MainActivity.class);
-
-                    // The stack builder object will contain an artificial back stack for the
-                    // started Activity.
-                    // This ensures that navigating backward from the Activity leads out of
-                    // your application to the Home screen.
-                    TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
-                    stackBuilder.addParentStack(MainActivity.class);
-                    // Adds the Intent that starts the Activity to the top of the stack
-                    stackBuilder.addNextIntent(resultIntent);
-                    PendingIntent resultPendingIntent =
-                            stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
-                    builder.setContentIntent(resultPendingIntent);
-                    builder.setVibrate(new long[]{1000, 1000, 1000, 1000, 1000});
-                    NotificationManager mNotificationManager =
-                            (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-                    // mId allows you to update the notification later on.
-                    mNotificationManager.notify(Constants.notificationID, builder.build());
-                    rxBus.send(new EventNewOpenLoopNotification());
-
-                    // Send to Wear
-                    actionStringHandler.get().handleInitiate("changeRequest");
+                    presentSuggestion(builder);
                 } else if (allowNotification) {
-                    // dismiss notifications
-                    NotificationManager notificationManager =
-                            (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
-                    notificationManager.cancel(Constants.notificationID);
-                    actionStringHandler.get().handleInitiate("cancelChangeRequest");
+                    dismissSuggestion();
                 }
             }
 
@@ -502,6 +493,40 @@ public class LoopPlugin extends PluginBase {
         }
     }
 
+    private void presentSuggestion(NotificationCompat.Builder builder) {
+        // Creates an explicit intent for an Activity in your app
+        Intent resultIntent = new Intent(context, MainActivity.class);
+
+        // The stack builder object will contain an artificial back stack for the
+        // started Activity.
+        // This ensures that navigating backward from the Activity leads out of
+        // your application to the Home screen.
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(context);
+        stackBuilder.addParentStack(MainActivity.class);
+        // Adds the Intent that starts the Activity to the top of the stack
+        stackBuilder.addNextIntent(resultIntent);
+        PendingIntent resultPendingIntent =
+                stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT);
+        builder.setContentIntent(resultPendingIntent);
+        builder.setVibrate(new long[]{1000, 1000, 1000, 1000, 1000});
+        NotificationManager mNotificationManager =
+                (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        // mId allows you to update the notification later on.
+        mNotificationManager.notify(Constants.notificationID, builder.build());
+        rxBus.send(new EventNewOpenLoopNotification());
+
+        // Send to Wear
+        actionStringHandler.get().handleInitiate("changeRequest");
+    }
+
+    private void dismissSuggestion() {
+        // dismiss notifications
+        NotificationManager notificationManager =
+                (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.cancel(Constants.notificationID);
+        actionStringHandler.get().handleInitiate("cancelChangeRequest");
+    }
+
     public void acceptChangeRequest() {
         Profile profile = profileFunction.getProfile();
         final LoopPlugin lp = this;
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
index dae170d5d9..746737ec0f 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
@@ -4,10 +4,11 @@ import org.json.JSONException;
 import org.json.JSONObject;
 
 import dagger.android.HasAndroidInjector;
-import info.nightscout.androidaps.logging.AAPSLogger;
 import info.nightscout.androidaps.logging.LTag;
+import info.nightscout.androidaps.R;
 import info.nightscout.androidaps.plugins.aps.loop.APSResult;
 import info.nightscout.androidaps.utils.DateUtil;
+import info.nightscout.androidaps.utils.SP;
 
 public class DetermineBasalResultSMB extends APSResult {
 
@@ -33,7 +34,12 @@ public class DetermineBasalResultSMB extends APSResult {
             if (result.has("eventualBG")) eventualBG = result.getDouble("eventualBG");
             if (result.has("snoozeBG")) snoozeBG = result.getDouble("snoozeBG");
             //if (result.has("insulinReq")) insulinReq = result.getDouble("insulinReq");
-            //if (result.has("carbsReq")) carbsReq = result.getDouble("carbsReq");
+
+            if (SP.getBoolean(R.string.key_smb_enable_carbs_suggestions, false)) {
+                if (result.has("carbsReq") && result.getInt("carbsReq") >= SP.getInt(R.string.key_smb_enable_carbs_suggestions_threshold, 0))
+                    carbsReq = result.getInt("carbsReq");
+                if (result.has("carbsReqWithin")) carbsReqWithin = result.getInt("carbsReqWithin");
+            }
 
             if (result.has("rate") && result.has("duration")) {
                 tempBasalRequested = true;
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1f15a23d70..d9d0e04ab3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -194,6 +194,8 @@
     <string name="enableloop">Enable loop</string>
 
     <string name="openloop_newsuggestion">New suggestion available</string>
+    <string name="carbssuggestion">Carbs Suggestion</string>
+    <string name="unsupportedclientver">Unsupported version of NSClient</string>
     <string name="unsupportednsversion">Unsupported version of Nightscout</string>
     <string name="loopdisabled">LOOP DISABLED BY CONSTRAINTS</string>
     <string name="treatments_wizard_basaliob_label">Basal IOB</string>
@@ -279,6 +281,7 @@
     <string name="percent">Percent</string>
     <string name="absolute">Absolute</string>
     <string name="canceltemp">Cancel temp basal</string>
+    <string name="carbsreq">"%dg Additional Carbs Required Within %d Minutes</string>
     <string name="smscommunicator">SMS Communicator</string>
     <string name="waitingforpumpresult">Waiting for result</string>
     <string name="smscommunicator_allowednumbers">Allowed phone numbers</string>
@@ -714,10 +717,16 @@
     <string name="smb_shortname">SMB</string>
     <string name="key_use_smb" translatable="false">use_smb</string>
     <string name="key_use_uam" translatable="false">use_uam</string>
+    <string name="key_smb_enable_carbs_suggestions" translatable="false">key_smb_enable_carbs_suggestions</string>
+    <string name="key_smb_enable_carbs_suggestions_threshold" translatable="false">key_smb_enable_carbs_suggestions_threshold</string>
     <string name="enableuam">Enable UAM</string>
     <string name="enablesmb">Enable SMB</string>
+    <string name="enablecarbssuggestions">Enable Carbs Suggestions</string>
+    <string name="enable_carbs_suggestions_threshold">Minimum Carbs Required For Suggestion</string>
+    <string name="enable_carbs_suggestions_threshold_summary">Minimum grams of carbs to display a carbs suggestion alert. Carbs suggestions below this number will not trigger a notification.</string>
     <string name="enablesmb_summary">Use Super Micro Boluses instead of temp basal for faster action</string>
     <string name="enableuam_summary">Detection of Unannounced meals</string>
+    <string name="enablecarbssuggestions_summary">Enable carbs suggestions when BG is predicted to go below threshold</string>
     <string name="key_insulin_oref_peak" translatable="false">insulin_oref_peak</string>
     <string name="insulin_oref_peak">IOB Curve Peak Time</string>
     <string name="insulin_peak_time">Peak Time [min]</string>
diff --git a/app/src/main/res/xml/pref_openapssmb.xml b/app/src/main/res/xml/pref_openapssmb.xml
index 0cecf93c73..b020a0a9b1 100644
--- a/app/src/main/res/xml/pref_openapssmb.xml
+++ b/app/src/main/res/xml/pref_openapssmb.xml
@@ -103,6 +103,25 @@
             android:summary="@string/low_temptarget_lowers_sensitivity_summary"
             android:title="@string/low_temptarget_lowers_sensitivity_title" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_smb_enable_carbs_suggestions"
+            android:summary="@string/enablecarbssuggestions_summary"
+            android:title="@string/enablecarbssuggestions" />
+
+        <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
+            android:defaultValue="0"
+            android:dialogMessage="@string/enable_carbs_suggestions_threshold_summary"
+            android:digits="0123456789"
+            android:inputType="number"
+            android:key="@string/key_smb_enable_carbs_suggestions_threshold"
+            android:maxLines="20"
+            android:selectAllOnFocus="true"
+            android:title="@string/enable_carbs_suggestions_threshold"
+            validate:maxNumber="20"
+            validate:minNumber="0"
+            validate:testType="numericRange" />
+
         <androidx.preference.PreferenceScreen
             android:key="absorption_smb_advanced"
             android:title="@string/advancedsettings_title">

From b1097880f4db42e93c47a3fe67a73b94f21bccf0 Mon Sep 17 00:00:00 2001
From: Brian Quinion <git@brian.quinion.co.uk>
Date: Tue, 10 Mar 2020 18:46:14 +0000
Subject: [PATCH 2/3] Add carbs required to overview. Add notification with
 option to ignore carbs suggestions for 5, 15 or 30min

---
 app/src/main/AndroidManifest.xml              |  3 ++
 .../dependencyInjection/ReceiversModule.kt    |  3 ++
 .../aps/loop/CarbSuggestionReceiver.java      | 20 ++++++++
 .../plugins/aps/loop/LoopPlugin.java          | 51 ++++++++++++++++---
 .../general/overview/OverviewFragment.java    | 14 +++++
 app/src/main/res/layout/overview_fragment.xml | 12 +++++
 app/src/main/res/values/strings.xml           |  2 +
 7 files changed, 99 insertions(+), 6 deletions(-)
 create mode 100644 app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.java

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7dae93317c..8e8c96b965 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -113,6 +113,9 @@
         <!-- Receiver keepalive, scheduled every 30 min -->
         <receiver android:name=".receivers.KeepAliveReceiver" />
 
+        <!-- Receive ignore 5m, 15m, 30m requests for carb notifications -->
+        <receiver android:name=".plugins.aps.loop.CarbSuggestionReceiver"></receiver>
+
         <!-- Auto start -->
         <receiver
             android:name=".receivers.AutoStartReceiver"
diff --git a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
index 30e372fd74..f22bf454ad 100644
--- a/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
+++ b/app/src/main/java/info/nightscout/androidaps/dependencyInjection/ReceiversModule.kt
@@ -2,6 +2,7 @@ package info.nightscout.androidaps.dependencyInjection
 
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
+import info.nightscout.androidaps.plugins.aps.loop.CarbSuggestionReceiver
 import info.nightscout.androidaps.receivers.KeepAliveReceiver
 
 @Module
@@ -9,4 +10,6 @@ import info.nightscout.androidaps.receivers.KeepAliveReceiver
 abstract class ReceiversModule {
 
     @ContributesAndroidInjector abstract fun contributesKeepAliveReceiver(): KeepAliveReceiver
+    @ContributesAndroidInjector abstract fun contributesCarbSuggestionReceiver(): CarbSuggestionReceiver
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.java
new file mode 100644
index 0000000000..fe0b9b3ef4
--- /dev/null
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/CarbSuggestionReceiver.java
@@ -0,0 +1,20 @@
+package info.nightscout.androidaps.plugins.aps.loop;
+
+import android.content.Context;
+import android.content.Intent;
+
+import javax.inject.Inject;
+
+import dagger.android.DaggerBroadcastReceiver;
+
+public class CarbSuggestionReceiver extends DaggerBroadcastReceiver {
+
+    @Inject LoopPlugin loopPlugin;
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        super.onReceive(context, intent);
+        int duartion = intent.getIntExtra("ignoreDuration", 5);
+        loopPlugin.disableCarbSuggestions(duartion);
+    }
+}
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index c386ce6f0a..eecb0d3e25 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -98,6 +98,8 @@ public class LoopPlugin extends PluginBase {
     private boolean isSuperBolus;
     private boolean isDisconnected;
 
+    private long carbsSuggestionsSuspendedUntil = 0;
+
     public class LastRun {
         public APSResult request = null;
         public APSResult constraintsProcessed = null;
@@ -407,17 +409,49 @@ public class LoopPlugin extends PluginBase {
             if (closedLoopEnabled.value()) {
 
                 if (allowNotification) {
-                    if (resultAfterConstraints.isCarbsRequired()) {
-                        NotificationCompat.Builder builder =
-                                new NotificationCompat.Builder(MainApp.instance().getApplicationContext(), CHANNEL_ID);
+                    if (resultAfterConstraints.isCarbsRequired() && carbsSuggestionsSuspendedUntil < System.currentTimeMillis()) {
+
+                        Intent intentAction5m = new Intent(context, CarbSuggestionReceiver.class);
+                        intentAction5m.putExtra("ignoreDuration",5);
+                        PendingIntent pendingIntent5m = PendingIntent.getBroadcast(context,1, intentAction5m,PendingIntent.FLAG_UPDATE_CURRENT);
+                        NotificationCompat.Action actionIgnore5m = new
+                                NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 5m", pendingIntent5m);
+
+                        Intent intentAction15m = new Intent(context, CarbSuggestionReceiver.class);
+                        intentAction15m.putExtra("ignoreDuration",15);
+                        PendingIntent pendingIntent15m = PendingIntent.getBroadcast(context,1, intentAction15m,PendingIntent.FLAG_UPDATE_CURRENT);
+                        NotificationCompat.Action actionIgnore15m = new
+                                NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 15m", pendingIntent15m);
+
+                        Intent intentAction30m = new Intent(context, CarbSuggestionReceiver.class);
+                        intentAction30m.putExtra("ignoreDuration",30);
+                        PendingIntent pendingIntent30m = PendingIntent.getBroadcast(context,1, intentAction30m,PendingIntent.FLAG_UPDATE_CURRENT);
+                        NotificationCompat.Action actionIgnore30m = new
+                                NotificationCompat.Action(R.drawable.ic_notif_aaps, "Ignore 30m", pendingIntent30m);
+
+                        NotificationCompat.Builder builder = new NotificationCompat.Builder(context, CHANNEL_ID);
                         builder.setSmallIcon(R.drawable.notif_icon)
-                                .setContentTitle(MainApp.gs(R.string.carbssuggestion))
+                                .setContentTitle(resourceHelper.gs(R.string.carbssuggestion))
                                 .setContentText(resultAfterConstraints.getCarbsRequiredText())
                                 .setAutoCancel(true)
                                 .setPriority(Notification.PRIORITY_MAX)
                                 .setCategory(Notification.CATEGORY_ALARM)
-                                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
-                        presentSuggestion(builder);
+                                .addAction(actionIgnore5m)
+                                .addAction(actionIgnore15m)
+                                .addAction(actionIgnore30m)
+                                .setVisibility(NotificationCompat.VISIBILITY_PUBLIC)
+                                .setVibrate(new long[]{1000, 1000, 1000, 1000, 1000});
+
+                        NotificationManager mNotificationManager =
+                                (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
+
+                        // mId allows you to update the notification later on.
+                        mNotificationManager.notify(Constants.notificationID, builder.build());
+                        rxBus.send(new EventNewOpenLoopNotification());
+
+                        // Send to Wear
+                        actionStringHandler.get().handleInitiate("changeRequest");
+
                     } else {
                         dismissSuggestion();
                     }
@@ -493,6 +527,11 @@ public class LoopPlugin extends PluginBase {
         }
     }
 
+    public void disableCarbSuggestions(int duartionMinutes) {
+        carbsSuggestionsSuspendedUntil = System.currentTimeMillis() + (duartionMinutes*60*1000);
+        dismissSuggestion();
+    }
+
     private void presentSuggestion(NotificationCompat.Builder builder) {
         // Creates an explicit intent for an Activity in your app
         Intent resultIntent = new Intent(context, MainActivity.class);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
index 0a21468800..d8b98f8e37 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewFragment.java
@@ -165,6 +165,7 @@ public class OverviewFragment extends DaggerFragment implements View.OnClickList
     TextView activeProfileView;
     TextView iobView;
     TextView cobView;
+    TextView cobRequiredView;
     TextView apsModeView;
     TextView tempTargetView;
     TextView pumpStatusView;
@@ -277,6 +278,8 @@ public class OverviewFragment extends DaggerFragment implements View.OnClickList
 
         iobView = (TextView) view.findViewById(R.id.overview_iob);
         cobView = (TextView) view.findViewById(R.id.overview_cob);
+        cobRequiredView = (TextView) view.findViewById(R.id.overview_cob_required);
+
         apsModeView = (TextView) view.findViewById(R.id.overview_apsmode);
         tempTargetView = (TextView) view.findViewById(R.id.overview_temptarget);
 
@@ -1331,6 +1334,17 @@ public class OverviewFragment extends DaggerFragment implements View.OnClickList
             cobView.setText(cobText);
         }
 
+        if (cobRequiredView != null) {
+            if (loopPlugin.lastRun != null && loopPlugin.lastRun.constraintsProcessed != null
+                    && loopPlugin.lastRun.constraintsProcessed.carbsReq > 0) {
+                cobRequiredView.setVisibility(View.VISIBLE);
+                String carbsRequiredString = String.format(resourceHelper.gs(R.string.overview_carbs_required), loopPlugin.lastRun.constraintsProcessed.carbsReq, loopPlugin.lastRun.constraintsProcessed.carbsReqWithin);
+                cobRequiredView.setText(carbsRequiredString);
+            } else {
+                cobRequiredView.setVisibility(View.GONE);
+            }
+        }
+
         if (statuslightsLayout != null)
             if (sp.getBoolean(R.string.key_show_statuslights, false)) {
                 if (sp.getBoolean(R.string.key_show_statuslights_extended, false)) {
diff --git a/app/src/main/res/layout/overview_fragment.xml b/app/src/main/res/layout/overview_fragment.xml
index 467c8c171a..70e1255275 100644
--- a/app/src/main/res/layout/overview_fragment.xml
+++ b/app/src/main/res/layout/overview_fragment.xml
@@ -266,6 +266,18 @@
                     app:layout_constraintBottom_toBottomOf="@+id/overview_cob_label"
                     app:layout_constraintStart_toEndOf="@+id/overview_cob_colon" />
 
+                <TextView
+                    android:id="@+id/overview_cob_required"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="10dp"
+                    android:text="@string/cob_required"
+                    android:textSize="16sp"
+                    android:textStyle="bold"
+                    android:textColor="@color/cobAlert"
+                    app:layout_constraintBottom_toBottomOf="@+id/overview_cob_label"
+                    app:layout_constraintStart_toEndOf="@+id/overview_cob" />
+
                 <!-- right side basal -->
                 <TextView
                     android:id="@+id/overview_basebasal_label"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d9d0e04ab3..63d9a21638 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1710,5 +1710,7 @@
     <string name="loop_smbexecution_time_label">SMB execution time</string>
     <string name="loop_tbrrequest_time_label">Temp basal request time</string>
     <string name="loop_tbrexecution_time_label">Temp basal execution time</string>
+    <string name="cob_required">(20g needed in 45min)</string>
+    <string name="overview_carbs_required">(%dg needed in %dmin)</string>
 
 </resources>

From 72a3e825e3a0f52f252f5aca41f2208ab44e0258 Mon Sep 17 00:00:00 2001
From: Brian Quinion <git@brian.quinion.co.uk>
Date: Tue, 10 Mar 2020 18:59:39 +0000
Subject: [PATCH 3/3] Move carbs_suggestions_threshold to LoopPlugin so that
 non-critical carbs still show on overview (but no system notification)

---
 .../nightscout/androidaps/plugins/aps/loop/LoopPlugin.java    | 4 +++-
 .../plugins/aps/openAPSSMB/DetermineBasalResultSMB.java       | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
index eecb0d3e25..d245bdd816 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/loop/LoopPlugin.java
@@ -409,7 +409,9 @@ public class LoopPlugin extends PluginBase {
             if (closedLoopEnabled.value()) {
 
                 if (allowNotification) {
-                    if (resultAfterConstraints.isCarbsRequired() && carbsSuggestionsSuspendedUntil < System.currentTimeMillis()) {
+                    if (resultAfterConstraints.isCarbsRequired()
+                            && resultAfterConstraints.carbsReq >= sp.getInt(R.string.key_smb_enable_carbs_suggestions_threshold, 0)
+                            && carbsSuggestionsSuspendedUntil < System.currentTimeMillis()) {
 
                         Intent intentAction5m = new Intent(context, CarbSuggestionReceiver.class);
                         intentAction5m.putExtra("ignoreDuration",5);
diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
index 746737ec0f..0c0c5e17ed 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalResultSMB.java
@@ -36,8 +36,7 @@ public class DetermineBasalResultSMB extends APSResult {
             //if (result.has("insulinReq")) insulinReq = result.getDouble("insulinReq");
 
             if (SP.getBoolean(R.string.key_smb_enable_carbs_suggestions, false)) {
-                if (result.has("carbsReq") && result.getInt("carbsReq") >= SP.getInt(R.string.key_smb_enable_carbs_suggestions_threshold, 0))
-                    carbsReq = result.getInt("carbsReq");
+                if (result.has("carbsReq")) carbsReq = result.getInt("carbsReq");
                 if (result.has("carbsReqWithin")) carbsReqWithin = result.getInt("carbsReqWithin");
             }