Skip to content
This repository was archived by the owner on Oct 1, 2024. It is now read-only.

Fix incorrect loaded boards when platform name changes #1513

Merged
merged 2 commits into from
Jun 21, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions src/arduino/boardManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,17 @@ export class BoardManager {
// addedPlatform.boards = util.union(addedPlatform.boards, plat.boards, (a, b) => {
// return a.name === b.name;
// });
if (addedPlatform.name === plat.name) {
addedPlatform.versions.push(plat.version);
// Check if this is the latest version. Platforms typically support more boards in later versions.
addedPlatform.versions.sort(versionCompare);
if (plat.version === addedPlatform.versions[addedPlatform.versions.length - 1]) {
addedPlatform.boards = plat.boards;
}

// Check if platform name is the same, if not, we should use the name from the latest version.
if (addedPlatform.name !== plat.name) {
addedPlatform.name = plat.name;
}

addedPlatform.versions.push(plat.version);
// Check if this is the latest version. Platforms typically support more boards in later versions.
addedPlatform.versions.sort(versionCompare);
if (plat.version === addedPlatform.versions[addedPlatform.versions.length - 1]) {
addedPlatform.boards = plat.boards;
}
} else {
plat.versions = [plat.version];
Expand Down