Merge pull request #263 from bastiaanv/feat/dana

[DanaKit] Progress update 02-06-2024
nightscout · Jun 8, 2024 · d8d5d2d · d8d5d2d
2 parents 13dfdec + f24959d
commit d8d5d2d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/DanaKit b/DanaKit
diff --git a/FreeAPS/Sources/APS/DeviceDataManager.swift b/FreeAPS/Sources/APS/DeviceDataManager.swift
@@ -1,5 +1,6 @@
 import Algorithms
 import Combine
+import DanaKit
 import Foundation
 import LoopKit
 import LoopKitUI
@@ -33,13 +34,15 @@ private let staticPumpManagers: [PumpManagerUI.Type] = [
     MinimedPumpManager.self,
     OmnipodPumpManager.self,
     OmniBLEPumpManager.self,
+    DanaKitPumpManager.self,
     MockPumpManager.self
 ]
 
 private let staticPumpManagersByIdentifier: [String: PumpManagerUI.Type] = [
     MinimedPumpManager.pluginIdentifier: MinimedPumpManager.self,
     OmnipodPumpManager.pluginIdentifier: OmnipodPumpManager.self,
     OmniBLEPumpManager.pluginIdentifier: OmniBLEPumpManager.self,
+    DanaKitPumpManager.pluginIdentifier: DanaKitPumpManager.self,
     MockPumpManager.pluginIdentifier: MockPumpManager.self
 ]
+15 −0		Common/Bundle.swift
+0 −2		Common/LocalizedString.swift
+4 −19		DanaKit.xcodeproj/project.pbxproj
+1 −1		DanaKit.xcodeproj/project.xcworkspace/contents.xcworkspacedata
+1 −1		DanaKit/Encryption/Common.swift
+23 −4		DanaKit/Packets/DanaBolusStart.swift
+10 −5		DanaKit/PumpManager/BluetoothManager.swift
+0 −1		DanaKit/PumpManager/DanaKit.swift
+180 −73		DanaKit/PumpManager/DanaKitPumpManager.swift
+9 −0		DanaKit/PumpManager/DanaKitPumpManagerError.swift
+6 −3		DanaKit/PumpManager/DanaKitPumpManagerState.swift
+47 −151		DanaKit/PumpManager/PeripheralManager.swift
+2 −0		DanaKitUI/ViewController/DanaUICoordinator.swift
+2 −10		DanaKitUI/ViewModels/DanaKitSettingsViewModel.swift
+3 −2		DanaKitUI/Views/Onboarding/DanaIExplainationView.swift
+3 −2		DanaKitUI/Views/Onboarding/DanaRSv1Explaination.swift
+1 −1		DanaKitUI/Views/Onboarding/DanaRSv1Password.swift
+4 −3		DanaKitUI/Views/Onboarding/DanaRSv3Explaination.swift
+2 −1		DanaKitUI/Views/Settings/BasalProfileView.swift
+9 −11		DanaKitUI/Views/Settings/DanaKitSettingsView.swift
+1 −1		DanaKitUI/Views/Settings/DanaKitUserSettingsView.swift
+8 −11		DanaKitUI/Views/Settings/PickerView.swift
+13 −4		Localization/ar.lproj/Localizable.strings
+12 −3		Localization/cs.lproj/Localizable.strings
+13 −4		Localization/da.lproj/Localizable.strings
+12 −3		Localization/de.lproj/Localizable.strings
+12 −3		Localization/en.lproj/Localizable.strings
+13 −4		Localization/es.lproj/Localizable.strings
+14 −5		Localization/fi.lproj/Localizable.strings
+12 −3		Localization/fr.lproj/Localizable.strings
+12 −3		Localization/he.lproj/Localizable.strings
+12 −3		Localization/hi.lproj/Localizable.strings
+13 −4		Localization/it.lproj/Localizable.strings
+13 −4		Localization/ja.lproj/Localizable.strings
+14 −5		Localization/nb.lproj/Localizable.strings
+13 −4		Localization/nl.lproj/Localizable.strings
+13 −4		Localization/pl.lproj/Localizable.strings
+12 −3		Localization/pt-BR.lproj/Localizable.strings
+13 −4		Localization/ro.lproj/Localizable.strings
+12 −3		Localization/ru.lproj/Localizable.strings
+12 −3		Localization/sk.lproj/Localizable.strings
+13 −4		Localization/sv.lproj/Localizable.strings
+12 −3		Localization/tr.lproj/Localizable.strings
+12 −3		Localization/vi.lproj/Localizable.strings
+13 −4		Localization/zh-Hans.lproj/Localizable.strings