Skip to content

Commit 8b65d2a

Browse files
author
Alberto Iannaccone
committed
refactor monito connection and fix some connection issues
1 parent 84bac5a commit 8b65d2a

File tree

5 files changed

+265
-337
lines changed

5 files changed

+265
-337
lines changed

arduino-ide-extension/src/browser/contributions/burn-bootloader.ts

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,7 @@ export class BurnBootloader extends SketchContribution {
4848
}
4949

5050
async burnBootloader(): Promise<void> {
51-
const monitorConfig = this.monitorConnection.monitorConfig;
52-
const serialConnection = this.monitorConnection.connectionType;
53-
54-
if (monitorConfig) {
55-
await this.monitorConnection.disconnect(serialConnection);
56-
}
51+
await this.monitorConnection.disconnect();
5752
try {
5853
const { boardsConfig } = this.boardsServiceClientImpl;
5954
const port = boardsConfig.selectedPort;
@@ -86,8 +81,8 @@ export class BurnBootloader extends SketchContribution {
8681
} catch (e) {
8782
this.messageService.error(e.toString());
8883
} finally {
89-
if (monitorConfig) {
90-
await this.monitorConnection.connect(serialConnection, monitorConfig);
84+
if (this.monitorConnection.isSerialOpen()) {
85+
await this.monitorConnection.connect();
9186
}
9287
}
9388
}

arduino-ide-extension/src/browser/contributions/upload-sketch.ts

Lines changed: 7 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -108,16 +108,7 @@ export class UploadSketch extends SketchContribution {
108108
if (!sketch) {
109109
return;
110110
}
111-
let shouldAutoConnect = false;
112-
const monitorConfig = this.monitorConnection.monitorConfig;
113-
const serialConnection = this.monitorConnection.connectionType;
114-
if (monitorConfig) {
115-
await this.monitorConnection.disconnect(serialConnection);
116-
if (this.monitorConnection.autoConnect) {
117-
shouldAutoConnect = true;
118-
}
119-
this.monitorConnection.autoConnect = false;
120-
}
111+
await this.monitorConnection.disconnect();
121112
try {
122113
const { boardsConfig } = this.boardsServiceClientImpl;
123114
const [fqbn, { selectedProgrammer }, verify, verbose, sourceOverride] =
@@ -176,18 +167,17 @@ export class UploadSketch extends SketchContribution {
176167
this.uploadInProgress = false;
177168
this.onDidChangeEmitter.fire();
178169

179-
if (monitorConfig) {
180-
const { board, port } = monitorConfig;
170+
if (
171+
this.monitorConnection.isSerialOpen() &&
172+
this.monitorConnection.monitorConfig
173+
) {
174+
const { board, port } = this.monitorConnection.monitorConfig;
181175
try {
182176
await this.boardsServiceClientImpl.waitUntilAvailable(
183177
Object.assign(board, { port }),
184178
10_000
185179
);
186-
this.monitorConnection.connect(
187-
serialConnection,
188-
monitorConfig,
189-
shouldAutoConnect
190-
);
180+
await this.monitorConnection.connect();
191181
} catch (waitError) {
192182
this.messageService.error(
193183
nls.localize(

0 commit comments

Comments
 (0)