diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 2d7d8923e..a456d33a9 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -9,8 +9,8 @@ "version": "3.29.1", "license": "Apache-2.0", "dependencies": { - "@particle/device-constants": "^3.5.0", - "binary-version-reader": "^2.5.1", + "@particle/device-constants": "^3.6.0", + "binary-version-reader": "^2.5.2", "chalk": "^2.4.2", "cli-progress": "^3.12.0", "cli-spinner": "^0.2.10", @@ -564,9 +564,9 @@ } }, "node_modules/@particle/device-constants": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@particle/device-constants/-/device-constants-3.5.0.tgz", - "integrity": "sha512-dJ85XvE+TrWHCkFP3pOkHloWuSdMSnCMzPdNrdEfXqs/ejwGUEi6G3w5DE0p4saT1KDD7VtRMpn1FHzFW4K5vA==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@particle/device-constants/-/device-constants-3.6.0.tgz", + "integrity": "sha512-aYHJKqIUZnKE2j21bqMhZRFpaMuSedr/ttxWaicEaMaTMY5vt6IMHpX6LJO9VWT/5RJCTLzbyzf3MZKHgga22A==", "engines": { "node": ">=12.x", "npm": "8.x" @@ -1403,9 +1403,9 @@ } }, "node_modules/binary-version-reader": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/binary-version-reader/-/binary-version-reader-2.5.1.tgz", - "integrity": "sha512-WbnriRmj9zD1tKNxa5RRABojBXqnN81qoT9+SpIosC8VtiwQWc83i+klyKjuUp1SRpAz2CPYRcv+c0tpxb+Exw==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/binary-version-reader/-/binary-version-reader-2.5.2.tgz", + "integrity": "sha512-fvjkRX2GC+zDNXWm9rQ3hiJUh4ypLo6EJoYuwHgOrQ8mOZ0F3rIQa+U/vm5leZ6QjwXvpIM5p1CeKUPpS2tHvg==", "dependencies": { "archiver": "^5.3.1", "buffer-crc32": "^0.2.5", @@ -1421,7 +1421,7 @@ "npm": "8.x" }, "peerDependencies": { - "@particle/device-constants": "^3.5.0" + "@particle/device-constants": "^3.6.0" } }, "node_modules/bl": { @@ -9670,9 +9670,9 @@ } }, "@particle/device-constants": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/@particle/device-constants/-/device-constants-3.5.0.tgz", - "integrity": "sha512-dJ85XvE+TrWHCkFP3pOkHloWuSdMSnCMzPdNrdEfXqs/ejwGUEi6G3w5DE0p4saT1KDD7VtRMpn1FHzFW4K5vA==" + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/@particle/device-constants/-/device-constants-3.6.0.tgz", + "integrity": "sha512-aYHJKqIUZnKE2j21bqMhZRFpaMuSedr/ttxWaicEaMaTMY5vt6IMHpX6LJO9VWT/5RJCTLzbyzf3MZKHgga22A==" }, "@particle/device-os-protobuf": { "version": "2.6.1", @@ -10321,9 +10321,9 @@ } }, "binary-version-reader": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/binary-version-reader/-/binary-version-reader-2.5.1.tgz", - "integrity": "sha512-WbnriRmj9zD1tKNxa5RRABojBXqnN81qoT9+SpIosC8VtiwQWc83i+klyKjuUp1SRpAz2CPYRcv+c0tpxb+Exw==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/binary-version-reader/-/binary-version-reader-2.5.2.tgz", + "integrity": "sha512-fvjkRX2GC+zDNXWm9rQ3hiJUh4ypLo6EJoYuwHgOrQ8mOZ0F3rIQa+U/vm5leZ6QjwXvpIM5p1CeKUPpS2tHvg==", "requires": { "archiver": "^5.3.1", "buffer-crc32": "^0.2.5", diff --git a/package.json b/package.json index 300282426..a79a1a10b 100644 --- a/package.json +++ b/package.json @@ -52,8 +52,8 @@ } ], "dependencies": { - "@particle/device-constants": "^3.5.0", - "binary-version-reader": "^2.5.1", + "@particle/device-constants": "^3.6.0", + "binary-version-reader": "^2.5.2", "chalk": "^2.4.2", "cli-progress": "^3.12.0", "cli-spinner": "^0.2.10", diff --git a/src/cli/cloud.test.js b/src/cli/cloud.test.js index 42773972c..8d68f5245 100644 --- a/src/cli/cloud.test.js +++ b/src/cli/cloud.test.js @@ -64,7 +64,7 @@ describe('Cloud Command-Line Interface', () => { 'Display a list of your devices, as well as their variables and functions', 'Usage: particle cloud list [options] [filter]', '', - 'Param filter can be: online, offline, a platform name (core, photon, p1, electron, argon, boron, xenon, esomx, bsom, b5som, tracker, trackerm, p2, msom), a device ID or name', + 'Param filter can be: online, offline, a platform name (core, photon, p1, electron, argon, boron, xenon, esomx, bsom, b5som, tracker, trackerm, p2, msom, electron2), a device ID or name', '' ].join('\n')); }); @@ -308,7 +308,7 @@ describe('Cloud Command-Line Interface', () => { ' particle cloud compile photon Compile the source code in the current directory in the cloud for a `photon`', ' particle cloud compile electron project --saveTo electron.bin Compile the source code in the project directory in the cloud for an `electron` and save it to a file named `electron.bin`', '', - 'Param deviceType can be: core, c, photon, p, p1, electron, e, argon, a, boron, b, xenon, x, esomx, bsom, b5som, tracker, assettracker, trackerm, p2, photon2, msom, muon', + 'Param deviceType can be: core, c, photon, p, p1, electron, e, argon, a, boron, b, xenon, x, esomx, bsom, b5som, tracker, assettracker, trackerm, p2, photon2, msom, muon, electron2', '' ].join('\n')); }); diff --git a/src/cli/usb.test.js b/src/cli/usb.test.js index 9d2cff098..6c07e3b2a 100644 --- a/src/cli/usb.test.js +++ b/src/cli/usb.test.js @@ -63,7 +63,7 @@ describe('USB Command-Line Interface', () => { ' --exclude-dfu Do not list devices which are in DFU mode [boolean]', ' --ids-only Print only device IDs [boolean]', '', - 'Param filter can be: online, offline, a platform name (core, photon, p1, electron, argon, boron, xenon, esomx, bsom, b5som, tracker, trackerm, p2, msom), a device ID or name', + 'Param filter can be: online, offline, a platform name (core, photon, p1, electron, argon, boron, xenon, esomx, bsom, b5som, tracker, trackerm, p2, msom, electron2), a device ID or name', '' ].join('\n')); }); diff --git a/src/lib/platform.js b/src/lib/platform.js index cb7e0baa5..425bc90a0 100644 --- a/src/lib/platform.js +++ b/src/lib/platform.js @@ -25,6 +25,7 @@ const PLATFORMS_BY_ID = PLATFORMS.reduce((map, p) => map.set(p.id, p), new Map() * @property {Number} TRACKERM * @property {Number} P2 * @property {Number} MSOM + * @property {Number} ELECTRON2 */ const PlatformId = PLATFORMS.reduce((out, p) => { out[p.name.toUpperCase()] = p.id; diff --git a/src/lib/utilities.test.js b/src/lib/utilities.test.js index 9f1acb352..af69acef4 100644 --- a/src/lib/utilities.test.js +++ b/src/lib/utilities.test.js @@ -22,7 +22,8 @@ describe('Utilities', () => { 'tracker': 26, 'trackerm': 28, 'p2': 32, - 'msom': 35 + 'msom': 35, + 'electron2': 37 }); }); }); @@ -52,7 +53,8 @@ describe('Utilities', () => { 'p2': 32, 'photon2': 32, 'msom': 35, - 'muon': 35 + 'muon': 35, + 'electron2': 37 }); }); }); @@ -73,7 +75,8 @@ describe('Utilities', () => { 26: 'Asset Tracker / Monitor One', 28: 'Tracker-M', 32: 'Photon 2 / P2', - 35: 'M-SoM' + 35: 'M-SoM', + 37: 'Electron 2' }); }); }); diff --git a/test/e2e/compile.e2e.js b/test/e2e/compile.e2e.js index d1cc963e8..c55eef41d 100644 --- a/test/e2e/compile.e2e.js +++ b/test/e2e/compile.e2e.js @@ -31,7 +31,7 @@ describe('Compile Commands', () => { ' particle compile photon Compile the source code in the current directory in the cloud for a `photon`', ' particle compile electron project --saveTo electron.bin Compile the source code in the project directory in the cloud for an `electron` and save it to a file named `electron.bin`', '', - 'Param deviceType can be: core, c, photon, p, p1, electron, e, argon, a, boron, b, xenon, x, esomx, bsom, b5som, tracker, assettracker, trackerm, p2, photon2, msom, muon', + 'Param deviceType can be: core, c, photon, p, p1, electron, e, argon, a, boron, b, xenon, x, esomx, bsom, b5som, tracker, assettracker, trackerm, p2, photon2, msom, muon, electron2', ]; beforeEach(async () => { diff --git a/test/e2e/list.e2e.js b/test/e2e/list.e2e.js index c5fee8224..8cfbb8a6a 100644 --- a/test/e2e/list.e2e.js +++ b/test/e2e/list.e2e.js @@ -17,7 +17,7 @@ describe('List Commands', () => { ' -v, --verbose Increases how much logging to display [count]', ' -q, --quiet Decreases how much logging to display [count]', '', - 'Param filter can be: online, offline, a platform name (core, photon, p1, electron, argon, boron, xenon, esomx, bsom, b5som, tracker, trackerm, p2, msom), a device ID or name' + 'Param filter can be: online, offline, a platform name (core, photon, p1, electron, argon, boron, xenon, esomx, bsom, b5som, tracker, trackerm, p2, msom, electron2), a device ID or name' ]; before(async () => {