From e157b386d8e377d62cac59fba9c7222a2bae5d21 Mon Sep 17 00:00:00 2001 From: Nathan Racklyeft Date: Tue, 14 Jun 2016 18:35:59 -0700 Subject: [PATCH] Changing pump events to value types --- MinimedKit/HistoryPage.swift | 11 ++++++----- .../PumpEvents/AlarmClockReminderPumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/AlarmSensorPumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/BGReceivedPumpEvent.swift | 4 ++-- .../PumpEvents/BasalProfileStartPumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/BatteryPumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/BolusNormalPumpEvent.swift | 4 ++-- .../PumpEvents/BolusWizardEstimatePumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/CalBGForPHPumpEvent.swift | 4 ++-- .../PumpEvents/ChangeAlarmClockEnablePumpEvent.swift | 4 ++-- .../PumpEvents/ChangeAlarmClockTimePumpEvent.swift | 4 ++-- .../PumpEvents/ChangeAlarmNotifyModePumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/ChangeAudioBolusPumpEvent.swift | 4 ++-- .../PumpEvents/ChangeBGReminderEnablePumpEvent.swift | 4 ++-- .../PumpEvents/ChangeBGReminderOffsetPumpEvent.swift | 4 ++-- .../ChangeBasalProfilePatternPumpEvent.swift | 4 ++-- .../PumpEvents/ChangeBasalProfilePumpEvent.swift | 4 ++-- .../ChangeBolusReminderEnablePumpEvent.swift | 4 ++-- .../PumpEvents/ChangeBolusReminderTimePumpEvent.swift | 4 ++-- .../ChangeBolusScrollStepSizePumpEvent.swift | 4 ++-- .../PumpEvents/ChangeBolusWizardSetupPumpEvent.swift | 4 ++-- .../ChangeCaptureEventEnablePumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/ChangeCarbUnitsPumpEvent.swift | 4 ++-- .../PumpEvents/ChangeChildBlockEnablePumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/ChangeMaxBasalPumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/ChangeMaxBolusPumpEvent.swift | 4 ++-- .../PumpEvents/ChangeOtherDeviceIDPumpEvent.swift | 4 ++-- .../PumpEvents/ChangeParadigmLinkIDPumpEvent.swift | 4 ++-- .../ChangeReservoirWarningTimePumpEvent.swift | 4 ++-- .../ChangeSensorRateOfChangeAlertSetupPumpEvent.swift | 4 ++-- .../PumpEvents/ChangeSensorSetup2PumpEvent.swift | 4 ++-- .../PumpEvents/ChangeTempBasalTypePumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/ChangeTimeFormatPumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/ChangeTimePumpEvent.swift | 4 ++-- .../PumpEvents/ChangeVariableBolusPumpEvent.swift | 4 ++-- .../PumpEvents/ChangeWatchdogEnablePumpEvent.swift | 4 ++-- .../ChangeWatchdogMarriageProfilePumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/ClearAlarmPumpEvent.swift | 4 ++-- .../PumpEvents/DeleteAlarmClockTimePumpEvent.swift | 4 ++-- .../PumpEvents/DeleteBolusReminderTimePumpEvent.swift | 4 ++-- .../PumpEvents/DeleteOtherDeviceIDPumpEvent.swift | 4 ++-- .../PumpEvents/EnableDisableRemotePumpEvent.swift | 4 ++-- .../JournalEntryExerciseMarkerPumpEvent.swift | 4 ++-- .../JournalEntryPumpLowBatteryPumpEvent.swift | 4 ++-- .../JournalEntryPumpLowReservoirPumpEvent.swift | 4 ++-- .../PumpEvents/Model522ResultTotalsPumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/PrimePumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/PumpAlarmPumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/ResultDailyTotalPumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/ResumePumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/RewindPumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/Sara6EPumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/SuspendPumpEvent.swift | 4 ++-- .../PumpEvents/TempBasalDurationPumpEvent.swift | 4 ++-- MinimedKit/PumpEvents/TempBasalPumpEvent.swift | 4 ++-- .../PumpEvents/UnabsorbedInsulinPumpEvent.swift | 4 ++-- 56 files changed, 116 insertions(+), 115 deletions(-) diff --git a/MinimedKit/HistoryPage.swift b/MinimedKit/HistoryPage.swift index e6c9d0233..dd55870df 100644 --- a/MinimedKit/HistoryPage.swift +++ b/MinimedKit/HistoryPage.swift @@ -45,17 +45,18 @@ public class HistoryPage { offset += 1 continue } - guard let event = matchEvent(offset) else { + guard var event = matchEvent(offset) else { events = [PumpEvent]() throw Error.UnknownEventType(eventType: pageData[offset] as UInt8) } - if event.dynamicType == BolusNormalPumpEvent.self && unabsorbedInsulinRecord != nil { - let bolus: BolusNormalPumpEvent = event as! BolusNormalPumpEvent + + if unabsorbedInsulinRecord != nil, var bolus = event as? BolusNormalPumpEvent { bolus.unabsorbedInsulinRecord = unabsorbedInsulinRecord unabsorbedInsulinRecord = nil + event = bolus } - if event.dynamicType == UnabsorbedInsulinPumpEvent.self { - unabsorbedInsulinRecord = event as? UnabsorbedInsulinPumpEvent + if let event = event as? UnabsorbedInsulinPumpEvent { + unabsorbedInsulinRecord = event } else { tempEvents.append(event) } diff --git a/MinimedKit/PumpEvents/AlarmClockReminderPumpEvent.swift b/MinimedKit/PumpEvents/AlarmClockReminderPumpEvent.swift index 7bbc080c7..3127e0b5b 100644 --- a/MinimedKit/PumpEvents/AlarmClockReminderPumpEvent.swift +++ b/MinimedKit/PumpEvents/AlarmClockReminderPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class AlarmClockReminderPumpEvent: TimestampedPumpEvent { +public struct AlarmClockReminderPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/AlarmSensorPumpEvent.swift b/MinimedKit/PumpEvents/AlarmSensorPumpEvent.swift index 86fd113a0..b3999c9dd 100644 --- a/MinimedKit/PumpEvents/AlarmSensorPumpEvent.swift +++ b/MinimedKit/PumpEvents/AlarmSensorPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class AlarmSensorPumpEvent: TimestampedPumpEvent { +public struct AlarmSensorPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 8 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/BGReceivedPumpEvent.swift b/MinimedKit/PumpEvents/BGReceivedPumpEvent.swift index fbb1170fb..34e2900c7 100644 --- a/MinimedKit/PumpEvents/BGReceivedPumpEvent.swift +++ b/MinimedKit/PumpEvents/BGReceivedPumpEvent.swift @@ -8,13 +8,13 @@ import Foundation -public class BGReceivedPumpEvent: TimestampedPumpEvent { +public struct BGReceivedPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents public let amount: Int public let meter: String - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 10 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/BasalProfileStartPumpEvent.swift b/MinimedKit/PumpEvents/BasalProfileStartPumpEvent.swift index 8f6c166fd..e7516ee42 100644 --- a/MinimedKit/PumpEvents/BasalProfileStartPumpEvent.swift +++ b/MinimedKit/PumpEvents/BasalProfileStartPumpEvent.swift @@ -8,7 +8,7 @@ import Foundation -public class BasalProfileStartPumpEvent: TimestampedPumpEvent { +public struct BasalProfileStartPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents let rate: Double @@ -16,7 +16,7 @@ public class BasalProfileStartPumpEvent: TimestampedPumpEvent { let offset: Int - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 10 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/BatteryPumpEvent.swift b/MinimedKit/PumpEvents/BatteryPumpEvent.swift index 4cc0a5e75..636500316 100644 --- a/MinimedKit/PumpEvents/BatteryPumpEvent.swift +++ b/MinimedKit/PumpEvents/BatteryPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class BatteryPumpEvent: TimestampedPumpEvent { +public struct BatteryPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/BolusNormalPumpEvent.swift b/MinimedKit/PumpEvents/BolusNormalPumpEvent.swift index 9f1ad7581..9a0800091 100644 --- a/MinimedKit/PumpEvents/BolusNormalPumpEvent.swift +++ b/MinimedKit/PumpEvents/BolusNormalPumpEvent.swift @@ -8,7 +8,7 @@ import Foundation -public class BolusNormalPumpEvent: TimestampedPumpEvent { +public struct BolusNormalPumpEvent: TimestampedPumpEvent { public enum BolusType: String { case Normal @@ -24,7 +24,7 @@ public class BolusNormalPumpEvent: TimestampedPumpEvent { public let type: BolusType public let duration: NSTimeInterval - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { func doubleValueFromDataAtIndex(index: Int) -> Double { return Double(availableData[index] as UInt8) diff --git a/MinimedKit/PumpEvents/BolusWizardEstimatePumpEvent.swift b/MinimedKit/PumpEvents/BolusWizardEstimatePumpEvent.swift index ed87225e4..94e118db2 100644 --- a/MinimedKit/PumpEvents/BolusWizardEstimatePumpEvent.swift +++ b/MinimedKit/PumpEvents/BolusWizardEstimatePumpEvent.swift @@ -8,7 +8,7 @@ import Foundation -public class BolusWizardEstimatePumpEvent: TimestampedPumpEvent { +public struct BolusWizardEstimatePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents public let carbohydrates: Int @@ -22,7 +22,7 @@ public class BolusWizardEstimatePumpEvent: TimestampedPumpEvent { public let insulinSensitivity: Int public let carbRatio: Double - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { func d(idx:Int) -> Int { return Int(availableData[idx] as UInt8) diff --git a/MinimedKit/PumpEvents/CalBGForPHPumpEvent.swift b/MinimedKit/PumpEvents/CalBGForPHPumpEvent.swift index 434608dae..0174d4e3e 100644 --- a/MinimedKit/PumpEvents/CalBGForPHPumpEvent.swift +++ b/MinimedKit/PumpEvents/CalBGForPHPumpEvent.swift @@ -8,12 +8,12 @@ import Foundation -public class CalBGForPHPumpEvent: TimestampedPumpEvent { +public struct CalBGForPHPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents public let amount: Int - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeAlarmClockEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeAlarmClockEnablePumpEvent.swift index 5d6da327b..705a40450 100644 --- a/MinimedKit/PumpEvents/ChangeAlarmClockEnablePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeAlarmClockEnablePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeAlarmClockEnablePumpEvent: TimestampedPumpEvent { +public struct ChangeAlarmClockEnablePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeAlarmClockTimePumpEvent.swift b/MinimedKit/PumpEvents/ChangeAlarmClockTimePumpEvent.swift index 9409c415c..e2791d480 100644 --- a/MinimedKit/PumpEvents/ChangeAlarmClockTimePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeAlarmClockTimePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeAlarmClockTimePumpEvent: TimestampedPumpEvent { +public struct ChangeAlarmClockTimePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 14 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeAlarmNotifyModePumpEvent.swift b/MinimedKit/PumpEvents/ChangeAlarmNotifyModePumpEvent.swift index ea02a71d1..306ce5f21 100644 --- a/MinimedKit/PumpEvents/ChangeAlarmNotifyModePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeAlarmNotifyModePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeAlarmNotifyModePumpEvent: TimestampedPumpEvent { +public struct ChangeAlarmNotifyModePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeAudioBolusPumpEvent.swift b/MinimedKit/PumpEvents/ChangeAudioBolusPumpEvent.swift index c333ec4cd..bf1a11227 100644 --- a/MinimedKit/PumpEvents/ChangeAudioBolusPumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeAudioBolusPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeAudioBolusPumpEvent: TimestampedPumpEvent { +public struct ChangeAudioBolusPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeBGReminderEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeBGReminderEnablePumpEvent.swift index 13c9f9a7e..bc22ceaaf 100644 --- a/MinimedKit/PumpEvents/ChangeBGReminderEnablePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeBGReminderEnablePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeBGReminderEnablePumpEvent: TimestampedPumpEvent { +public struct ChangeBGReminderEnablePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeBGReminderOffsetPumpEvent.swift b/MinimedKit/PumpEvents/ChangeBGReminderOffsetPumpEvent.swift index 2d8983fa5..56b7e1162 100644 --- a/MinimedKit/PumpEvents/ChangeBGReminderOffsetPumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeBGReminderOffsetPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeBGReminderOffsetPumpEvent: TimestampedPumpEvent { +public struct ChangeBGReminderOffsetPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeBasalProfilePatternPumpEvent.swift b/MinimedKit/PumpEvents/ChangeBasalProfilePatternPumpEvent.swift index 31586e696..54d724fa4 100644 --- a/MinimedKit/PumpEvents/ChangeBasalProfilePatternPumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeBasalProfilePatternPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeBasalProfilePatternPumpEvent: TimestampedPumpEvent { +public struct ChangeBasalProfilePatternPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 152 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeBasalProfilePumpEvent.swift b/MinimedKit/PumpEvents/ChangeBasalProfilePumpEvent.swift index af1e5a411..a7ee9e6ef 100644 --- a/MinimedKit/PumpEvents/ChangeBasalProfilePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeBasalProfilePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeBasalProfilePumpEvent: TimestampedPumpEvent { +public struct ChangeBasalProfilePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 152 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeBolusReminderEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeBolusReminderEnablePumpEvent.swift index 7a9a226af..889a27bac 100644 --- a/MinimedKit/PumpEvents/ChangeBolusReminderEnablePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeBolusReminderEnablePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeBolusReminderEnablePumpEvent: TimestampedPumpEvent { +public struct ChangeBolusReminderEnablePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeBolusReminderTimePumpEvent.swift b/MinimedKit/PumpEvents/ChangeBolusReminderTimePumpEvent.swift index 664926af6..6f9344243 100644 --- a/MinimedKit/PumpEvents/ChangeBolusReminderTimePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeBolusReminderTimePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeBolusReminderTimePumpEvent: TimestampedPumpEvent { +public struct ChangeBolusReminderTimePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 9 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeBolusScrollStepSizePumpEvent.swift b/MinimedKit/PumpEvents/ChangeBolusScrollStepSizePumpEvent.swift index d4f553acd..7b1e9721f 100644 --- a/MinimedKit/PumpEvents/ChangeBolusScrollStepSizePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeBolusScrollStepSizePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeBolusScrollStepSizePumpEvent: TimestampedPumpEvent { +public struct ChangeBolusScrollStepSizePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeBolusWizardSetupPumpEvent.swift b/MinimedKit/PumpEvents/ChangeBolusWizardSetupPumpEvent.swift index 1bb9cd894..2b37860ca 100644 --- a/MinimedKit/PumpEvents/ChangeBolusWizardSetupPumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeBolusWizardSetupPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeBolusWizardSetupPumpEvent: TimestampedPumpEvent { +public struct ChangeBolusWizardSetupPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { if pumpModel.larger { length = 144 } else { diff --git a/MinimedKit/PumpEvents/ChangeCaptureEventEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeCaptureEventEnablePumpEvent.swift index 1a81038c6..409694147 100644 --- a/MinimedKit/PumpEvents/ChangeCaptureEventEnablePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeCaptureEventEnablePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeCaptureEventEnablePumpEvent: TimestampedPumpEvent { +public struct ChangeCaptureEventEnablePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeCarbUnitsPumpEvent.swift b/MinimedKit/PumpEvents/ChangeCarbUnitsPumpEvent.swift index ca8df4b67..2b7e8abcb 100644 --- a/MinimedKit/PumpEvents/ChangeCarbUnitsPumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeCarbUnitsPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeCarbUnitsPumpEvent: TimestampedPumpEvent { +public struct ChangeCarbUnitsPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeChildBlockEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeChildBlockEnablePumpEvent.swift index c580e688b..45850522f 100644 --- a/MinimedKit/PumpEvents/ChangeChildBlockEnablePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeChildBlockEnablePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeChildBlockEnablePumpEvent: TimestampedPumpEvent { +public struct ChangeChildBlockEnablePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeMaxBasalPumpEvent.swift b/MinimedKit/PumpEvents/ChangeMaxBasalPumpEvent.swift index d547b34e3..b5dc53934 100644 --- a/MinimedKit/PumpEvents/ChangeMaxBasalPumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeMaxBasalPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeMaxBasalPumpEvent: TimestampedPumpEvent { +public struct ChangeMaxBasalPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeMaxBolusPumpEvent.swift b/MinimedKit/PumpEvents/ChangeMaxBolusPumpEvent.swift index e94d925d6..7adb29852 100644 --- a/MinimedKit/PumpEvents/ChangeMaxBolusPumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeMaxBolusPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeMaxBolusPumpEvent: TimestampedPumpEvent { +public struct ChangeMaxBolusPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeOtherDeviceIDPumpEvent.swift b/MinimedKit/PumpEvents/ChangeOtherDeviceIDPumpEvent.swift index 7dfc62b62..df3fea5fb 100644 --- a/MinimedKit/PumpEvents/ChangeOtherDeviceIDPumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeOtherDeviceIDPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeOtherDeviceIDPumpEvent: TimestampedPumpEvent { +public struct ChangeOtherDeviceIDPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 37 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeParadigmLinkIDPumpEvent.swift b/MinimedKit/PumpEvents/ChangeParadigmLinkIDPumpEvent.swift index d6418a556..438afed9f 100644 --- a/MinimedKit/PumpEvents/ChangeParadigmLinkIDPumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeParadigmLinkIDPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeParadigmLinkIDPumpEvent: TimestampedPumpEvent { +public struct ChangeParadigmLinkIDPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 21 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeReservoirWarningTimePumpEvent.swift b/MinimedKit/PumpEvents/ChangeReservoirWarningTimePumpEvent.swift index 77367809c..83ccd0b7d 100644 --- a/MinimedKit/PumpEvents/ChangeReservoirWarningTimePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeReservoirWarningTimePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeReservoirWarningTimePumpEvent: TimestampedPumpEvent { +public struct ChangeReservoirWarningTimePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeSensorRateOfChangeAlertSetupPumpEvent.swift b/MinimedKit/PumpEvents/ChangeSensorRateOfChangeAlertSetupPumpEvent.swift index df0b3425a..b6c0a8134 100644 --- a/MinimedKit/PumpEvents/ChangeSensorRateOfChangeAlertSetupPumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeSensorRateOfChangeAlertSetupPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeSensorRateOfChangeAlertSetupPumpEvent: TimestampedPumpEvent { +public struct ChangeSensorRateOfChangeAlertSetupPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 12 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeSensorSetup2PumpEvent.swift b/MinimedKit/PumpEvents/ChangeSensorSetup2PumpEvent.swift index 261c24d44..caa6a7ba5 100644 --- a/MinimedKit/PumpEvents/ChangeSensorSetup2PumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeSensorSetup2PumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeSensorSetup2PumpEvent: TimestampedPumpEvent { +public struct ChangeSensorSetup2PumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 37 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeTempBasalTypePumpEvent.swift b/MinimedKit/PumpEvents/ChangeTempBasalTypePumpEvent.swift index 9f8d8355b..35b0191a8 100644 --- a/MinimedKit/PumpEvents/ChangeTempBasalTypePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeTempBasalTypePumpEvent.swift @@ -8,12 +8,12 @@ import Foundation -public class ChangeTempBasalTypePumpEvent: TimestampedPumpEvent { +public struct ChangeTempBasalTypePumpEvent: TimestampedPumpEvent { public let length: Int public let basalType: String public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 func d(idx:Int) -> Int { diff --git a/MinimedKit/PumpEvents/ChangeTimeFormatPumpEvent.swift b/MinimedKit/PumpEvents/ChangeTimeFormatPumpEvent.swift index 590c4911c..843cd90de 100644 --- a/MinimedKit/PumpEvents/ChangeTimeFormatPumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeTimeFormatPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeTimeFormatPumpEvent: TimestampedPumpEvent { +public struct ChangeTimeFormatPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeTimePumpEvent.swift b/MinimedKit/PumpEvents/ChangeTimePumpEvent.swift index d61a2d590..568e95515 100644 --- a/MinimedKit/PumpEvents/ChangeTimePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeTimePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeTimePumpEvent: TimestampedPumpEvent { +public struct ChangeTimePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 14 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeVariableBolusPumpEvent.swift b/MinimedKit/PumpEvents/ChangeVariableBolusPumpEvent.swift index 09e204f90..abb217648 100644 --- a/MinimedKit/PumpEvents/ChangeVariableBolusPumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeVariableBolusPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeVariableBolusPumpEvent: TimestampedPumpEvent { +public struct ChangeVariableBolusPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeWatchdogEnablePumpEvent.swift b/MinimedKit/PumpEvents/ChangeWatchdogEnablePumpEvent.swift index 6bdf7380c..68ab53d16 100644 --- a/MinimedKit/PumpEvents/ChangeWatchdogEnablePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeWatchdogEnablePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeWatchdogEnablePumpEvent: TimestampedPumpEvent { +public struct ChangeWatchdogEnablePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ChangeWatchdogMarriageProfilePumpEvent.swift b/MinimedKit/PumpEvents/ChangeWatchdogMarriageProfilePumpEvent.swift index 32f610bee..ca9da6a4a 100644 --- a/MinimedKit/PumpEvents/ChangeWatchdogMarriageProfilePumpEvent.swift +++ b/MinimedKit/PumpEvents/ChangeWatchdogMarriageProfilePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ChangeWatchdogMarriageProfilePumpEvent: TimestampedPumpEvent { +public struct ChangeWatchdogMarriageProfilePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 12 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ClearAlarmPumpEvent.swift b/MinimedKit/PumpEvents/ClearAlarmPumpEvent.swift index 8bf6408e6..bd0891723 100644 --- a/MinimedKit/PumpEvents/ClearAlarmPumpEvent.swift +++ b/MinimedKit/PumpEvents/ClearAlarmPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ClearAlarmPumpEvent: TimestampedPumpEvent { +public struct ClearAlarmPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/DeleteAlarmClockTimePumpEvent.swift b/MinimedKit/PumpEvents/DeleteAlarmClockTimePumpEvent.swift index 83a765b21..a0beeb966 100644 --- a/MinimedKit/PumpEvents/DeleteAlarmClockTimePumpEvent.swift +++ b/MinimedKit/PumpEvents/DeleteAlarmClockTimePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class DeleteAlarmClockTimePumpEvent: TimestampedPumpEvent { +public struct DeleteAlarmClockTimePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 14 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/DeleteBolusReminderTimePumpEvent.swift b/MinimedKit/PumpEvents/DeleteBolusReminderTimePumpEvent.swift index d3572535b..bcd5f859a 100644 --- a/MinimedKit/PumpEvents/DeleteBolusReminderTimePumpEvent.swift +++ b/MinimedKit/PumpEvents/DeleteBolusReminderTimePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class DeleteBolusReminderTimePumpEvent: TimestampedPumpEvent { +public struct DeleteBolusReminderTimePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 9 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/DeleteOtherDeviceIDPumpEvent.swift b/MinimedKit/PumpEvents/DeleteOtherDeviceIDPumpEvent.swift index 81c2c388b..5c72af8ae 100644 --- a/MinimedKit/PumpEvents/DeleteOtherDeviceIDPumpEvent.swift +++ b/MinimedKit/PumpEvents/DeleteOtherDeviceIDPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class DeleteOtherDeviceIDPumpEvent: TimestampedPumpEvent { +public struct DeleteOtherDeviceIDPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 12 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/EnableDisableRemotePumpEvent.swift b/MinimedKit/PumpEvents/EnableDisableRemotePumpEvent.swift index 8c2db67ce..ed0661e28 100644 --- a/MinimedKit/PumpEvents/EnableDisableRemotePumpEvent.swift +++ b/MinimedKit/PumpEvents/EnableDisableRemotePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class EnableDisableRemotePumpEvent: TimestampedPumpEvent { +public struct EnableDisableRemotePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 21 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/JournalEntryExerciseMarkerPumpEvent.swift b/MinimedKit/PumpEvents/JournalEntryExerciseMarkerPumpEvent.swift index 9f207d685..5004dbb3a 100644 --- a/MinimedKit/PumpEvents/JournalEntryExerciseMarkerPumpEvent.swift +++ b/MinimedKit/PumpEvents/JournalEntryExerciseMarkerPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class JournalEntryExerciseMarkerPumpEvent: TimestampedPumpEvent { +public struct JournalEntryExerciseMarkerPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 8 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/JournalEntryPumpLowBatteryPumpEvent.swift b/MinimedKit/PumpEvents/JournalEntryPumpLowBatteryPumpEvent.swift index e7ec79337..f68c9a9f1 100644 --- a/MinimedKit/PumpEvents/JournalEntryPumpLowBatteryPumpEvent.swift +++ b/MinimedKit/PumpEvents/JournalEntryPumpLowBatteryPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class JournalEntryPumpLowBatteryPumpEvent: TimestampedPumpEvent { +public struct JournalEntryPumpLowBatteryPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/JournalEntryPumpLowReservoirPumpEvent.swift b/MinimedKit/PumpEvents/JournalEntryPumpLowReservoirPumpEvent.swift index 9b9592eb2..adef53ea5 100644 --- a/MinimedKit/PumpEvents/JournalEntryPumpLowReservoirPumpEvent.swift +++ b/MinimedKit/PumpEvents/JournalEntryPumpLowReservoirPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class JournalEntryPumpLowReservoirPumpEvent: TimestampedPumpEvent { +public struct JournalEntryPumpLowReservoirPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/Model522ResultTotalsPumpEvent.swift b/MinimedKit/PumpEvents/Model522ResultTotalsPumpEvent.swift index 7583b57e3..fb92ff2ca 100644 --- a/MinimedKit/PumpEvents/Model522ResultTotalsPumpEvent.swift +++ b/MinimedKit/PumpEvents/Model522ResultTotalsPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class Model522ResultTotalsPumpEvent: TimestampedPumpEvent { +public struct Model522ResultTotalsPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 44 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/PrimePumpEvent.swift b/MinimedKit/PumpEvents/PrimePumpEvent.swift index 6c15b23db..22a23c2df 100644 --- a/MinimedKit/PumpEvents/PrimePumpEvent.swift +++ b/MinimedKit/PumpEvents/PrimePumpEvent.swift @@ -8,14 +8,14 @@ import Foundation -public class PrimePumpEvent: TimestampedPumpEvent { +public struct PrimePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents let amount: Double let primeType: String let programmedAmount: Double - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 10 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/PumpAlarmPumpEvent.swift b/MinimedKit/PumpEvents/PumpAlarmPumpEvent.swift index 35b7cfb70..a1bda53d9 100644 --- a/MinimedKit/PumpEvents/PumpAlarmPumpEvent.swift +++ b/MinimedKit/PumpEvents/PumpAlarmPumpEvent.swift @@ -8,12 +8,12 @@ import Foundation -public class PumpAlarmPumpEvent: TimestampedPumpEvent { +public struct PumpAlarmPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents let rawType: Int - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 9 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/ResultDailyTotalPumpEvent.swift b/MinimedKit/PumpEvents/ResultDailyTotalPumpEvent.swift index 96b183c30..6dd1e6cda 100644 --- a/MinimedKit/PumpEvents/ResultDailyTotalPumpEvent.swift +++ b/MinimedKit/PumpEvents/ResultDailyTotalPumpEvent.swift @@ -8,12 +8,12 @@ import Foundation -public class ResultDailyTotalPumpEvent: PumpEvent { +public struct ResultDailyTotalPumpEvent: PumpEvent { public let length: Int public let timestamp: NSDateComponents let validDateStr: String - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { if pumpModel.larger { length = 10 diff --git a/MinimedKit/PumpEvents/ResumePumpEvent.swift b/MinimedKit/PumpEvents/ResumePumpEvent.swift index d2c68e360..934c203c9 100644 --- a/MinimedKit/PumpEvents/ResumePumpEvent.swift +++ b/MinimedKit/PumpEvents/ResumePumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class ResumePumpEvent: TimestampedPumpEvent { +public struct ResumePumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/RewindPumpEvent.swift b/MinimedKit/PumpEvents/RewindPumpEvent.swift index 926925e70..c8d9379ac 100644 --- a/MinimedKit/PumpEvents/RewindPumpEvent.swift +++ b/MinimedKit/PumpEvents/RewindPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class RewindPumpEvent: TimestampedPumpEvent { +public struct RewindPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/Sara6EPumpEvent.swift b/MinimedKit/PumpEvents/Sara6EPumpEvent.swift index 86d07be95..bb956bd06 100644 --- a/MinimedKit/PumpEvents/Sara6EPumpEvent.swift +++ b/MinimedKit/PumpEvents/Sara6EPumpEvent.swift @@ -8,13 +8,13 @@ import Foundation -public class Sara6EPumpEvent: PumpEvent { +public struct Sara6EPumpEvent: PumpEvent { public let length: Int public let timestamp: NSDateComponents let validDateStr: String - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 52 // Sometimes we encounter this at the end of a page, and it can be less characters??? diff --git a/MinimedKit/PumpEvents/SuspendPumpEvent.swift b/MinimedKit/PumpEvents/SuspendPumpEvent.swift index 44bd09f8f..ef5da48ce 100644 --- a/MinimedKit/PumpEvents/SuspendPumpEvent.swift +++ b/MinimedKit/PumpEvents/SuspendPumpEvent.swift @@ -8,11 +8,11 @@ import Foundation -public class SuspendPumpEvent: TimestampedPumpEvent { +public struct SuspendPumpEvent: TimestampedPumpEvent { public let length: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 guard length <= availableData.length else { diff --git a/MinimedKit/PumpEvents/TempBasalDurationPumpEvent.swift b/MinimedKit/PumpEvents/TempBasalDurationPumpEvent.swift index 45ead4595..8e0052eca 100644 --- a/MinimedKit/PumpEvents/TempBasalDurationPumpEvent.swift +++ b/MinimedKit/PumpEvents/TempBasalDurationPumpEvent.swift @@ -8,12 +8,12 @@ import Foundation -public class TempBasalDurationPumpEvent: TimestampedPumpEvent { +public struct TempBasalDurationPumpEvent: TimestampedPumpEvent { public let length: Int public let duration: Int public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 7 func d(idx:Int) -> Int { diff --git a/MinimedKit/PumpEvents/TempBasalPumpEvent.swift b/MinimedKit/PumpEvents/TempBasalPumpEvent.swift index 296f473d5..2b9c0844d 100644 --- a/MinimedKit/PumpEvents/TempBasalPumpEvent.swift +++ b/MinimedKit/PumpEvents/TempBasalPumpEvent.swift @@ -8,7 +8,7 @@ import Foundation -public class TempBasalPumpEvent: TimestampedPumpEvent { +public struct TempBasalPumpEvent: TimestampedPumpEvent { public enum RateType : String { case Absolute = "absolute" @@ -21,7 +21,7 @@ public class TempBasalPumpEvent: TimestampedPumpEvent { public let rate: Double public let timestamp: NSDateComponents - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = 8 func d(idx:Int) -> Int { diff --git a/MinimedKit/PumpEvents/UnabsorbedInsulinPumpEvent.swift b/MinimedKit/PumpEvents/UnabsorbedInsulinPumpEvent.swift index 57860b840..bdb321201 100644 --- a/MinimedKit/PumpEvents/UnabsorbedInsulinPumpEvent.swift +++ b/MinimedKit/PumpEvents/UnabsorbedInsulinPumpEvent.swift @@ -8,7 +8,7 @@ import Foundation -public class UnabsorbedInsulinPumpEvent: PumpEvent { +public struct UnabsorbedInsulinPumpEvent: PumpEvent { public struct Record : DictionaryRepresentable { var amount: Double @@ -31,7 +31,7 @@ public class UnabsorbedInsulinPumpEvent: PumpEvent { public let records: [Record] - public required init?(availableData: NSData, pumpModel: PumpModel) { + public init?(availableData: NSData, pumpModel: PumpModel) { length = Int(max(availableData[1] as UInt8, UInt8(2))) var records = [Record]()