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

…o dev-bo
bjornoleh · Oct 28, 2023 · 003b292 · 003b292
2 parents 197da42 + 62750dc
commit 003b292
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 9 deletions.
diff --git a/FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift b/FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift
@@ -46,8 +46,8 @@ struct MainChartView: View {
  }
 
  private enum Command {
- static let open = "🟢"
- static let closed = "🔴"
+ static let open = "🔴"
+ static let closed = "🟢"
  static let suspend = "❌"
  static let resume = "✅"
  static let tempbasal = "basal"

diff --git a/FreeAPS/Sources/Modules/NightscoutConfig/NightscoutConfigStateModel.swift b/FreeAPS/Sources/Modules/NightscoutConfig/NightscoutConfigStateModel.swift
@@ -266,7 +266,9 @@ extension NightscoutConfig {
  debug(.service, "Settings have been imported and the Basals saved to pump!")
  // DIA. Save if changed.
  let dia = fetchedProfile.dia
- if dia != self.dia, dia <= 0 {
+ print("dia: " + dia.description)
+ print("pump dia: " + self.dia.description)
+ if dia != self.dia, dia >= 0 {
  let file = PumpSettings(
  insulinActionCurve: dia,
  maxBolus: self.maxBolus,

diff --git a/FreeAPS/Sources/Modules/PreferencesEditor/PreferencesEditorStateModel.swift b/FreeAPS/Sources/Modules/PreferencesEditor/PreferencesEditorStateModel.swift
@@ -22,12 +22,6 @@ extension PreferencesEditor {
  }
 
  let mainFields = [
- Field(
- displayName: NSLocalizedString("Insulin curve", comment: "Insulin curve"),
- type: .insulinCurve(keypath: \.curve),
- infoText: "Insulin curve info",
- settable: self
- ),
  Field(
  displayName: NSLocalizedString("Max IOB", comment: "Max IOB"),
  type: .decimal(keypath: \.maxIOB),