diff --git a/.travis.yml b/.travis.yml index 49207d4..6ff74a5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,21 +39,25 @@ matrix: ######## - name: '[OSX] Node.js v6.x' + sudo: required os: osx osx_image: xcode9.3 node_js: '6' - name: '[OSX] Node.js v8.x' + sudo: required os: osx osx_image: xcode9.3 node_js: '8' - name: '[OSX] Node.js v10.x xcode` 9.3' + sudo: required os: osx osx_image: xcode9.3 node_js: '10' - name: '[OSX] Node.js v10.x xcode10' + sudo: required os: osx osx_image: xcode10 node_js: '10' @@ -64,6 +68,35 @@ matrix: - 'echo -e "Host *\n\tStrictHostKeyChecking no\n" >> ~/.ssh/config' - semantic-release + ########### + # Windows # + ########### + # Travis builds are failing on windows when adding secret environment variables + # this is due to a naming issue with nvs + # https://travis-ci.community/t/windows-instances-hanging-before-install/250/15 + # + # - name: '[Windows] Node.js v6.x' + # sudo: required + # os: windows + # env: TARGET_ARCH=x64 + # node_js: '6' + # before_install: + # - npm install --global --production windows-build-tools + # - name: '[Windows] Node.js v8.x' + # sudo: required + # os: windows + # env: TARGET_ARCH=x64 + # node_js: '8' + # before_install: + # - npm install --global --production windows-build-tools + # - name: '[Windows] Node.js v10.x' + # sudo: required + # os: windows + # env: TARGET_ARCH=x64 + # node_js: '10' + # before_install: + # - npm install --global --production windows-build-tools + branches: only: - master diff --git a/package-lock.json b/package-lock.json index ce17971..3725d66 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10795,9 +10795,9 @@ } }, "typescript": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz", - "integrity": "sha512-VCj5UiSyHBjwfYacmDuc/NOk4QQixbE+Wn7MFJuS0nRuPQbof132Pw4u53dm264O8LPc2MVsc7RJNml5szurkg==", + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.2.4.tgz", + "integrity": "sha512-0RNDbSdEokBeEAkgNbxJ+BLwSManFy9TeXz8uW+48j/xhEXv1ePME60olyzw2XzUqUBNAYFeJadIqAgNqIACwg==", "dev": true }, "uglify-js": { diff --git a/package.json b/package.json index 8daf70a..00b50b1 100644 --- a/package.json +++ b/package.json @@ -138,7 +138,7 @@ "tslint": "^5.12.1", "tslint-config-prettier": "^1.17.0", "tslint-eslint-rules": "^5.4.0", - "typescript": "^3.2.2", + "typescript": "^3.2.4", "watch": "^1.0.2" } } diff --git a/src/drone.ts b/src/drone.ts index 7b929ab..922767f 100644 --- a/src/drone.ts +++ b/src/drone.ts @@ -41,6 +41,7 @@ export default class Drone extends EventEmitter { '4300cf1909090100', '4300cf1907090100', '4300cf190a090100', + '4300cf190b090100', ] const localNameMatch = @@ -49,9 +50,12 @@ export default class Drone extends EventEmitter { return localName.startsWith(name) }) >= 0 - const manufacturerMatch = - manufacturer && - acceptedManufacturers.indexOf(manufacturer.toString('hex')) >= 0 + let manufacturerMatch = false + + if (manufacturer) { + const hexManufacturer = manufacturer.toString('hex') + manufacturerMatch = acceptedManufacturers.indexOf(hexManufacturer) >= 0 + } // Is true for EITHER a valid name prefix OR manufacturer code. return localNameMatch || manufacturerMatch diff --git a/tsconfig.json b/tsconfig.json index 606b3a8..0f566ac 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -4,7 +4,7 @@ "module": "commonjs", "allowJs": false, "declaration": true, - "target": "es2017", + "target": "es2015", "rootDir": "src" }, "include": ["src/**/*"],