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

M5Stack : moved M5StackBluetoothDelegate to other folder

This commit is contained in:
Johan Degraeve 2019-11-11 17:57:59 +01:00
parent 98979c9146
commit 2144d3945e
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xdrip.xcodeproj/project.pbxproj
View File

@ -26,6 +26,7 @@
F80ED2EC236F68F90005C035 /* SettingsViewM5StackBluetoothSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80ED2E9236F68F90005C035 /* SettingsViewM5StackBluetoothSettingsViewModel.swift */; };
F80ED2ED236F68F90005C035 /* SettingsViewM5StackGeneralSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80ED2EA236F68F90005C035 /* SettingsViewM5StackGeneralSettingsViewModel.swift */; };
F80ED2EE236F68F90005C035 /* SettingsViewM5StackWiFiSettingsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80ED2EB236F68F90005C035 /* SettingsViewM5StackWiFiSettingsViewModel.swift */; };
F80ED2F32379C6CD0005C035 /* M5StackBluetoothDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F80ED2F22379C6CD0005C035 /* M5StackBluetoothDelegate.swift */; };
F81D6D4822BD5F62005EFAE2 /* DexcomShareUploadManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = F81D6D4722BD5F62005EFAE2 /* DexcomShareUploadManager.swift */; };
F81D6D4E22BFC762005EFAE2 /* TextsDexcomShareTestResult.swift in Sources */ = {isa = PBXBuildFile; fileRef = F81D6D4D22BFC762005EFAE2 /* TextsDexcomShareTestResult.swift */; };
F81D6D5222C27F18005EFAE2 /* BgReading+DexcomShare.swift in Sources */ = {isa = PBXBuildFile; fileRef = F81D6D5122C27F18005EFAE2 /* BgReading+DexcomShare.swift */; };
@ -102,7 +103,6 @@
F8A389C3231F1A4B0010F405 /* M5StackReadBlePassWordTxMessage.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A389C2231F1A4B0010F405 /* M5StackReadBlePassWordTxMessage.swift */; };
F8A389C6231FBA110010F405 /* M5StackPacket.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A389C5231FBA110010F405 /* M5StackPacket.swift */; };
F8A389C823203E3E0010F405 /* ConstantsM5Stack.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A389C723203E3E0010F405 /* ConstantsM5Stack.swift */; };
F8A389CA232118E80010F405 /* M5StackBluetoothDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A389C9232118E80010F405 /* M5StackBluetoothDelegate.swift */; };
F8A389CC232191280010F405 /* M5StackUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A389CB232191280010F405 /* M5StackUtilities.swift */; };
F8A389CF232AE2EA0010F405 /* M5StackSettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A389CE232AE2E90010F405 /* M5StackSettingsViewController.swift */; };
F8A389E7232ECE7E0010F405 /* SettingsViewUtilities.swift in Sources */ = {isa = PBXBuildFile; fileRef = F8A389E6232ECE7E0010F405 /* SettingsViewUtilities.swift */; };
@ -267,6 +267,7 @@
F80ED2E9236F68F90005C035 /* SettingsViewM5StackBluetoothSettingsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsViewM5StackBluetoothSettingsViewModel.swift; sourceTree = "<group>"; };
F80ED2EA236F68F90005C035 /* SettingsViewM5StackGeneralSettingsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsViewM5StackGeneralSettingsViewModel.swift; sourceTree = "<group>"; };
F80ED2EB236F68F90005C035 /* SettingsViewM5StackWiFiSettingsViewModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsViewM5StackWiFiSettingsViewModel.swift; sourceTree = "<group>"; };
F80ED2F22379C6CD0005C035 /* M5StackBluetoothDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = M5StackBluetoothDelegate.swift; sourceTree = "<group>"; };
F81D6D4522B67F55005EFAE2 /* pt */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = pt; path = pt.lproj/SpeakReading.strings; sourceTree = "<group>"; };
F81D6D4722BD5F62005EFAE2 /* DexcomShareUploadManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DexcomShareUploadManager.swift; sourceTree = "<group>"; };
F81D6D4D22BFC762005EFAE2 /* TextsDexcomShareTestResult.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TextsDexcomShareTestResult.swift; sourceTree = "<group>"; };
@ -399,7 +400,6 @@
F8A389C2231F1A4B0010F405 /* M5StackReadBlePassWordTxMessage.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = M5StackReadBlePassWordTxMessage.swift; sourceTree = "<group>"; };
F8A389C5231FBA110010F405 /* M5StackPacket.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = M5StackPacket.swift; sourceTree = "<group>"; };
F8A389C723203E3E0010F405 /* ConstantsM5Stack.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ConstantsM5Stack.swift; sourceTree = "<group>"; };
F8A389C9232118E80010F405 /* M5StackBluetoothDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = M5StackBluetoothDelegate.swift; sourceTree = "<group>"; };
F8A389CB232191280010F405 /* M5StackUtilities.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = M5StackUtilities.swift; sourceTree = "<group>"; };
F8A389CE232AE2E90010F405 /* M5StackSettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = M5StackSettingsViewController.swift; sourceTree = "<group>"; };
F8A389E6232ECE7E0010F405 /* SettingsViewUtilities.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SettingsViewUtilities.swift; sourceTree = "<group>"; };
@ -987,6 +987,7 @@
F8A389B82315DB080010F405 /* M5Stack */ = {
isa = PBXGroup;
children = (
F80ED2F22379C6CD0005C035 /* M5StackBluetoothDelegate.swift */,
F8A389C4231FB9B30010F405 /* Utilities */,
F8A389BD231DC7DC0010F405 /* M5StackMessages */,
F8A389B92315DC060010F405 /* M5StackBluetoothTransmitter.swift */,
@ -1008,7 +1009,6 @@
isa = PBXGroup;
children = (
F8A389C5231FBA110010F405 /* M5StackPacket.swift */,
F8A389C9232118E80010F405 /* M5StackBluetoothDelegate.swift */,
F8A389CB232191280010F405 /* M5StackUtilities.swift */,
);
path = Utilities;
@ -1790,7 +1790,6 @@
F8EEDD5422FF685400D2D610 /* NSMutableURLRequest.swift in Sources */,
F897AAFB2201018800CDDD10 /* String.swift in Sources */,
F889CB60236C3DCB00A81068 /* CGMBlueReaderTransmitter.swift in Sources */,
F8A389CA232118E80010F405 /* M5StackBluetoothDelegate.swift in Sources */,
F8B3A847227F090E004BA588 /* SettingsViewNightScoutSettingsViewModel.swift in Sources */,
F8B3A79622635A25004BA588 /* AlertEntry+CoreDataClass.swift in Sources */,
F804870C2336D90200EBDDB7 /* M5Stack+CoreDataClass.swift in Sources */,
@ -1857,6 +1856,7 @@
F8F6226C233A85CE00BE8796 /* M5StackManager.swift in Sources */,
F8A389C6231FBA110010F405 /* M5StackPacket.swift in Sources */,
F8B3A846227F090E004BA588 /* SettingsViewTransmitterSettingsViewModel.swift in Sources */,
F80ED2F32379C6CD0005C035 /* M5StackBluetoothDelegate.swift in Sources */,
F821CF6B229FC22D005C1E43 /* Endpoint.swift in Sources */,
F821CF58229BF43A005C1E43 /* AlertManager.swift in Sources */,
F8A389CC232191280010F405 /* M5StackUtilities.swift in Sources */,

6
xdrip/Managers/M5Stack/M5StackManager.swift
View File

@ -381,7 +381,7 @@ extension M5StackManager: M5StackManaging {
return Array(m5StacksBlueToothTransmitters.keys)
}
/// sets flag m5StacksParameterUpdateNeeded for m5Stack to true
/// sets flag parameterUpdateNeeded for m5Stack to true
func updateNeeded(forM5Stack m5Stack: M5Stack) {
m5Stack.parameterUpdateNeeded = true
}
@ -401,11 +401,11 @@ extension M5StackManager: M5StackBluetoothDelegate {
/// m5Stack is asking for an update of all parameters, send them
func isAskingForAllParameters(m5Stack: M5Stack) {
// send all parameters, if successful,then for this m5Stack we can set m5StacksParameterUpdateNeeded to false
// send all parameters, if successful,then for this m5Stack we can set parameterUpdateNeeded to false
if sendAllParameters(toM5Stack: m5Stack) {
m5Stack.parameterUpdateNeeded = false
} else {
// failed, so we need to set m5StacksParameterUpdateNeeded to true, so that next time it connects we will send all parameters
// failed, so we need to set parameterUpdateNeeded to true, so that next time it connects we will send all parameters
m5Stack.parameterUpdateNeeded = true
}

0
xdrip/Transmitter/M5Stack/Utilities/M5StackBluetoothDelegate.swift → xdrip/Transmitter/M5Stack/M5StackBluetoothDelegate.swift
View File

2
xdrip/Transmitter/M5Stack/M5StackBluetoothTransmitter.swift
View File

@ -413,7 +413,7 @@ final class M5StackBluetoothTransmitter: BluetoothTransmitter, BluetoothTransmit
}
case .readTimeStampRx:
// M5Stack is requesting for password
// M5Stack is requesting for timestamp
sendLocalTimeAndUTCTimeOffSetInSecondsToM5Stack()
case .readAllParametersRx: