morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-15 00:34:08 +09:00
Code Issues Packages Projects Releases Wiki Activity

fix: temporarily disabled getting Bluetooth devices via CBCentralManager (#642)

Browse Source
This commit is contained in:
Serhiy Mytrovtsiy
2021-09-23 21:57:05 +02:00
parent 3530c8c747
commit 73f423f67d
2 changed files with 2 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

90
Modules/Bluetooth/readers.swift
View File

@@ -14,9 +14,8 @@ import Kit
import CoreBluetooth
import IOBluetooth
internal class DevicesReader: Reader<[BLEDevice]>, CBCentralManagerDelegate, CBPeripheralDelegate {
internal class DevicesReader: Reader<[BLEDevice]> {
private let queue = DispatchQueue(label: "eu.exelban.Stats.Bluetooth.reader", attributes: .concurrent)
private var manager: CBCentralManager!
private var _devices: [BLEDevice] = []
private var _uuidAddress: [UUID: String] = [:]
@@ -49,7 +48,6 @@ internal class DevicesReader: Reader<[BLEDevice]>, CBCentralManagerDelegate, CBP
init() {
super.init()
self.manager = CBCentralManager.init(delegate: self, queue: nil)
}
public override func read() {
@@ -181,90 +179,4 @@ internal class DevicesReader: Reader<[BLEDevice]>, CBCentralManagerDelegate, CBP
}
}
}
// MARK: - CBCentralManagerDelegate
func centralManagerDidUpdateState(_ central: CBCentralManager) {
if central.state == .poweredOff {
self.manager.stopScan()
} else if central.state == .poweredOn {
self.manager.scanForPeripherals(withServices: nil, options: nil)
}
}
func centralManager(_ central: CBCentralManager, didDiscover peripheral: CBPeripheral, advertisementData: [String: Any], rssi RSSI: NSNumber) {
guard let address = self.uuidAddress[peripheral.identifier] else {
return
}
guard let idx = self.devices.firstIndex(where: { $0.address == address && $0.conn == .ble }) else {
self.devices.append(BLEDevice(
conn: .ble,
address: address,
name: peripheral.name ?? "Unknown",
uuid: peripheral.identifier,
RSSI: Int(truncating: RSSI),
peripheral: peripheral
))
return
}
self.devices[idx].RSSI = Int(truncating: RSSI)
if peripheral.state == .disconnected {
central.connect(peripheral, options: nil)
} else if peripheral.state == .connected && !self.devices[idx].isPeripheralConnected {
peripheral.delegate = self
peripheral.discoverServices([batteryServiceUUID])
self.devices[idx].isPeripheralConnected = true
}
}
// MARK: - CBPeripheralDelegate
func peripheral(_ peripheral: CBPeripheral, didDiscoverServices error: Error?) {
guard error == nil else {
error_msg("didDiscoverServices: \(error!)")
return
}
guard let service = peripheral.services?.first(where: { $0.uuid == self.batteryServiceUUID }) else {
print("battery service not found, skipping")
return
}
peripheral.discoverCharacteristics([self.batteryCharacteristicsUUID], for: service)
debug("\(peripheral.identifier): discover bluetooth services")
}
func peripheral(_ peripheral: CBPeripheral, didDiscoverCharacteristicsFor service: CBService, error: Error?) {
guard error == nil else {
error_msg("didDiscoverCharacteristicsFor: \(error!)")
return
}
guard let batteryCharacteristics = service.characteristics?.first(where: { $0.uuid == self.batteryCharacteristicsUUID }) else {
print("characteristics not found")
return
}
self.characteristicsDict[peripheral.identifier] = batteryCharacteristics
peripheral.readValue(for: batteryCharacteristics)
debug("\(peripheral.identifier): discover battery service")
}
func peripheral(_ peripheral: CBPeripheral, didUpdateValueFor characteristic: CBCharacteristic, error: Error?) {
guard error == nil else {
error_msg("didUpdateValueFor: \(error!)")
return
}
if let batteryLevel = characteristic.value?[0], let idx = self.devices.firstIndex(where: { $0.uuid == peripheral.identifier }) {
self.devices[idx].batteryLevel = [KeyValue_t(key: "battery", value: "\(batteryLevel)")]
}
debug("\(peripheral.identifier): receive battery update")
}
}