Skip to content

[ATL-1533] Firmware&Certificate Uploader #469

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

Merged
merged 17 commits into from
Aug 25, 2021
Merged

[ATL-1533] Firmware&Certificate Uploader #469

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
3ba61b7
uploader firmware dialog
Jul 29, 2021
4886b16
board select component
fstasi Jul 29, 2021
d95e164
updated font
fstasi Aug 2, 2021
2e97723
wip
fstasi Aug 2, 2021
ef91a9f
firmware uploader service
Aug 3, 2021
12e62ce
certificate uploader
fstasi Aug 3, 2021
48c4bed
list available firmware in update-frimware-dialog
Aug 4, 2021
4b9b513
fix board select component
fstasi Aug 4, 2021
b2454cd
fixed copy
fstasi Aug 5, 2021
f3e8ed8
fix fwuploader flashing inssues
Aug 5, 2021
f466525
added tooltip component
fstasi Aug 5, 2021
e0e509a
polishing
fstasi Aug 5, 2021
b4e0b3f
updated icons
fstasi Aug 5, 2021
13bf075
disabled close modal while fwuploader operations are in progress
fstasi Aug 5, 2021
14ecd5b
add spinners to firmware and certificate dialogs
Aug 5, 2021
8d8e27a
fixed copy
fstasi Aug 9, 2021
bd21ce6
reset fwuploader dialog once closed
Aug 13, 2021
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
Prev Previous commit
Next Next commit
fix fwuploader flashing inssues
  • Loading branch information
@fstasi
Alberto Iannaccone authored and fstasi committed Aug 23, 2021
commit f3e8ed8f60268673b234e4f766ac07740492021e
25 changes: 15 additions & 10 deletions arduino-ide-extension/src/browser/dialogs/firmware-uploader/firmware-uploader-component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,16 +70,21 @@ export const FirmwareUploaderComponent = ({
(firmware) => firmware.firmware_version === selectedFirmware?.value
);

const installStatus =
!!firmwareToFlash &&
!!selectedBoard?.port &&
(await firmwareUploader.flash(
firmwareToFlash,
selectedBoard?.port.address
));

setInstallFeedback((installStatus && 'ok') || 'fail');
setInstallingFw(false);
try {
const installStatus =
!!firmwareToFlash &&
!!selectedBoard?.port &&
(await firmwareUploader.flash(
firmwareToFlash,
selectedBoard?.port.address
));

setInstallFeedback((installStatus && 'ok') || 'fail');
setInstallingFw(false);
} catch {
setInstallFeedback('fail');
setInstallingFw(false);
}
}, [firmwareUploader, selectedBoard, selectedFirmware, availableFirmwares]);

const onBoardSelect = React.useCallback(
Expand Down
23 changes: 10 additions & 13 deletions arduino-ide-extension/src/node/arduino-firmware-uploader-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,7 @@ export class ArduinoFirmwareUploaderImpl implements ArduinoFirmwareUploader {

async runCommand(args: string[]): Promise<any> {
const execPath = await this.getExecPath();
const raw = await spawnCommand(
`"${execPath}"`,
args,
this.onError.bind(this)
);
return JSON.parse(raw);
return await spawnCommand(`"${execPath}"`, args, this.onError.bind(this));
}

async uploadCertificates(command: string): Promise<any> {
Expand All @@ -47,13 +42,15 @@ export class ArduinoFirmwareUploaderImpl implements ArduinoFirmwareUploader {
async list(fqbn?: string): Promise<FirmwareInfo[]> {
const fqbnFlag = fqbn ? ['--fqbn', fqbn] : [];
const firmwares: FirmwareInfo[] =
(await this.runCommand([
'firmware',
'list',
'--format',
'json',
...fqbnFlag,
])) || [];
JSON.parse(
await this.runCommand([
'firmware',
'list',
...fqbnFlag,
'--format',
'json',
])
) || [];
return firmwares.reverse();
}

Expand Down