sync EoL and baudRates

Author: fstasi

arduino-ide-extension/package.json

@@ -19,7 +19,7 @@
     "test:watch": "mocha --watch --watch-files lib \"./lib/test/**/*.test.js\""
   },
   "dependencies": {
-    "arduino-serial-plotter-webapp": "0.0.3",
+    "arduino-serial-plotter-webapp": "0.0.4",
     "@grpc/grpc-js": "^1.3.7",
     "@theia/application-package": "1.18.0",
     "@theia/core": "1.18.0",

arduino-ide-extension/src/browser/monitor/monitor-connection.ts

@@ -86,6 +86,17 @@ export class SerialConnectionManager {
     this.monitorServiceClient.onWebSocketChanged(
       this.handleWebSocketChanged.bind(this)
     );
+    this.monitorServiceClient.onBaudRateChanged((baudRate) => {
+      if (this.monitorModel.baudRate !== baudRate) {
+        this.monitorModel.baudRate = baudRate;
+      }
+    });
+    this.monitorServiceClient.onLineEndingChanged((lineending) => {
+      if (this.monitorModel.lineEnding !== lineending) {
+        this.monitorModel.lineEnding = lineending;
+      }
+    });
+
     this.monitorServiceClient.onError(this.handleError.bind(this));
     this.boardsServiceProvider.onBoardsConfigChanged(
       this.handleBoardConfigChange.bind(this)
@@ -99,6 +110,16 @@ export class SerialConnectionManager {
         const { boardsConfig } = this.boardsServiceProvider;
         this.handleBoardConfigChange(boardsConfig);
       }
+
+      // update the current values in the backend and propagate to websocket clients
+      this.monitorService.updateWsConfigParam({
+        ...(property === 'baudRate' && {
+          currentBaudrate: this.monitorModel.baudRate,
+        }),
+        ...(property === 'lineEnding' && {
+          currentLineEnding: this.monitorModel.lineEnding,
+        }),
+      });
     });
 
     this.themeService.onDidColorThemeChange((theme) => {
@@ -433,10 +454,6 @@ export class SerialConnectionManager {
       if (ports.some((port) => Port.equals(port, boardsConfig.selectedPort))) {
         const { selectedBoard: board, selectedPort: port } = boardsConfig;
         const { baudRate } = this.monitorModel;
-        // update the baudrate on the config
-        this.monitorService.updateWsConfigParam({
-          currentBaudrate: baudRate,
-        });
         const newConfig: MonitorConfig = { board, port, baudRate };
         this.setConfig(newConfig);
       }

arduino-ide-extension/src/browser/monitor/monitor-service-client-impl.ts

@@ -3,7 +3,9 @@ import { Emitter } from '@theia/core/lib/common/event';
 import {
   MonitorServiceClient,
   MonitorError,
+  MonitorConfig,
 } from '../../common/protocol/monitor-service';
+import { MonitorModel } from './monitor-model';
 
 @injectable()
 export class MonitorServiceClientImpl implements MonitorServiceClient {
@@ -13,11 +15,25 @@ export class MonitorServiceClientImpl implements MonitorServiceClient {
   protected readonly onMessageEmitter = new Emitter<number>();
   readonly onWebSocketChanged = this.onMessageEmitter.event;
 
+  protected readonly onBaudEmitter = new Emitter<MonitorConfig.BaudRate>();
+  readonly onBaudRateChanged = this.onBaudEmitter.event;
+
+  protected readonly onEolEmitter = new Emitter<MonitorModel.EOL>();
+  readonly onLineEndingChanged = this.onEolEmitter.event;
+
   notifyError(error: MonitorError): void {
     this.onErrorEmitter.fire(error);
   }
 
   notifyWebSocketChanged(message: number): void {
     this.onMessageEmitter.fire(message);
   }
+
+  notifyBaudRateChanged(message: MonitorConfig.BaudRate): void {
+    this.onBaudEmitter.fire(message);
+  }
+
+  notifyLineEndingChanged(message: MonitorModel.EOL): void {
+    this.onEolEmitter.fire(message);
+  }
 }

arduino-ide-extension/src/browser/monitor/monitor-widget.tsx

@@ -64,6 +64,7 @@ export class MonitorWidget extends ReactWidget {
     this.toDispose.push(
       this.monitorConnection.onConnectionChanged(() => this.clearConsole())
     );
+    this.toDispose.push(this.monitorModel.onChange(() => this.update()));
   }
 
   clearConsole(): void {
@@ -172,7 +173,7 @@ export class MonitorWidget extends ReactWidget {
               <ArduinoSelect
                 maxMenuHeight={this.widgetHeight - 40}
                 options={lineEndings}
-                defaultValue={lineEnding}
+                value={lineEnding}
                 onChange={this.onChangeLineEnding}
               />
             </div>
@@ -181,7 +182,7 @@ export class MonitorWidget extends ReactWidget {
                 className="select"
                 maxMenuHeight={this.widgetHeight - 40}
                 options={baudRates}
-                defaultValue={baudRate}
+                value={baudRate}
                 onChange={this.onChangeBaudRate}
               />
             </div>

arduino-ide-extension/src/common/protocol/monitor-service.ts

@@ -2,6 +2,7 @@ import { JsonRpcServer } from '@theia/core/lib/common/messaging/proxy-factory';
 import { Board, Port } from './boards-service';
 import { Event } from '@theia/core/lib/common/event';
 import { SerialPlotter } from '../../browser/plotter/protocol';
+import { MonitorModel } from '../../browser/monitor/monitor-model';
 
 export interface Status {}
 export type OK = Status;
@@ -58,8 +59,12 @@ export const MonitorServiceClient = Symbol('MonitorServiceClient');
 export interface MonitorServiceClient {
   onError: Event<MonitorError>;
   onWebSocketChanged: Event<number>;
+  onLineEndingChanged: Event<MonitorModel.EOL>;
+  onBaudRateChanged: Event<MonitorConfig.BaudRate>;
   notifyError(event: MonitorError): void;
   notifyWebSocketChanged(message: number): void;
+  notifyLineEndingChanged(message: MonitorModel.EOL): void;
+  notifyBaudRateChanged(message: MonitorConfig.BaudRate): void;
 }
 
 export interface MonitorError {

arduino-ide-extension/src/node/monitor/monitor-service-impl.ts

@@ -158,9 +158,13 @@ export class MonitorServiceImpl implements MonitorService {
             break;
 
           case SerialPlotter.Protocol.Command.PLOTTER_SET_BAUDRATE:
+            this.client?.notifyBaudRateChanged(
+              parseInt(message.data, 10) as MonitorConfig.BaudRate
+            );
             break;
 
           case SerialPlotter.Protocol.Command.PLOTTER_SET_LINE_ENDING:
+            this.client?.notifyLineEndingChanged(message.data);
             break;
 
           default: