Merge branch 'dev' of https://github.com/nightscout/Trio into refactor-fpu-handling

CGMBLEKit

@@ -1 +1 @@
-Subproject commit a442ea0a21078e82264176a89617d2f9a3a6f36d
+Subproject commit 134396b96170d410b18f9699b92409bc6d35aedb

Config.xcconfig

@@ -19,7 +19,7 @@ TRIO_APP_GROUP_ID = group.org.nightscout.$(DEVELOPMENT_TEAM).trio.trio-app-group
 
 // The developers set the version numbers, please leave them alone
 APP_VERSION = 0.6.0
-APP_DEV_VERSION = 0.6.0.51
+APP_DEV_VERSION = 0.6.0.53
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE =
 

DanaKit

@@ -1 +1 @@
-Subproject commit bad8fad9ccf980f4a3384b2454a7cd41abe69464
+Subproject commit 3970b2aadc55044c851130567879fd0ae3ade6cc

G7SensorKit

@@ -1 +1 @@
-Subproject commit ee064ddcc1c13e0050ee56d0eec38a6bdc0d3c76
+Subproject commit 0c093050084b63d7af0dc99307dba09239eb3180

LibreTransmitter

@@ -1 +1 @@
-Subproject commit 38cc483f3d7716735ceee6e57b6ed4dd68eaf1d0
+Subproject commit 12dec3ce191afe761fd68a70172ef75638319e20

LoopKit

@@ -1 +1 @@
-Subproject commit edd4e6037d263ef32dd8dd4c0d699c5429097373
+Subproject commit 9c09a6fea98e2638d76d610ba097c4fae14ca220

MinimedKit

@@ -1 +1 @@
-Subproject commit d52c0f8f1fe615760794fdac233ba78657449870
+Subproject commit 942996e3f53c4875553c9827aeee1799a8dbf434

OmniBLE

@@ -1 +1 @@
-Subproject commit ffec85de22d979e4bee6535c374ab72c692e101b
+Subproject commit 3782c584fe800116b6e60754e3be3cd818e033ee

OmniKit

@@ -1 +1 @@
-Subproject commit 64731f0b31d61cae14d00528a9c2bf78ea6da9a6
+Subproject commit 1446be89bfab23ac021d3e22f03b34bda8ce30cf

RileyLinkKit

@@ -1 +1 @@
-Subproject commit 83b211a442672612e1790c2f0d393aeb23600b5f
+Subproject commit 8dad76d15295e13e091be74f6f47dbca5f0eb022

TidepoolService

@@ -1 +1 @@
-Subproject commit b4fb9a0672f6e4a7bfed619fc3193b03a8a2ab79
+Subproject commit a10f9d3ba097daae85de61d4a5bca063f34d64dc

Trio/Sources/Localizations/Main/Localizable.xcstrings

@@ -151864,6 +151864,65 @@
         }
       }
     },
+    "Max Allowed Glucose Rise for SMB" : {
+      "comment" : "Max Allowed Glucose Rise for SMB, formerly Max Delta-BG Threshold",
+      "localizations" : {
+        "da" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Maks tilladt glukose stigning for SMB"
+          }
+        },
+        "de" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Max Zulässiger Glukoseanstieg für SMB"
+          }
+        },
+        "fr" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Augmentation max de glucose autorisée pour SMB"
+          }
+        },
+        "nb-NO" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Maks tillatt blodsukkerstigning for SMB"
+          }
+        },
+        "nl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Max toegestane glucosestijging voor SMB"
+          }
+        },
+        "pl" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Maks dozwolony wzrost glikemii dla SMB"
+          }
+        },
+        "sv" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Max tillåten glukosstigning för SMB"
+          }
+        },
+        "vi" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Tối đa Mức tăng đường huyết cho phép với SMB"
+          }
+        },
+        "zh-Hant" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "最大允許的 SMB 血糖上升量"
+          }
+        }
+      }
+    },
     "Max Basal Rate" : {
       "localizations" : {
         "bg" : {
@@ -155342,125 +155401,6 @@
         }
       }
     },
-    "Max. Allowed Glucose Rise for SMB" : {
-      "comment" : "Max. Allowed Glucose Rise for SMB, formerly Max Delta-BG Threshold",
-      "localizations" : {
-        "bg" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Max. Allowed Glucose Rise for SMB"
-          }
-        },
-        "da" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Maks. tilladt glukose stigning for SMB"
-          }
-        },
-        "de" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Max. Zulässiger Glukoseanstieg für SMB"
-          }
-        },
-        "es" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Max. Allowed Glucose Rise for SMB"
-          }
-        },
-        "fr" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Augmentation max. de glucose autorisée pour SMB"
-          }
-        },
-        "he" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Max. Allowed Glucose Rise for SMB"
-          }
-        },
-        "it" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Max. Allowed Glucose Rise for SMB"
-          }
-        },
-        "ko" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Max. Allowed Glucose Rise for SMB"
-          }
-        },
-        "nb-NO" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Maks. tillatt blodsukkerstigning for SMB"
-          }
-        },
-        "nl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Max. toegestane glucosestijging voor SMB"
-          }
-        },
-        "pl" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Maks. dozwolony wzrost glikemii dla SMB"
-          }
-        },
-        "pt-PT" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Max. Allowed Glucose Rise for SMB"
-          }
-        },
-        "ro" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Max. Allowed Glucose Rise for SMB"
-          }
-        },
-        "ru" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Max. Allowed Glucose Rise for SMB"
-          }
-        },
-        "sv" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Max. tillåten glukosstigning för SMB"
-          }
-        },
-        "tr" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Max. Allowed Glucose Rise for SMB"
-          }
-        },
-        "uk" : {
-          "stringUnit" : {
-            "state" : "new",
-            "value" : "Max. Allowed Glucose Rise for SMB"
-          }
-        },
-        "vi" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Tối đa. Mức tăng đường huyết cho phép với SMB"
-          }
-        },
-        "zh-Hant" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "最大允許的 SMB 血糖上升量"
-          }
-        }
-      }
-    },
     "Maximum allowed positive percent change in glucose level to permit SMBs. If the difference in glucose is greater than this, Trio will only adjust Temp Basal Rate and not deliver an SMB that loop cycle." : {
       "localizations" : {
         "bg" : {

Trio/Sources/Modules/Onboarding/View/OnboardingView+AlgorithmUtil.swift

@@ -121,8 +121,8 @@ enum AlgorithmSettingsSubstep: Int, CaseIterable, Identifiable {
         case .maxSMBMinutes: return String(localized: "Max SMB Basal Minutes", comment: "Max SMB Basal Minutes")
         case .maxUAMMinutes: return String(localized: "Max UAM Basal Minutes", comment: "Max UAM Basal Minutes")
         case .maxDeltaGlucoseThreshold: return String(
-                localized: "Max. Allowed Glucose Rise for SMB",
-                comment: "Max. Allowed Glucose Rise for SMB, formerly Max Delta-BG Threshold"
+                localized: "Max Allowed Glucose Rise for SMB",
+                comment: "Max Allowed Glucose Rise for SMB, formerly Max Delta-BG Threshold"
             )
         case .highTempTargetRaisesSensitivity: return String(
                 localized: "High Temp Target Raises Sensitivity",

Trio/Sources/Modules/SMBSettings/View/SMBSettingsRootView.swift

@@ -331,16 +331,16 @@ extension SMBSettings {
                         set: {
                             selectedVerboseHint = $0.map { AnyView($0) }
                             hintLabel = String(
-                                localized: "Max. Allowed Glucose Rise for SMB",
-                                comment: "Max. Allowed Glucose Rise for SMB, formerly Max Delta-BG Threshold"
+                                localized: "Max Allowed Glucose Rise for SMB",
+                                comment: "Max Allowed Glucose Rise for SMB, formerly Max Delta-BG Threshold"
                             )
                         }
                     ),
                     units: state.units,
                     type: .decimal("maxDeltaBGthreshold"),
                     label: String(
-                        localized: "Max. Allowed Glucose Rise for SMB",
-                        comment: "Max. Allowed Glucose Rise for SMB, formerly Max Delta-BG Threshold"
+                        localized: "Max Allowed Glucose Rise for SMB",
+                        comment: "Max Allowed Glucose Rise for SMB, formerly Max Delta-BG Threshold"
                     ),
                     miniHint: String(localized: "Disables SMBs if last two glucose values differ by more than this percent."),
                     verboseHint:

Trio/Sources/Modules/Settings/SettingItems.swift

@@ -114,13 +114,13 @@ enum SettingItems {
                 "Enable SMB With COB",
                 "Enable SMB With Temporary Target",
                 "Enable SMB After Carbs",
-                "Enable SMB With High BG",
-                "High BG Target",
+                "Enable SMB With High Glucose",
+                "High Glucose Target",
                 "Allow SMB With High Temporary Target",
                 "Enable UAM",
                 "Max SMB Basal Minutes",
                 "Max UAM SMB Basal Minutes",
-                "Max Delta-BG Threshold SMB"
+                "Max Allowed Glucose Rise for SMB"
             ],
             path: ["Algorithm", "Super Micro Bolus (SMB)"]
         ),

Trio/Sources/Modules/SettingsExport/SettingsExportStateModel.swift

@@ -396,7 +396,7 @@ extension SettingsExport {
                 addSetting(
                     category: algorithmCategory,
                     subcategory: smbSubcategory,
-                    name: String(localized: "Max. Allowed Glucose Rise for SMB"),
+                    name: String(localized: "Max Allowed Glucose Rise for SMB"),
                     value: String(format: "%.0f", (preferences.maxDeltaBGthreshold as NSDecimalNumber).doubleValue * 100),
                     unit: "%"
                 )

dexcom-share-client-swift

@@ -1 +1 @@
-Subproject commit 82a9179d444b3e79d5e9cfe99bbe7f298c4e8b40
+Subproject commit 8c4f0edfe9356463c66a2e5dff9d00794291ebfd

scripts/define_common_trio.sh

@@ -0,0 +1,36 @@
+#!/bin/zsh
+
+# copied from Loop where this definition was used by more than one script
+# initially we probably will not need that capability, but does no harm to keep it
+# define parameters and arrays used by more than one script
+#   These are always capitalized
+#      TRIO_PROJECTS
+
+# include this file in each script using
+#   source scripts/define_commont_trio.sh
+
+# define the TRIO_PROJECTS used by Trio where for Trio the .gitmodules points
+#   to the downstream fork of loopandlearn in all cases
+#
+# The only submodule that needs a special trio branch (at this time) is LoopKit
+#    put that repository first in the list
+#
+# The scrips in LoopWorkspace are used to update translations and make
+#   sure the loopandlearn branches are up to date
+# Even though MedtrumKit and EversenseKit are not yet part of dev
+#   it does no harm to update those repositories using this script
+TRIO_PROJECTS=( \
+    loopandlearn:LoopKit:trio \
+    loopandlearn:CGMBLEKit:dev \
+    loopandlearn:dexcom-share-client-swift:dev \
+    loopandlearn:G7SensorKit:main \
+    loopandlearn:LibreTransmitter:main \
+    loopandlearn:MinimedKit:main \
+    loopandlearn:OmniBLE:dev \
+    loopandlearn:OmniKit:main \
+    loopandlearn:RileyLinkKit:dev \
+    loopandlearn:TidepoolService:dev \
+    loopandlearn:DanaKit:dev \
+    loopandlearn:EversenseKit:dev \
+    loopandlearn:MedtrumKit:dev \
+)

scripts/update_submodules_trio.sh

@@ -0,0 +1,13 @@
+#!/bin/zsh
+
+source scripts/define_common_trio.sh
+
+for project in ${TRIO_PROJECTS}; do
+  echo "Updating to $project"
+  IFS=":" read user dir branch <<< "$project"
+  echo "Updating to $branch on $user/$project"
+  cd $dir
+  git checkout $branch
+  git pull
+  cd -
+done