Skip to content
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-lock.json

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

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.3.3",
"version": "2.3.4",
"description": "JS module providing discovery of the Arduino Create Plugin and communication with it",
"main": "lib/index.js",
"module": "es/index.js",
Expand Down
22 changes: 14 additions & 8 deletions src/firmware-updater.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import { BehaviorSubject } from 'rxjs';

import {
takeUntil,
filter,
first
} from 'rxjs/operators';
import semverCompare from 'semver-compare';
import { fwupdaterSignatures, oldFwupdaterSignatures } from './signatures';

/* The status of the Firmware Updater Tool */
const FWUToolStatusEnum = Object.freeze({
Expand All @@ -15,12 +16,9 @@ const FWUToolStatusEnum = Object.freeze({
});

/* The signatures needed to run the commands to use the Firmware Updater Tool */
const signaturesEnum = Object.freeze({
GET_FIRMWARE_INFO: 'aceffd98d331df0daa5bb3308bb49a95767d77e7a1557c07a0ec544d2f41c3ec67269f01ce9a63e01f3b43e087ab8eb22b7f1d34135b6686e8ce27d4b5dc083ec8e6149df11880d32486448a71280ef3128efccbd45a84dbd7990a9420a65ee86b3822edba3554fa8e6ca11aec12d4dd99ad072285b98bfdf7b2b64f677da50feb8bddef25a36f52d7605078487d8a5d7cbdc84bfa65d510cee97b46baefea149139a9a6ed4b545346040536e33d850e6ad84c83fe605f677e2ca77439de3fa42350ce504ad9a49cf62c6751d4c2a284500d2c628cd52cd73b4c3e7ef08ae823eb8941383f9c6ff0686da532369d3b266ded8fdd33cca1a128068a4795920f25',
UPLOAD_FIRMWARE_BOSSAC: '5c61682e3ce2544365b05577f9016d5fbfa4c20efdce6ec2ebe6940380ea4f9421322b338c83b7721f900c99c61282720224d9fb20a639154984fd1feef682ee432c8a225f14fe7ba80d2d71d51bc92bfffe63de9386c0b9bc17a827ce21dda837fe3fd0c518ff0b84982c65db81a3eebab88712593c068f5a43f7bc22d4a3f3608969e8f30b3102b382d2c0f7f28d482b39cbcfd16eb680dd04bda66b9cb0d1c2b2e91d89dd8c6033562f1d3983002b61aa39ef70d45a456178867609c058a09bbcd8bce4d97d2e65c28756659bf5ba111e8541302cea934a2c005331ef89425390f610d2f609d581175d16193e72752fe8384f66051e6a2abea79757f042eb',
UPLOAD_FIRMWARE_AVRDUDE: '83b177b05dcd7043d484e321417d1dd499fdbd80b7109cc86fcb91cb14e59b834c3956a279e8d4ceba466a308cb8a1aceb5ab6770b8f207e9bc92e84a191edc21cdecb4f7cc1883fbf0eb258f1f849ffbe76bb0320dfe92d85f77226b45fd90824fc126e22ebe8d2350f854c9d43a03186d7f260d8d03bf83e6669646b2e13a6371dcbf1dd5711edcbe3c3a0f186d091ba26118ed2cdb3ef58e0079096403a2e93684d5089b216c53f2fcb1387b6e9d49feea914943971ac1e58bba1ecdf4f14f557d278e8b4f05d594e21887ba87322fbe1d70d05f03412d87f3149a4b3aff302088a2f0ecc42302b6ba66024e94226b5d99c9e0375383e4494bc1e0d0e20b8'
});
let signaturesEnum = fwupdaterSignatures;

let updaterBinaryName = 'FirmwareUploader';

export default class FirmwareUpdater {
constructor(Daemon) {
Expand Down Expand Up @@ -56,6 +54,14 @@ export default class FirmwareUpdater {
.pipe(takeUntil(this.updatingError));
}

setToolVersion(version) {
this.toolVersion = version;
if (semverCompare(version, '0.1.2') < 0) {
signaturesEnum = oldFwupdaterSignatures;
updaterBinaryName = 'updater';
}
}

getFirmwareInfo(boardId, port, firmwareVersion) {
this.firmwareVersionData = null;
this.loaderPath = null;
Expand Down Expand Up @@ -112,7 +118,7 @@ export default class FirmwareUpdater {
const data = {
board: boardId,
port,
commandline: `"{runtime.tools.fwupdater.path}/updater" -get_available_for {network.password}`,
commandline: `"{runtime.tools.fwupdater.path}/${updaterBinaryName}" -get_available_for {network.password}`,
signature: signaturesEnum.GET_FIRMWARE_INFO,
extra: {
auth: {
Expand Down Expand Up @@ -199,7 +205,7 @@ export default class FirmwareUpdater {
const data = {
board: boardId,
port,
commandline: `"{runtime.tools.fwupdater.path}/updater" -flasher {network.password} -port {serial.port} -restore_binary "{build.path}/{build.project_name}.bin" -programmer ${programmer}`,
commandline: `"{runtime.tools.fwupdater.path}/${updaterBinaryName}" -flasher {network.password} -port {serial.port} -restore_binary "{build.path}/{build.project_name}.bin" -programmer ${programmer}`,
hex: '',
extra: {
auth: {
Expand Down
14 changes: 14 additions & 0 deletions src/signatures.js

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