Skip to content

Add rp2040 fw updater support #521

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

Merged
merged 4 commits into from
Jun 11, 2021
Merged
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
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "arduino-create-agent-js-client",
"version": "2.4.9",
"version": "2.5.0",
"description": "JS module providing discovery of the Arduino Create Plugin and communication with it",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
20 changes: 13 additions & 7 deletions src/firmware-updater.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,17 @@ const FWUToolStatusEnum = Object.freeze({
});

/* The signatures needed to run the commands to use the Firmware Updater Tool */
let signaturesEnum = fwupdaterSignatures;
let signatures = fwupdaterSignatures;

let updaterBinaryName = 'FirmwareUploader';

function programmerFor(boardId) {
if (boardId === 'uno2018') return ['{runtime.tools.avrdude}/bin/avrdude', signatures.UPLOAD_FIRMWARE_AVRDUDE];
if (boardId === 'nanorp2040connect') return [`{runtime.tools.rp2040tools.path}/rp2040load`, signatures.UPLOAD_FIRMWARE_RP2040];

return [`{runtime.tools.bossac}/bossac`, signatures.UPLOAD_FIRMWARE_BOSSAC];
}

export default class FirmwareUpdater {
constructor(Daemon) {
this.updateStatusEnum = Object.freeze({
Expand Down Expand Up @@ -57,7 +64,7 @@ export default class FirmwareUpdater {
setToolVersion(version) {
this.toolVersion = version;
if (semverCompare(version, '0.1.2') < 0) {
signaturesEnum = oldFwupdaterSignatures;
signatures = oldFwupdaterSignatures;
updaterBinaryName = 'updater';
}
}
Expand Down Expand Up @@ -119,7 +126,7 @@ export default class FirmwareUpdater {
board: boardId,
port,
commandline: `"{runtime.tools.fwupdater.path}/${updaterBinaryName}" -get_available_for {network.password}`,
signature: signaturesEnum.GET_FIRMWARE_INFO,
signature: signatures.GET_FIRMWARE_INFO,
extra: {
auth: {
password: boardId
Expand Down Expand Up @@ -196,8 +203,7 @@ export default class FirmwareUpdater {
}
});

const isUsingAvrdude = boardId === 'uno2018';
const programmer = isUsingAvrdude ? '{runtime.tools.avrdude}/bin/avrdude' : '{runtime.tools.bossac}/bossac';
const [programmer, signature] = programmerFor(boardId);

if (!this.loaderPath) {
this.updating.next({ status: this.updateStatusEnum.ERROR, err: `Can't update Firmware: 'loaderPath' is empty or 'null'` });
Expand All @@ -214,7 +220,7 @@ export default class FirmwareUpdater {
password: `"${this.loaderPath}" -firmware "${this.firmwareVersionData.Path}" ${addresses}`,
},
},
signature: isUsingAvrdude ? signaturesEnum.UPLOAD_FIRMWARE_AVRDUDE : signaturesEnum.UPLOAD_FIRMWARE_BOSSAC,
signature,
filename: 'CheckFirmwareVersion.bin',
};

Expand All @@ -237,4 +243,4 @@ export default class FirmwareUpdater {
this.getFirmwareInfo(boardId, port, firmwareVersion);
});
}
}
}
1 change: 1 addition & 0 deletions src/signatures.js

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