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.

Sign up for GitHub

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

[FL-3940] Work around incorrect serial port handling by the OS #4040

Merged
merged 4 commits into from
Dec 23, 2024
Merged

[FL-3940] Work around incorrect serial port handling by the OS #4040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb456bd
fix: js sdk flipper detection
portasynthinca3 Dec 19, 2024
6e21efc
chore: bump ver
portasynthinca3 Dec 19, 2024
c191116
Merge branch 'dev' into portasynthinca3/3940-js-sdk-serial
portasynthinca3 Dec 19, 2024
a41260e
Merge branch 'dev' into portasynthinca3/3940-js-sdk-serial
skotopes Dec 23, 2024
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
2 changes: 1 addition & 1 deletion applications/system/js_app/packages/fz-sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@flipperdevices/fz-sdk",
"version": "0.1.2",
"version": "0.1.3",
"description": "Type declarations and documentation for native JS modules available on Flipper Zero",
"keywords": [
"flipper",
Expand Down
13 changes: 6 additions & 7 deletions applications/system/js_app/packages/fz-sdk/pnpm-lock.yaml
View file
Open in desktop

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

16 changes: 14 additions & 2 deletions applications/system/js_app/packages/fz-sdk/sdk.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,21 @@ async function build(config) {

async function upload(config) {
const appFile = fs.readFileSync(config.input, "utf8");
const flippers = (await SerialPort.list()).filter(x => x.serialNumber?.startsWith("flip_"));
const serialPorts = await SerialPort.list();

let flippers = serialPorts
.filter(x => x.serialNumber?.startsWith("flip_"))
.map(x => ({ path: x.path, name: x.serialNumber.replace("flip_", "") }));

if (!flippers.length) {
// some Windows installations don't report the serial number correctly;
// filter by STM VCP VID:PID instead
flippers = serialPorts
.filter(x => x?.vendorId === "0483" && x?.productId === "5740")
.map(x => ({ path: x.path, name: x.path }));
}

if (!flippers) {
if (!flippers.length) {
console.error("No Flippers found");
process.exit(1);
}
Expand Down
Loading