jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-08-21 09:09:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

ATL-750: Handle board name change after install.

Browse Source 
Signed-off-by: Akos Kitta <kittaakos@typefox.io>
This commit is contained in:
Akos Kitta
2020-12-02 09:03:04 +01:00
committed by Akos Kitta
parent 7696e2c4c9
commit c024a8d3d1
26 changed files with 674 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
arduino-ide-extension/src/common/protocol/boards-service.ts
View File

@@ -104,7 +104,7 @@ export interface BoardsService extends Installable<BoardsPackage>, Searchable<Bo
getContainerBoardPackage(options: { fqbn: string }): Promise<BoardsPackage | undefined>;
// The CLI cannot do fuzzy search. This method provides all boards and we do the fuzzy search (with monaco) on the frontend.
// https://github.com/arduino/arduino-cli/issues/629
allBoards(options: {}): Promise<Array<Board & { packageName: string }>>;
allBoards(options: {}): Promise<Array<BoardWithPackage>>;
}
export interface Port {
@@ -255,6 +255,18 @@ export interface Board {
readonly port?: Port;
}
export interface BoardWithPackage extends Board {
readonly packageName: string;
readonly packageId: string;
}
export namespace BoardWithPackage {
export function is(board: Board & Partial<{ packageName: string, packageId: string }>): board is BoardWithPackage {
return !!board.packageId && !!board.packageName;
}
}
export interface BoardDetails {
readonly fqbn: string;
readonly requiredTools: Tool[];
@@ -381,10 +393,10 @@ export namespace Board {
return `${board.name}${fqbn}`;
}
export type Detailed = Board & Readonly<{ selected: boolean, missing: boolean, packageName: string, details?: string }>;
export type Detailed = Board & Readonly<{ selected: boolean, missing: boolean, packageName: string, packageId: string, details?: string }>;
export function decorateBoards(
selectedBoard: Board | undefined,
boards: Array<Board & { packageName: string }>): Array<Detailed> {
boards: Array<BoardWithPackage>): Array<Detailed> {
// Board names are not unique. We show the corresponding core name as a detail.
// https://github.com/arduino/arduino-cli/pull/294#issuecomment-513764948
const distinctBoardNames = new Map<string, number>();
@@ -394,12 +406,15 @@ export namespace Board {
}
// Due to the non-unique board names, we have to check the package name as well.
const selected = (board: Board & { packageName: string }) => {
const selected = (board: BoardWithPackage) => {
if (!!selectedBoard) {
if (Board.equals(board, selectedBoard)) {
if ('packageName' in selectedBoard) {
return board.packageName === (selectedBoard as any).packageName;
}
if ('packageId' in selectedBoard) {
return board.packageId === (selectedBoard as any).packageId;
}
return true;
}
}