From fb078e8dd5eafff45b4c58fc509ca93b532ea4c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20B=20M=C3=A5rtensson?= <53905247+Jon-b-m@users.noreply.github.com> Date: Fri, 27 Oct 2023 21:06:42 +0200 Subject: [PATCH 1/3] Symbols mixed up. --- FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift b/FreeAPS/Sources/Modules/Home/View/Chart/MainChartView.swift index 2b08059c0a..fb4e82f57f 100644 --- 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" From 2557abf501498c05f54a71bda955bd79123c0daf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20M=C3=A5rtensson?= Date: Sat, 28 Oct 2023 00:15:09 +0200 Subject: [PATCH 2/3] Typo which prevented change of imported DIA setting --- .../Modules/NightscoutConfig/NightscoutConfigStateModel.swift | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/FreeAPS/Sources/Modules/NightscoutConfig/NightscoutConfigStateModel.swift b/FreeAPS/Sources/Modules/NightscoutConfig/NightscoutConfigStateModel.swift index b244ff11bb..cab1f7219a 100644 --- 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, From 62750dc67b9a251aa379769c50fa4e71f0b46ede Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jon=20M=C3=A5rtensson?= Date: Sat, 28 Oct 2023 00:18:43 +0200 Subject: [PATCH 3/3] Remove openaps setting insulin curve, becuse this now is a duplicate setting found also in pumpManagerUI settings --- .../PreferencesEditor/PreferencesEditorStateModel.swift | 6 ------ 1 file changed, 6 deletions(-) diff --git a/FreeAPS/Sources/Modules/PreferencesEditor/PreferencesEditorStateModel.swift b/FreeAPS/Sources/Modules/PreferencesEditor/PreferencesEditorStateModel.swift index bdd1c86326..5f9e3b6962 100644 --- 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),