Skip to content

Commit

Permalink
Changing pump events to value types
Browse files Browse the repository at this point in the history
  • Loading branch information
Nathan Racklyeft committed Jun 15, 2016
1 parent 697983f commit e157b38
Show file tree
Hide file tree
Showing 56 changed files with 116 additions and 115 deletions.
11 changes: 6 additions & 5 deletions MinimedKit/HistoryPage.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/AlarmClockReminderPumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/AlarmSensorPumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/BGReceivedPumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/BasalProfileStartPumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@

import Foundation

public class BasalProfileStartPumpEvent: TimestampedPumpEvent {
public struct BasalProfileStartPumpEvent: TimestampedPumpEvent {
public let length: Int
public let timestamp: NSDateComponents
let rate: Double
let profileIndex: Int
let offset: Int


public required init?(availableData: NSData, pumpModel: PumpModel) {
public init?(availableData: NSData, pumpModel: PumpModel) {
length = 10

guard length <= availableData.length else {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/BatteryPumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/BolusNormalPumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

import Foundation

public class BolusNormalPumpEvent: TimestampedPumpEvent {
public struct BolusNormalPumpEvent: TimestampedPumpEvent {

public enum BolusType: String {
case Normal
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/BolusWizardEstimatePumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/CalBGForPHPumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeAlarmClockEnablePumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeAlarmClockTimePumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeAlarmNotifyModePumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeAudioBolusPumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeBGReminderEnablePumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeBGReminderOffsetPumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeBasalProfilePatternPumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeBasalProfilePumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeBolusReminderEnablePumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeBolusReminderTimePumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeBolusScrollStepSizePumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeBolusWizardSetupPumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeCaptureEventEnablePumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeCarbUnitsPumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeChildBlockEnablePumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeMaxBasalPumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions MinimedKit/PumpEvents/ChangeMaxBolusPumpEvent.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
Loading

0 comments on commit e157b38

Please sign in to comment.