ch/TempTrack-iOS
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Allow deletion of measurements

Browse Source
This commit is contained in:
Christoph Hagen
2023-06-13 17:14:57 +02:00
parent f731927dcd
commit 01a3aac91b
17 changed files with 239 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
TempTrack/Bluetooth/BluetoothClient.swift
View File

@@ -24,7 +24,7 @@ final class BluetoothClient: ObservableObject {
@Published
private(set) var deviceState: DeviceState = .disconnected {
didSet {
print("State: \(deviceState.text)")
print("State: \(deviceState)")
if case .configured = deviceState {
startRegularUpdates()
} else {
@@ -38,6 +38,11 @@ final class BluetoothClient: ObservableObject {
didSet {
updateDeviceTimeIfNeeded()
collectRecordedData()
if let deviceInfo, let runningTransfer {
runningTransfer.update(info: deviceInfo)
let next = runningTransfer.nextRequest()
addRequest(next)
}
}
}
@@ -95,7 +100,6 @@ final class BluetoothClient: ObservableObject {
return
}
let next = openRequests.removeFirst()
//print("Starting request \(next)")
guard connection.send(next.serialized) else {
print("Failed to start request \(next)")
@@ -106,9 +110,19 @@ final class BluetoothClient: ObservableObject {
}
func addRequest(_ request: BluetoothRequest) {
// TODO: Check if request already exists
defer {
performNextRequest()
}
let type = request.byte
if let runningRequest, runningRequest.byte == type {
print("Skipping duplicate request \(request)")
return
}
guard !openRequests.contains(where: { $0.byte == type }) else {
print("Skipping duplicate request \(request)")
return
}
openRequests.append(request)
performNextRequest()
}
// MARK: Device time
@@ -134,12 +148,15 @@ final class BluetoothClient: ObservableObject {
@discardableResult
func collectRecordedData() -> Bool {
guard runningTransfer == nil else {
print("Transfer already running")
return false
}
guard !openRequests.contains(where: { if case .getRecordingData = $0 { return true }; return false }) else {
print("Transfer already in scheduled")
return false
}
guard let info = deviceInfo else {
print("No device info to start transfer")
return false
}
guard info.numberOfStoredMeasurements > 0 else {
@@ -149,38 +166,27 @@ final class BluetoothClient: ObservableObject {
let transfer = TemperatureDataTransfer(info: info)
runningTransfer = transfer
let next = transfer.nextRequest()
print("Starting transfer")
addRequest(next)
return true
}
private func didReceive(data: Data, offset: Int, count: Int) {
guard let runningTransfer else {
print("No running transfer to process device data")
return // TODO: Start new transfer?
}
runningTransfer.add(data: data, offset: offset, count: count)
continueTransfer()
}
private func continueTransfer() {
guard let runningTransfer else {
return // TODO: Start new transfer?
}
let next = runningTransfer.nextRequest()
addRequest(next)
}
private func decode(info: Data) {
guard let newInfo = try? DeviceInfo(info: info) else {
print("Failed to decode device info")
return
}
self.deviceInfo = newInfo
if let runningTransfer {
runningTransfer.update(info: newInfo)
let next = runningTransfer.nextRequest()
addRequest(next)
} else if newInfo.numberOfStoredMeasurements > 0 {
collectRecordedData()
}
}
}
@@ -209,15 +215,31 @@ extension BluetoothClient: DeviceManagerDelegate {
case .success:
break
case .responseInProgress:
print("Device is busy for \(runningRequest)")
// Retry the request
addRequest(runningRequest)
return
case .invalidNumberOfBytesToDelete:
guard case .clearRecordingBuffer = runningRequest else {
// If clearing the recording buffer fails due to byte mismatch,
// then requesting new info will resolve the mismatch, and the transfer will be resumed
addRequest(.getInfo)
return
}
print("Request \(runningRequest) received non-matching responde about number of bytes to delete")
case .responseTooLarge:
guard case .getRecordingData = runningRequest else {
// If requesting bytes fails due to the response size,
// then requesting new info will update the response size, and the transfer will be resumed
addRequest(.getInfo)
return
}
print("Unexpectedly exceeded payload size for request \(runningRequest)")
default:
print("Unknown response \(data[0]) for request \(runningRequest)")
// If clearing the recording buffer fails due to byte mismatch,
// then requesting new info will resolve the mismatch, and the transfer will be resumed
// If requesting bytes fails due to the response size,
// then requesting new info will update the response size, and the transfer will be resumed
addRequest(.getInfo)
return
@@ -240,6 +262,7 @@ extension BluetoothClient: DeviceManagerDelegate {
private func didClearDeviceStorage() {
guard let runningTransfer else {
print("No running transfer after clearing device storage")
return
}
runningTransfer.completeTransfer()

4
TempTrack/Bluetooth/DeviceInfo.swift
View File

@@ -33,6 +33,8 @@ struct DeviceInfo {
let hasDeviceStartTimeSet: Bool
let wakeupReason: DeviceWakeCause
// MARK: Storage
let storageSize: Int
@@ -74,6 +76,7 @@ extension DeviceInfo {
let deviceStartTimeSeconds = try data.decodeFourByteInteger()
self.sensor0 = try data.decodeSensor()
self.sensor1 = try data.decodeSensor()
self.wakeupReason = .init(rawValue: try data.getByte()) ?? .WAKEUP_UNDEFINED
if deviceStartTimeSeconds != 0 {
self.hasDeviceStartTimeSet = true
@@ -101,6 +104,7 @@ extension DeviceInfo {
numberOfSecondsRunning: 20,
deviceStartTime: .now.addingTimeInterval(-20755),
hasDeviceStartTimeSet: true,
wakeupReason: .WAKEUP_EXT0,
storageSize: 10000,
transferBlockSize: 180)
}

1
TempTrack/Bluetooth/DeviceManager.swift
View File

@@ -78,7 +78,6 @@ final class DeviceManager: NSObject, CBCentralManagerDelegate {
return false
}
device.writeValue(data, for: characteristic, type: .withResponse)
//DispatchQueue.main.asyncAfter(deadline: .now() + .milliseconds(200)) { }
return self.read()
}

20
TempTrack/Bluetooth/DeviceState.swift
View File

@@ -26,27 +26,21 @@ enum DeviceState {
case .bluetoothEnabled:
return "Bluetooth enabled"
case .scanning:
return "Scanning for devices..."
return "Scanning..."
case .connecting(let device):
guard let name = device.name else {
return "Connecting to device..."
return "Connecting..."
}
return "Connecting to \(name)..."
case .discoveringServices(let device):
guard let name = device.name else {
return "Setting up device..."
}
return "Setting up \(name)..."
case .discoveringCharacteristic(let device):
guard let name = device.name else {
return "Setting up device..."
}
return "Setting up \(name)..."
case .discoveringServices:
return "Discovering service..."
case .discoveringCharacteristic:
return "Discovering characteristic..."
case .configured(let device, _):
guard let name = device.name else {
return "Connected"
}
return "Connected to \(name)"
return name
case .disconnected:
return "Not connected"
}

77
TempTrack/Bluetooth/DeviceWakeCause.swift Normal file
View File

@@ -0,0 +1,77 @@
import Foundation
enum DeviceWakeCause: UInt8 {
/// In case of deep sleep, reset was not caused by exit from deep sleep
case WAKEUP_UNDEFINED = 0
/// Not a wakeup cause, used to disable all wakeup sources with esp_sleep_disable_wakeup_source
case WAKEUP_ALL = 1
/// Wakeup caused by external signal using RTC_IO
case WAKEUP_EXT0 = 2
/// Wakeup caused by external signal using RTC_CNTL
case WAKEUP_EXT1 = 3
/// Wakeup caused by timer
case WAKEUP_TIMER = 4
/// Wakeup caused by touchpad
case WAKEUP_TOUCHPAD = 5
/// Wakeup caused by ULP program
case WAKEUP_ULP = 6
/// Wakeup caused by GPIO (light sleep only on ESP32, S2 and S3)
case WAKEUP_GPIO = 7
/// Wakeup caused by UART (light sleep only)
case WAKEUP_UART = 8
/// Wakeup caused by WIFI (light sleep only)
case WAKEUP_WIFI = 9
/// Wakeup caused by COCPU int
case WAKEUP_COCPU = 10
/// Wakeup caused by COCPU crash
case WAKEUP_COCPU_TRAP_TRIG = 11
/// Wakeup caused by BT (light sleep only)
case WAKEUP_BT = 12
}
extension DeviceWakeCause {
var text: String {
switch self {
case .WAKEUP_UNDEFINED:
return "Power On"
case .WAKEUP_ALL:
return ""
case .WAKEUP_EXT0:
return "Button"
case .WAKEUP_EXT1:
return "EXT1"
case .WAKEUP_TIMER:
return "Timer"
case .WAKEUP_TOUCHPAD:
return "Touch"
case .WAKEUP_ULP:
return "ELP"
case .WAKEUP_GPIO:
return "GPIO"
case .WAKEUP_UART:
return "UART"
case .WAKEUP_WIFI:
return "WiFi"
case .WAKEUP_COCPU:
return "CoCPU Interupt"
case .WAKEUP_COCPU_TRAP_TRIG:
return "CoCPU Crash"
case .WAKEUP_BT:
return "Bluetooth"
}
}
}