more fixes

mountrcg · Nov 7, 2024 · 005e419 · 005e419
1 parent 0eadbf3
commit 005e419
Show file tree

Hide file tree

Showing 4 changed files with 78 additions and 1 deletion.
diff --git a/FreeAPS/Sources/APS/APSManager.swift b/FreeAPS/Sources/APS/APSManager.swift
@@ -41,7 +41,10 @@ enum APSError: LocalizedError {
     case apsError(message: String)
     case deviceSyncError(message: String)
     case manualBasalTemp(message: String)
-
+    case activeBolusViewBolus
+    case activeBolusViewBasal
+    case activeBolusViewBasalandBolus
+
     var errorDescription: String? {
         switch self {
         case let .pumpError(error):
@@ -56,6 +59,12 @@ enum APSError: LocalizedError {
             return "Sync error: \(message)"
         case let .manualBasalTemp(message):
             return "Manual Basal Temp : \(message)"
+        case .activeBolusViewBolus:
+            return "Suggested SMB not enacted while in Bolus View"
+        case .activeBolusViewBasal:
+            return "Suggested Temp Basal (when > 0) not enacted while in Bolus View"
+        case .activeBolusViewBasalandBolus:
+            return "Suggested Temp Basal (when > 0) and SMB not enacted while in Bolus View"
         }
     }
 }
@@ -1299,6 +1308,11 @@ final class BaseAPSManager: APSManager, Injectable {
             }
         }
     }
+
+    private func activeBolusView() -> Bool {
+        let defaults = UserDefaults.standard
+        return defaults.bool(forKey: IAPSconfig.inBolusView)
+    }
 
     private func loopStats(loopStatRecord: LoopStats) {
         coredataContext.perform {

diff --git a/FreeAPS/Sources/Application/FreeAPSApp.swift b/FreeAPS/Sources/Application/FreeAPSApp.swift
@@ -81,4 +81,18 @@ import Swinject
         default: break
         }
     }
+
+    private func isNewVersion() {
+        let userDefaults = UserDefaults.standard
+        var version = userDefaults.string(forKey: IAPSconfig.version) ?? ""
+        userDefaults.set(false, forKey: IAPSconfig.inBolusView)
+
+        guard version.count > 1, version == (Bundle.main.releaseVersionNumber ?? "") else {
+            version = Bundle.main.releaseVersionNumber ?? ""
+            userDefaults.set(version, forKey: IAPSconfig.version)
+            userDefaults.set(true, forKey: IAPSconfig.newVersion)
+            debug(.default, "Running new version: \(version)")
+            return
+        }
+    }
 }
diff --git a/FreeAPS/Sources/Models/Configs.swift b/FreeAPS/Sources/Models/Configs.swift
@@ -21,6 +21,11 @@ public enum IAPSconfig {
     static let glassShadowOpacity: CGFloat = 0.6
     static let shadowFraction: CGFloat = 2
     static let minimumCarbEquivalent: Decimal = 0.6
+    static let id = "iAPS.identifier"
+    static let version = "iAPS.version"
+    static let newVersion = "iAPS.newVersion"
+    static let inBolusView = "iAPS.inBolusView"
+    static let statURL = URL(string: "https://submit.open-iaps.app")!
 }
 
 extension Font {

diff --git a/FreeAPS/Sources/Modules/Bolus/BolusStateModel.swift b/FreeAPS/Sources/Modules/Bolus/BolusStateModel.swift
@@ -66,6 +66,22 @@ extension Bolus {
         @Published var fat: Decimal = 0
         @Published var protein: Decimal = 0
         @Published var note: String = ""
+        @Published var eventualBG: Bool = false
+        @Published var bolusIncrement: Decimal = 0.1
+        @Published var closedLoop: Bool = false
+        @Published var loopDate: Date = .distantFuture
+        @Published var now = Date.now
+
+
+        let loopReminder: CGFloat = 20
+
+        private var loopFormatter: NumberFormatter {
+            let formatter = NumberFormatter()
+            formatter.numberStyle = .decimal
+            formatter.maximumFractionDigits = 0
+            return formatter
+        }
+
 
         override func subscribe() {
             setupInsulinRequired()
@@ -80,6 +96,8 @@ extension Bolus {
             fattyMeals = settings.settings.fattyMeals
             fattyMealFactor = settings.settings.fattyMealFactor
             displayPredictions = settings.settings.displayPredictions
+            bolusIncrement = settings.preferences.bolusIncrement
+            closedLoop = settings.settings.closedLoop
 
             if waitForSuggestionInitial {
                 apsManager.determineBasal()
@@ -285,6 +303,32 @@ extension Bolus {
             }
             return nil
         }
+
+        func notActive() {
+            let defaults = UserDefaults.standard
+            defaults.set(false, forKey: IAPSconfig.inBolusView)
+            // print("Active: NO") // For testing
+        }
+
+        func viewActive() {
+            let defaults = UserDefaults.standard
+            defaults.set(true, forKey: IAPSconfig.inBolusView)
+            // print("Active: YES") // For testing
+        }
+
+        func lastLoop() -> String? {
+            guard closedLoop else { return nil }
+            guard abs(now.timeIntervalSinceNow / 60) > loopReminder else { return nil }
+            let minAgo = abs(loopDate.timeIntervalSinceNow / 60)
+
+            let stringAgo = loopFormatter.string(from: minAgo as NSNumber) ?? ""
+            return "Last loop \(stringAgo) minutes ago. Complete or cancel this meal/bolus transaction to allow for next loop cycle to run"
+        }
+
+        private func roundBolus(_ amount: Decimal) -> Decimal {
+            // Account for increments (don't use the APSManager function as that gets too slow)
+            Decimal(round(Double(amount / bolusIncrement))) * bolusIncrement
+        }
     }
 }