From 0a5fff05bfca65cce4004920323fec2fd83e8c48 Mon Sep 17 00:00:00 2001 From: Nathaniel Hamming Date: Mon, 25 Sep 2023 15:53:02 -0300 Subject: [PATCH 1/4] [COASTAL-1291] plugin identifier is no longer class property (#8) --- OmniBLE/PumpManager/OmniBLEPumpManager.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/OmniBLE/PumpManager/OmniBLEPumpManager.swift b/OmniBLE/PumpManager/OmniBLEPumpManager.swift index 2d0da5bd..fec2d548 100644 --- a/OmniBLE/PumpManager/OmniBLEPumpManager.swift +++ b/OmniBLE/PumpManager/OmniBLEPumpManager.swift @@ -80,7 +80,7 @@ extension OmniBLEPumpManagerError: LocalizedError { public class OmniBLEPumpManager: DeviceManager { - public static let pluginIdentifier: String = "Omnipod-Dash" // use a single token to make parsing log files easier + public let pluginIdentifier: String = "Omnipod-Dash" // use a single token to make parsing log files easier public let localizedTitle = LocalizedString("Omnipod DASH", comment: "Generic title of the OmniBLE pump manager") From 84c36184eca1600026c0f00e5670109a1e414a12 Mon Sep 17 00:00:00 2001 From: Cameron Ingham Date: Fri, 12 Jan 2024 11:09:48 -0800 Subject: [PATCH 2/4] [COASTAL-1335] Update Picker Component --- .../Views/ExpirationReminderPickerView.swift | 11 ++++++--- .../Views/ManualTempBasalEntryView.swift | 23 ++++++++++++++----- 2 files changed, 25 insertions(+), 9 deletions(-) diff --git a/OmniBLE/PumpManagerUI/Views/ExpirationReminderPickerView.swift b/OmniBLE/PumpManagerUI/Views/ExpirationReminderPickerView.swift index 7d69c975..257d8f84 100644 --- a/OmniBLE/PumpManagerUI/Views/ExpirationReminderPickerView.swift +++ b/OmniBLE/PumpManagerUI/Views/ExpirationReminderPickerView.swift @@ -43,9 +43,14 @@ struct ExpirationReminderPickerView: View { } } if showingHourPicker { - ResizeablePicker(selection: expirationReminderDefault, - data: Array(Self.expirationReminderHoursAllowed), - formatter: { expirationReminderHourString($0) }) + Picker(selection: expirationReminderDefault) { + ForEach(Array(Self.expirationReminderHoursAllowed), id: \.self) { value in + Text(expirationReminderHourString(value)) + } + } label: { + EmptyView() + } + .pickerStyle(.wheel) } } } diff --git a/OmniBLE/PumpManagerUI/Views/ManualTempBasalEntryView.swift b/OmniBLE/PumpManagerUI/Views/ManualTempBasalEntryView.swift index 5922b55b..beace326 100644 --- a/OmniBLE/PumpManagerUI/Views/ManualTempBasalEntryView.swift +++ b/OmniBLE/PumpManagerUI/Views/ManualTempBasalEntryView.swift @@ -81,12 +81,23 @@ struct ManualTempBasalEntryView: View { Text(String(format: LocalizedString("%1$@ for %2$@", comment: "Summary string for temporary basal rate configuration page"), formatRate(rateEntered), formatDuration(durationEntered))) } HStack { - ResizeablePicker(selection: $rateEntered, - data: allowedRates, - formatter: { formatRate($0) }) - ResizeablePicker(selection: $durationEntered, - data: Pod.supportedTempBasalDurations, - formatter: { formatDuration($0) }) + Picker(selection: $rateEntered) { + ForEach(allowedRates, id: \.self) { value in + Text(formatRate(value)) + } + } label: { + EmptyView() + } + .pickerStyle(.wheel) + + Picker(selection: $durationEntered) { + ForEach(Pod.supportedTempBasalDurations, id: \.self) { value in + Text(formatDuration(value)) + } + } label: { + EmptyView() + } + .pickerStyle(.wheel) } .frame(maxHeight: 162.0) .alert(isPresented: $showingMissingConfigAlert, content: { missingConfigAlert }) From 2dafc55a9352e78a28116bf8d5bdc041ed493402 Mon Sep 17 00:00:00 2001 From: Nathaniel Hamming Date: Fri, 7 Jun 2024 14:11:45 -0300 Subject: [PATCH 3/4] [LOOP-4801] adding pump inoperable (#11) * adding pump inoperable * fault returns pumpInoperable --- OmniBLE/PumpManager/OmniBLEPumpManager.swift | 2 +- OmniBLE/PumpManagerUI/ViewModels/OmniBLESettingsViewModel.swift | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OmniBLE/PumpManager/OmniBLEPumpManager.swift b/OmniBLE/PumpManager/OmniBLEPumpManager.swift index e70842ad..30541f25 100644 --- a/OmniBLE/PumpManager/OmniBLEPumpManager.swift +++ b/OmniBLE/PumpManager/OmniBLEPumpManager.swift @@ -361,7 +361,7 @@ extension OmniBLEPumpManager { switch podCommState(for: state) { case .fault: - return .active(.distantPast) + return .pumpInoperable default: break } diff --git a/OmniBLE/PumpManagerUI/ViewModels/OmniBLESettingsViewModel.swift b/OmniBLE/PumpManagerUI/ViewModels/OmniBLESettingsViewModel.swift index 5780c26f..8087c0a2 100644 --- a/OmniBLE/PumpManagerUI/ViewModels/OmniBLESettingsViewModel.swift +++ b/OmniBLE/PumpManagerUI/ViewModels/OmniBLESettingsViewModel.swift @@ -164,7 +164,7 @@ class OmniBLESettingsViewModel: ObservableObject { switch basalDeliveryState { case .active(_), .initiatingTempBasal: return true - case .tempBasal(_), .cancelingTempBasal, .suspending, .suspended(_), .resuming, .none: + default: return false } } From 56808fb0dafffe6838c349f7d6277ac00da9a574 Mon Sep 17 00:00:00 2001 From: Pete Schwamb Date: Thu, 31 Oct 2024 09:27:57 -0500 Subject: [PATCH 4/4] disable module verifier for build performance --- OmniBLE.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/OmniBLE.xcodeproj/project.pbxproj b/OmniBLE.xcodeproj/project.pbxproj index 1f080d87..03a10c17 100644 --- a/OmniBLE.xcodeproj/project.pbxproj +++ b/OmniBLE.xcodeproj/project.pbxproj @@ -1552,7 +1552,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = "$(CLANG_MODULES_ENABLE_VERIFIER_TOOL)"; + ENABLE_MODULE_VERIFIER = NO; FRAMEWORK_SEARCH_PATHS = ""; INFOPLIST_FILE = OmniBLE/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; @@ -1592,7 +1592,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - ENABLE_MODULE_VERIFIER = "$(CLANG_MODULES_ENABLE_VERIFIER_TOOL)"; + ENABLE_MODULE_VERIFIER = NO; FRAMEWORK_SEARCH_PATHS = ""; INFOPLIST_FILE = OmniBLE/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";