bgi on watch status (optional)
This commit is contained in:
parent
63b9a06431
commit
1fa3a2a697
5 changed files with 75 additions and 36 deletions
|
@ -7,6 +7,7 @@ import android.content.SharedPreferences;
|
||||||
import android.os.BatteryManager;
|
import android.os.BatteryManager;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
import android.preference.PreferenceManager;
|
import android.preference.PreferenceManager;
|
||||||
|
import android.support.annotation.NonNull;
|
||||||
import android.util.Log;
|
import android.util.Log;
|
||||||
|
|
||||||
import com.google.android.gms.common.ConnectionResult;
|
import com.google.android.gms.common.ConnectionResult;
|
||||||
|
@ -503,42 +504,7 @@ public class WatchUpdaterService extends WearableListenerService implements
|
||||||
private void sendStatus() {
|
private void sendStatus() {
|
||||||
if (googleApiClient.isConnected()) {
|
if (googleApiClient.isConnected()) {
|
||||||
|
|
||||||
String status = "";
|
String status = generateStatusString();
|
||||||
boolean shortString = true;
|
|
||||||
|
|
||||||
LoopPlugin activeloop = MainApp.getConfigBuilder().getActiveLoop();
|
|
||||||
|
|
||||||
if (activeloop != null && !activeloop.isEnabled(PluginBase.LOOP)) {
|
|
||||||
status += getString(R.string.disabledloop) + "\n";
|
|
||||||
lastLoopStatus = false;
|
|
||||||
} else if (activeloop != null && activeloop.isEnabled(PluginBase.LOOP)) {
|
|
||||||
lastLoopStatus = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
//Temp basal
|
|
||||||
PumpInterface pump = MainApp.getConfigBuilder();
|
|
||||||
|
|
||||||
if (pump.isTempBasalInProgress()) {
|
|
||||||
TempBasal activeTemp = pump.getTempBasal();
|
|
||||||
if (shortString) {
|
|
||||||
status += activeTemp.toStringShort();
|
|
||||||
} else {
|
|
||||||
status += activeTemp.toStringMedium();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
//IOB
|
|
||||||
MainApp.getConfigBuilder().getActiveTreatments().updateTotalIOB();
|
|
||||||
IobTotal bolusIob = MainApp.getConfigBuilder().getActiveTreatments().getLastCalculation().round();
|
|
||||||
MainApp.getConfigBuilder().getActiveTempBasals().updateTotalIOB();
|
|
||||||
IobTotal basalIob = MainApp.getConfigBuilder().getActiveTempBasals().getLastCalculation().round();
|
|
||||||
status += (shortString?"":(getString(R.string.treatments_iob_label_string) + " ")) + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob);
|
|
||||||
|
|
||||||
if (mPrefs.getBoolean("wear_detailediob", true)) {
|
|
||||||
status += "("
|
|
||||||
+ DecimalFormatter.to2Decimal(bolusIob.iob) + "|"
|
|
||||||
+ DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
|
|
||||||
}
|
|
||||||
|
|
||||||
PutDataMapRequest dataMapRequest = PutDataMapRequest.create(NEW_STATUS_PATH);
|
PutDataMapRequest dataMapRequest = PutDataMapRequest.create(NEW_STATUS_PATH);
|
||||||
//unique content
|
//unique content
|
||||||
|
@ -551,6 +517,56 @@ public class WatchUpdaterService extends WearableListenerService implements
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@NonNull
|
||||||
|
private String generateStatusString() {
|
||||||
|
String status = "";
|
||||||
|
boolean shortString = true;
|
||||||
|
|
||||||
|
LoopPlugin activeloop = MainApp.getConfigBuilder().getActiveLoop();
|
||||||
|
|
||||||
|
if (activeloop != null && !activeloop.isEnabled(PluginBase.LOOP)) {
|
||||||
|
status += getString(R.string.disabledloop) + "\n";
|
||||||
|
lastLoopStatus = false;
|
||||||
|
} else if (activeloop != null && activeloop.isEnabled(PluginBase.LOOP)) {
|
||||||
|
lastLoopStatus = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
//Temp basal
|
||||||
|
PumpInterface pump = MainApp.getConfigBuilder();
|
||||||
|
|
||||||
|
if (pump.isTempBasalInProgress()) {
|
||||||
|
TempBasal activeTemp = pump.getTempBasal();
|
||||||
|
if (shortString) {
|
||||||
|
status += activeTemp.toStringShort();
|
||||||
|
} else {
|
||||||
|
status += activeTemp.toStringMedium();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
//IOB
|
||||||
|
MainApp.getConfigBuilder().getActiveTreatments().updateTotalIOB();
|
||||||
|
IobTotal bolusIob = MainApp.getConfigBuilder().getActiveTreatments().getLastCalculation().round();
|
||||||
|
MainApp.getConfigBuilder().getActiveTempBasals().updateTotalIOB();
|
||||||
|
IobTotal basalIob = MainApp.getConfigBuilder().getActiveTempBasals().getLastCalculation().round();
|
||||||
|
status += (shortString?"":(getString(R.string.treatments_iob_label_string) + " ")) + DecimalFormatter.to2Decimal(bolusIob.iob + basalIob.basaliob);
|
||||||
|
|
||||||
|
if (mPrefs.getBoolean("wear_detailediob", true)) {
|
||||||
|
status += "("
|
||||||
|
+ DecimalFormatter.to2Decimal(bolusIob.iob) + "|"
|
||||||
|
+ DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
|
||||||
|
}
|
||||||
|
NSProfile profile = MainApp.getConfigBuilder().getActiveProfile().getProfile();
|
||||||
|
if (!mPrefs.getBoolean("wear_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;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDestroy() {
|
public void onDestroy() {
|
||||||
if (googleApiClient != null && googleApiClient.isConnected()) {
|
if (googleApiClient != null && googleApiClient.isConnected()) {
|
||||||
|
|
|
@ -21,6 +21,7 @@ import info.nightscout.androidaps.events.EventTreatmentChange;
|
||||||
import info.nightscout.androidaps.interfaces.PluginBase;
|
import info.nightscout.androidaps.interfaces.PluginBase;
|
||||||
import info.nightscout.androidaps.interfaces.PumpInterface;
|
import info.nightscout.androidaps.interfaces.PumpInterface;
|
||||||
import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
|
import info.nightscout.androidaps.plugins.Loop.LoopPlugin;
|
||||||
|
import info.nightscout.androidaps.plugins.NSClientInternal.data.NSProfile;
|
||||||
import info.nightscout.utils.DecimalFormatter;
|
import info.nightscout.utils.DecimalFormatter;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -181,6 +182,15 @@ public class StatuslinePlugin implements PluginBase {
|
||||||
+ DecimalFormatter.to2Decimal(bolusIob.iob) + "|"
|
+ DecimalFormatter.to2Decimal(bolusIob.iob) + "|"
|
||||||
+ DecimalFormatter.to2Decimal(basalIob.basaliob) + ")";
|
+ 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;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -603,4 +603,6 @@
|
||||||
<string name="xdripstatus_settings">xDrip Status (watch)</string>
|
<string name="xdripstatus_settings">xDrip Status (watch)</string>
|
||||||
<string name="xdripstatus">xDrip Statusline (watch)</string>
|
<string name="xdripstatus">xDrip Statusline (watch)</string>
|
||||||
<string name="xdripstatus_shortname">xds</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>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -9,6 +9,12 @@
|
||||||
android:key="wear_detailediob"
|
android:key="wear_detailediob"
|
||||||
android:title="@string/wear_detailedIOB_title"
|
android:title="@string/wear_detailedIOB_title"
|
||||||
android:summary="@string/wear_detailedIOB_summary"/>
|
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>
|
</PreferenceCategory>
|
||||||
|
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
|
@ -9,6 +9,11 @@
|
||||||
android:key="xdripstatus_detailediob"
|
android:key="xdripstatus_detailediob"
|
||||||
android:title="@string/wear_detailedIOB_title"
|
android:title="@string/wear_detailedIOB_title"
|
||||||
android:summary="@string/wear_detailedIOB_summary"/>
|
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>
|
</PreferenceCategory>
|
||||||
|
|
||||||
</PreferenceScreen>
|
</PreferenceScreen>
|
Loading…
Reference in a new issue