mirrors
/
xdripswift
mirror of https://github.com/JohanDegraeve/xdripswift.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix for Dexcom calibration

This commit is contained in:
Johan Degraeve 2019-05-29 14:55:15 +02:00
parent aed5cf9118
commit 2ed0768975
2 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
xdrip/Transmitter/CGMBluetoothTransmitter/G5/CGMG5Transmitter.swift
View File

@ -118,7 +118,18 @@ class CGMG5Transmitter:BluetoothTransmitter, BluetoothTransmitterDelegate, CGMTr
// start scanning
_ = startScanning()
}
public func temptesting() {
// test
let testdata = RawGlucoseData(timeStamp: Date(), glucoseLevelRaw: 130000, glucoseLevelFiltered: 130000)
let testdata2 = RawGlucoseData(timeStamp: Date(timeIntervalSinceNow: -300), glucoseLevelRaw: 120000, glucoseLevelFiltered: 120000)
debuglogging("timestamp testdata = " + testdata.timeStamp.description)
debuglogging("timestamp testdata2 = " + testdata2.timeStamp.description)
var testdataasarray = [testdata,testdata2]
cgmTransmitterDelegate?.cgmTransmitterInfoReceived(glucoseData: &testdataasarray, transmitterBatteryInfo: nil, sensorState: nil, sensorTimeInMinutes: nil, firmware: nil, hardware: nil, serialNumber: nil, bootloader: nil)
}
// MARK: public functions
func doG5Reset() {

20
xdrip/View Controllers/Root View Controller/RootViewController.swift
View File

@ -109,6 +109,9 @@ final class RootViewController: UIViewController {
// update label texts, minutes ago, diff and value
self.updateLabels()
// create transmitter based on UserDefaults
self.initializeCGMTransmitter()
})
@ -122,9 +125,6 @@ final class RootViewController: UIViewController {
UserDefaults.standard.addObserver(self, forKeyPath: UserDefaults.Key.isMaster.rawValue, options: .new
, context: nil)
// create transmitter based on UserDefaults
initializeCGMTransmitter()
// setup delegate for UNUserNotificationCenter
UNUserNotificationCenter.current().delegate = self
@ -232,7 +232,7 @@ final class RootViewController: UIViewController {
}
}
if let activeSensor = activeSensor, let calibrator = self.calibrator, let bgReadingsAccessor = self.bgReadingsAccessor {
if let activeSensor = activeSensor, let calibrator = calibrator, let bgReadingsAccessor = bgReadingsAccessor {
// initialize help variables
var latest3BgReadings = bgReadingsAccessor.getLatestBgReadings(limit: 3, howOld: nil, forSensor: activeSensor, ignoreRawData: false, ignoreCalculatedValue: false)
@ -264,7 +264,13 @@ final class RootViewController: UIViewController {
// if no two calibration exist yet then create calibration request notification, otherwise a bgreading notification and update labels
if firstCalibrationForActiveSensor == nil && lastCalibrationForActiveSensor == nil {
createInitialCalibrationRequest()
// there must be at least 2 readings
let latestReadings = bgReadingsAccessor.getLatestBgReadings(limit: 36, howOld: nil, forSensor: activeSensor, ignoreRawData: false, ignoreCalculatedValue: true)
if latestReadings.count > 1 {
createInitialCalibrationRequest()
}
} else {
// update notification
createBgReadingNotification()
@ -323,7 +329,7 @@ final class RootViewController: UIViewController {
// MARK: - View Methods
/// Configure View
/// Configure View, only stuff that is independent of coredata
private func setupView() {
// set texts for buttons on top
@ -471,8 +477,8 @@ final class RootViewController: UIViewController {
case .dexcomG5:
if let currentTransmitterId = UserDefaults.standard.transmitterId {
cgmTransmitter = CGMG5Transmitter(address: UserDefaults.standard.bluetoothDeviceAddress, transmitterID: currentTransmitterId, delegate: self)
calibrator = DexcomCalibrator()
cgmTransmitter = CGMG5Transmitter(address: UserDefaults.standard.bluetoothDeviceAddress, transmitterID: currentTransmitterId, delegate: self)
}
case .miaomiao: