libreTransmitter added with Loop dependencies

FreeAPS/Sources/APS/CGM/LibreTransmitterSource.swift

@@ -183,4 +183,3 @@ extension LibreTransmitterSource: CGMManagerDelegate {
 
     func recordRetractedAlert(_: LoopKit.Alert, at _: Date) {}
 }
-

FreeAPS/Sources/APS/Extensions/BloodGlucoseExtensions.swift

@@ -47,5 +47,4 @@ extension BloodGlucose.Direction {
             self = .none
         }
     }
-
 }

FreeAPS/Sources/APS/FetchGlucoseManager.swift

@@ -19,7 +19,6 @@ final class BaseFetchGlucoseManager: FetchGlucoseManager, Injectable {
     @Injected() var nightscoutManager: NightscoutManager!
     @Injected() var apsManager: APSManager!
     @Injected() var settingsManager: SettingsManager!
-    @Injected() var libreTransmitter: LibreTransmitterSource!
     @Injected() var healthKitManager: HealthKitManager!
     @Injected() var deviceDataManager: DeviceDataManager!
 
@@ -30,6 +29,7 @@ final class BaseFetchGlucoseManager: FetchGlucoseManager, Injectable {
     private lazy var dexcomSourceG5 = DexcomSourceG5(glucoseStorage: glucoseStorage, glucoseManager: self)
     private lazy var dexcomSourceG6 = DexcomSourceG6(glucoseStorage: glucoseStorage, glucoseManager: self)
     private lazy var dexcomSourceG7 = DexcomSourceG7(glucoseStorage: glucoseStorage, glucoseManager: self)
+    private lazy var libreSource = LibreTransmitterSource(glucoseStorage: glucoseStorage, glucoseManager: self)
     private lazy var simulatorSource = GlucoseSimulatorSource()
 
     init(resolver: Resolver) {
@@ -55,7 +55,7 @@ final class BaseFetchGlucoseManager: FetchGlucoseManager, Injectable {
         case .simulator:
             glucoseSource = simulatorSource
         case .libreTransmitter:
-            glucoseSource = libreTransmitter
+            glucoseSource = libreSource
         case .glucoseDirect:
             glucoseSource = AppGroupSource(from: "GlucoseDirect", cgmType: .glucoseDirect)
         case .enlite:
@@ -63,12 +63,6 @@ final class BaseFetchGlucoseManager: FetchGlucoseManager, Injectable {
         }
         // update the config
         cgmGlucoseSourceType = settingsManager.settings.cgm
-
-        if settingsManager.settings.cgm != .libreTransmitter {
-            libreTransmitter.manager = nil
-        } else {
-            libreTransmitter.glucoseManager = self
-        }
     }
 
     /// function called when a callback is fired by CGM BLE - no more used

FreeAPS/Sources/Assemblies/APSAssembly.swift

@@ -3,8 +3,6 @@ import Swinject
 
 final class APSAssembly: Assembly {
     func assemble(container: Container) {
-        container.register(CalibrationService.self) { r in BaseCalibrationService(resolver: r) }
-        container.register(LibreTransmitterSource.self) { r in BaseLibreTransmitterSource(resolver: r) }
         container.register(DeviceDataManager.self) { r in BaseDeviceDataManager(resolver: r) }
         container.register(APSManager.self) { r in BaseAPSManager(resolver: r) }
         container.register(FetchGlucoseManager.self) { r in BaseFetchGlucoseManager(resolver: r) }

FreeAPS/Sources/Modules/CGM/View/CGMRootView.swift

@@ -47,12 +47,6 @@ extension CGM {
                             }
                         }
                     }
-                    if state.cgm == .libreTransmitter {
-                        Button("Configure Libre Transmitter") {
-                            state.showModal(for: .libreConfig)
-                        }
-                        Text("Calibrations").navigationLink(to: .calibrations, from: self)
-                    }
                     Section(header: Text("Calendar")) {
                         Toggle("Create events in calendar", isOn: $state.createCalendarEvents)
                         if state.calendarIDs.isNotEmpty {

FreeAPS/Sources/Modules/Home/HomeStateModel.swift

@@ -357,8 +357,8 @@ extension Home {
                 url = URL(string: "spikeapp://")!
             case "http://127.0.0.1:17580":
                 url = URL(string: "diabox://")!
-            case CGMType.libreTransmitter.appURL?.absoluteString:
-                showModal(for: .libreConfig)
+//            case CGMType.libreTransmitter.appURL?.absoluteString:
+//                showModal(for: .libreConfig)
             default: break
             }
             UIApplication.shared.open(url, options: [:], completionHandler: nil)