Merge branch 'master' into release/v2.6

README.md

@@ -28,13 +28,13 @@ These variables can be set in `.npmrc` file in the root of your Electron based p
 
 If there are no precompiled binaries for your platform, the install script will try to build them. You will need a working C++ compiler and the pc-ble-driver library available by cmake find_package.
 
-The recommended way to get pc-ble-driver is using vcpkg. There are two options getting vcpkg. One is to [download](https://github.com/NordicPlayground/vcpkg/releases/tag/2019-05-10) the released version, the other is to clone the repository and checkout tag/2019-05-10.
+The recommended way to get pc-ble-driver is using vcpkg. There are two options getting vcpkg. One is to [download](https://github.com/NordicPlayground/vcpkg/releases/tag/2019-06-09) the released version, the other is to clone the repository and checkout tag/2019-06-09.
  Afterwards vcpkg must be compiled for the target architecture used by your node executable. Then set the environment variable `VCPKG_ROOT` to the full path of the vcpkg install and repository and it will get automatically picked up when doing `npm install`.
 
 A full example of preparing building on Windows for 64-bit Node:
 
     $ git clone https://github.com/NordicPlayground/vcpkg.git
-    $ git checkout tags/2019-05-10
+    $ git checkout tags/2019-06-09
     $ ./vcpkg/bootstrap.bat
     $ ./vcpkg/vcpkg install nrf-ble-driver:x64-windows
 

api/adapter.js

@@ -3224,8 +3224,7 @@ class Adapter extends EventEmitter {
      * @param {string} serviceInstanceId The unique Id of this service.
      * @returns {Service} The service.
      */
-    getService(serviceInstanceId, callback) {
-        // TODO: Do read on service? callback?
+    getService(serviceInstanceId) {
         return this._services[serviceInstanceId];
     }
 

typings/index.d.ts

@@ -211,7 +211,7 @@ declare class Adapter extends EventEmitter {
   requestAttMtu(deviceInstanceId: string, mtu: number, callback?: (err: any, value: number) => void): void;
   getCurrentAttMtu(deviceInstanceId: string): number|undefined;
 
-  getService(serviceInstanceId: string, callback?: (err: any, service: Service) => void): Service;
+  getService(serviceInstanceId: string): Service;
   getServices(deviceInstanceId: string, callback?: (err: any, services: Array<Service>) => void): void;
   getCharacteristic(characteristicId: string): Characteristic;
   getCharacteristics(serviceInstanceId: string, callback?: (err: any, services: Array<Characteristic>) => void): void;
@@ -271,14 +271,14 @@ declare class Adapter extends EventEmitter {
 
 export declare class AdapterFactory extends EventEmitter {
   static getInstance(): AdapterFactory;
-  getAdapters(callback?: (err: any, adapters: Adapter[]) => void);
+  getAdapters(callback?: (err: any, adapters: Adapter[]) => void): void;
   createAdapter(sdVersion: 'v2' | 'v3', comName: string, instanceId: string): Adapter;
 }
 
 export declare class ServiceFactory {
-  createService(uuid: string, serviceType: string);
-  createCharacteristic(service: Service, uuid: string, value: Array<number>, properties: any, options: any);
-  createDescriptor(characteristic: Characteristic, uuid: string, value: Array<number>, options: any);
+  createService(uuid: string, serviceType: string): Service;
+  createCharacteristic(service: Service, uuid: string, value: Array<number>, properties: any, options: any): Characteristic;
+  createDescriptor(characteristic: Characteristic, uuid: string, value: Array<number>, options: any): Descriptor;
 }
 
 export declare interface KeyPair {