Master chds

app/build.gradle

@@ -121,7 +121,7 @@ tasks.matching { it instanceof Test }.all {
 
 android {
     compileSdkVersion 28
-    ndkVersion "21.1.6352462"
+    ndkVersion "21.3.6528147"
 
     defaultConfig {
         minSdkVersion 24

app/src/main/AndroidManifest.xml

@@ -32,6 +32,7 @@
 
     <application
         android:name=".MainApp"
+        android:extractNativeLibs="true"
         android:allowBackup="true"
         android:icon="${appIcon}"
         android:label="@string/app_name"

app/src/main/java/info/nightscout/androidaps/plugins/aps/openAPSSMB/DetermineBasalAdapterSMBJS.java

@@ -77,6 +77,8 @@ public class DetermineBasalAdapterSMBJS {
     private String storedSMBAlwaysAllowed = null;
     private String storedCurrentTime = null;
 
+    private String enableSmbIgnore = null;
+
     private String scriptDebug = "";
 
     /**
@@ -258,10 +260,10 @@ public void setData(Profile profile,
         mProfile.put("max_daily_safety_multiplier", sp.getInt(R.string.key_openapsama_max_daily_safety_multiplier, 3));
         mProfile.put("current_basal_safety_multiplier", sp.getDouble(R.string.key_openapsama_current_basal_safety_multiplier, 4d));
 
-        //mProfile.put("high_temptarget_raises_sensitivity", SP.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity));
-        mProfile.put("high_temptarget_raises_sensitivity", false);
-        //mProfile.put("low_temptarget_lowers_sensitivity", SP.getBoolean(R.string.key_low_temptarget_lowers_sensitivity, SMBDefaults.low_temptarget_lowers_sensitivity));
-        mProfile.put("low_temptarget_lowers_sensitivity", false);
+        mProfile.put("high_temptarget_raises_sensitivity", sp.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity));
+        //mProfile.put("high_temptarget_raises_sensitivity", false);
+        mProfile.put("low_temptarget_lowers_sensitivity", sp.getBoolean(R.string.key_low_temptarget_lowers_sensitivity, SMBDefaults.low_temptarget_lowers_sensitivity));
+        //mProfile.put("low_temptarget_lowers_sensitivity", false);
 
 
         mProfile.put("sensitivity_raises_target", sp.getBoolean(resourceHelper.gs(R.string.key_sensitivity_raises_target),SMBDefaults.sensitivity_raises_target));
@@ -279,7 +281,7 @@ public void setData(Profile profile,
         //}
         mProfile.put("remainingCarbsCap", SMBDefaults.remainingCarbsCap);
         mProfile.put("enableUAM", uamAllowed);
-        mProfile.put("A52_risk_enable", SMBDefaults.A52_risk_enable);
+        mProfile.put("A52_risk_enable", sp.getBoolean(R.string.key_a52_risk_enable, SMBDefaults.A52_risk_enable));
 
         boolean smbEnabled = sp.getBoolean(resourceHelper.gs(R.string.key_use_smb), false);
         mProfile.put("SMBInterval", sp.getInt("key_smbinterval", SMBDefaults.SMBInterval));

app/src/main/java/info/nightscout/androidaps/plugins/constraints/safety/SafetyPlugin.java

@@ -152,7 +152,9 @@ public Constraint<Boolean> isUAMEnabled(@NonNull Constraint<Boolean> value) {
     public Constraint<Boolean> isAdvancedFilteringEnabled(@NonNull Constraint<Boolean> value) {
         BgSourceInterface bgSource = activePlugin.getActiveBgSource();
 
-        if (!bgSource.advancedFilteringSupported())
+        boolean ignore = sp.getBoolean(R.string.key_enableSMB_ignore, false);
+
+        if (!ignore && !bgSource.advancedFilteringSupported())
             value.set(getAapsLogger(), false, getResourceHelper().gs(R.string.smbalwaysdisabled), this);
         return value;
     }

app/src/main/java/info/nightscout/androidaps/plugins/iob/iobCobCalculator/IobCobOref1Thread.java

@@ -366,7 +366,7 @@ public final void run() {
 
                     // add an extra negative deviation if a high temptarget is running and exercise mode is set
                     // TODO AS-FIX
-                    if (false && sp.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity)) {
+                    if (sp.getBoolean(R.string.key_high_temptarget_raises_sensitivity, SMBDefaults.high_temptarget_raises_sensitivity)) {
                         TempTarget tempTarget = treatmentsPlugin.getTempTargetFromHistory(bgTime);
                         if (tempTarget != null && tempTarget.target() >= 100) {
                             autosensData.extraDeviation.add(-(tempTarget.target() - 100) / 20);

app/src/main/res/values-ru-rRU/strings.xml

@@ -337,6 +337,8 @@
     <string name="openapsma_autosensdata_label">данные autosens</string>
     <string name="openapsma_scriptdebugdata_label">отладка скрипта</string>
     <string name="openapsama_useautosens">Пользоваться функцией Autosens</string>
+    <string name="a52_risk_enable">A52_risk_enable</string>
+    <string name="a52_risk_enable_summary">Отключить безопасности препятствующей ошибке Medtronic A52 (может привести к более агрессивным болюсам)</string>
     <string name="refresheventsfromnightscout">обновить данные из NS</string>
     <string name="deletefuturetreatments">Удалить назначения из будущего</string>
     <string name="eatingsoon">Ожидаемый прием пищи</string>
@@ -646,6 +648,8 @@
     <string name="enablesmbalways_summary">Всегда включать супер микро болюс SMB независимо от болюсов. Возможно только для источников СК с хорошей фильтрацией данных вроде G5</string>
     <string name="enablesmbaftercarbs">Активировать супер микро болюс SMB после углеводов</string>
     <string name="enablesmbaftercarbs_summary">Включать супер микро болюс SMB на 6 часов после углеводов, даже при 0 активных углеводов COB. Возможно только для источников СК с хорошей фильтрацией данных вроде G5</string>
+    <string name="enablesmbignore">Игнорировать источник СК для SMB (РИСКОВАНО)</string>
+    <string name="enablesmbaftercarbs_ignore">Включить SMB даже для источников СК без поддержки фильтрации (РИСКОВАНО)</string>
     <string name="enablesmbwithcob">Включить супер микро болюс при активных углеводах COB</string>
     <string name="enablesmbwithcob_summary">Включить супер микро болюс SMB, когда имеются активные углеводы COB.</string>
     <string name="enablesmbwithtemptarget">Включить супер микро болюс SMB с временными целями</string>

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

@@ -382,6 +382,8 @@
     <string name="openapsma_autosensdata_label">Autosens data</string>
     <string name="openapsma_scriptdebugdata_label">Script debug</string>
     <string name="openapsama_useautosens">Use Autosens feature</string>
+    <string name="a52_risk_enable">A52 risk enable</string>
+    <string name="a52_risk_enable_summary">Flag to disable Medtronic A52 error safety (should lead to more agressive bolusing)</string>
     <string name="refresheventsfromnightscout">Refresh events from NS</string>
     <string name="deletefuturetreatments">Delete treatments in the future</string>
     <string name="eatingsoon">Eating Soon</string>
@@ -618,6 +620,7 @@
     <string name="careportal_newnstreatment_duration_min_label">Duration [min]</string>
     <string name="openapssmb">OpenAPS SMB</string>
     <string name="key_use_smb" translatable="false">use_smb</string>
+    <string name="key_use_smb_ignore" translatable="false">use_smb_ignore</string>
     <string name="key_use_uam" translatable="false">use_uam</string>
     <string name="key_smb_enable_carbs_suggestions_threshold" translatable="false">smb_enable_carbs_suggestions_threshold</string>
     <string name="enableuam">Enable UAM</string>
@@ -750,14 +753,17 @@
     <string name="key_enableSMB_with_COB" translatable="false">enableSMB_with_COB</string>
     <string name="key_enableSMB_with_temptarget" translatable="false">enableSMB_with_temptarget</string>
     <string name="key_enableSMB_after_carbs" translatable="false">enableSMB_after_carbs</string>
+    <string name="key_enableSMB_ignore" translatable="false">enableSMB_ignore</string>
     <string name="key_allowSMB_with_high_temptarget" translatable="false">enableSMB_with_high_temptarget</string>
     <string name="key_set_neutral_temps" translatable="false">set_neutral_temps</string>
     <string name="set_neutral_temps_title">Set neutral temp basals</string>
     <string name="set_neutral_temps_summary">If enabled, it will cancel a temporary basal before the end of each hour. This method can help stop some pumps beeping/vibrating on the hour.</string>
     <string name="enablesmbalways">Enable SMB always</string>
     <string name="enablesmbalways_summary">Enable SMB always independently to boluses. Possible only with BG source with nice filtering of data like G5</string>
     <string name="enablesmbaftercarbs">Enable SMB after carbs</string>
+    <string name="enablesmbignore">Enable SMB disregarding BG source (UNSAFE)</string>
     <string name="enablesmbaftercarbs_summary">Enable SMB for 6h after carbs, even with 0 COB. Possible only with BG source with nice filtering of data like G5</string>
+    <string name="enablesmbaftercarbs_ignore">Enable SMB not caring about noisy BG source (UNSAFE)</string>
     <string name="enablesmbwithcob">Enable SMB with COB</string>
     <string name="enablesmbwithcob_summary">Enable SMB when there is COB active.</string>
     <string name="enablesmbwithtemptarget">Enable SMB with temp targets</string>
@@ -1166,6 +1172,7 @@
 
     <string name="key_smbmaxminutes" translatable="false">smbmaxminutes</string>
     <string name="key_uamsmbmaxminutes" translatable="false">uamsmbmaxminutes</string>
+    <string name="key_a52_risk_enable" translatable="false">a52_risk_enable</string>
     <string name="dst_plugin_name" translatable="false">Daylight Saving time</string>
     <string name="dst_in_24h_warning">Daylight Saving time change in 24h or less</string>
     <string name="dst_loop_disabled_warning">Daylight Saving time change less than 3 hours ago - Closed loop disabled</string>

app/src/main/res/xml/pref_openapssmb.xml

@@ -32,6 +32,12 @@
             android:key="openapsama_useautosens"
             android:title="@string/openapsama_useautosens" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:key="@string/key_a52_risk_enable"
+            android:title="@string/a52_risk_enable"
+            android:summary="@string/a52_risk_enable_summary" />
+
         <SwitchPreference
             android:defaultValue="false"
             android:key="@string/key_use_smb"
@@ -73,6 +79,13 @@
             android:summary="@string/enablesmbaftercarbs_summary"
             android:title="@string/enablesmbaftercarbs" />
 
+        <SwitchPreference
+            android:defaultValue="false"
+            android:dependency="@string/key_use_smb"
+            android:key="@string/key_enableSMB_ignore"
+            android:summary="@string/enablesmbaftercarbs_ignore"
+            android:title="@string/enablesmbignore" />
+
         <info.nightscout.androidaps.utils.textValidator.ValidatingEditTextPreference
             android:defaultValue="3"
             android:digits="0123456789"
@@ -130,15 +143,13 @@
         <!-- TODO AS-FIX -->
         <SwitchPreference
             android:defaultValue="false"
-            android:enabled="false"
             android:key="@string/key_high_temptarget_raises_sensitivity"
             android:summary="@string/high_temptarget_raises_sensitivity_summary"
             android:title="@string/high_temptarget_raises_sensitivity_title" />
 
         <!-- TODO AS-FIX -->
         <SwitchPreference
             android:defaultValue="false"
-            android:enabled="false"
             android:key="@string/key_low_temptarget_lowers_sensitivity"
             android:summary="@string/low_temptarget_lowers_sensitivity_summary"
             android:title="@string/low_temptarget_lowers_sensitivity_title" />