Commit 726628e

author

Alberto Iannaccone

authored

Fix monitor service id creation (#1025)

1 parent 585a82b commit 726628eCopy full SHA for 726628e

File tree

-2

lines changed

-2

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ export class ArduinoFirmwareUploaderImpl implements ArduinoFirmwareUploader {`
`76`	`76`	`fqbn: firmware.board_fqbn,`
`77`	`77`	`};`
`78`	`78`	`try {`
`79`		`- this.monitorManager.notifyUploadStarted(board, port);`
	`79`	`+ awaitthis.monitorManager.notifyUploadStarted(board, port);`
`80`	`80`	`output = await this.runCommand([`
`81`	`81`	`'firmware',`
`82`	`82`	`'flash',`

Lines changed: 3 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -215,6 +215,8 @@ export class MonitorManager extends CoreClientAware {`
`215`	`215`	`* @returns a unique monitor ID`
`216`	`216`	`*/`
`217`	`217`	`private monitorID(board: Board, port: Port): MonitorID {`
`218`		- return `${board.fqbn}-${port.address}-${port.protocol}`;
	`218`	`+ const splitFqbn = board?.fqbn?.split(':') \|\| [];`
	`219`	`+ const shortenedFqbn = splitFqbn.slice(0, 3).join(':') \|\| '';`
	`220`	+ return `${shortenedFqbn}-${port.address}-${port.protocol}`;
`219`	`221`	`}`
`220`	`222`	`}`

Comments

(0)