Просмотр исходного кода

add debug info and other minor change

avouspierre 3 лет назад
Родитель
Сommit
27a7301636

+ 1 - 1
Config.xcconfig

@@ -1,5 +1,5 @@
 APP_DISPLAY_NAME = FreeAPS X
-APP_VERSION = 0.6.4
+APP_VERSION = 0.6.5
 APP_BUILD_NUMBER = 1
 COPYRIGHT_NOTICE = 
 DEVELOPER_TEAM = ##TEAM_ID##

+ 1 - 0
FreeAPS/Resources/Info.plist

@@ -39,6 +39,7 @@
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
+		<string>dexcomg7</string>
 		<string>xdripswift</string>
 		<string>dexcomg6</string>
 		<string>dexcomcgm</string>

+ 1 - 1
FreeAPS/Sources/APS/CGM/CGMType.swift

@@ -48,7 +48,7 @@ enum CGMType: String, JSON, CaseIterable, Identifiable {
         case .dexcomG6:
             return URL(string: "dexcomg6://")!
         case .dexcomG7:
-            return URL(string: "dexcomg6://")! // TODO: PL
+            return URL(string: "dexcomg7://")!
         case .dexcomG5:
             return URL(string: "dexcomgcgm://")!
         case .simulator:

+ 11 - 3
FreeAPS/Sources/APS/CGM/DexcomSource.swift

@@ -5,10 +5,15 @@ import LoopKit
 import LoopKitUI
 import ShareClient
 
+enum GlucoseDataError: Error {
+    case noData
+    case unreliableData
+}
+
 final class DexcomSource: GlucoseSource {
     private let processQueue = DispatchQueue(label: "DexcomSource.processQueue")
     private var timer: DispatchTimer?
-    private var glucoseStorage: GlucoseStorage!
+    private let glucoseStorage: GlucoseStorage!
 
     var cgmManager: G6CGMManager?
 
@@ -17,10 +22,10 @@ final class DexcomSource: GlucoseSource {
     private var promise: Future<[BloodGlucose], Error>.Promise?
 
     init(glucoseStorage: GlucoseStorage) {
+        self.glucoseStorage = glucoseStorage
         cgmManager = G6CGMManager
             .init(state: TransmitterManagerState(transmitterID: UserDefaults.standard.dexcomTransmitterID ?? "000000"))
         cgmManager?.cgmManagerDelegate = self
-        self.glucoseStorage = glucoseStorage
     }
 
     var transmitterID: String {
@@ -76,8 +81,8 @@ extension DexcomSource: CGMManagerDelegate {
     func cgmManager(_ manager: CGMManager, hasNew readingResult: CGMReadingResult) {
         dispatchPrecondition(condition: .onQueue(.main))
         processCGMReadingResult(manager, readingResult: readingResult) {
+            warning(.deviceManager, "DEXCOM - Force the fire of the dispatch timer")
             self.timer?.fire()
-            // self.checkPumpDataAndLoop()
         }
     }
 
@@ -103,6 +108,7 @@ extension DexcomSource: CGMManagerDelegate {
     }
 
     private func processCGMReadingResult(_: CGMManager, readingResult: CGMReadingResult, completion: @escaping () -> Void) {
+        warning(.deviceManager, "DEXCOM - Process CGM Reading Result launched")
         switch readingResult {
         case let .newData(values):
             let bloodGlucose = values.compactMap { newGlucoseSample -> BloodGlucose? in
@@ -129,8 +135,10 @@ extension DexcomSource: CGMManagerDelegate {
             completion()
         case .unreliableData:
             // loopManager.receivedUnreliableCGMReading()
+            promise?(.failure(GlucoseDataError.unreliableData))
             completion()
         case .noData:
+            promise?(.failure(GlucoseDataError.noData))
             completion()
         case let .error(error):
             promise?(.failure(error))

+ 2 - 0
FreeAPS/Sources/APS/CGM/dexcomSourceG7.swift

@@ -71,6 +71,7 @@ extension DexcomSourceG7: CGMManagerDelegate {
     func cgmManager(_ manager: CGMManager, hasNew readingResult: CGMReadingResult) {
         dispatchPrecondition(condition: .onQueue(.main))
         processCGMReadingResult(manager, readingResult: readingResult) {
+            warning(.deviceManager, "DEXCOMG7 - Force the fire of the dispatch timer")
             self.timer?.fire()
             // self.checkPumpDataAndLoop()
         }
@@ -98,6 +99,7 @@ extension DexcomSourceG7: CGMManagerDelegate {
     }
 
     private func processCGMReadingResult(_: CGMManager, readingResult: CGMReadingResult, completion: @escaping () -> Void) {
+        warning(.deviceManager, "DEXCOMG7 - Process CGM Reading Result launched")
         switch readingResult {
         case let .newData(values):
             let bloodGlucose = values.compactMap { newGlucoseSample -> BloodGlucose? in

+ 1 - 1
FreeAPS/Sources/APS/FetchGlucoseManager.swift

@@ -72,7 +72,7 @@ final class BaseFetchGlucoseManager: FetchGlucoseManager, Injectable {
                 .eraseToAnyPublisher()
             }
             .sink { date, syncDate, glucose, glucoseFromHealth in
-                debug(.nightscout, "SyncDate is \(syncDate)")
+                debug(.nightscout, "FETCHGLUCOSE : SyncDate is \(syncDate)")
                 let allGlucose = glucose + glucoseFromHealth
                 guard allGlucose.isNotEmpty else { return }