Profile presets watch

.github/workflows/build_iAPS.yml

@@ -22,7 +22,7 @@ jobs:
  steps:
  # Uncomment to manually select Xcode version if needed
  - name: Select Xcode version
- run: "sudo xcode-select --switch /Applications/Xcode_14.3.app/Contents/Developer"
+ run: "sudo xcode-select --switch /Applications/Xcode_15.0.1.app/Contents/Developer"
 
  # Checks-out the repo
  - name: Checkout Repo
@@ -64,4 +64,4 @@ jobs:
  name: build-artifacts
  path: |
  artifacts
- buildlog
+ buildlog

.gitignore

@@ -80,3 +80,5 @@ fastlane/test_output
 fastlane/FastlaneRunner
 
 ConfigOverride.xcconfig
+
+branch.txt

Config.xcconfig

@@ -1,5 +1,5 @@
 APP_DISPLAY_NAME = iAPS
-APP_VERSION = 2.2.5
+APP_VERSION = 2.2.8
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE =
 DEVELOPER_TEAM = ##TEAM_ID##

Core_Data.xcdatamodeld/Core_Data.xcdatamodel/contents

@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="21754" systemVersion="22F82" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22225" systemVersion="23B74" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+ <entity name="Autosens_" representedClassName="Autosens_" syncable="YES" codeGenerationType="class">
+ <attribute name="newisf" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+ <attribute name="ratio" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+ <attribute name="timestamp" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+ </entity>
+ <entity name="Autotune_" representedClassName="Autotune_" syncable="YES" codeGenerationType="class">
+ <attribute name="basalProfile" optional="YES" attributeType="Transformable"/>
+ <attribute name="carbRatio" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+ <attribute name="createdAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+ <attribute name="sensitivity" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+ </entity>
  <entity name="BGaverages" representedClassName="BGaverages" syncable="YES" codeGenerationType="class">
  <attribute name="average" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
  <attribute name="average_1" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
@@ -31,20 +42,37 @@
  <attribute name="hba1c_7" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
  <attribute name="hba1c_30" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
  </entity>
+ <entity name="ImportError" representedClassName="ImportError" syncable="YES" codeGenerationType="class">
+ <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+ <attribute name="error" optional="YES" attributeType="String"/>
+ </entity>
  <entity name="InsulinDistribution" representedClassName="InsulinDistribution" syncable="YES" codeGenerationType="class">
  <attribute name="bolus" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
  <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
  <attribute name="scheduledBasal" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
  <attribute name="tempBasal" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
  <relationship name="insulin" optional="YES" maxCount="1" deletionRule="Nullify" destinationEntity="Oref0Suggestion" inverseName="computedInsulinDistribution" inverseEntity="Oref0Suggestion"/>
  </entity>
+ <entity name="LastLoop" representedClassName="LastLoop" syncable="YES" codeGenerationType="class">
+ <attribute name="cob" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+ <attribute name="iob" optional="YES" attributeType="Decimal" defaultValueString="0.0"/>
+ <attribute name="timestamp" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+ </entity>
  <entity name="LoopStatRecord" representedClassName="LoopStatRecord" syncable="YES" codeGenerationType="class">
  <attribute name="duration" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
  <attribute name="end" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
  <attribute name="interval" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
  <attribute name="loopStatus" optional="YES" attributeType="String"/>
  <attribute name="start" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
  </entity>
+ <entity name="Meals" representedClassName="Meals" syncable="YES" codeGenerationType="class">
+ <attribute name="carbs" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
+ <attribute name="createdAt" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+ <attribute name="fat" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
+ <attribute name="id" optional="YES" attributeType="String"/>
+ <attribute name="note" optional="YES" attributeType="String"/>
+ <attribute name="protein" optional="YES" attributeType="Double" defaultValueString="0.0" usesScalarValueType="YES"/>
+ </entity>
  <entity name="Oref0Suggestion" representedClassName="Oref0Suggestion" syncable="YES" codeGenerationType="class">
  <relationship name="computedInsulinDistribution" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="InsulinDistribution" inverseName="insulin" inverseEntity="InsulinDistribution"/>
  <relationship name="computedTDD" optional="YES" toMany="YES" deletionRule="Nullify" destinationEntity="TDD" inverseName="computed" inverseEntity="TDD"/>
@@ -101,6 +129,7 @@
  </entity>
  <entity name="Readings" representedClassName="Readings" syncable="YES" codeGenerationType="class">
  <attribute name="date" optional="YES" attributeType="Date" usesScalarValueType="NO"/>
+ <attribute name="direction" optional="YES" attributeType="String"/>
  <attribute name="glucose" optional="YES" attributeType="Integer 16" defaultValueString="0" usesScalarValueType="YES"/>
  <attribute name="id" optional="YES" attributeType="String"/>
  </entity>

Dependencies/CGMBLEKit/CGMBLEKit/de.lproj/Localizable.strings

@@ -5,10 +5,10 @@
 "Dexcom G6" = "Dexcom G6";
 
 /* Error description for unreliable state */
-"Glucose data is unavailable" = "Blutzuckerdaten sind nicht verfügbar";
+"Glucose data is unavailable" = "Glukosedaten nicht verfügbar";
 
 /* Describes a low battery */
-"Low Battery" = "Niedriger Batteriestatus";
+"Low Battery" = "Batterie schwach";
 
 /* Describes a functioning transmitter */
 "OK" = "OK";
@@ -23,13 +23,13 @@
 "Peripheral isnʼt connected" = "Peripherie ist nicht verbunden";
 
 /* The description of sensor calibration state when sensor calibration is ok. */
-"Sensor calibration is OK" = "Sensorkalibrierung ist OK";
+"Sensor calibration is OK" = "Sensorkalibrierung OK";
 
 /* The description of sensor calibration state when raw value is unknown. (1: missing data details) */
 "Sensor is in unknown state %1$d" = "Sensor befindet sich in unbekanntem Zustand %1$d";
 
 /* The description of sensor calibration state when sensor sensor is stopped. */
-"Sensor is stopped" = "Sensor ist gestoppt";
+"Sensor is stopped" = "Sensor gestoppt";
 
 /* The description of sensor calibration state when sensor sensor is warming up. */
 "Sensor is warming up" = "Sensor befindet sich in der Aufwärmphase";

Dependencies/CGMBLEKit/CGMBLEKitUI/de.lproj/Localizable.strings

@@ -39,7 +39,7 @@ Title text for the button to remove a CGM from Loop */
 "Remote Data Synchronization" = "Remote Daten Synchronisation";
 
 /* Title describing sensor expiration */
-"Sensor Expires" = "Sensor-Ablaufzeitpunkt";
+"Sensor Expires" = "Sensor läuft ab";
 
 /* Title describing past sensor expiration */
 "Sensor Expired" = "Sensor abgelaufen";

Dependencies/G7SensorKit/G7SensorKitUI/Views/G7SettingsView.swift

@@ -72,7 +72,7 @@ struct G7SettingsView: View {
  }
  }
 
- Section("Last Reading") {
+ Section(LocalizedString("Last Reading", comment: "")) {
  LabeledValueView(label: LocalizedString("Glucose", comment: "Field label"),
  value: viewModel.lastGlucoseString)
  LabeledDateView(label: LocalizedString("Time", comment: "Field label"),
@@ -82,7 +82,7 @@ struct G7SettingsView: View {
  value: viewModel.lastGlucoseTrendString)
  }
 
- Section("Bluetooth") {
+ Section(LocalizedString("Bluetooth", comment: "")) {
  if let name = viewModel.sensorName {
  HStack {
  Text(LocalizedString("Name", comment: "title for g7 settings row showing BLE Name"))
@@ -114,15 +114,15 @@ struct G7SettingsView: View {
  }
  }
 
- Section("Configuration") {
+ Section(LocalizedString("Configuration", comment: "")) {
  HStack {
  Toggle(LocalizedString("Upload Readings", comment: "title for g7 config settings to upload readings"), isOn: $viewModel.uploadReadings)
  }
  }
 
  Section () {
  if !self.viewModel.scanning {
- Button("Scan for new sensor", action: {
+ Button(LocalizedString("Scan for new sensor", comment: ""), action: {
  self.viewModel.scanForNewSensor()
  })
  }

Dependencies/G7SensorKit/G7SensorKitUI/Views/G7StartupView.swift

@@ -26,7 +26,7 @@ struct G7StartupView: View {
  .frame(height: 120)
  .padding(.horizontal)
  }.frame(maxWidth: .infinity)
- Text(LocalizedString("Loop can read G7 CGM data, but you must still use the Dexcom G7 App for pairing, calibration, and other sensor management.", comment: "Descriptive text on G7StartupView"))
+ Text(LocalizedString("iAPS can read G7 CGM data, but you must still use the Dexcom G7 App for pairing, calibration, and other sensor management.", comment: "Descriptive text on G7StartupView"))
  .fixedSize(horizontal: false, vertical: true)
  .foregroundColor(.secondary)
  Spacer()

Dependencies/G7SensorKit/G7SensorKitUI/ar.lproj/Localizable.strings

@@ -1,18 +1,117 @@
 /* No glucose value representation (3 dashes for mg/dL) */
-"– – –" = "---";
+"– – –" = "– – –";
+
+/* Format string for glucose trend per minute. (1: glucose value and unit) */
+"%@/min" = "%@/min";
+
+/* No comment provided by engineer. */
+"Are you sure you want to delete this CGM?" = "Are you sure you want to delete this CGM?";
 
 /* No comment provided by engineer. */
-"Are you sure you want to delete this CGM?" = "هل أنت متأكد أنك تريد حذف هذا CGM؟";
+"Bluetooth" = "Bluetooth";
 
 /* Button text to cancel G7 setup */
-"Cancel" = "إلغاء";
+"Cancel" = "Cancel";
 
 /* No comment provided by engineer. */
-"Configuration" = "المعطيات";
+"Configuration" = "Configuration";
+
+/* title for g7 settings connection status when connected */
+"Connected" = "Connected";
+
+/* title for g7 settings connection status when connecting */
+"Connecting" = "Connecting";
+
+/* Button title for starting setup */
+"Continue" = "Continue";
 
 /* Button label for removing CGM */
-"Delete CGM" = "حذف CGM";
+"Delete CGM" = "Delete CGM";
+
+/* Navigation bar title for G7SettingsView
+ Title on WelcomeView */
+"Dexcom G7" = "Dexcom G7";
+
+/* No comment provided by engineer. */
+"Done" = "Done";
+
+/* Field label */
+"Glucose" = "Glucose";
+
+/* title for g7 settings row showing sensor grace period end time */
+"Grace Period End" = "Grace Period End";
+
+/* G7 Progress bar label when sensor grace period progress showing */
+"Grace period remaining" = "Grace period remaining";
+
+/* String displayed instead of a glucose value above the CGM range */
+"HIGH" = "HIGH";
+
+/* title for g7 settings row showing sensor last connect time */
+"Last Connect" = "Last Connect";
+
+/* No comment provided by engineer. */
+"Last Reading" = "Last Reading";
+
+/* Descriptive text on G7StartupView */
+"iAPS can read G7 CGM data, but you must still use the Dexcom G7 App for pairing, calibration, and other sensor management." = "iAPS can read G7 CGM data, but you must still use the Dexcom G7 App for pairing, calibration, and other sensor management.";
+
+/* String displayed instead of a glucose value below the CGM range */
+"LOW" = "LOW";
+
+/* title for g7 settings row showing BLE Name */
+"Name" = "Name";
+
+/* No comment provided by engineer. */
+"Scan for new sensor" = "Scan for new sensor";
+
+/* title for g7 settings connection status when scanning */
+"Scanning" = "Scanning";
+
+/* G7 Status highlight text for searching for sensor */
+"Searching for\nSensor" = "Searching for\nSensor";
+
+/* G7 Progress bar label when searching for sensor */
+"Searching for sensor" = "Searching for sensor";
+
+/* G7 Status highlight text for sensor expired */
+"Sensor\nExpired" = "Sensor\nExpired";
+
+/* G7 Status highlight text for sensor failed */
+"Sensor\nFailed" = "Sensor\nFailed";
+
+/* G7 Status highlight text for sensor error */
+"Sensor\nIssue" = "Sensor\nIssue";
+
+/* G7 Status highlight text for sensor warmup */
+"Sensor\nWarmup" = "Sensor\nWarmup";
+
+/* title for g7 settings row showing sensor expiration time */
+"Sensor Expiration" = "Sensor Expiration";
+
+/* G7 Progress bar label when sensor expired */
+"Sensor expired" = "Sensor expired";
+
+/* G7 Progress bar label when sensor lifetime progress showing */
+"Sensor expires" = "Sensor expires";
+
+/* G7 Progress bar label when sensor failed */
+"Sensor failed" = "Sensor failed";
+
+/* title for g7 settings row showing sensor start time */
+"Sensor Start" = "Start sensor";
+
+/* G7 Status highlight text for signal loss */
+"Signal\nLoss" = "Signal\nLoss";
+
+/* Field label */
+"Time" = "Time";
 
 /* Field label */
-"Glucose" = "قراءات السكر";
+"Trend" = "Trend";
+
+/* title for g7 config settings to upload readings */
+"Upload Readings" = "Upload Readings";
 
+/* G7 Progress bar label when sensor in warmup */
+"Warmup completes" = "Warmup completes";

Dependencies/G7SensorKit/G7SensorKitUI/da.lproj/Localizable.strings

@@ -33,28 +33,28 @@
 "Dexcom G7" = "Dexcom G7";
 
 /* No comment provided by engineer. */
-"Done" = "Udført";
+"Done" = "OK";
 
 /* Field label */
 "Glucose" = "Glukose";
 
 /* title for g7 settings row showing sensor grace period end time */
-"Grace Period End" = "Grace period slut";
+"Grace Period End" = "Nådeperiodens Slut";
 
 /* G7 Progress bar label when sensor grace period progress showing */
-"Grace period remaining" = "Grace period tilbage";
+"Grace period remaining" = "Tilbageværende nådeperiode";
 
 /* String displayed instead of a glucose value above the CGM range */
 "HIGH" = "HØJ";
 
 /* title for g7 settings row showing sensor last connect time */
-"Last Connect" = "Sidst tilsluttet";
+"Last Connect" = "Sidste Forbindelse";
 
 /* No comment provided by engineer. */
-"Last Reading" = "Seneste aflæsning";
+"Last Reading" = "Sidste Aflæsning";
 
 /* Descriptive text on G7StartupView */
-"Loop can read G7 CGM data, but you must still use the Dexcom G7 App for pairing, calibration, and other sensor management." = "Loop kan aflæse data fra en G7 sensor, men du skal stadig benytte Dexcoms egen G7 App til at parre, kalibrere og administrere G7-sensoren.";
+"iAPS can read G7 CGM data, but you must still use the Dexcom G7 App for pairing, calibration, and other sensor management." = "iAPS kan læse G7 CGM-data, men du skal stadig bruge Dexcom G7-appen til parring, kalibrering og anden sensorkontrol.";
 
 /* String displayed instead of a glucose value below the CGM range */
 "LOW" = "LAV";
@@ -66,28 +66,28 @@
 "Scan for new sensor" = "Scan efter ny sensor";
 
 /* title for g7 settings connection status when scanning */
-"Scanning" = "Skanner";
+"Scanning" = "Scanner";
 
 /* G7 Status highlight text for searching for sensor */
-"Searching for\nSensor" = "Søger efter sensor";
+"Searching for\nSensor" = "Søger efter\nSensor";
 
 /* G7 Progress bar label when searching for sensor */
 "Searching for sensor" = "Søger efter sensor";
 
 /* G7 Status highlight text for sensor expired */
-"Sensor\nExpired" = "Sensor udløbet";
+"Sensor\nExpired" = "Sensor\nUdløbet";
 
 /* G7 Status highlight text for sensor failed */
-"Sensor\nFailed" = "Sensorfejl";
+"Sensor\nFailed" = "Sensor\nFejlede";
 
 /* G7 Status highlight text for sensor error */
-"Sensor\nIssue" = "Sensorproblem";
+"Sensor\nIssue" = "Sensor\nProblem";
 
 /* G7 Status highlight text for sensor warmup */
-"Sensor\nWarmup" = "Sensor opvarmning";
+"Sensor\nWarmup" = "Sensor\nWarmup";
 
 /* title for g7 settings row showing sensor expiration time */
-"Sensor Expiration" = "Sensor udløb";
+"Sensor Expiration" = "Sensor Udløber";
 
 /* G7 Progress bar label when sensor expired */
 "Sensor expired" = "Sensor udløbet";
@@ -96,7 +96,7 @@
 "Sensor expires" = "Sensor udløber";
 
 /* G7 Progress bar label when sensor failed */
-"Sensor failed" = "Sensorfejl";
+"Sensor failed" = "Sensor fejlede";
 
 /* title for g7 settings row showing sensor start time */
 "Sensor Start" = "Start sensor";
@@ -111,8 +111,7 @@
 "Trend" = "Trend";
 
 /* title for g7 config settings to upload readings */
-"Upload Readings" = "Upload aflæsninger";
+"Upload Readings" = "Upload Aflæsninger";
 
 /* G7 Progress bar label when sensor in warmup */
-"Warmup completes" = "Opvarmning afsluttes";
-
+"Warmup completes" = "Warmup fuldfører";