Merge pull request #327 from ps2/dev

Release 1.0.1

.travis.yml

@@ -1,7 +1,7 @@
 language: objective-c
-osx_image: xcode8
-xcode_sdk: iphonesimulator10
+osx_image: xcode8.3
+xcode_sdk: iphonesimulator10.3
 xcode_project: RileyLink.xcodeproj
 xcode_scheme: RileyLink
 script:
- - xcodebuild -project RileyLink.xcodeproj -scheme RileyLink -sdk iphonesimulator10.0 build -destination 'name=iPhone SE' test
+ - xcodebuild -project RileyLink.xcodeproj -scheme RileyLink -sdk iphonesimulator10.3 build -destination 'name=iPhone SE' test

Crypto/Info.plist

@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>FMWK</string>
  <key>CFBundleShortVersionString</key>
- <string>1.0</string>
+ <string>1.0.1</string>
  <key>CFBundleVersion</key>
  <string>$(CURRENT_PROJECT_VERSION)</string>
  <key>NSPrincipalClass</key>

MinimedKit/Info.plist

@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>FMWK</string>
  <key>CFBundleShortVersionString</key>
- <string>1.0</string>
+ <string>1.0.1</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>

MinimedKitTests/Info.plist

@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>BNDL</string>
  <key>CFBundleShortVersionString</key>
- <string>1.0</string>
+ <string>1.0.1</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>

NightscoutUploadKit/DeviceStatus/PumpStatus.swift

@@ -16,33 +16,47 @@ public struct PumpStatus {
  let suspended: Bool?
  let bolusing: Bool?
  let reservoir: Double?
-
- public init(clock: Date, pumpID: String, iob: IOBStatus? = nil, battery: BatteryStatus? = nil, suspended: Bool? = nil, bolusing: Bool? = nil, reservoir: Double? = nil) {
+ let secondsFromGMT: Int?
+
+ public init(clock: Date, pumpID: String, iob: IOBStatus? = nil, battery: BatteryStatus? = nil, suspended: Bool? = nil, bolusing: Bool? = nil, reservoir: Double? = nil, secondsFromGMT: Int? = nil) {
  self.clock = clock
  self.pumpID = pumpID
  self.iob = iob
  self.battery = battery
  self.suspended = suspended
  self.bolusing = bolusing
  self.reservoir = reservoir
+ self.secondsFromGMT = secondsFromGMT
  }
 
  public var dictionaryRepresentation: [String: Any] {
  var rval = [String: Any]()
 
  rval["clock"] = TimeFormat.timestampStrFromDate(clock)
  rval["pumpID"] = pumpID
-
+
+ if let iob = iob {
+ rval["iob"] = iob.dictionaryRepresentation
+ }
+
  if let battery = battery {
  rval["battery"] = battery.dictionaryRepresentation
  }
 
+ if let suspended = suspended {
+ rval["suspended"] = suspended
+ }
+
+ if let bolusing = bolusing {
+ rval["bolusing"] = bolusing
+ }
+
  if let reservoir = reservoir {
  rval["reservoir"] = reservoir
  }
- 
- if let iob = iob {
- rval["iob"] = iob.dictionaryRepresentation
+
+ if let secondsFromGMT = secondsFromGMT {
+ rval["secondsFromGMT"] = secondsFromGMT
  }
 
  return rval

NightscoutUploadKit/Info.plist

@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>FMWK</string>
  <key>CFBundleShortVersionString</key>
- <string>1.0</string>
+ <string>1.0.1</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>

NightscoutUploadKit/NightscoutPumpEvents.swift

@@ -64,10 +64,10 @@ public class NightscoutPumpEvents: NSObject {
  lastBasalDuration = tempBasalDuration
  lastBasalDurationDate = event.date
  case is SuspendPumpEvent:
- let entry = SuspendPumpTreatment(timestamp: event.date, enteredBy: eventSource, suspended: true)
+ let entry = PumpSuspendTreatment(timestamp: event.date, enteredBy: eventSource)
  results.append(entry)
  case is ResumePumpEvent:
- let entry = SuspendPumpTreatment(timestamp: event.date, enteredBy: eventSource, suspended: false)
+ let entry = PumpResumeTreatment(timestamp: event.date, enteredBy: eventSource)
  results.append(entry)
  default:
  break

NightscoutUploadKit/NightscoutUploader.swift

@@ -36,7 +36,7 @@ public class NightscoutUploader {
  private(set) var entries = [NightscoutEntry]()
  private(set) var deviceStatuses = [[String: Any]]()
  private(set) var treatmentsQueue = [NightscoutTreatment]()
- 
+
  private(set) var lastMeterMessageRxTime: Date?
 
  public private(set) var observingPumpEventsSince: Date!
@@ -282,7 +282,7 @@ public class NightscoutUploader {
  lastMeterMessageRxTime = date
  }
  }
- 
+
  // MARK: - Uploading
 
  func flushAll() {

NightscoutUploadKit/Treatments/BGCheckNightscoutTreatment.swift

@@ -14,16 +14,15 @@ public class BGCheckNightscoutTreatment: NightscoutTreatment {
  let glucoseType: GlucoseType
  let units: Units
 
- init(timestamp: Date, enteredBy: String, glucose: Int, glucoseType: GlucoseType, units: Units) {
+ public init(timestamp: Date, enteredBy: String, glucose: Int, glucoseType: GlucoseType, units: Units, notes: String? = nil) {
  self.glucose = glucose
  self.glucoseType = glucoseType
  self.units = units
- super.init(timestamp: timestamp, enteredBy: enteredBy)
+ super.init(timestamp: timestamp, enteredBy: enteredBy, notes: notes, eventType: "BG Check")
  }
 
  override public var dictionaryRepresentation: [String: Any] {
  var rval = super.dictionaryRepresentation
- rval["eventType"] = "BG Check"
  rval["glucose"] = glucose
  rval["glucoseType"] = glucoseType.rawValue
  rval["units"] = units.rawValue

NightscoutUploadKit/Treatments/BolusNightscoutTreatment.swift

@@ -10,39 +10,38 @@ import Foundation
 
 public class BolusNightscoutTreatment: NightscoutTreatment {
 
- enum BolusType: String {
+ public enum BolusType: String {
  case Normal = "normal"
  case Square = "square"
  case DualWave = "dual"
  }
- 
+
  let bolusType: BolusType
  let amount: Double
  let programmed: Double
  let unabsorbed: Double
  let duration: TimeInterval
  let carbs: Int
  let ratio: Double
- 
- init(timestamp: Date, enteredBy: String, bolusType: BolusType, amount: Double, programmed: Double, unabsorbed: Double, duration: TimeInterval, carbs: Int, ratio: Double) {
+
+ public init(timestamp: Date, enteredBy: String, bolusType: BolusType, amount: Double, programmed: Double, unabsorbed: Double, duration: TimeInterval, carbs: Int, ratio: Double, notes: String? = nil) {
  self.bolusType = bolusType
  self.amount = amount
  self.programmed = programmed
  self.unabsorbed = unabsorbed
  self.duration = duration
  self.carbs = carbs
  self.ratio = ratio
- super.init(timestamp: timestamp, enteredBy: enteredBy)
+ super.init(timestamp: timestamp, enteredBy: enteredBy, notes: notes,
+ eventType: (carbs > 0) ? "Meal Bolus" : "Correction Bolus")
+
  }
- 
+
  override public var dictionaryRepresentation: [String: Any] {
  var rval = super.dictionaryRepresentation
  if carbs > 0 {
- rval["eventType"] = "Meal Bolus"
  rval["carbs"] = carbs
  rval["ratio"] = ratio
- } else {
- rval["eventType"] = "Correction Bolus"
  }
  rval["type"] = bolusType.rawValue
  rval["insulin"] = amount

NightscoutUploadKit/Treatments/MealBolusNightscoutTreatment.swift

@@ -17,19 +17,18 @@ public class MealBolusNightscoutTreatment: NightscoutTreatment {
  let units: Units? // of glucose entry
  let glucoseType: GlucoseType?
 
- public init(timestamp: Date, enteredBy: String, id: String?, carbs: Int, absorptionTime: TimeInterval? = nil, insulin: Double? = nil, glucose: Int? = nil, glucoseType: GlucoseType? = nil, units: Units? = nil) {
+ public init(timestamp: Date, enteredBy: String, id: String?, carbs: Int, absorptionTime: TimeInterval? = nil, insulin: Double? = nil, glucose: Int? = nil, glucoseType: GlucoseType? = nil, units: Units? = nil, notes: String? = nil) {
  self.carbs = carbs
  self.absorptionTime = absorptionTime
  self.glucose = glucose
  self.glucoseType = glucoseType
  self.units = units
  self.insulin = insulin
- super.init(timestamp: timestamp, enteredBy: enteredBy, id: id)
+ super.init(timestamp: timestamp, enteredBy: enteredBy, notes: notes, id: id, eventType: "Meal Bolus")
  }
 
  override public var dictionaryRepresentation: [String: Any] {
  var rval = super.dictionaryRepresentation
- rval["eventType"] = "Meal Bolus"
  rval["carbs"] = carbs
  if let absorptionTime = absorptionTime {
  rval["absorptionTime"] = absorptionTime.minutes

NightscoutUploadKit/Treatments/NightscoutTreatment.swift

@@ -22,12 +22,17 @@ public class NightscoutTreatment: DictionaryRepresentable {
 
  let timestamp: Date
  let enteredBy: String
+ let notes: String?
  let id: String?
+ let eventType: String?
 
- init(timestamp: Date, enteredBy: String, id: String? = nil) {
+
+ public init(timestamp: Date, enteredBy: String, notes: String? = nil, id: String? = nil, eventType: String? = nil) {
  self.timestamp = timestamp
  self.enteredBy = enteredBy
  self.id = id
+ self.notes = notes
+ self.eventType = eventType
  }
 
  public var dictionaryRepresentation: [String: Any] {
@@ -39,6 +44,12 @@ public class NightscoutTreatment: DictionaryRepresentable {
  if let id = id {
  rval["_id"] = id
  }
+ if let notes = notes {
+ rval["notes"] = notes
+ }
+ if let eventType = eventType {
+ rval["eventType"] = eventType
+ }
  return rval
  }
 }

NightscoutUploadKit/Treatments/NoteNightscoutTreatment.swift

@@ -0,0 +1,17 @@
+//
+// NoteNightscoutTreatment.swift
+// RileyLink
+//
+// Copyright © 2017 Pete Schwamb. All rights reserved.
+//
+
+import Foundation
+
+
+public class NoteNightscoutTreatment: NightscoutTreatment {
+
+ public init(timestamp: Date, enteredBy: String, notes: String? = nil, id: String? = nil) {
+ super.init(timestamp: timestamp, enteredBy: enteredBy, notes: notes, id: id, eventType: "Note")
+ }
+
+}

NightscoutUploadKit/Treatments/PumpResumeTreatment.swift

@@ -0,0 +1,17 @@
+//
+// PumpResumeTreatment.swift
+// RileyLink
+//
+// Created by Pete Schwamb on 3/27/17.
+// Copyright © 2017 Pete Schwamb. All rights reserved.
+//
+
+import Foundation
+
+public class PumpResumeTreatment: NightscoutTreatment {
+
+ public init(timestamp: Date, enteredBy: String) {
+ super.init(timestamp: timestamp, enteredBy: enteredBy, eventType: "Resume Pump")
+ }
+
+}

NightscoutUploadKit/Treatments/PumpSuspendTreatment.swift

@@ -0,0 +1,17 @@
+//
+// PumpSuspendTreatment.swift
+// RileyLink
+//
+// Created by Pete Schwamb on 3/27/17.
+// Copyright © 2017 Pete Schwamb. All rights reserved.
+//
+
+import Foundation
+
+public class PumpSuspendTreatment: NightscoutTreatment {
+
+ public init(timestamp: Date, enteredBy: String) {
+ super.init(timestamp: timestamp, enteredBy: enteredBy, eventType: "Suspend Pump")
+ }
+
+}

NightscoutUploadKit/Treatments/TempBasalNightscoutTreatment.swift

@@ -27,12 +27,11 @@ public class TempBasalNightscoutTreatment: NightscoutTreatment {
  self.temp = temp
  self.duration = duration
 
- super.init(timestamp: timestamp, enteredBy: enteredBy)
+ super.init(timestamp: timestamp, enteredBy: enteredBy, eventType: "Temp Basal")
  }
 
  override public var dictionaryRepresentation: [String: Any] {
  var rval = super.dictionaryRepresentation
- rval["eventType"] = "Temp Basal"
  rval["temp"] = temp.rawValue
  rval["rate"] = rate
  if let absolute = absolute {

NightscoutUploadKitTests/Info.plist

@@ -15,7 +15,7 @@
  <key>CFBundlePackageType</key>
  <string>BNDL</string>
  <key>CFBundleShortVersionString</key>
- <string>1.0</string>
+ <string>1.0.1</string>
  <key>CFBundleSignature</key>
  <string>????</string>
  <key>CFBundleVersion</key>