8000 fix 180: prevent erroneous "auto-reconnect"(s) in board selector by davegarthsimpson · Pull Request #1328 · arduino/arduino-ide · GitHub
[go: up one dir, main page]

Skip to content

fix 180: prevent erroneous "auto-reconnect"(s) in board selector #1328

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Aug 24, 2022
Merged
Prev Previous commit
Next Next commit
clean up naming
  • Loading branch information
davegarthsimpson committed Aug 23, 2022
commit cac5dabb3b03b9ae8261cb5f2ee312f4cf40b267
24 changes: 14 additions & 10 deletions arduino-ide-extension/src/browser/boards/boards-service-provider.ts
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
protected _availableBoards: AvailableBoard[] = [];

private lastBoardsConfigOnUpload: BoardsConfig.Config | undefined;
private boardConfigToSelect: BoardsConfig.Config | undefined;
private boardConfigToAutoSelect: BoardsConfig.Config | undefined;

/**
* Unlike `onAttachedBoardsChanged` this even fires when the user modifies the selected board in the IDE.\
Expand Down Expand Up @@ -120,9 +120,11 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
this.lastBoardsConfigOnUpload = value;
}

private derivePersistingUploadPort(event: AttachedBoardsChangeEvent): void {
private deriveBoardConfigToAutoSelect(
event: AttachedBoardsChangeEvent
): void {
if (!this.lastBoardsConfigOnUpload) {
this.boardConfigToSelect = undefined;
this.boardConfigToAutoSelect = undefined;
return;
}

Expand All @@ -142,18 +144,20 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
const lastSelectionOnUpload = this.lastBoardsConfigOnUpload;
this.setLastBoardsConfigOnUpload(undefined);

const appearedPort = appearedPorts[0];

const boardOnAppearedPort = newBoards.find((board: Board) =>
Port.sameAs(board.port, appearedPorts[0])
Port.sameAs(board.port, appearedPort)
);

if (
boardOnAppearedPort &&
lastSelectionOnUpload.selectedBoard &&
Board.sameAs(boardOnAppearedPort, lastSelectionOnUpload.selectedBoard)
) {
this.boardConfigToSelect = {
this.boardConfigToAutoSelect = {
selectedBoard: boardOnAppearedPort,
selectedPort: appearedPorts[0],
selectedPort: appearedPort,
};
return;
}
Expand All @@ -172,7 +176,7 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
const { uploadInProgress } = event;

if (!uploadInProgress) {
this.derivePersistingUploadPort(event);
this.deriveBoardConfigToAutoSelect(event);
}

this._attachedBoards = event.newState.boards;
Expand Down Expand Up @@ -299,10 +303,10 @@ export class BoardsServiceProvider implements FrontendApplicationContribution {
}
}

if (!this.boardConfigToSelect) return false;
if (!this.boardConfigToAutoSelect) return false;

this.boardsConfig = this.boardConfigToSelect;
this.boardConfigToSelect = undefined;
this.boardsConfig = this.boardConfigToAutoSelect;
this.boardConfigToAutoSelect = undefined;
return true;
}
return false;
Expand Down
0