Show carb suggestions from OpenAPS

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);

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,10 +128,19 @@ 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
+        }
+
+        if (isCarbsRequired()) {
+            return getCarbsRequiredText();
+        }
+
         return resourceHelper.gs(R.string.nochangerequested);
     }
 
@@ -150,10 +166,19 @@ 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
+        }
+
+        if (isCarbsRequired()) {
+            return Html.fromHtml(getCarbsRequiredText());
+        }
+
         return Html.fromHtml(resourceHelper.gs(R.string.nochangerequested));
     }
 
@@ -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

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,7 +481,19 @@ public class LoopPlugin extends PluginBase {
                     if (sp.getBoolean("wearcontrol", false)) {
                         builder.setLocalOnly(true);
                     }
+                    presentSuggestion(builder);
+                } else if (allowNotification) {
+                    dismissSuggestion();
+                }
+            }
 
+            rxBus.send(new EventLoopUpdateGui());
+        } finally {
+            getAapsLogger().debug(LTag.APS, "invoke end");
+        }
+    }
+
+    private void presentSuggestion(NotificationCompat.Builder builder) {
         // Creates an explicit intent for an Activity in your app
         Intent resultIntent = new Intent(context, MainActivity.class);
 
@@ -487,20 +517,15 @@ public class LoopPlugin extends PluginBase {
 
         // Send to Wear
         actionStringHandler.get().handleInitiate("changeRequest");
-                } else if (allowNotification) {
+    }
+
+    private void dismissSuggestion() {
         // dismiss notifications
         NotificationManager notificationManager =
                 (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE);
         notificationManager.cancel(Constants.notificationID);
         actionStringHandler.get().handleInitiate("cancelChangeRequest");
     }
-            }
-
-            rxBus.send(new EventLoopUpdateGui());
-        } finally {
-            getAapsLogger().debug(LTag.APS, "invoke end");
-        }
-    }
 
     public void acceptChangeRequest() {
         Profile profile = profileFunction.getProfile();

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;

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>

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">