Skip to content

Commit 726628e

Browse files
author
Alberto Iannaccone
authored
Fix monitor service id creation (#1025)
1 parent 585a82b commit 726628e

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Diff for: arduino-ide-extension/src/node/arduino-firmware-uploader-impl.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ export class ArduinoFirmwareUploaderImpl implements ArduinoFirmwareUploader {
7676
fqbn: firmware.board_fqbn,
7777
};
7878
try {
79-
this.monitorManager.notifyUploadStarted(board, port);
79+
await this.monitorManager.notifyUploadStarted(board, port);
8080
output = await this.runCommand([
8181
'firmware',
8282
'flash',

Diff for: arduino-ide-extension/src/node/monitor-manager.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -215,6 +215,8 @@ export class MonitorManager extends CoreClientAware {
215215
* @returns a unique monitor ID
216216
*/
217217
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}`;
219221
}
220222
}

0 commit comments

Comments
 (0)