caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

local alert thresholds as settings

Browse source
This commit is contained in:
AdrianLxM 2017-11-06 12:58:44 +01:00
parent ffd912e32b
commit 87ea412516
3 changed files with 34 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
app/src/main/java/info/nightscout/androidaps/receivers/KeepAliveReceiver.java
View file

@ -35,9 +35,17 @@ public class KeepAliveReceiver extends BroadcastReceiver {
// TODO consider moving this into an Alarms plugin that works offline and can be configured // TODO consider moving this into an Alarms plugin that works offline and can be configured
// (e.g. override silent mode at night only) // (e.g. override silent mode at night only)
public static final int ALARM_FREQUENCY = 25 * 60 * 1000;
private static long nextPumpDisconnectedAlarm = System.currentTimeMillis() + ALARM_FREQUENCY; private static int missedReadingsThreshold() {
private static long nextMissedReadingsAlarm = System.currentTimeMillis() + ALARM_FREQUENCY; return SP.getInt(MainApp.sResources.getString(R.string.key_missed_bg_readings_threshold), 30) * 60 * 1000;
}
private static int pumpUnreachableThreshold() {
return SP.getInt(MainApp.sResources.getString(R.string.key_pump_unreachable_threshold), 30) * 60 * 1000;
}
private static long nextPumpDisconnectedAlarm = System.currentTimeMillis() + pumpUnreachableThreshold();
private static long nextMissedReadingsAlarm = System.currentTimeMillis() + missedReadingsThreshold();
@Override @Override
public void onReceive(Context context, Intent rIntent) { public void onReceive(Context context, Intent rIntent) {
@ -55,11 +63,11 @@ public class KeepAliveReceiver extends BroadcastReceiver {
private void checkBg() { private void checkBg() {
BgReading bgReading = DatabaseHelper.lastBg(); BgReading bgReading = DatabaseHelper.lastBg();
if (SP.getBoolean(MainApp.sResources.getString(R.string.key_enable_missed_bg_readings_alert), false) if (SP.getBoolean(MainApp.sResources.getString(R.string.key_enable_missed_bg_readings_alert), false)
&& bgReading != null && bgReading.date + ALARM_FREQUENCY < System.currentTimeMillis() && bgReading != null && bgReading.date + missedReadingsThreshold() < System.currentTimeMillis()
&& nextMissedReadingsAlarm < System.currentTimeMillis()) { && nextMissedReadingsAlarm < System.currentTimeMillis()) {
Notification n = new Notification(Notification.BG_READINGS_MISSED, MainApp.sResources.getString(R.string.missed_bg_readings), Notification.URGENT); Notification n = new Notification(Notification.BG_READINGS_MISSED, MainApp.sResources.getString(R.string.missed_bg_readings), Notification.URGENT);
n.soundId = R.raw.alarm; n.soundId = R.raw.alarm;
nextMissedReadingsAlarm = System.currentTimeMillis() + ALARM_FREQUENCY; nextMissedReadingsAlarm = System.currentTimeMillis() + missedReadingsThreshold();
MainApp.bus().post(new EventNewNotification(n)); MainApp.bus().post(new EventNewNotification(n));
} }
} }
@ -73,7 +81,7 @@ public class KeepAliveReceiver extends BroadcastReceiver {
boolean isStatusOutdated = lastConnection.getTime() + STATUS_UPDATE_FREQUENCY < System.currentTimeMillis(); boolean isStatusOutdated = lastConnection.getTime() + STATUS_UPDATE_FREQUENCY < System.currentTimeMillis();
boolean isBasalOutdated = Math.abs(profile.getBasal() - pump.getBaseBasalRate()) > pump.getPumpDescription().basalStep; boolean isBasalOutdated = Math.abs(profile.getBasal() - pump.getBaseBasalRate()) > pump.getPumpDescription().basalStep;
boolean alarmTimeoutExpired = lastConnection.getTime() + ALARM_FREQUENCY < System.currentTimeMillis(); boolean alarmTimeoutExpired = lastConnection.getTime() + pumpUnreachableThreshold() < System.currentTimeMillis();
boolean nextAlarmOccurrenceReached = nextPumpDisconnectedAlarm < System.currentTimeMillis(); boolean nextAlarmOccurrenceReached = nextPumpDisconnectedAlarm < System.currentTimeMillis();
SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext()); SharedPreferences SP = PreferenceManager.getDefaultSharedPreferences(MainApp.instance().getApplicationContext());
@ -81,7 +89,7 @@ public class KeepAliveReceiver extends BroadcastReceiver {
&& isStatusOutdated && alarmTimeoutExpired && nextAlarmOccurrenceReached) { && isStatusOutdated && alarmTimeoutExpired && nextAlarmOccurrenceReached) {
Notification n = new Notification(Notification.PUMP_UNREACHABLE, MainApp.sResources.getString(R.string.pump_unreachable), Notification.URGENT); Notification n = new Notification(Notification.PUMP_UNREACHABLE, MainApp.sResources.getString(R.string.pump_unreachable), Notification.URGENT);
n.soundId = R.raw.alarm; n.soundId = R.raw.alarm;
nextPumpDisconnectedAlarm = System.currentTimeMillis() + ALARM_FREQUENCY; nextPumpDisconnectedAlarm = System.currentTimeMillis() + pumpUnreachableThreshold();
MainApp.bus().post(new EventNewNotification(n)); MainApp.bus().post(new EventNewNotification(n));
} else if (SP.getBoolean("syncprofiletopump", false) && !pump.isThisProfileSet(profile)) { } else if (SP.getBoolean("syncprofiletopump", false) && !pump.isThisProfileSet(profile)) {
Thread t = new Thread(new Runnable() { Thread t = new Thread(new Runnable() {

7
app/src/main/res/values/strings.xml
View file

@ -764,7 +764,10 @@
<string name="key_enable_pump_unreachable_alert" translatable="false">enable_pump_unreachable_alert</string> <string name="key_enable_pump_unreachable_alert" translatable="false">enable_pump_unreachable_alert</string>
<string name="key_enable_missed_bg_readings_alert" translatable="false">enable_missed_bg_readings</string> <string name="key_enable_missed_bg_readings_alert" translatable="false">enable_missed_bg_readings</string>
<string name="localalertsettings_title">Local alerts</string> <string name="localalertsettings_title">Local alerts</string>
<string name="enable_missed_bg_readings_alert">Alert if no BGs received in 30 min</string> <string name="enable_missed_bg_readings_alert">Alert if no BG data is received</string>
<string name="enable_pump_unreachable_alert">Alert if pump unreachable for 30 min</string> <string name="enable_pump_unreachable_alert">Alert if pump is unreachable</string>
<string name="pump_unreachable_threshold">Pump unreachable threshold [min]</string>
<string name="key_pump_unreachable_threshold" translatable="false">pump_unreachable_threshold</string>
<string name="key_missed_bg_readings_threshold" translatable="false">missed_bg_readings_threshold</string>
</resources> </resources>

14
app/src/main/res/xml/pref_others.xml
View file

@ -79,10 +79,24 @@
android:defaultValue="false" android:defaultValue="false"
android:key="@string/key_enable_missed_bg_readings_alert" android:key="@string/key_enable_missed_bg_readings_alert"
android:title="@string/enable_missed_bg_readings_alert"/> android:title="@string/enable_missed_bg_readings_alert"/>
<EditTextPreference
android:title="@string/nsalarm_staledatavalue_label"
android:key="@string/key_missed_bg_readings_threshold"
android:dependency="@string/key_enable_missed_bg_readings_alert"
android:defaultValue="30"
android:inputType="number">
</EditTextPreference>
<SwitchPreference <SwitchPreference
android:defaultValue="false" android:defaultValue="false"
android:key="@string/key_enable_pump_unreachable_alert" android:key="@string/key_enable_pump_unreachable_alert"
android:title="@string/enable_pump_unreachable_alert"/> android:title="@string/enable_pump_unreachable_alert"/>
<EditTextPreference
android:title="@string/pump_unreachable_threshold"
android:key="@string/key_pump_unreachable_threshold"
android:dependency="@string/key_enable_pump_unreachable_alert"
android:defaultValue="30"
android:inputType="number">
</EditTextPreference>
<SwitchPreference <SwitchPreference
android:defaultValue="false" android:defaultValue="false"
android:key="raise_urgent_alarms_as_android_notification" android:key="raise_urgent_alarms_as_android_notification"