Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore/sc-132686/update-device-constants #781

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions npm-shrinkwrap.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We shouldn't bump binary-version-reader when updating device-constants. The point of having device-constants as a peer dependency in binary-version-reader is to avoid updating dependencies transiently. Only the top-level application has to update device-constants.

No need to undo it here, but no need to update in other applications.

"chalk": "^2.4.2",
"cli-progress": "^3.12.0",
"cli-spinner": "^0.2.10",
Expand Down
4 changes: 2 additions & 2 deletions src/cli/cloud.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
});
Expand Down Expand Up @@ -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'));
});
Expand Down
2 changes: 1 addition & 1 deletion src/cli/usb.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'));
});
Expand Down
1 change: 1 addition & 0 deletions src/lib/platform.js
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
9 changes: 6 additions & 3 deletions src/lib/utilities.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ describe('Utilities', () => {
'tracker': 26,
'trackerm': 28,
'p2': 32,
'msom': 35
'msom': 35,
'electron2': 37
});
});
});
Expand Down Expand Up @@ -52,7 +53,8 @@ describe('Utilities', () => {
'p2': 32,
'photon2': 32,
'msom': 35,
'muon': 35
'muon': 35,
'electron2': 37
});
});
});
Expand All @@ -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'
});
});
});
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/compile.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/list.e2e.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 () => {
Expand Down
Loading