mirror of
https://github.com/arduino/arduino-ide.git
synced 2025-10-18 07:38:33 +00:00
* 1032 failing upload flag for monitor mgr
* move upload failure fix logic to frontend
* misc corrections
* avoid starting monitor when upload is in progress
* avoid starting monitor when upload is in progress
* prevent monitor side effects on upload (WIP)
* send upload req after notifying mgr
* dispose instead of pause on upld (code not final)
* Revert "dispose instead of pause on upld (code not final)"
This reverts commit 2d5dff2a2d
.
* force wait before upload (test)
* always start queued services after uplaod finishes
* test cli with monitor close delay
* clean up unnecessary await(s)
* remove unused dependency
* revert CLI to 0.23
* use master cli for testing, await in upload finish
* remove upload port from pending monitor requests
* fix startQueuedServices
* refinements queued monitors
* clean up monitor mgr state
* fix typo from prev cleanup
* avoid dupl queued monitor services
* variable name changes
* reference latest cli commit in package.json
Co-authored-by: Alberto Iannaccone <a.iannaccone@arduino.cc>
This commit is contained in:
@@ -60,7 +60,6 @@ export class MonitorService extends CoreClientAware implements Disposable {
|
||||
protected readonly onDisposeEmitter = new Emitter<void>();
|
||||
readonly onDispose = this.onDisposeEmitter.event;
|
||||
|
||||
protected uploadInProgress = false;
|
||||
protected _initialized = new Deferred<void>();
|
||||
protected creating: Deferred<Status>;
|
||||
|
||||
@@ -114,10 +113,6 @@ export class MonitorService extends CoreClientAware implements Disposable {
|
||||
return this._initialized.promise;
|
||||
}
|
||||
|
||||
setUploadInProgress(status: boolean): void {
|
||||
this.uploadInProgress = status;
|
||||
}
|
||||
|
||||
getWebsocketAddressPort(): number {
|
||||
return this.webSocketProvider.getAddress().port;
|
||||
}
|
||||
@@ -161,15 +156,6 @@ export class MonitorService extends CoreClientAware implements Disposable {
|
||||
return this.creating.promise;
|
||||
}
|
||||
|
||||
if (this.uploadInProgress) {
|
||||
this.updateClientsSettings({
|
||||
monitorUISettings: { connected: false, serialPort: this.port.address },
|
||||
});
|
||||
|
||||
this.creating.resolve(Status.UPLOAD_IN_PROGRESS);
|
||||
return this.creating.promise;
|
||||
}
|
||||
|
||||
this.logger.info('starting monitor');
|
||||
|
||||
// get default monitor settings from the CLI
|
||||
|
Reference in New Issue
Block a user