Add filter for and services #24

brymez1609 · 2020-10-05T21:16:57Z

No description provided.

…pheralImp

…riptors

CLAassistant · 2020-10-05T21:17:01Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.

Wilson Jaramillo seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

…ng empty array

jpsoultanis

Thanks for the contribution to RxCBCentral! In general things look good, just please cleanup debugging comments and remove your print statements.

jpsoultanis · 2020-10-09T23:52:08Z

Sources/RxCBCentral/RxPeripheral.swift

@@ -80,6 +80,10 @@ public protocol RxPeripheral: AnyObject {
    /// The data returned will be processed by the `Preprocessor` given when registering
    /// for notifications for this `characteristic`, if one was provided.
    func notificationData(for characteristic: CBUUID) -> Observable<Data>
+
+    /// Validate if service exist
+    func hasService(service: CBUUID) -> Observable<Bool>


Nice addition, can you use modify this interface to use more Swift style naming, like:

func hasService(_ service: CBUUID) -> Observable<Bool>

jpsoultanis · 2020-10-09T23:53:24Z

Sources/RxCBCentral/core/RxPeripheralImpl.swift

+                    print("RFN ",services.count, services)
+                    print("RFN ",services.first?.uuid.uuidString, service.uuidString)


Printing is helpful for debugging purposes but we don't want to ship the library with live print statements. Please remove or add these to the logger.

jpsoultanis · 2020-10-09T23:54:27Z

Sources/RxCBCentral/core/RxPeripheralImpl.swift

+                    print("RFN characteristics ",characteristics.count, characteristics)
+                    for c in characteristics {
+                        print(c.uuid.uuidString, characteristic.uuidString)
+                        if(c.uuid.uuidString == characteristic.uuidString){
+                            return (c, error)
+                        }
+                    }
+                    print("not found , what to do, raise an error")
+                    return (characteristics.first,GattError.characteristicNotFound)
+//                    print("RFN ",characteristics.first?.uuid.uuidString , characteristic.uuidString)
+//                    let characteristic = characteristics.first { $0.uuid.uuidString == characteristic.uuidString }
+//                    return (characteristic, error)


Cleanup required

jpsoultanis · 2020-10-09T23:55:05Z

Sources/RxCBCentral/core/RxPeripheralImpl.swift

+//                des.setValue(<#T##value: Any?##Any?#>, forKey: <#T##String#>)
+                print("BEGIN:SPAKA DESCRIPTOR========>\(des)")
+//                self.peripheral.setNotifyValue(true, for: characteristic)


cleanup required

jpsoultanis · 2020-10-09T23:56:46Z

Sources/RxCBCentral/core/RxPeripheralImpl.swift

+        if characteristic.value != nil {
+            let value = characteristic.value?.subdata(in: Range(1...2)).withUnsafeBytes {$0.load(as: UInt8.self)}
+            print("didUpdateValueFor Characteristic", characteristic, " value:", value ?? "No data 324")
+        }


Please delete, since we don't want to ship the library with live print statements

mustafagunes

First, thank you very much for sending a pull request 👏. But some changes need to be made. Please follow the changes I suggest. After that, your pull request will be reviewed 🙂

mustafagunes · 2021-01-21T12:54:35Z

Sources/RxCBCentral/RxPeripheral.swift

@@ -80,6 +80,12 @@ public protocol RxPeripheral: AnyObject {
    /// The data returned will be processed by the `Preprocessor` given when registering
    /// for notifications for this `characteristic`, if one was provided.
    func notificationData(for characteristic: CBUUID) -> Observable<Data>
+
+    /// Validate if service exist
+    func hasService(service: CBUUID) -> Observable<Bool>


Suggested change

func hasService(service: CBUUID) -> Observable<Bool>

func hasService(_ service: CBUUID) -> Observable<Bool>

mustafagunes · 2021-01-21T12:56:33Z

Sources/RxCBCentral/core/RxPeripheralImpl.swift

+                if (services.count == 0){
+                    return false
+                } else {
+                    return true
+                }


Suggested change

if (services.count == 0){

return false

} else {

return true

}

return services.count == 0 ? false : true

mustafagunes · 2021-01-21T12:57:21Z

Sources/RxCBCentral/core/RxPeripheralImpl.swift

@@ -94,8 +101,10 @@ class RxPeripheralImpl: NSObject, RxPeripheral, CBPeripheralDelegate {
            }
            .take(1)
            .map { (characteristics: [CBCharacteristic], error: Error?) -> (CBCharacteristic?, Error?) in
+                print("READ \(#line) ",characteristics.first?.uuid.uuidString,characteristic.uuidString)


Suggested change

print("READ \(#line) ",characteristics.first?.uuid.uuidString,characteristic.uuidString)

mustafagunes · 2021-01-21T12:57:34Z

Sources/RxCBCentral/core/RxPeripheralImpl.swift

                 // check that given characteristic exists on the peripheral
                let characteristic = characteristics.first { $0.uuid.uuidString == characteristic.uuidString }
+                print("READ after \(#line) ",characteristic)


Suggested change

print("READ after \(#line) ",characteristic)

mustafagunes · 2021-01-21T12:58:33Z

Sources/RxCBCentral/core/RxPeripheralImpl.swift

                    let matchingService = services.first { $0.uuid.uuidString == service.uuidString }
                    return (matchingService, error)
                }
                .take(1)
                .flatMapLatest { (matchingService: CBService?, error: Error?) -> Observable<([CBCharacteristic], Error?)> in
+                    print("MATCHINGSERVICE :",matchingService)


Suggested change

print("MATCHINGSERVICE :",matchingService)

mustafagunes · 2021-01-21T13:13:33Z

Sources/RxCBCentral/core/RxPeripheralImpl.swift

+        if characteristic.value != nil {
+            let cmd = [UInt8](characteristic.value ?? Data(_:[0x00]))
+            print("didUpdateValueFor UINT8: ",cmd)
+        }


Suggested change

if characteristic.value != nil {

let cmd = [UInt8](characteristic.value ?? Data(_:[0x00]))

print("didUpdateValueFor UINT8: ",cmd)

}

mustafagunes · 2021-01-21T13:13:53Z

Sources/RxCBCentral/mocks/Mocks.swift

@@ -243,6 +243,10 @@ public class BluetoothDetectorTypeMock: BluetoothDetectorType {
 }

 public class CBPeripheralTypeMock: CBPeripheralType {
+    public func discoverDescriptors(for characteristic: CBCharacteristic) {
+        print("ok")


Please arrange here.

mustafagunes · 2021-01-21T13:14:12Z

Sources/RxCBCentral/mocks/Mocks.swift

+    public func hasService(service: CBUUID) -> Observable<Bool>{
+        return Observable.just(true)
+    }
+    public func setIndicateDescriptor(service: CBUUID, characteristic: CBUUID, preprocessor: Preprocessor? = nil) -> Observable<Bool>{
+        return Observable.just(true)
+    }


Suggested change

public func hasService(service: CBUUID) -> Observable<Bool>{

return Observable.just(true)

}

public func setIndicateDescriptor(service: CBUUID, characteristic: CBUUID, preprocessor: Preprocessor? = nil) -> Observable<Bool>{

return Observable.just(true)

}

public func hasService(service: CBUUID) -> Observable<Bool>{

return Observable.just(true)

}

public func setIndicateDescriptor(service: CBUUID, characteristic: CBUUID, preprocessor: Preprocessor? = nil) -> Observable<Bool>{

return Observable.just(true)

}

mustafagunes · 2021-01-21T13:15:28Z

Sources/RxCBCentral/core/RxPeripheralImpl.swift

+    }
+
+    public func setIndicateDescriptor(service: CBUUID, characteristic: CBUUID, preprocessor: Preprocessor? = nil) -> Observable<Bool>{
+        print("setIndicateDescriptor")


Suggested change

print("setIndicateDescriptor")

mustafagunes · 2021-01-21T13:15:43Z

Sources/RxCBCentral/core/RxPeripheralImpl.swift

+            }
+            .take(1)
+            .flatMapLatest { (matchingService: CBService?, error: Error?) -> Observable<([CBCharacteristic], Error?)> in
+                print("MATCHINGSERVICE SID :",matchingService)


Suggested change

print("MATCHINGSERVICE SID :",matchingService)

Wilson Jaramillo and others added 4 commits September 25, 2020 21:12

Modify registerForNotification Method and hasService method on RxPeri…

5ff9e1f

…pheralImp

create SetIndicate Descriptors using setNotify after discovering desc…

c719039

…riptors

UPDATE setIndicateDescriptor func on RxImplementation

093e8fd

Add filter for AND services

65fb2ef

Wilson Jaramillo added 3 commits October 5, 2020 18:19

Debug on didUpdateValue For

3261f06

Modify filter args for services and characteristics observers returni…

5072286

…ng empty array

Merge branch 'master' into add-filter-for-and-services

07663d1

jpsoultanis suggested changes Oct 9, 2020

View reviewed changes

mustafagunes suggested changes Jan 21, 2021

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add filter for and services #24

Add filter for and services #24

brymez1609 commented Oct 5, 2020

CLAassistant commented Oct 5, 2020

jpsoultanis left a comment

jpsoultanis Oct 9, 2020

jpsoultanis Oct 9, 2020

jpsoultanis Oct 9, 2020

jpsoultanis Oct 9, 2020

jpsoultanis Oct 9, 2020

mustafagunes left a comment •

edited

mustafagunes Jan 21, 2021

mustafagunes Jan 21, 2021

mustafagunes Jan 21, 2021

mustafagunes Jan 21, 2021

mustafagunes Jan 21, 2021

mustafagunes Jan 21, 2021

mustafagunes Jan 21, 2021

mustafagunes Jan 21, 2021

mustafagunes Jan 21, 2021

mustafagunes Jan 21, 2021

		print("RFN ",services.count, services)
		print("RFN ",services.first?.uuid.uuidString, service.uuidString)

	func hasService(service: CBUUID) -> Observable<Bool>
	func hasService(_ service: CBUUID) -> Observable<Bool>

Add filter for and services #24

Are you sure you want to change the base?

Add filter for and services #24

Conversation

brymez1609 commented Oct 5, 2020

CLAassistant commented Oct 5, 2020

jpsoultanis left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mustafagunes left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mustafagunes left a comment •

edited