Skip to content

Commit 4efd881

Browse files
author
Marco Crespi
committed
Merge branch 'develop'
2 parents 869a580 + fb8a552 commit 4efd881

File tree

7 files changed

+354
-403
lines changed

7 files changed

+354
-403
lines changed

lib/bindings/hci/misc/Hci.d.ts

+5-3
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,11 @@ export declare class Hci extends TypedEmitter<HciEvents> {
3737
private socketTimer;
3838
private isSocketUp;
3939
private handles;
40-
private mutex;
4140
private currentCmd;
4241
private cmdTimeout;
42+
private cmdMutex;
43+
private connTimeout;
44+
private connMutex;
4345
private aclDataPacketLength;
4446
private totalNumAclDataPackets;
4547
private aclLeDataPacketLength;
@@ -48,7 +50,7 @@ export declare class Hci extends TypedEmitter<HciEvents> {
4850
constructor(devId?: number | {
4951
bus: number;
5052
address: number;
51-
}, cmdTimeout?: number);
53+
}, cmdTimeout?: number, connTimeout?: number);
5254
private static createSocket;
5355
static getDeviceList(): HciDevice[];
5456
private isInitializing;
@@ -69,7 +71,7 @@ export declare class Hci extends TypedEmitter<HciEvents> {
6971
setScanParameters(): Promise<void>;
7072
setScanEnabled(enabled: boolean, filterDuplicates: boolean): Promise<void>;
7173
createLeConn(address: string, addressType: AddressType, minInterval?: number, maxInterval?: number, latency?: number, supervisionTimeout?: number): Promise<number>;
72-
cancelLeConn(customMutex?: boolean): Promise<void>;
74+
cancelLeConn(): Promise<void>;
7375
connUpdateLe(handle: number, minInterval: number, maxInterval: number, latency: number, supervisionTimeout: number): Promise<void>;
7476
disconnect(handle: number, reason?: number): Promise<void>;
7577
readRssi(handle: number): Promise<number>;

lib/bindings/hci/misc/Hci.d.ts.map

+1-1
Original file line numberDiff line numberDiff line change

lib/bindings/hci/misc/Hci.js

+67-65
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/bindings/hci/misc/Hci.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)