diff --git a/xdrip/BluetoothTransmitter/CGM/Generic/CGMTransmitter.swift b/xdrip/BluetoothTransmitter/CGM/Generic/CGMTransmitter.swift index c3baa1ff..efcd6a37 100644 --- a/xdrip/BluetoothTransmitter/CGM/Generic/CGMTransmitter.swift +++ b/xdrip/BluetoothTransmitter/CGM/Generic/CGMTransmitter.swift @@ -238,7 +238,7 @@ enum CGMTransmitterType:String, CaseIterable { return "" case .dexcom: - return "voltA" + return "voltB" case .miaomiao, .Bubble, .Droplet1: return "%" diff --git a/xdrip/BluetoothTransmitter/CGM/Generic/TransmitterBatteryInfo.swift b/xdrip/BluetoothTransmitter/CGM/Generic/TransmitterBatteryInfo.swift index 8704aff0..0f70d694 100644 --- a/xdrip/BluetoothTransmitter/CGM/Generic/TransmitterBatteryInfo.swift +++ b/xdrip/BluetoothTransmitter/CGM/Generic/TransmitterBatteryInfo.swift @@ -33,9 +33,9 @@ enum TransmitterBatteryInfo: Equatable { return ("battery" , percentage) - case .DexcomG5(voltageA: let voltageA, voltageB: _, resist: _, runtime: _, temperature: _): + case .DexcomG5(voltageA: _, voltageB: let voltageB, resist: _, runtime: _, temperature: _): - return ("batteryVoltage" , voltageA) + return ("batteryVoltage" , voltageB) case .DexcomG4(level: let level): diff --git a/xdrip/Constants/ConstantsDefaultAlertLevels.swift b/xdrip/Constants/ConstantsDefaultAlertLevels.swift index 5e61eaa5..51dbad52 100644 --- a/xdrip/Constants/ConstantsDefaultAlertLevels.swift +++ b/xdrip/Constants/ConstantsDefaultAlertLevels.swift @@ -1,7 +1,7 @@ /// default alert levels to be used when creating defalt alert entries enum ConstantsDefaultAlertLevels { // default battery alert level, below this level an alert should be generated - this default value will be used when changing transmittertype - static let defaultBatteryAlertLevelDexcomG5 = 300 + static let defaultBatteryAlertLevelDexcomG5 = 260 static let defaultBatteryAlertLevelDexcomG4 = 210 static let defaultBatteryAlertLevelMiaoMiao = 20 static let defaultBatteryAlertLevelBubble = 20 diff --git a/xdrip/Managers/Alerts/AlertKind.swift b/xdrip/Managers/Alerts/AlertKind.swift index ef1f091c..eb2d026f 100644 --- a/xdrip/Managers/Alerts/AlertKind.swift +++ b/xdrip/Managers/Alerts/AlertKind.swift @@ -359,8 +359,8 @@ public enum AlertKind:Int, CaseIterable { switch transmitterBatteryInfo { case .percentage(let percentage): batteryLevelToCheck = percentage - case .DexcomG5(let voltageA, _, _, _, _): - batteryLevelToCheck = voltageA + case .DexcomG5(_, let voltageB, _, _, _): + batteryLevelToCheck = voltageB case .DexcomG4(let level): batteryLevelToCheck = level }