Welcome to Trio land

BolusStored+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  BolusStored+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(BolusStored)
-public class BolusStored: NSManagedObject {
-
-}
+@objc(BolusStored) public class BolusStored: NSManagedObject {}

BolusStored+CoreDataProperties.swift

@@ -1,28 +1,15 @@
-//
-//  BolusStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension BolusStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<BolusStored> {
-        return NSFetchRequest<BolusStored>(entityName: "BolusStored")
+public extension BolusStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<BolusStored> {
+        NSFetchRequest<BolusStored>(entityName: "BolusStored")
     }
 
-    @NSManaged public var amount: NSDecimalNumber?
-    @NSManaged public var isExternal: Bool
-    @NSManaged public var isSMB: Bool
-    @NSManaged public var pumpEvent: PumpEventStored?
-
+    @NSManaged var amount: NSDecimalNumber?
+    @NSManaged var isExternal: Bool
+    @NSManaged var isSMB: Bool
+    @NSManaged var pumpEvent: PumpEventStored?
 }
 
-extension BolusStored : Identifiable {
-
-}
+extension BolusStored: Identifiable {}

CarbEntryStored+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  CarbEntryStored+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(CarbEntryStored)
-public class CarbEntryStored: NSManagedObject {
-
-}
+@objc(CarbEntryStored) public class CarbEntryStored: NSManagedObject {}

CarbEntryStored+CoreDataProperties.swift

@@ -1,33 +1,20 @@
-//
-//  CarbEntryStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension CarbEntryStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<CarbEntryStored> {
-        return NSFetchRequest<CarbEntryStored>(entityName: "CarbEntryStored")
+public extension CarbEntryStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<CarbEntryStored> {
+        NSFetchRequest<CarbEntryStored>(entityName: "CarbEntryStored")
     }
 
-    @NSManaged public var carbs: Double
-    @NSManaged public var date: Date?
-    @NSManaged public var fat: Double
-    @NSManaged public var fpuID: UUID?
-    @NSManaged public var id: UUID?
-    @NSManaged public var isFPU: Bool
-    @NSManaged public var isUploadedToNS: Bool
-    @NSManaged public var note: String?
-    @NSManaged public var protein: Double
-
+    @NSManaged var carbs: Double
+    @NSManaged var date: Date?
+    @NSManaged var fat: Double
+    @NSManaged var fpuID: UUID?
+    @NSManaged var id: UUID?
+    @NSManaged var isFPU: Bool
+    @NSManaged var isUploadedToNS: Bool
+    @NSManaged var note: String?
+    @NSManaged var protein: Double
 }
 
-extension CarbEntryStored : Identifiable {
-
-}
+extension CarbEntryStored: Identifiable {}

Forecast+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  Forecast+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(Forecast)
-public class Forecast: NSManagedObject {
-
-}
+@objc(Forecast) public class Forecast: NSManagedObject {}

Forecast+CoreDataProperties.swift

@@ -1,46 +1,32 @@
-//
-//  Forecast+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension Forecast {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<Forecast> {
-        return NSFetchRequest<Forecast>(entityName: "Forecast")
+public extension Forecast {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<Forecast> {
+        NSFetchRequest<Forecast>(entityName: "Forecast")
     }
 
-    @NSManaged public var date: Date?
-    @NSManaged public var id: UUID?
-    @NSManaged public var type: String?
-    @NSManaged public var forecastValues: Set<ForecastValue>?
-    @NSManaged public var orefDetermination: OrefDetermination?
-
+    @NSManaged var date: Date?
+    @NSManaged var id: UUID?
+    @NSManaged var type: String?
+    @NSManaged var forecastValues: Set<ForecastValue>?
+    @NSManaged var orefDetermination: OrefDetermination?
 }
 
 // MARK: Generated accessors for forecastValues
-extension Forecast {
 
+public extension Forecast {
     @objc(addForecastValuesObject:)
-    @NSManaged public func addToForecastValues(_ value: ForecastValue)
+    @NSManaged func addToForecastValues(_ value: ForecastValue)
 
     @objc(removeForecastValuesObject:)
-    @NSManaged public func removeFromForecastValues(_ value: ForecastValue)
+    @NSManaged func removeFromForecastValues(_ value: ForecastValue)
 
     @objc(addForecastValues:)
-    @NSManaged public func addToForecastValues(_ values: NSSet)
+    @NSManaged func addToForecastValues(_ values: NSSet)
 
     @objc(removeForecastValues:)
-    @NSManaged public func removeFromForecastValues(_ values: NSSet)
-
+    @NSManaged func removeFromForecastValues(_ values: NSSet)
 }
 
-extension Forecast : Identifiable {
-
-}
+extension Forecast: Identifiable {}

ForecastValue+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  ForecastValue+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(ForecastValue)
-public class ForecastValue: NSManagedObject {
-
-}
+@objc(ForecastValue) public class ForecastValue: NSManagedObject {}

ForecastValue+CoreDataProperties.swift

@@ -1,27 +1,14 @@
-//
-//  ForecastValue+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension ForecastValue {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<ForecastValue> {
-        return NSFetchRequest<ForecastValue>(entityName: "ForecastValue")
+public extension ForecastValue {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<ForecastValue> {
+        NSFetchRequest<ForecastValue>(entityName: "ForecastValue")
     }
 
-    @NSManaged public var index: Int32
-    @NSManaged public var value: Int32
-    @NSManaged public var forecast: Forecast?
-
+    @NSManaged var index: Int32
+    @NSManaged var value: Int32
+    @NSManaged var forecast: Forecast?
 }
 
-extension ForecastValue : Identifiable {
-
-}
+extension ForecastValue: Identifiable {}

FreeAPS.xcodeproj/project.pbxproj

@@ -2529,7 +2529,7 @@
 				38E8753D27554D5900975559 /* Embed Watch Content */,
 				6B1A8D122B14D88E00E76752 /* Embed Foundation Extensions */,
 				CE95BF582BA5F8F300DC3DE3 /* Install plugins */,
-				DD1DB7C92BEBF79B0048B367 /* Capture Build Details */,
+				DD88C8DF2C4D583900F2D558 /* ShellScript */,
 			);
 			buildRules = (
 			);
@@ -2789,7 +2789,7 @@
 			shellPath = /bin/sh;
 			shellScript = "\"${SRCROOT}/Scripts/copy-plugins.sh\"\n";
 		};
-		DD1DB7C92BEBF79B0048B367 /* Capture Build Details */ = {
+		DD88C8DF2C4D583900F2D558 /* ShellScript */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
@@ -2798,7 +2798,6 @@
 			);
 			inputPaths = (
 			);
-			name = "Capture Build Details";
 			outputFileListPaths = (
 			);
 			outputPaths = (

FreeAPS/Sources/APS/APSManager.swift

@@ -915,7 +915,7 @@ final class BaseAPSManager: APSManager, Injectable {
     // Add to statistics.JSON for upload to NS.
     private func statistics() async {
         let now = Date()
-        if settingsManager.settings.uploadStats {
+        if settingsManager.settings.uploadStats != nil {
             let hour = Calendar.current.component(.hour, from: now)
             guard hour > 20 else {
                 return
@@ -951,7 +951,7 @@ final class BaseAPSManager: APSManager, Injectable {
             }
             let af = pref.adjustmentFactor
             let insulin_type = pref.curve
-            let buildDate = Bundle.main.buildDate
+//            let buildDate = Bundle.main.buildDate // TODO: fix this
             let version = Bundle.main.releaseVersionNumber
             let build = Bundle.main.buildVersionNumber
 
@@ -1011,7 +1011,7 @@ final class BaseAPSManager: APSManager, Injectable {
                 Build_Number: build ?? "1",
                 Branch: branch,
                 CopyRightNotice: String(copyrightNotice_.prefix(32)),
-                Build_Date: buildDate,
+                Build_Date: Date(), // TODO: fix this
                 Algorithm: algo_,
                 AdjustmentFactor: af,
                 Pump: pump_,

FreeAPS/Sources/APS/FetchGlucoseManager.swift

@@ -267,7 +267,7 @@ final class BaseFetchGlucoseManager: FetchGlucoseManager, Injectable {
 
         Task.detached {
             await self.nightscoutManager.uploadGlucose()
-            self.tidepoolService.uploadGlucose(device: self.cgmManager?.cgmManagerStatus.device)
+            await self.tidepoolService.uploadGlucose(device: self.cgmManager?.cgmManagerStatus.device)
         }
 
         let glucoseForHealth = filteredByDate.filter { !glucoseFromHealth.contains($0) }

FreeAPS/Sources/APS/OpenAPS/OpenAPS.swift

@@ -422,9 +422,6 @@ final class OpenAPS {
                     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
                 )
@@ -452,9 +449,6 @@ final class OpenAPS {
                     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
                 )

FreeAPS/Sources/Models/Oref2_variables.swift

@@ -18,9 +18,6 @@ struct Oref2_variables: JSON, Equatable {
     var isfAndCr: Bool
     var isf: Bool
     var cr: Bool
-    var smbIsScheduledOff: Bool
-    var start: Decimal
-    var end: Decimal
     var smbMinutes: Decimal
     var uamMinutes: Decimal
 
@@ -42,9 +39,6 @@ struct Oref2_variables: JSON, Equatable {
         isfAndCr: Bool,
         isf: Bool,
         cr: Bool,
-        smbIsScheduledOff: Bool,
-        start: Decimal,
-        end: Decimal,
         smbMinutes: Decimal,
         uamMinutes: Decimal
     ) {
@@ -65,9 +59,6 @@ struct Oref2_variables: JSON, Equatable {
         self.isfAndCr = isfAndCr
         self.isf = isf
         self.cr = cr
-        self.smbIsScheduledOff = smbIsScheduledOff
-        self.start = start
-        self.end = end
         self.smbMinutes = smbMinutes
         self.uamMinutes = uamMinutes
     }
@@ -92,9 +83,6 @@ extension Oref2_variables {
         case isfAndCr
         case isf
         case cr
-        case smbIsScheduledOff
-        case start
-        case end
         case smbMinutes
         case uamMinutes
     }

FreeAPS/Sources/Router/Screen.swift

@@ -16,7 +16,6 @@ enum Screen: Identifiable, Hashable {
     case crEditor
     case targetsEditor
     case preferencesEditor
-    case addTempTarget
     case bolus
     case manualTempBasal
     case autotuneConfig
@@ -70,8 +69,6 @@ extension Screen {
             TargetsEditor.RootView(resolver: resolver)
         case .preferencesEditor:
             PreferencesEditor.RootView(resolver: resolver)
-        case .addTempTarget:
-            AddTempTarget.RootView(resolver: resolver)
         case .bolus:
             Bolus.RootView(resolver: resolver)
         case .manualTempBasal:

FreeAPS/Sources/Services/Network/TidepoolManager.swift

@@ -320,25 +320,25 @@ final class BaseTidepoolManager: TidepoolManager, Injectable {
     func uploadGlucose(device: HKDevice?) async {
         // TODO: get correct glucose values
         let glucose: [BloodGlucose] = await glucoseStorage.getGlucoseNotYetUploadedToNightscout()
-        
+
         guard !glucose.isEmpty, let tidepoolService = self.tidepoolService else { return }
-        
+
         let glucoseWithoutCorrectID = glucose.filter { UUID(uuidString: $0._id ?? UUID().uuidString) != nil }
-        
+
         let chunks = glucoseWithoutCorrectID.chunks(ofCount: tidepoolService.glucoseDataLimit ?? 100)
-        
+
         processQueue.async {
             for chunk in chunks {
                 // Link all glucose values with the current device
                 let chunkStoreGlucose = chunk.map { $0.convertStoredGlucoseSample(device: device) }
-                
+
                 tidepoolService.uploadGlucoseData(chunkStoreGlucose) { result in
                     switch result {
-                        case .success:
-                            debug(.nightscout, "Success synchronizing glucose data:")
-                        case .failure(let error):
-                            debug(.nightscout, "Error synchronizing glucose data: \(String(describing: error))")
-                            // self.uploadFailed(key)
+                    case .success:
+                        debug(.nightscout, "Success synchronizing glucose data:")
+                    case let .failure(error):
+                        debug(.nightscout, "Error synchronizing glucose data: \(String(describing: error))")
+                        // self.uploadFailed(key)
                     }
                 }
             }

GlucoseStored+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  GlucoseStored+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(GlucoseStored)
-public class GlucoseStored: NSManagedObject {
-
-}
+@objc(GlucoseStored) public class GlucoseStored: NSManagedObject {}

GlucoseStored+CoreDataProperties.swift

@@ -1,30 +1,17 @@
-//
-//  GlucoseStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension GlucoseStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<GlucoseStored> {
-        return NSFetchRequest<GlucoseStored>(entityName: "GlucoseStored")
+public extension GlucoseStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<GlucoseStored> {
+        NSFetchRequest<GlucoseStored>(entityName: "GlucoseStored")
     }
 
-    @NSManaged public var date: Date?
-    @NSManaged public var direction: String?
-    @NSManaged public var glucose: Int16
-    @NSManaged public var id: UUID?
-    @NSManaged public var isManual: Bool
-    @NSManaged public var isUploadedToNS: Bool
-
+    @NSManaged var date: Date?
+    @NSManaged var direction: String?
+    @NSManaged var glucose: Int16
+    @NSManaged var id: UUID?
+    @NSManaged var isManual: Bool
+    @NSManaged var isUploadedToNS: Bool
 }
 
-extension GlucoseStored : Identifiable {
-
-}
+extension GlucoseStored: Identifiable {}

ImportError+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  ImportError+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(ImportError)
-public class ImportError: NSManagedObject {
-
-}
+@objc(ImportError) public class ImportError: NSManagedObject {}

ImportError+CoreDataProperties.swift

@@ -1,26 +1,13 @@
-//
-//  ImportError+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension ImportError {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<ImportError> {
-        return NSFetchRequest<ImportError>(entityName: "ImportError")
+public extension ImportError {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<ImportError> {
+        NSFetchRequest<ImportError>(entityName: "ImportError")
     }
 
-    @NSManaged public var date: Date?
-    @NSManaged public var error: String?
-
+    @NSManaged var date: Date?
+    @NSManaged var error: String?
 }
 
-extension ImportError : Identifiable {
-
-}
+extension ImportError: Identifiable {}

LoopStatRecord+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  LoopStatRecord+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(LoopStatRecord)
-public class LoopStatRecord: NSManagedObject {
-
-}
+@objc(LoopStatRecord) public class LoopStatRecord: NSManagedObject {}

LoopStatRecord+CoreDataProperties.swift

@@ -1,29 +1,16 @@
-//
-//  LoopStatRecord+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension LoopStatRecord {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<LoopStatRecord> {
-        return NSFetchRequest<LoopStatRecord>(entityName: "LoopStatRecord")
+public extension LoopStatRecord {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<LoopStatRecord> {
+        NSFetchRequest<LoopStatRecord>(entityName: "LoopStatRecord")
     }
 
-    @NSManaged public var duration: Double
-    @NSManaged public var end: Date?
-    @NSManaged public var interval: Double
-    @NSManaged public var loopStatus: String?
-    @NSManaged public var start: Date?
-
+    @NSManaged var duration: Double
+    @NSManaged var end: Date?
+    @NSManaged var interval: Double
+    @NSManaged var loopStatus: String?
+    @NSManaged var start: Date?
 }
 
-extension LoopStatRecord : Identifiable {
-
-}
+extension LoopStatRecord: Identifiable {}

MealPresetStored+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  MealPresetStored+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(MealPresetStored)
-public class MealPresetStored: NSManagedObject {
-
-}
+@objc(MealPresetStored) public class MealPresetStored: NSManagedObject {}

MealPresetStored+CoreDataProperties.swift

@@ -1,28 +1,15 @@
-//
-//  MealPresetStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension MealPresetStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<MealPresetStored> {
-        return NSFetchRequest<MealPresetStored>(entityName: "MealPresetStored")
+public extension MealPresetStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<MealPresetStored> {
+        NSFetchRequest<MealPresetStored>(entityName: "MealPresetStored")
     }
 
-    @NSManaged public var carbs: NSDecimalNumber?
-    @NSManaged public var dish: String?
-    @NSManaged public var fat: NSDecimalNumber?
-    @NSManaged public var protein: NSDecimalNumber?
-
+    @NSManaged var carbs: NSDecimalNumber?
+    @NSManaged var dish: String?
+    @NSManaged var fat: NSDecimalNumber?
+    @NSManaged var protein: NSDecimalNumber?
 }
 
-extension MealPresetStored : Identifiable {
-
-}
+extension MealPresetStored: Identifiable {}

OpenAPS_Battery+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  OpenAPS_Battery+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(OpenAPS_Battery)
-public class OpenAPS_Battery: NSManagedObject {
-
-}
+@objc(OpenAPS_Battery) public class OpenAPS_Battery: NSManagedObject {}

OpenAPS_Battery+CoreDataProperties.swift

@@ -1,30 +1,17 @@
-//
-//  OpenAPS_Battery+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension OpenAPS_Battery {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<OpenAPS_Battery> {
-        return NSFetchRequest<OpenAPS_Battery>(entityName: "OpenAPS_Battery")
+public extension OpenAPS_Battery {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<OpenAPS_Battery> {
+        NSFetchRequest<OpenAPS_Battery>(entityName: "OpenAPS_Battery")
     }
 
-    @NSManaged public var date: Date?
-    @NSManaged public var display: Bool
-    @NSManaged public var id: UUID?
-    @NSManaged public var percent: Int16
-    @NSManaged public var status: String?
-    @NSManaged public var voltage: NSDecimalNumber?
-
+    @NSManaged var date: Date?
+    @NSManaged var display: Bool
+    @NSManaged var id: UUID?
+    @NSManaged var percent: Int16
+    @NSManaged var status: String?
+    @NSManaged var voltage: NSDecimalNumber?
 }
 
-extension OpenAPS_Battery : Identifiable {
-
-}
+extension OpenAPS_Battery: Identifiable {}

OrefDetermination+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  OrefDetermination+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(OrefDetermination)
-public class OrefDetermination: NSManagedObject {
-
-}
+@objc(OrefDetermination) public class OrefDetermination: NSManagedObject {}

OrefDetermination+CoreDataProperties.swift

@@ -1,74 +1,60 @@
-//
-//  OrefDetermination+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension OrefDetermination {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<OrefDetermination> {
-        return NSFetchRequest<OrefDetermination>(entityName: "OrefDetermination")
+public extension OrefDetermination {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<OrefDetermination> {
+        NSFetchRequest<OrefDetermination>(entityName: "OrefDetermination")
     }
 
-    @NSManaged public var bolus: NSDecimalNumber?
-    @NSManaged public var carbRatio: NSDecimalNumber?
-    @NSManaged public var carbsRequired: Int16
-    @NSManaged public var cob: Int16
-    @NSManaged public var currentTarget: NSDecimalNumber?
-    @NSManaged public var deliverAt: Date?
-    @NSManaged public var duration: NSDecimalNumber?
-    @NSManaged public var enacted: Bool
-    @NSManaged public var eventualBG: NSDecimalNumber?
-    @NSManaged public var expectedDelta: NSDecimalNumber?
-    @NSManaged public var glucose: NSDecimalNumber?
-    @NSManaged public var id: UUID?
-    @NSManaged public var insulinForManualBolus: NSDecimalNumber?
-    @NSManaged public var insulinReq: NSDecimalNumber?
-    @NSManaged public var insulinSensitivity: NSDecimalNumber?
-    @NSManaged public var iob: NSDecimalNumber?
-    @NSManaged public var isUploadedToNS: Bool
-    @NSManaged public var manualBolusErrorString: NSDecimalNumber?
-    @NSManaged public var minDelta: NSDecimalNumber?
-    @NSManaged public var rate: NSDecimalNumber?
-    @NSManaged public var reason: String?
-    @NSManaged public var received: Bool
-    @NSManaged public var reservoir: NSDecimalNumber?
-    @NSManaged public var scheduledBasal: NSDecimalNumber?
-    @NSManaged public var sensitivityRatio: NSDecimalNumber?
-    @NSManaged public var smbToDeliver: NSDecimalNumber?
-    @NSManaged public var temp: String?
-    @NSManaged public var tempBasal: NSDecimalNumber?
-    @NSManaged public var threshold: NSDecimalNumber?
-    @NSManaged public var timestamp: Date?
-    @NSManaged public var timestampEnacted: Date?
-    @NSManaged public var totalDailyDose: NSDecimalNumber?
-    @NSManaged public var forecasts: NSSet?
-
+    @NSManaged var bolus: NSDecimalNumber?
+    @NSManaged var carbRatio: NSDecimalNumber?
+    @NSManaged var carbsRequired: Int16
+    @NSManaged var cob: Int16
+    @NSManaged var currentTarget: NSDecimalNumber?
+    @NSManaged var deliverAt: Date?
+    @NSManaged var duration: NSDecimalNumber?
+    @NSManaged var enacted: Bool
+    @NSManaged var eventualBG: NSDecimalNumber?
+    @NSManaged var expectedDelta: NSDecimalNumber?
+    @NSManaged var glucose: NSDecimalNumber?
+    @NSManaged var id: UUID?
+    @NSManaged var insulinForManualBolus: NSDecimalNumber?
+    @NSManaged var insulinReq: NSDecimalNumber?
+    @NSManaged var insulinSensitivity: NSDecimalNumber?
+    @NSManaged var iob: NSDecimalNumber?
+    @NSManaged var isUploadedToNS: Bool
+    @NSManaged var manualBolusErrorString: NSDecimalNumber?
+    @NSManaged var minDelta: NSDecimalNumber?
+    @NSManaged var rate: NSDecimalNumber?
+    @NSManaged var reason: String?
+    @NSManaged var received: Bool
+    @NSManaged var reservoir: NSDecimalNumber?
+    @NSManaged var scheduledBasal: NSDecimalNumber?
+    @NSManaged var sensitivityRatio: NSDecimalNumber?
+    @NSManaged var smbToDeliver: NSDecimalNumber?
+    @NSManaged var temp: String?
+    @NSManaged var tempBasal: NSDecimalNumber?
+    @NSManaged var threshold: NSDecimalNumber?
+    @NSManaged var timestamp: Date?
+    @NSManaged var timestampEnacted: Date?
+    @NSManaged var totalDailyDose: NSDecimalNumber?
+    @NSManaged var forecasts: NSSet?
 }
 
 // MARK: Generated accessors for forecasts
-extension OrefDetermination {
 
+public extension OrefDetermination {
     @objc(addForecastsObject:)
-    @NSManaged public func addToForecasts(_ value: Forecast)
+    @NSManaged func addToForecasts(_ value: Forecast)
 
     @objc(removeForecastsObject:)
-    @NSManaged public func removeFromForecasts(_ value: Forecast)
+    @NSManaged func removeFromForecasts(_ value: Forecast)
 
     @objc(addForecasts:)
-    @NSManaged public func addToForecasts(_ values: NSSet)
+    @NSManaged func addToForecasts(_ values: NSSet)
 
     @objc(removeForecasts:)
-    @NSManaged public func removeFromForecasts(_ values: NSSet)
-
+    @NSManaged func removeFromForecasts(_ values: NSSet)
 }
 
-extension OrefDetermination : Identifiable {
-
-}
+extension OrefDetermination: Identifiable {}

OverrideRunStored+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  OverrideRunStored+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(OverrideRunStored)
-public class OverrideRunStored: NSManagedObject {
-
-}
+@objc(OverrideRunStored) public class OverrideRunStored: NSManagedObject {}

OverrideRunStored+CoreDataProperties.swift

@@ -1,31 +1,18 @@
-//
-//  OverrideRunStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension OverrideRunStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<OverrideRunStored> {
-        return NSFetchRequest<OverrideRunStored>(entityName: "OverrideRunStored")
+public extension OverrideRunStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<OverrideRunStored> {
+        NSFetchRequest<OverrideRunStored>(entityName: "OverrideRunStored")
     }
 
-    @NSManaged public var endDate: Date?
-    @NSManaged public var id: UUID?
-    @NSManaged public var isUploadedToNS: Bool
-    @NSManaged public var name: String?
-    @NSManaged public var startDate: Date?
-    @NSManaged public var target: NSDecimalNumber?
-    @NSManaged public var override: OverrideStored?
-
+    @NSManaged var endDate: Date?
+    @NSManaged var id: UUID?
+    @NSManaged var isUploadedToNS: Bool
+    @NSManaged var name: String?
+    @NSManaged var startDate: Date?
+    @NSManaged var target: NSDecimalNumber?
+    @NSManaged var override: OverrideStored?
 }
 
-extension OverrideRunStored : Identifiable {
-
-}
+extension OverrideRunStored: Identifiable {}

OverrideStored+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  OverrideStored+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(OverrideStored)
-public class OverrideStored: NSManagedObject {
-
-}
+@objc(OverrideStored) public class OverrideStored: NSManagedObject {}

OverrideStored+CoreDataProperties.swift

@@ -1,46 +1,33 @@
-//
-//  OverrideStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension OverrideStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<OverrideStored> {
-        return NSFetchRequest<OverrideStored>(entityName: "OverrideStored")
+public extension OverrideStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<OverrideStored> {
+        NSFetchRequest<OverrideStored>(entityName: "OverrideStored")
     }
 
-    @NSManaged public var advancedSettings: Bool
-    @NSManaged public var cr: Bool
-    @NSManaged public var date: Date?
-    @NSManaged public var duration: NSDecimalNumber?
-    @NSManaged public var enabled: Bool
-    @NSManaged public var end: NSDecimalNumber?
-    @NSManaged public var id: String?
-    @NSManaged public var indefinite: Bool
-    @NSManaged public var isf: Bool
-    @NSManaged public var isfAndCr: Bool
-    @NSManaged public var isPreset: Bool
-    @NSManaged public var isUploadedToNS: Bool
-    @NSManaged public var name: String?
-    @NSManaged public var orderPosition: Int16
-    @NSManaged public var percentage: Double
-    @NSManaged public var smbIsAlwaysOff: Bool
-    @NSManaged public var smbIsOff: Bool
-    @NSManaged public var smbMinutes: NSDecimalNumber?
-    @NSManaged public var start: NSDecimalNumber?
-    @NSManaged public var target: NSDecimalNumber?
-    @NSManaged public var uamMinutes: NSDecimalNumber?
-    @NSManaged public var overrideRun: OverrideRunStored?
-
+    @NSManaged var advancedSettings: Bool
+    @NSManaged var cr: Bool
+    @NSManaged var date: Date?
+    @NSManaged var duration: NSDecimalNumber?
+    @NSManaged var enabled: Bool
+    @NSManaged var end: NSDecimalNumber?
+    @NSManaged var id: String?
+    @NSManaged var indefinite: Bool
+    @NSManaged var isf: Bool
+    @NSManaged var isfAndCr: Bool
+    @NSManaged var isPreset: Bool
+    @NSManaged var isUploadedToNS: Bool
+    @NSManaged var name: String?
+    @NSManaged var orderPosition: Int16
+    @NSManaged var percentage: Double
+    @NSManaged var smbIsAlwaysOff: Bool
+    @NSManaged var smbIsOff: Bool
+    @NSManaged var smbMinutes: NSDecimalNumber?
+    @NSManaged var start: NSDecimalNumber?
+    @NSManaged var target: NSDecimalNumber?
+    @NSManaged var uamMinutes: NSDecimalNumber?
+    @NSManaged var overrideRun: OverrideRunStored?
 }
 
-extension OverrideStored : Identifiable {
-
-}
+extension OverrideStored: Identifiable {}

PumpEventStored+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  PumpEventStored+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(PumpEventStored)
-public class PumpEventStored: NSManagedObject {
-
-}
+@objc(PumpEventStored) public class PumpEventStored: NSManagedObject {}

PumpEventStored+CoreDataProperties.swift

@@ -1,31 +1,18 @@
-//
-//  PumpEventStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension PumpEventStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<PumpEventStored> {
-        return NSFetchRequest<PumpEventStored>(entityName: "PumpEventStored")
+public extension PumpEventStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<PumpEventStored> {
+        NSFetchRequest<PumpEventStored>(entityName: "PumpEventStored")
     }
 
-    @NSManaged public var id: String?
-    @NSManaged public var isUploadedToNS: Bool
-    @NSManaged public var note: String?
-    @NSManaged public var timestamp: Date?
-    @NSManaged public var type: String?
-    @NSManaged public var bolus: BolusStored?
-    @NSManaged public var tempBasal: TempBasalStored?
-
+    @NSManaged var id: String?
+    @NSManaged var isUploadedToNS: Bool
+    @NSManaged var note: String?
+    @NSManaged var timestamp: Date?
+    @NSManaged var type: String?
+    @NSManaged var bolus: BolusStored?
+    @NSManaged var tempBasal: TempBasalStored?
 }
 
-extension PumpEventStored : Identifiable {
-
-}
+extension PumpEventStored: Identifiable {}

StatsData+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  StatsData+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(StatsData)
-public class StatsData: NSManagedObject {
-
-}
+@objc(StatsData) public class StatsData: NSManagedObject {}

StatsData+CoreDataProperties.swift

@@ -1,25 +1,12 @@
-//
-//  StatsData+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension StatsData {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<StatsData> {
-        return NSFetchRequest<StatsData>(entityName: "StatsData")
+public extension StatsData {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<StatsData> {
+        NSFetchRequest<StatsData>(entityName: "StatsData")
     }
 
-    @NSManaged public var lastrun: Date?
-
+    @NSManaged var lastrun: Date?
 }
 
-extension StatsData : Identifiable {
-
-}
+extension StatsData: Identifiable {}

TempBasalStored+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  TempBasalStored+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(TempBasalStored)
-public class TempBasalStored: NSManagedObject {
-
-}
+@objc(TempBasalStored) public class TempBasalStored: NSManagedObject {}

TempBasalStored+CoreDataProperties.swift

@@ -1,28 +1,15 @@
-//
-//  TempBasalStored+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension TempBasalStored {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<TempBasalStored> {
-        return NSFetchRequest<TempBasalStored>(entityName: "TempBasalStored")
+public extension TempBasalStored {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<TempBasalStored> {
+        NSFetchRequest<TempBasalStored>(entityName: "TempBasalStored")
     }
 
-    @NSManaged public var duration: Int16
-    @NSManaged public var rate: NSDecimalNumber?
-    @NSManaged public var tempType: String?
-    @NSManaged public var pumpEvent: PumpEventStored?
-
+    @NSManaged var duration: Int16
+    @NSManaged var rate: NSDecimalNumber?
+    @NSManaged var tempType: String?
+    @NSManaged var pumpEvent: PumpEventStored?
 }
 
-extension TempBasalStored : Identifiable {
-
-}
+extension TempBasalStored: Identifiable {}

TempTargets+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  TempTargets+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(TempTargets)
-public class TempTargets: NSManagedObject {
-
-}
+@objc(TempTargets) public class TempTargets: NSManagedObject {}

TempTargets+CoreDataProperties.swift

@@ -1,30 +1,17 @@
-//
-//  TempTargets+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension TempTargets {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<TempTargets> {
-        return NSFetchRequest<TempTargets>(entityName: "TempTargets")
+public extension TempTargets {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<TempTargets> {
+        NSFetchRequest<TempTargets>(entityName: "TempTargets")
     }
 
-    @NSManaged public var active: Bool
-    @NSManaged public var date: Date?
-    @NSManaged public var duration: NSDecimalNumber?
-    @NSManaged public var hbt: Double
-    @NSManaged public var id: String?
-    @NSManaged public var startDate: Date?
-
+    @NSManaged var active: Bool
+    @NSManaged var date: Date?
+    @NSManaged var duration: NSDecimalNumber?
+    @NSManaged var hbt: Double
+    @NSManaged var id: String?
+    @NSManaged var startDate: Date?
 }
 
-extension TempTargets : Identifiable {
-
-}
+extension TempTargets: Identifiable {}

TempTargetsSlider+CoreDataClass.swift

@@ -1,15 +1,4 @@
-//
-//  TempTargetsSlider+CoreDataClass.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-@objc(TempTargetsSlider)
-public class TempTargetsSlider: NSManagedObject {
-
-}
+@objc(TempTargetsSlider) public class TempTargetsSlider: NSManagedObject {}

TempTargetsSlider+CoreDataProperties.swift

@@ -1,31 +1,18 @@
-//
-//  TempTargetsSlider+CoreDataProperties.swift
-//  FreeAPS
-//
-//  Created by Cengiz Deniz on 21.07.24.
-//
-//
-
-import Foundation
 import CoreData
+import Foundation
 
-
-extension TempTargetsSlider {
-
-    @nonobjc public class func fetchRequest() -> NSFetchRequest<TempTargetsSlider> {
-        return NSFetchRequest<TempTargetsSlider>(entityName: "TempTargetsSlider")
+public extension TempTargetsSlider {
+    @nonobjc class func fetchRequest() -> NSFetchRequest<TempTargetsSlider> {
+        NSFetchRequest<TempTargetsSlider>(entityName: "TempTargetsSlider")
     }
 
-    @NSManaged public var date: Date?
-    @NSManaged public var defaultHBT: Double
-    @NSManaged public var duration: NSDecimalNumber?
-    @NSManaged public var enabled: Bool
-    @NSManaged public var hbt: Double
-    @NSManaged public var id: String?
-    @NSManaged public var isPreset: Bool
-
+    @NSManaged var date: Date?
+    @NSManaged var defaultHBT: Double
+    @NSManaged var duration: NSDecimalNumber?
+    @NSManaged var enabled: Bool
+    @NSManaged var hbt: Double
+    @NSManaged var id: String?
+    @NSManaged var isPreset: Bool
 }
 
-extension TempTargetsSlider : Identifiable {
-
-}
+extension TempTargetsSlider: Identifiable {}

Trio.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,4 +1,5 @@
 {
+  "originHash" : "f5c836c216c4ca7d356e3777e58d6d4f9502b03f3974891349eb775f4c4cf750",
   "pins" : [
     {
       "identity" : "cryptoswift",
@@ -91,5 +92,5 @@
       }
     }
   ],
-  "version" : 2
+  "version" : 3
 }