Merge alpha into dev

.gitmodules

@@ -1,39 +1,40 @@
 [submodule "LoopKit"]
  path = LoopKit
- url = https://github.com/LoopKit/LoopKit.git
- branch = dev
+ url = https://github.com/loopandlearn/LoopKit.git
+ branch = trio
 [submodule "CGMBLEKit"]
  path = CGMBLEKit
- url = https://github.com/LoopKit/CGMBLEKit.git
- branch = dev
+ url = https://github.com/loopandlearn/CGMBLEKit.git
+ branch = trio
 [submodule "dexcom-share-client-swift"]
  path = dexcom-share-client-swift
- url = https://github.com/LoopKit/dexcom-share-client-swift.git
- branch = dev
+ url = https://github.com/loopandlearn/dexcom-share-client-swift.git
+ branch = trio
 [submodule "RileyLinkKit"]
  path = RileyLinkKit
- url = https://github.com/LoopKit/RileyLinkKit
- branch = dev
+ url = https://github.com/loopandlearn/RileyLinkKit
+ branch = trio
 [submodule "OmniBLE"]
  path = OmniBLE
- url = https://github.com/LoopKit/OmniBLE.git
- branch = dev
+ url = https://github.com/loopandlearn/OmniBLE.git
+ branch = trio
 [submodule "G7SensorKit"]
  path = G7SensorKit
- url = https://github.com/LoopKit/G7SensorKit.git
- branch = main
+ url = https://github.com/loopandlearn/G7SensorKit.git
+ branch = trio
 [submodule "OmniKit"]
  path = OmniKit
- url = https://github.com/LoopKit/OmniKit.git
- branch = main
+ url = https://github.com/loopandlearn/OmniKit.git
+ branch = trio
 [submodule "MinimedKit"]
  path = MinimedKit
- url = https://github.com/LoopKit/MinimedKit.git
- branch = main
+ url = https://github.com/loopandlearn/MinimedKit.git
+ branch = trio
 [submodule "LibreTransmitter"]
  path = LibreTransmitter
- url = https://github.com/LoopKit/LibreTransmitter.git
- branch = main
+ url = https://github.com/loopandlearn/LibreTransmitter.git
+ branch = trio
 [submodule "TidepoolService"]
  path = TidepoolService
- url = https://github.com/LoopKit/TidepoolService.git
+ url = https://github.com/loopandlearn/TidepoolService.git
+ branch = trio

FreeAPS/Sources/APS/CGM/PluginSource.swift

@@ -24,7 +24,26 @@ final class PluginSource: GlucoseSource {
  cgmManager?.cgmManagerDelegate = self
  }
 
+ /// Function that fetches blood glucose data
+ /// This function combines two data fetching mechanisms (`callBLEFetch` and `fetchIfNeeded`) into a single publisher.
+ /// It returns the first non-empty result from either of the sources within a 5-minute timeout period.
+ /// If no valid data is fetched within the timeout, it returns an empty array.
+ ///
+ /// - Parameter timer: An optional `DispatchTimer` (not used in the function but can be used to trigger fetch logic).
+ /// - Returns: An `AnyPublisher` that emits an array of `BloodGlucose` values or an empty array if an error occurs or the timeout is reached.
  func fetch(_: DispatchTimer?) -> AnyPublisher<[BloodGlucose], Never> {
+ Publishers.Merge(
+ callBLEFetch(),
+ fetchIfNeeded()
+ )
+ .filter { !$0.isEmpty }
+ .first()
+ .timeout(60 * 5, scheduler: processQueue, options: nil, customError: nil)
+ .replaceError(with: [])
+ .eraseToAnyPublisher()
+ }
+
+ func callBLEFetch() -> AnyPublisher<[BloodGlucose], Never> {
  Future<[BloodGlucose], Error> { [weak self] promise in
  self?.promise = promise
  }
@@ -35,17 +54,15 @@ final class PluginSource: GlucoseSource {
  }
 
  func fetchIfNeeded() -> AnyPublisher<[BloodGlucose], Never> {
- Future<[BloodGlucose], Error> { _ in
+ Future<[BloodGlucose], Error> { [weak self] promise in
+ guard let self = self else { return }
  self.processQueue.async {
  guard let cgmManager = self.cgmManager else { return }
  cgmManager.fetchNewDataIfNeeded { result in
- self.processCGMReadingResult(cgmManager, readingResult: result) {
- // nothing to do
- }
+ promise(self.readCGMResult(readingResult: result))
  }
  }
  }
- .timeout(60, scheduler: processQueue, options: nil, customError: nil)
  .replaceError(with: [])
  .replaceEmpty(with: [])
  .eraseToAnyPublisher()
@@ -92,11 +109,10 @@ extension PluginSource: CGMManagerDelegate {
  glucoseManager?.cgmGlucoseSourceType = .none
  }
 
- func cgmManager(_ manager: CGMManager, hasNew readingResult: CGMReadingResult) {
+ func cgmManager(_: CGMManager, hasNew readingResult: CGMReadingResult) {
  dispatchPrecondition(condition: .onQueue(processQueue))
- processCGMReadingResult(manager, readingResult: readingResult) {
- debug(.deviceManager, "CGM PLUGIN - Direct return done")
- }
+ promise?(readCGMResult(readingResult: readingResult))
+ debug(.deviceManager, "CGM PLUGIN - Direct return done")
  }
 
  func cgmManager(_: LoopKit.CGMManager, hasNew events: [LoopKit.PersistedCgmEvent]) {
@@ -140,11 +156,7 @@ extension PluginSource: CGMManagerDelegate {
  }
  }
 
- private func processCGMReadingResult(
- _: CGMManager,
- readingResult: CGMReadingResult,
- completion: @escaping () -> Void
- ) {
+ private func readCGMResult(readingResult: CGMReadingResult) -> Result<[BloodGlucose], Error> {
  debug(.deviceManager, "PLUGIN CGM - Process CGM Reading Result launched with \(readingResult)")
  switch readingResult {
  case let .newData(values):
@@ -177,18 +189,14 @@ extension PluginSource: CGMManagerDelegate {
  transmitterID: sensorTransmitterID
  )
  }
- promise?(.success(bloodGlucose))
- completion()
+ return .success(bloodGlucose)
  case .unreliableData:
  // loopManager.receivedUnreliableCGMReading()
- promise?(.failure(GlucoseDataError.unreliableData))
- completion()
+ return .failure(GlucoseDataError.unreliableData)
  case .noData:
- promise?(.failure(GlucoseDataError.noData))
- completion()
+ return .failure(GlucoseDataError.noData)
  case let .error(error):
- promise?(.failure(error))
- completion()
+ return .failure(error)
  }
  }
 }

FreeAPS/Sources/Modules/NightscoutConfig/NightscoutConfigStateModel.swift

@@ -51,6 +51,10 @@ extension NightscoutConfig {
  }
 
  func connect() {
+ if let CheckURL = url.last, CheckURL == "/" {
+ let fixedURL = url.dropLast()
+ url = String(fixedURL)
+ }
  guard let url = URL(string: url) else {
  message = "Invalid URL"
  return

FreeAPS/Sources/Modules/Stat/View/ChartsView.swift

@@ -114,15 +114,15 @@ struct ChartsView: View {
  type: NSLocalizedString(
  "Low",
  comment: ""
- ) + " (≤\(low.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))",
+ ) + " (<\(low.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))",
  percent: fetched[0].decimal
  ),
  .init(type: NSLocalizedString("In Range", comment: ""), percent: fetched[1].decimal),
  .init(
  type: NSLocalizedString(
  "High",
  comment: ""
- ) + " (≥\(high.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))",
+ ) + " (>\(high.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))",
  percent: fetched[2].decimal
  )
  ]
@@ -142,12 +142,12 @@ struct ChartsView: View {
  NSLocalizedString(
  "Low",
  comment: ""
- ) + " (≤\(low.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))": .red,
+ ) + " (<\(low.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))": .red,
  NSLocalizedString("In Range", comment: ""): .green,
  NSLocalizedString(
  "High",
  comment: ""
- ) + " (≥\(high.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))": .orange
+ ) + " (>\(high.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))": .orange
  ]).frame(maxHeight: 25)
  }
 
@@ -161,18 +161,18 @@ struct ChartsView: View {
  type: NSLocalizedString(
  "Low",
  comment: ""
- ) + " (≤ \(low.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))",
+ ) + " (< \(low.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))",
  percent: fetched[0].decimal
  ),
  .init(
- type: "> \(low.formatted(.number.precision(.fractionLength(fraction)))) - < \(high.formatted(.number.precision(.fractionLength(fraction))))",
+ type: "\(low.formatted(.number.precision(.fractionLength(fraction)))) - \(high.formatted(.number.precision(.fractionLength(fraction))))",
  percent: fetched[1].decimal
  ),
  .init(
  type: NSLocalizedString(
  "High",
  comment: ""
- ) + " (≥ \(high.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))",
+ ) + " (> \(high.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))",
  percent: fetched[2].decimal
  )
  ]
@@ -196,12 +196,12 @@ struct ChartsView: View {
  NSLocalizedString(
  "Low",
  comment: ""
- ) + " (≤ \(low.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))": .red,
- "> \(low.formatted(.number.precision(.fractionLength(fraction)))) - < \(high.formatted(.number.precision(.fractionLength(fraction))))": .green,
+ ) + " (< \(low.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))": .red,
+ "\(low.formatted(.number.precision(.fractionLength(fraction)))) - \(high.formatted(.number.precision(.fractionLength(fraction))))": .green,
  NSLocalizedString(
  "High",
  comment: ""
- ) + " (≥ \(high.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))": .orange
+ ) + " (> \(high.formatted(.number.grouping(.never).rounded().precision(.fractionLength(1)))))": .orange
  ])
  }
 
@@ -276,11 +276,11 @@ struct ChartsView: View {
  let justGlucoseArray = glucose.compactMap({ each in Int(each.glucose as Int16) })
  let totalReadings = justGlucoseArray.count
 
- let hyperArray = glucose.filter({ $0.glucose >= hyperLimit })
+ let hyperArray = glucose.filter({ $0.glucose > hyperLimit })
  let hyperReadings = hyperArray.compactMap({ each in each.glucose as Int16 }).count
  let hyperPercentage = Double(hyperReadings) / Double(totalReadings) * 100
 
- let hypoArray = glucose.filter({ $0.glucose <= hypoLimit })
+ let hypoArray = glucose.filter({ $0.glucose < hypoLimit })
  let hypoReadings = hypoArray.compactMap({ each in each.glucose as Int16 }).count
  let hypoPercentage = Double(hypoReadings) / Double(totalReadings) * 100
 

FreeAPS/Sources/Modules/TargetsEditor/TargetsEditorStateModel.swift

@@ -6,7 +6,7 @@ extension TargetsEditor {
 
  let timeValues = stride(from: 0.0, to: 1.days.timeInterval, by: 30.minutes.timeInterval).map { $0 }
 
- var rateValues: [Double] {
+ var rateValues: [Decimal] {
  switch units {
  case .mgdL:
  return stride(from: 72, to: 180.01, by: 1.0).map { $0 }
@@ -27,8 +27,8 @@ extension TargetsEditor {
  units = profile.units
  items = profile.targets.map { value in
  let timeIndex = timeValues.firstIndex(of: Double(value.offset * 60)) ?? 0
- let lowIndex = rateValues.firstIndex(of: Double(value.low)) ?? 0
- let highIndex = lowIndex
+ let lowIndex = rateValues.firstIndex(of: value.low) ?? 0
+ let highIndex = rateValues.firstIndex(of: value.high) ?? 0
  return Item(lowIndex: lowIndex, highIndex: highIndex, timeIndex: timeIndex)
  }
  }
@@ -50,14 +50,14 @@ extension TargetsEditor {
 
  func save() {
  let targets = items.map { item -> BGTargetEntry in
- let fotmatter = DateFormatter()
- fotmatter.timeZone = TimeZone(secondsFromGMT: 0)
- fotmatter.dateFormat = "HH:mm:ss"
+ let formatter = DateFormatter()
+ formatter.timeZone = TimeZone(secondsFromGMT: 0)
+ formatter.dateFormat = "HH:mm:ss"
  let date = Date(timeIntervalSince1970: self.timeValues[item.timeIndex])
  let minutes = Int(date.timeIntervalSince1970 / 60)
- let low = Decimal(self.rateValues[item.lowIndex])
+ let low = self.rateValues[item.lowIndex]
  let high = low
- return BGTargetEntry(low: low, high: high, start: fotmatter.string(from: date), offset: minutes)
+ return BGTargetEntry(low: low, high: high, start: formatter.string(from: date), offset: minutes)
  }
  let profile = BGTargets(units: units, userPrefferedUnits: settingsManager.settings.units, targets: targets)
  provider.saveProfile(profile)
@@ -68,8 +68,7 @@ extension TargetsEditor {
  let uniq = Array(Set(self.items))
  let sorted = uniq.sorted { $0.timeIndex < $1.timeIndex }
  .map { item -> Item in
- guard item.highIndex < item.lowIndex else { return item }
- return Item(lowIndex: item.lowIndex, highIndex: item.lowIndex, timeIndex: item.timeIndex)
+ Item(lowIndex: item.lowIndex, highIndex: item.highIndex, timeIndex: item.timeIndex)
  }
  sorted.first?.timeIndex = 0
  self.items = sorted

fastlane/Fastfile

@@ -184,24 +184,22 @@ platform :ios do
  }
  end
 
- configure_bundle_id("FreeAPS", "#{BUNDLE_ID}", [
+ configure_bundle_id("Trio", "#{BUNDLE_ID}", [
  Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS,
  Spaceship::ConnectAPI::BundleIdCapability::Type::HEALTHKIT,
  Spaceship::ConnectAPI::BundleIdCapability::Type::NFC_TAG_READING
  ])
 
- configure_bundle_id("FreeAPSWatch WatchKit Extension", "#{BUNDLE_ID}.watchkitapp.watchkitextension", [
+ configure_bundle_id("Trio WatchKit Extension", "#{BUNDLE_ID}.watchkitapp.watchkitextension", [
  Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS,
  Spaceship::ConnectAPI::BundleIdCapability::Type::HEALTHKIT
  ])
 
- configure_bundle_id("FreeAPSWatch", "#{BUNDLE_ID}.watchkitapp", [
+ configure_bundle_id("Trio Watch", "#{BUNDLE_ID}.watchkitapp", [
  Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS
  ])
 
- configure_bundle_id("LiveActivityExtension", "#{BUNDLE_ID}.LiveActivity", [
- Spaceship::ConnectAPI::BundleIdCapability::Type::APP_GROUPS
- ])
+ configure_bundle_id("Trio LiveActivity", "#{BUNDLE_ID}.LiveActivity", [])
 
  end