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

app/src/main/java/info/nightscout/androidaps/data/GlucoseStatus.java

@@ -131,7 +131,7 @@ public class GlucoseStatus {
 
         status.short_avgdelta = average(short_deltas);
 
-        if (prefs.getBoolean("always_use_shortavg", false) || last_deltas.isEmpty()) {
+        if (last_deltas.isEmpty()) {
             status.delta = status.short_avgdelta;
         } else {
             status.delta = average(last_deltas);

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSAMA/DetermineBasalAdapterAMAJS.java

@@ -243,7 +243,12 @@ public class DetermineBasalAdapterAMAJS {
 
         mGlucoseStatus = new V8Object(mV8rt);
         mGlucoseStatus.add("glucose", glucoseStatus.glucose);
+
+        if(SP.getBoolean("always_use_shortavg", false)){
+            mGlucoseStatus.add("delta", glucoseStatus.short_avgdelta);
+        } else {
             mGlucoseStatus.add("delta", glucoseStatus.delta);
+        }
         mGlucoseStatus.add("short_avgdelta", glucoseStatus.short_avgdelta);
         mGlucoseStatus.add("long_avgdelta", glucoseStatus.long_avgdelta);
         mV8rt.add(PARAM_glucoseStatus, mGlucoseStatus);

app/src/main/java/info/nightscout/androidaps/plugins/OpenAPSMA/DetermineBasalAdapterMAJS.java

@@ -19,6 +19,7 @@ import info.nightscout.androidaps.data.MealData;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.Loop.ScriptReader;
 import info.nightscout.androidaps.plugins.NSClientInternal.data.NSProfile;
+import info.nightscout.utils.SP;
 
 public class DetermineBasalAdapterMAJS {
     private static Logger log = LoggerFactory.getLogger(DetermineBasalAdapterMAJS.class);
@@ -251,7 +252,11 @@ public class DetermineBasalAdapterMAJS {
         mIobData.add("hightempinsulin", iobData.hightempinsulin);
 
         mGlucoseStatus.add("glucose", glucoseStatus.glucose);
+        if(SP.getBoolean("always_use_shortavg", false)){
+            mGlucoseStatus.add("delta", glucoseStatus.short_avgdelta);
+        } else {
             mGlucoseStatus.add("delta", glucoseStatus.delta);
+        }
         mGlucoseStatus.add("avgdelta", glucoseStatus.avgdelta);
 
         mMealData.add("carbs", mealData.carbs);

app/src/main/java/info/nightscout/androidaps/plugins/Wear/wearintegration/WatchUpdaterService.java

@@ -7,6 +7,7 @@ import android.content.SharedPreferences;
 import android.os.BatteryManager;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
+import android.support.annotation.NonNull;
 import android.util.Log;
 
 import com.google.android.gms.common.ConnectionResult;
@@ -503,6 +504,21 @@ public class WatchUpdaterService extends WearableListenerService implements
     private void sendStatus() {
         if (googleApiClient.isConnected()) {
 
+            String status = generateStatusString();
+
+            PutDataMapRequest dataMapRequest = PutDataMapRequest.create(NEW_STATUS_PATH);
+            //unique content
+            dataMapRequest.getDataMap().putDouble("timestamp", System.currentTimeMillis());
+            dataMapRequest.getDataMap().putString("externalStatusString", status);
+            PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
+            Wearable.DataApi.putDataItem(googleApiClient, putDataRequest);
+        } else {
+            Log.e("SendStatus", "No connection to wearable available!");
+        }
+    }
+
+    @NonNull
+    private String generateStatusString() {
         String status = "";
         boolean shortString = true;
 
@@ -539,16 +555,16 @@ public class WatchUpdaterService extends WearableListenerService implements
                     + DecimalFormatter.to2Decimal(bolusIob.iob) + "|"
                     + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
         }
-
+        NSProfile profile = MainApp.getConfigBuilder().getActiveProfile().getProfile();
-            PutDataMapRequest dataMapRequest = PutDataMapRequest.create(NEW_STATUS_PATH);
+        if (!mPrefs.getBoolean("wear_showbgi", false) ||profile == null || profile.getIsf(NSProfile.secondsFromMidnight()) == null || profile.getIc(NSProfile.secondsFromMidnight()) == null) {
-            //unique content
+            return status;
-            dataMapRequest.getDataMap().putDouble("timestamp", System.currentTimeMillis());
-            dataMapRequest.getDataMap().putString("externalStatusString", status);
-            PutDataRequest putDataRequest = dataMapRequest.asPutDataRequest();
-            Wearable.DataApi.putDataItem(googleApiClient, putDataRequest);
-        } else {
-            Log.e("SendStatus", "No connection to wearable available!");
         }
+
+        double bgi = -(bolusIob.activity + basalIob.activity)*5*profile.getIsf(NSProfile.secondsFromMidnight());
+
+        status += " " + ((bgi>=0)?"+":"") + DecimalFormatter.to2Decimal(bgi);
+
+        return status;
     }
 
     @Override

app/src/main/java/info/nightscout/androidaps/plugins/XDripStatusline/StatuslinePlugin.java

@@ -21,6 +21,7 @@ import info.nightscout.androidaps.events.EventTreatmentChange;
 import info.nightscout.androidaps.interfaces.PluginBase;
 import info.nightscout.androidaps.interfaces.PumpInterface;
 import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
+import info.nightscout.androidaps.plugins.NSClientInternal.data.NSProfile;
 import info.nightscout.utils.DecimalFormatter;
 
 /**
@@ -181,6 +182,15 @@ public class StatuslinePlugin implements PluginBase {
                     + DecimalFormatter.to2Decimal(bolusIob.iob) + "|"
                     + DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
         }
+        NSProfile profile = MainApp.getConfigBuilder().getActiveProfile().getProfile();
+        if (!mPrefs.getBoolean("xdripstatus_showbgi", false) ||profile == null || profile.getIsf(NSProfile.secondsFromMidnight()) == null || profile.getIc(NSProfile.secondsFromMidnight()) == null) {
+            return status;
+        }
+
+        double bgi = -(bolusIob.activity + basalIob.activity)*5*profile.getIsf(NSProfile.secondsFromMidnight());
+
+        status += " " + ((bgi>=0)?"+":"") + DecimalFormatter.to2Decimal(bgi);
+
         return status;
     }
 

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

@@ -603,6 +603,8 @@
     <string name="xdripstatus_settings">xDrip Status (watch)</string>
     <string name="xdripstatus">xDrip Statusline (watch)</string>
     <string name="xdripstatus_shortname">xds</string>
+    <string name="wear_showbgi_title">Show BGI</string>
+    <string name="wear_showbgi_summary">Add BGI to status line</string>
     <string name="ns_noupload">No upload to NS</string>
     <string name="ns_noupload_summary">All data sent to NS are dropped. AAPS is connected to NS but no change in NS is done</string>
     <string name="key_ns_upload_only" translatable="false">ns_upload_only</string>

app/src/main/res/xml/pref_wear.xml

@@ -9,6 +9,12 @@
             android:key="wear_detailediob"
             android:title="@string/wear_detailedIOB_title"
             android:summary="@string/wear_detailedIOB_summary"/>
+
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="wear_showbgi"
+            android:title="@string/wear_showbgi_title"
+            android:summary="@string/wear_showbgi_summary"/>
     </PreferenceCategory>
 
 </PreferenceScreen>

app/src/main/res/xml/pref_xdripstatus.xml

@@ -9,6 +9,11 @@
             android:key="xdripstatus_detailediob"
             android:title="@string/wear_detailedIOB_title"
             android:summary="@string/wear_detailedIOB_summary"/>
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="xdripstatus_showbgi"
+            android:title="@string/wear_showbgi_title"
+            android:summary="@string/wear_showbgi_summary"/>
     </PreferenceCategory>
 
 </PreferenceScreen>