diff --git a/App-iOS-Wearable/App-iOS-Wearable.xcodeproj/project.xcworkspace/xcuserdata/sedeam.xcuserdatad/UserInterfaceState.xcuserstate b/App-iOS-Wearable/App-iOS-Wearable.xcodeproj/project.xcworkspace/xcuserdata/sedeam.xcuserdatad/UserInterfaceState.xcuserstate index 696accb..269bad1 100644 Binary files a/App-iOS-Wearable/App-iOS-Wearable.xcodeproj/project.xcworkspace/xcuserdata/sedeam.xcuserdatad/UserInterfaceState.xcuserstate and b/App-iOS-Wearable/App-iOS-Wearable.xcodeproj/project.xcworkspace/xcuserdata/sedeam.xcuserdatad/UserInterfaceState.xcuserstate differ diff --git a/App-iOS-Wearable/App-iOS-Wearable.xcodeproj/xcuserdata/sedeam.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/App-iOS-Wearable/App-iOS-Wearable.xcodeproj/xcuserdata/sedeam.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist new file mode 100644 index 0000000..cc1e84d --- /dev/null +++ b/App-iOS-Wearable/App-iOS-Wearable.xcodeproj/xcuserdata/sedeam.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist @@ -0,0 +1,6 @@ + + + diff --git a/App-iOS-Wearable/App-iOS-Wearable/Controller/Activities/ActivitiesViewController.swift b/App-iOS-Wearable/App-iOS-Wearable/Controller/Activities/ActivitiesViewController.swift index 4345787..ffedf8a 100644 --- a/App-iOS-Wearable/App-iOS-Wearable/Controller/Activities/ActivitiesViewController.swift +++ b/App-iOS-Wearable/App-iOS-Wearable/Controller/Activities/ActivitiesViewController.swift @@ -6,7 +6,6 @@ // import UIKit -import CoreBluetooth class ActivitiesViewController: UIViewController, BluetoothManagerDelegate { @@ -26,7 +25,6 @@ class ActivitiesViewController: UIViewController, BluetoothManagerDelegate { title = "Actividades" BluetoothManager.shared.delegate = self - BluetoothManager.shared.searchForDevices() } @IBAction func connectButtonTapped(_ sender: UIButton) { @@ -84,11 +82,4 @@ class ActivitiesViewController: UIViewController, BluetoothManagerDelegate { print("Datos del MPU6050: \(data)") } } - - func didDiscoverPeripherals(peripherals: [CBPeripheral]) { - print("Dispositivos encontrados: ") - for peripheral in peripherals { - print("Nombre: \(peripheral.name ?? "Sin nombre"), UUID: \(peripheral.identifier.uuidString)") - } - } } diff --git a/App-iOS-Wearable/App-iOS-Wearable/Model/BLE/BluetoothManager.swift b/App-iOS-Wearable/App-iOS-Wearable/Model/BLE/BluetoothManager.swift index 7b338ac..b82250b 100644 --- a/App-iOS-Wearable/App-iOS-Wearable/Model/BLE/BluetoothManager.swift +++ b/App-iOS-Wearable/App-iOS-Wearable/Model/BLE/BluetoothManager.swift @@ -10,7 +10,6 @@ import CoreBluetooth protocol BluetoothManagerDelegate: AnyObject { func didUpdateConnectionStatus(isConnected: Bool) func didReceiveData(fromCharacteristic uuid: String, data: String) - func didDiscoverPeripherals(peripherals: [CBPeripheral]) // delegado a notificar de dispositivos encontrados } class BluetoothManager: NSObject, CBCentralManagerDelegate, CBPeripheralDelegate { @@ -25,7 +24,8 @@ class BluetoothManager: NSObject, CBCentralManagerDelegate, CBPeripheralDelegate private var centralManager: CBCentralManager! private var esp32Peripheral: CBPeripheral? private var characteristics: [CBUUID: CBCharacteristic] = [:] // variable para almacenar características encontradas - private var discoveredPeripherals: [CBPeripheral] = [] // almacenar dispositivos encontrados + + private let deviceName = "ESP_32_BLE_ITM" // Nombre del wearable para realizar conexión weak var delegate: BluetoothManagerDelegate? // delegado para notificaciones @@ -37,7 +37,7 @@ class BluetoothManager: NSObject, CBCentralManagerDelegate, CBPeripheralDelegate // inicia el escaneo de dispositivos func startScanning() { if centralManager.state == .poweredOn { - centralManager.scanForPeripherals(withServices: [SERVICE_UUID], options: nil) + // centralManager.scanForPeripherals(withServices: [SERVICE_UUID], options: nil) centralManager.scanForPeripherals(withServices: nil, options: nil) print("Buscando ESP32...") } @@ -65,7 +65,7 @@ class BluetoothManager: NSObject, CBCentralManagerDelegate, CBPeripheralDelegate let uuid = peripheral.identifier.uuidString print("Dispositivo detectado: \(deviceName) - UUID: \(uuid)") - if peripheral.name == "ESP_32_BLE_ITM" { + if peripheral.name == self.deviceName { self.esp32Peripheral = peripheral self.esp32Peripheral?.delegate = self centralManager.stopScan() @@ -76,7 +76,7 @@ class BluetoothManager: NSObject, CBCentralManagerDelegate, CBPeripheralDelegate // CBCentralManagerDelegate - Conexión exitosa func centralManager(_ central: CBCentralManager, didConnect peripheral: CBPeripheral) { - print("Conectado al ESP32") + print("Dispositivo iOS conectado a: \(self.deviceName)") delegate?.didUpdateConnectionStatus(isConnected: true) esp32Peripheral?.discoverServices(nil) // descubrir todos los servicios } @@ -125,15 +125,14 @@ class BluetoothManager: NSObject, CBCentralManagerDelegate, CBPeripheralDelegate print("Comando enviado: \(command)") } + // Función para buscar dispositivos BLE / depuraciones func searchForDevices() { - discoveredPeripherals.removeAll() if centralManager.state == .poweredOn { centralManager.scanForPeripherals(withServices: nil, options: nil) print("Buscando dispositivos BLE...") - DispatchQueue.main.asyncAfter(deadline: .now() + 5) { + DispatchQueue.main.asyncAfter(deadline: .now() + 2) { self.centralManager.stopScan() print("Deteniendo escaneo") - self.delegate?.didDiscoverPeripherals(peripherals: self.discoveredPeripherals) } } else { print("Bluetooth no esta disponible")