Commit c064673

author

Alberto Iannaccone

authored

Close serial port connection before flashing firmware (#688)

1 parent cc5764e commit c064673Copy full SHA for c064673

File tree

2 files changed

+34

-22

lines changed

arduino-ide-extension/src/node
- arduino-firmware-uploader-impl.ts
- arduino-ide-backend-module.ts

2 files changed

+34

-22

lines changed

`‎arduino-ide-extension/src/node/arduino-firmware-uploader-impl.ts‎`

Lines changed: 25 additions & 10 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ import {`
`4`	`4`	`} from '../common/protocol/arduino-firmware-uploader';`
`5`	`5`	`import { injectable, inject, named } from 'inversify';`
`6`	`6`	`import { ExecutableService } from '../common/protocol';`
	`7`	`+import { SerialService } from '../common/protocol/serial-service';`
`7`	`8`	`import { getExecPath, spawnCommand } from './exec-util';`
`8`	`9`	`import { ILogger } from '@theia/core/lib/common/logger';`
`9`	`10`
`@@ -18,6 +19,9 @@ export class ArduinoFirmwareUploaderImpl implements ArduinoFirmwareUploader {`
`18`	`19`	`@named('fwuploader')`
`19`	`20`	`protected readonly logger: ILogger;`
`20`	`21`
	`22`	`+ @inject(SerialService)`
	`23`	`+ protected readonly serialService: SerialService;`
	`24`	`+`
`21`	`25`	`protected onError(error: any): void {`
`22`	`26`	`this.logger.error(error);`
`23`	`27`	`}`
`@@ -66,15 +70,26 @@ export class ArduinoFirmwareUploaderImpl implements ArduinoFirmwareUploader {`
`66`	`70`	`}`
`67`	`71`
`68`	`72`	`async flash(firmware: FirmwareInfo, port: string): Promise<string> {`
`69`		`- return await this.runCommand([`
`70`		`- 'firmware',`
`71`		`- 'flash',`
`72`		`- '--fqbn',`
`73`		`- firmware.board_fqbn,`
`74`		`- '--address',`
`75`		`- port,`
`76`		`- '--module',`
`77`		- `${firmware.module}@${firmware.firmware_version}`,
`78`		`- ]);`
	`73`	`+ let output;`
	`74`	`+ try {`
	`75`	`+ this.serialService.uploadInProgress = true;`
	`76`	`+ await this.serialService.disconnect();`
	`77`	`+ output = await this.runCommand([`
	`78`	`+ 'firmware',`
	`79`	`+ 'flash',`
	`80`	`+ '--fqbn',`
	`81`	`+ firmware.board_fqbn,`
	`82`	`+ '--address',`
	`83`	`+ port,`
	`84`	`+ '--module',`
	`85`	+ `${firmware.module}@${firmware.firmware_version}`,
	`86`	`+ ]);`
	`87`	`+ } catch (e) {`
	`88`	`+ throw e;`
	`89`	`+ } finally {`
	`90`	`+ this.serialService.uploadInProgress = false;`
	`91`	`+ this.serialService.connectSerialIfRequired();`
	`92`	`+ return output;`
	`93`	`+ }`
`79`	`94`	`}`
`80`	`95`	`}`

`‎arduino-ide-extension/src/node/arduino-ide-backend-module.ts‎`

Lines changed: 9 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {`
`203`	`203`
`204`	`204`	`// #endregion Theia customizations`
`205`	`205`
`206`		`- // Monitor client provider per connected frontend.`
	`206`	`+ // Serial client provider per connected frontend.`
`207`	`207`	`bind(ConnectionContainerModule).toConstantValue(`
`208`	`208`	`ConnectionContainerModule.create(({ bind, bindBackendService }) => {`
`209`	`209`	`bind(MonitorClientProvider).toSelf().inSingletonScope();`
`@@ -260,17 +260,14 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {`
`260`	`260`	`)`
`261`	`261`	`.inSingletonScope();`
`262`	`262`
`263`		`- bind(ArduinoFirmwareUploaderImpl).toSelf().inSingletonScope();`
`264`		`- bind(ArduinoFirmwareUploader).toService(ArduinoFirmwareUploaderImpl);`
`265`		`- bind(BackendApplicationContribution).toService(ArduinoFirmwareUploaderImpl);`
`266`		`- bind(ConnectionHandler)`
`267`		`- .toDynamicValue(`
`268`		`- (context) =>`
`269`		`- new JsonRpcConnectionHandler(ArduinoFirmwareUploaderPath, () =>`
`270`		`- context.container.get(ArduinoFirmwareUploader)`
`271`		`- )`
`272`		`- )`
`273`		`- .inSingletonScope();`
	`263`	`+ // Singleton per BE, each FE connection gets its proxy.`
	`264`	`+ bind(ConnectionContainerModule).toConstantValue(`
	`265`	`+ ConnectionContainerModule.create(({ bind, bindBackendService }) => {`
	`266`	`+ bind(ArduinoFirmwareUploaderImpl).toSelf().inSingletonScope();`
	`267`	`+ bind(ArduinoFirmwareUploader).toService(ArduinoFirmwareUploaderImpl);`
	`268`	`+ bindBackendService(ArduinoFirmwareUploaderPath, ArduinoFirmwareUploader);`
	`269`	`+ })`
	`270`	`+ );`
`274`	`271`
`275`	`272`	`// Logger for the Arduino daemon`
`276`	`273`	`bind(ILogger)`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit c064673

File tree

2 files changed

2 files changed

`‎arduino-ide-extension/src/node/arduino-firmware-uploader-impl.ts‎`

`‎arduino-ide-extension/src/node/arduino-ide-backend-module.ts‎`

0 commit comments