Merge branch 'pluggable-monitor' of https://github.com/arduino/arduino-ide into pluggable-monitor

Author: davegarthsimpson

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

@@ -39,7 +39,7 @@ export class MonitorModel implements FrontendApplicationContribution {
     this._darkTheme = false;
     this._wsPort = 0;
     this._serialPort = '';
-    this._connected = false;
+    this._connected = true;
 
     this.onChangeEmitter = new Emitter<
       MonitorModel.State.Change<keyof MonitorModel.State>

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

@@ -132,10 +132,13 @@ export class MonitorService extends CoreClientAware implements Disposable {
     }
 
     if (!this.board?.fqbn || !this.port?.address || !this.port?.protocol) {
+      this.updateClientsSettings({ monitorUISettings: { connected: false } });
+
       return Status.CONFIG_MISSING;
     }
 
     if (this.uploadInProgress) {
+      this.updateClientsSettings({ monitorUISettings: { connected: false } });
       return Status.UPLOAD_IN_PROGRESS;
     }
 
@@ -389,7 +392,10 @@ export class MonitorService extends CoreClientAware implements Disposable {
     }
 
     this.updateClientsSettings({
-      ...settings,
+      monitorUISettings: {
+        ...settings.monitorUISettings,
+        connected: !!this.duplex,
+      },
       pluggableMonitorSettings: reconciledSettings,
     });