Skip to content

Commit 617d985

Browse files
author
Alberto Iannaccone
committed
connect serial plotter app with websocket
1 parent f33c06f commit 617d985

14 files changed

+298
-125
lines changed

arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,6 @@ import {
258258
PlotterPath,
259259
PlotterService,
260260
} from '../common/protocol/plotter-service';
261-
import { PlotterConnection } from './plotter/plotter-connection';
262261

263262
const ElementQueries = require('css-element-queries/src/ElementQueries');
264263

@@ -410,7 +409,7 @@ export default new ContainerModule((bind, unbind, isBound, rebind) => {
410409
})
411410
.inSingletonScope();
412411
bind(MonitorConnection).toSelf().inSingletonScope();
413-
bind(PlotterConnection).toSelf().inSingletonScope();
412+
414413
// Serial monitor service client to receive and delegate notifications from the backend.
415414
bind(MonitorServiceClient).to(MonitorServiceClientImpl).inSingletonScope();
416415

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,10 @@ export class BurnBootloader extends SketchContribution {
4545

4646
async burnBootloader(): Promise<void> {
4747
const monitorConfig = this.monitorConnection.monitorConfig;
48+
const serialConnection = this.monitorConnection.connectionType;
49+
4850
if (monitorConfig) {
49-
await this.monitorConnection.disconnect();
51+
await this.monitorConnection.disconnect(serialConnection);
5052
}
5153
try {
5254
const { boardsConfig } = this.boardsServiceClientImpl;
@@ -75,7 +77,7 @@ export class BurnBootloader extends SketchContribution {
7577
this.messageService.error(e.toString());
7678
} finally {
7779
if (monitorConfig) {
78-
await this.monitorConnection.connect(monitorConfig);
80+
await this.monitorConnection.connect(serialConnection, monitorConfig);
7981
}
8082
}
8183
}

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,9 @@ export class UploadSketch extends SketchContribution {
106106
}
107107
let shouldAutoConnect = false;
108108
const monitorConfig = this.monitorConnection.monitorConfig;
109+
const serialConnection = this.monitorConnection.connectionType;
109110
if (monitorConfig) {
110-
await this.monitorConnection.disconnect();
111+
await this.monitorConnection.disconnect(serialConnection);
111112
if (this.monitorConnection.autoConnect) {
112113
shouldAutoConnect = true;
113114
}
@@ -175,12 +176,11 @@ export class UploadSketch extends SketchContribution {
175176
Object.assign(board, { port }),
176177
10_000
177178
);
178-
if (shouldAutoConnect) {
179-
// Enabling auto-connect will trigger a connect.
180-
this.monitorConnection.autoConnect = true;
181-
} else {
182-
await this.monitorConnection.connect(monitorConfig);
183-
}
179+
this.monitorConnection.connect(
180+
serialConnection,
181+
monitorConfig,
182+
shouldAutoConnect
183+
);
184184
} catch (waitError) {
185185
this.messageService.error(
186186
`Could not reconnect to serial monitor. ${waitError.toString()}`

0 commit comments

Comments
 (0)