Override refactor + override in charts + override in Watch

Core_Data.xcdatamodeld/Core_Data.xcdatamodel/contents

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22757" systemVersion="23E224" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
+<model type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="22222" systemVersion="23E224" minimumToolsVersion="Automatic" sourceLanguage="Swift" userDefinedModelVersionIdentifier="">
  <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"/>
@@ -65,6 +65,7 @@
  <attribute name="isf" optional="YES" attributeType="Boolean" defaultValueString="YES" usesScalarValueType="YES"/>
  <attribute name="isfAndCr" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
  <attribute name="isPreset" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
+ <attribute name="name" optional="YES" attributeType="String"/>
  <attribute name="percentage" optional="YES" attributeType="Double" defaultValueString="100" usesScalarValueType="YES"/>
  <attribute name="smbIsOff" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>
  <attribute name="smbIsScheduledOff" optional="YES" attributeType="Boolean" defaultValueString="NO" usesScalarValueType="YES"/>

FreeAPS.xcodeproj/xcshareddata/xcschemes/Trio.xcscheme

@@ -263,7 +263,7 @@
  </BuildableReference>
  </TestableReference>
  <TestableReference
- skipped = "YES">
+ skipped = "NO">
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "43CABDFC1C3506F100005705"
@@ -273,7 +273,7 @@
  </BuildableReference>
  </TestableReference>
  <TestableReference
- skipped = "YES">
+ skipped = "NO">
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "C17F50CD291EAC3800555EB5"
@@ -283,7 +283,7 @@
  </BuildableReference>
  </TestableReference>
  <TestableReference
- skipped = "YES">
+ skipped = "NO">
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "43D8FDD41C728FDF0073BE78"
@@ -293,7 +293,7 @@
  </BuildableReference>
  </TestableReference>
  <TestableReference
- skipped = "YES">
+ skipped = "NO">
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "B4CEE2DF257129780093111B"
@@ -303,7 +303,7 @@
  </BuildableReference>
  </TestableReference>
  <TestableReference
- skipped = "YES">
+ skipped = "NO">
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "C13CC34029C7B73A007F25DE"
@@ -313,7 +313,7 @@
  </BuildableReference>
  </TestableReference>
  <TestableReference
- skipped = "YES">
+ skipped = "NO">
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "84752E8A26ED0FFE009FD801"
@@ -323,7 +323,7 @@
  </BuildableReference>
  </TestableReference>
  <TestableReference
- skipped = "YES">
+ skipped = "NO">
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "C12ED9C929C7DBA900435701"
@@ -333,7 +333,7 @@
  </BuildableReference>
  </TestableReference>
  <TestableReference
- skipped = "YES">
+ skipped = "NO">
  <BuildableReference
  BuildableIdentifier = "primary"
  BlueprintIdentifier = "431CE7761F98564200255374"

FreeAPS/Resources/Assets.xcassets/Colors/Profil.colorset/Contents.json

@@ -0,0 +1,38 @@
+{
+ "colors" : [
+ {
+ "color" : {
+ "color-space" : "display-p3",
+ "components" : {
+ "alpha" : "1.000",
+ "blue" : "0.843",
+ "green" : "0.341",
+ "red" : "0.639"
+ }
+ },
+ "idiom" : "universal"
+ },
+ {
+ "appearances" : [
+ {
+ "appearance" : "luminosity",
+ "value" : "dark"
+ }
+ ],
+ "color" : {
+ "color-space" : "display-p3",
+ "components" : {
+ "alpha" : "0.830",
+ "blue" : "0.981",
+ "green" : "0.618",
+ "red" : "0.948"
+ }
+ },
+ "idiom" : "universal"
+ }
+ ],
+ "info" : {
+ "author" : "xcode",
+ "version" : 1
+ }
+}

FreeAPS/Resources/Assets.xcassets/Colors/TempBasal.colorset/Contents.json

@@ -2,12 +2,12 @@
  "colors" : [
  {
  "color" : {
- "color-space" : "srgb",
+ "color-space" : "display-p3",
  "components" : {
- "alpha" : "0.500",
- "blue" : "0.976",
- "green" : "0.839",
- "red" : "0.635"
+ "alpha" : "1.000",
+ "blue" : "0.962",
+ "green" : "0.745",
+ "red" : "0.453"
  }
  },
  "idiom" : "universal"

FreeAPS/Resources/json/defaults/freeaps/freeaps_settings.json

@@ -5,6 +5,7 @@
  "useAutotune" : false,
  "onlyAutotuneBasals" : false,
  "isUploadEnabled" : false,
+ "isDownloadEnabled" : false,
  "useLocalGlucoseSource" : false,
  "localGlucosePort" : 8080,
  "debugOptions" : false,

FreeAPS/Sources/APS/APSManager.swift

@@ -73,6 +73,7 @@ final class BaseAPSManager: APSManager, Injectable {
  @Injected() private var settingsManager: SettingsManager!
  @Injected() private var broadcaster: Broadcaster!
  @Injected() private var healthKitManager: HealthKitManager!
+ @Injected() private var overrideStorage: OverrideStorage!
  @Persisted(key: "lastAutotuneDate") private var lastAutotuneDate = Date()
  @Persisted(key: "lastStartLoopDate") private var lastStartLoopDate: Date = .distantPast
  @Persisted(key: "lastLoopDate") var lastLoopDate: Date = .distantPast {
@@ -359,10 +360,12 @@ final class BaseAPSManager: APSManager, Injectable {
  let now = Date()
  let temp = currentTemp(date: now)
 
+ let eventuelOverride: OverrideProfil? = overrideStorage.current()
+
  let mainPublisher = makeProfiles()
  .flatMap { _ in self.autosens() }
  .flatMap { _ in self.dailyAutotune() }
- .flatMap { _ in self.openAPS.determineBasal(currentTemp: temp, clock: now) }
+ .flatMap { _ in self.openAPS.determineBasal(currentTemp: temp, clock: now, override: eventuelOverride) }
  .map { suggestion -> Bool in
  if let suggestion = suggestion {
  DispatchQueue.main.async {

FreeAPS/Sources/APS/FetchGlucoseManager.swift

@@ -30,7 +30,7 @@ final class BaseFetchGlucoseManager: FetchGlucoseManager, Injectable {
  private let processQueue = DispatchQueue(label: "BaseGlucoseManager.processQueue")
  @Injected() var glucoseStorage: GlucoseStorage!
  @Injected() var nightscoutManager: NightscoutManager!
- @Injected() var tidePoolService: TidePoolManager!
+ @Injected() var tidepoolService: TidepoolManager!
  @Injected() var apsManager: APSManager!
  @Injected() var settingsManager: SettingsManager!
  @Injected() var healthKitManager: HealthKitManager!
@@ -235,7 +235,7 @@ final class BaseFetchGlucoseManager: FetchGlucoseManager, Injectable {
  deviceDataManager.heartbeat(date: Date())
 
  nightscoutManager.uploadGlucose()
- tidePoolService.uploadGlucose(device: cgmManager?.cgmManagerStatus.device)
+ tidepoolService.uploadGlucose(device: cgmManager?.cgmManagerStatus.device)
 
  let glucoseForHealth = filteredByDate.filter { !glucoseFromHealth.contains($0) }
 

FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift

@@ -15,7 +15,11 @@ final class OpenAPS {
  self.storage = storage
  }
 
- func determineBasal(currentTemp: TempBasal, clock: Date = Date()) -> Future<Suggestion?, Never> {
+ func determineBasal(
+ currentTemp: TempBasal,
+ clock: Date = Date(),
+ override: OverrideProfil? = nil
+ ) -> Future<Suggestion?, Never> {
  Future { promise in
  self.processQueue.async {
  debug(.openAPS, "Start determineBasal")
@@ -61,7 +65,7 @@ final class OpenAPS {
  let preferences = self.loadFileFromStorage(name: Settings.preferences)
 
  // oref2
- let oref2_variables = self.oref2()
+ let oref2_variables = self.oref2(override)
 
  let suggested = self.determineBasal(
  glucose: glucose,
@@ -118,13 +122,13 @@ final class OpenAPS {
  }
  }
 
- func oref2() -> RawJSON {
+ func oref2(_ override: OverrideProfil? = nil) -> RawJSON {
  coredataContext.performAndWait {
  let preferences = storage.retrieve(OpenAPS.Settings.preferences, as: Preferences.self)
  var hbt_ = preferences?.halfBasalExerciseTarget ?? 160
  let wp = preferences?.weightPercentage ?? 1
- let smbMinutes = (preferences?.maxSMBBasalMinutes ?? 30) as NSDecimalNumber
- let uamMinutes = (preferences?.maxUAMSMBBasalMinutes ?? 30) as NSDecimalNumber
+ let smbMinutes = preferences?.maxSMBBasalMinutes ?? 30
+ let uamMinutes = preferences?.maxUAMSMBBasalMinutes ?? 30
 
  let tenDaysAgo = Date().addingTimeInterval(-10.days.timeInterval)
  let twoHoursAgo = Date().addingTimeInterval(-2.hours.timeInterval)
@@ -143,13 +147,6 @@ final class OpenAPS {
  // requestIsEnbled.fetchLimit = 1
  try? sliderArray = coredataContext.fetch(requestIsEnbled)
 
- var overrideArray = [Override]()
- let requestOverrides = Override.fetchRequest() as NSFetchRequest<Override>
- let sortOverride = NSSortDescriptor(key: "date", ascending: false)
- requestOverrides.sortDescriptors = [sortOverride]
- // requestOverrides.fetchLimit = 1
- try? overrideArray = coredataContext.fetch(requestOverrides)
-
  var tempTargetsArray = [TempTargets]()
  let requestTempTargets = TempTargets.fetchRequest() as NSFetchRequest<TempTargets>
  let sortTT = NSSortDescriptor(key: "date", ascending: false)
@@ -167,11 +164,8 @@ final class OpenAPS {
  var temptargetActive = tempTargetsArray.first?.active ?? false
  let isPercentageEnabled = sliderArray.first?.enabled ?? false
 
- var useOverride = overrideArray.first?.enabled ?? false
- var overridePercentage = Decimal(overrideArray.first?.percentage ?? 100)
- var unlimited = overrideArray.first?.indefinite ?? true
- var disableSMBs = overrideArray.first?.smbIsOff ?? false
-
+ let unlimited = override?.indefinite ?? true
+ let disableSMBs = override?.smbIsOff ?? false
  let currentTDD = (uniqueEvents.last?.tdd ?? 0) as Decimal
 
  if indeces == 0 {
@@ -187,36 +181,22 @@ final class OpenAPS {
  let weight = wp
  let weighted_average = weight * average2hours + (1 - weight) * average14
 
+ let useOverride = (override != nil)
+ var overridePercentage = Decimal(override?.percentage ?? 100)
  var duration: Decimal = 0
- var newDuration: Decimal = 0
  var overrideTarget: Decimal = 0
+ var smbMin: Decimal = smbMinutes
+ var uamMin: Decimal = uamMinutes
 
  if useOverride {
- duration = (overrideArray.first?.duration ?? 0) as Decimal
- overrideTarget = (overrideArray.first?.target ?? 0) as Decimal
- let advancedSettings = overrideArray.first?.advancedSettings ?? false
- let addedMinutes = Int(duration)
- let date = overrideArray.first?.date ?? Date()
- if date.addingTimeInterval(addedMinutes.minutes.timeInterval) < Date(),
- !unlimited
- {
- useOverride = false
- let saveToCoreData = Override(context: self.coredataContext)
- saveToCoreData.enabled = false
- saveToCoreData.date = Date()
- saveToCoreData.duration = 0
- saveToCoreData.indefinite = false
- saveToCoreData.percentage = 100
- try? self.coredataContext.save()
+ duration = override?.duration ?? 0
+ overrideTarget = override?.target ?? 0
+ if let sm = override?.smbMinutes {
+ smbMin = sm > 0 ? sm : smbMinutes
+ }
+ if let um = override?.uamMinutes {
+ uamMin = um > 0 ? um : uamMinutes
  }
- }
-
- if !useOverride {
- unlimited = true
- overridePercentage = 100
- duration = 0
- overrideTarget = 0
- disableSMBs = false
  }
 
  if temptargetActive {
@@ -255,15 +235,15 @@ final class OpenAPS {
  hbt: hbt_,
  overrideTarget: overrideTarget,
  smbIsOff: disableSMBs,
- advancedSettings: overrideArray.first?.advancedSettings ?? false,
- isfAndCr: overrideArray.first?.isfAndCr ?? false,
- isf: overrideArray.first?.isf ?? false,
- cr: overrideArray.first?.cr ?? false,
- smbIsScheduledOff: overrideArray.first?.smbIsScheduledOff ?? false,
- start: (overrideArray.first?.start ?? 0) as Decimal,
- end: (overrideArray.first?.end ?? 0) as Decimal,
- smbMinutes: (overrideArray.first?.smbMinutes ?? smbMinutes) as Decimal,
- uamMinutes: (overrideArray.first?.uamMinutes ?? uamMinutes) as Decimal
+ advancedSettings: override?.advancedSettings ?? false,
+ isfAndCr: override?.isfAndCr ?? false,
+ isf: override?.isf ?? false,
+ cr: override?.cr ?? false,
+ smbIsScheduledOff: override?.smbIsScheduledOff ?? false,
+ start: override?.start ?? 0,
+ end: override?.end ?? 0,
+ smbMinutes: smbMin,
+ uamMinutes: uamMin
  )
  storage.save(averages, as: OpenAPS.Monitor.oref2_variables)
  return self.loadFileFromStorage(name: Monitor.oref2_variables)
@@ -283,15 +263,15 @@ final class OpenAPS {
  hbt: hbt_,
  overrideTarget: overrideTarget,
  smbIsOff: disableSMBs,
- advancedSettings: overrideArray.first?.advancedSettings ?? false,
- isfAndCr: overrideArray.first?.isfAndCr ?? false,
- isf: overrideArray.first?.isf ?? false,
- cr: overrideArray.first?.cr ?? false,
- smbIsScheduledOff: overrideArray.first?.smbIsScheduledOff ?? false,
- start: (overrideArray.first?.start ?? 0) as Decimal,
- end: (overrideArray.first?.end ?? 0) as Decimal,
- smbMinutes: (overrideArray.first?.smbMinutes ?? smbMinutes) as Decimal,
- uamMinutes: (overrideArray.first?.uamMinutes ?? uamMinutes) as Decimal
+ advancedSettings: override?.advancedSettings ?? false,
+ isfAndCr: override?.isfAndCr ?? false,
+ isf: override?.isf ?? false,
+ cr: override?.cr ?? false,
+ smbIsScheduledOff: override?.smbIsScheduledOff ?? false,
+ start: override?.start ?? 0,
+ end: override?.end ?? 0,
+ smbMinutes: smbMin,
+ uamMinutes: uamMin
  )
  storage.save(averages, as: OpenAPS.Monitor.oref2_variables)
  return self.loadFileFromStorage(name: Monitor.oref2_variables)