Merge branch 'dev' of https://github.com/Artificial-Pancreas/iAPS int…

…o dev-bo
bjornoleh · Oct 20, 2023 · bf0ef62 · bf0ef62
2 parents 8a74c02 + 5f4e1a9
commit bf0ef62
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 7 deletions.
diff --git a/FreeAPS/Resources/javascript/bundle/determine-basal.js b/FreeAPS/Resources/javascript/bundle/determine-basal.js
diff --git a/FreeAPS/Sources/APS/APSManager.swift b/FreeAPS/Sources/APS/APSManager.swift
@@ -342,10 +342,13 @@ final class BaseAPSManager: APSManager, Injectable {
  return Just(false).eraseToAnyPublisher()
  }
 
- guard glucoseStorage.isGlucoseNotFlat() else {
- debug(.apsManager, "Glucose data is too flat")
- processError(APSError.glucoseError(message: "Glucose data is too flat"))
- return Just(false).eraseToAnyPublisher()
+ // Only let glucose be flat when 400 mg/dl
+ if (glucoseStorage.recent().last?.glucose ?? 100) != 400 {
+ guard glucoseStorage.isGlucoseNotFlat() else {
+ debug(.apsManager, "Glucose data is too flat")
+ processError(APSError.glucoseError(message: "Glucose data is too flat"))
+ return Just(false).eraseToAnyPublisher()
+ }
  }
 
  let now = Date()

diff --git a/FreeAPS/Sources/Modules/DataTable/View/DataTableRootView.swift b/FreeAPS/Sources/Modules/DataTable/View/DataTableRootView.swift
@@ -76,7 +76,7 @@ extension DataTable {
  }
  label: { Text("Save") }
  .frame(maxWidth: .infinity, alignment: .trailing)
-   .disabled(state.manualGlcuose < limitLow || state.manualGlcuose > limitHigh)
+ // .disabled(state.manualGlcuose < limitLow || state.manualGlcuose > limitHigh)
 
  }.padding(20)
  }

diff --git a/FreeAPS/Sources/Modules/Home/View/Header/CurrentGlucoseView.swift b/FreeAPS/Sources/Modules/Home/View/Header/CurrentGlucoseView.swift
@@ -48,7 +48,7 @@ struct CurrentGlucoseView: View {
  VStack(alignment: .center) {
  HStack {
  Text(
- recentGlucose?.glucose
+ (recentGlucose?.glucose ?? 100) == 400 ? "HIGH" : recentGlucose?.glucose
  .map {
  glucoseFormatter
  .string(from: Double(units == .mmolL ? $0.asMmolL : Decimal($0)) as NSNumber)! }

diff --git a/FreeAPS/Sources/Modules/Home/View/HomeRootView.swift b/FreeAPS/Sources/Modules/Home/View/HomeRootView.swift
@@ -618,6 +618,9 @@ extension Home {
  .padding(.bottom, 4)
  .padding(.top, 8)
  Text(errorMessage).font(.caption).foregroundColor(.loopRed)
+ } else if let suggestion = state.suggestion, (suggestion.bg ?? 100) == 400 {
+ Text("Invalid CGM reading (HIGH).").font(.callout).bold().foregroundColor(.loopRed).padding(.top, 8)
+ Text("SMBs and High Temps Disabled.").font(.caption).foregroundColor(.white).padding(.bottom, 4)
  }
  }
  }