From 7200dc5d350f8744a38a5bfc2a4de7ea087c6458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Carlos=20Henrique=20Guard=C3=A3o=20Gandarez?= Date: Tue, 7 Jun 2022 18:27:43 -0300 Subject: [PATCH 1/2] Fix incorrect loading boards when platform name changes --- src/arduino/boardManager.ts | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/src/arduino/boardManager.ts b/src/arduino/boardManager.ts index 196e4edb..b3f7b810 100644 --- a/src/arduino/boardManager.ts +++ b/src/arduino/boardManager.ts @@ -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]; From d5cdb44d6b6a394fa94c90d0cebd10e4702c6678 Mon Sep 17 00:00:00 2001 From: Garrett Campbell Date: Tue, 21 Jun 2022 10:57:42 -0400 Subject: [PATCH 2/2] fix not equal sign --- src/arduino/boardManager.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/arduino/boardManager.ts b/src/arduino/boardManager.ts index b3f7b810..81af5526 100644 --- a/src/arduino/boardManager.ts +++ b/src/arduino/boardManager.ts @@ -229,7 +229,7 @@ export class BoardManager { // }); // Check if platform name is the same, if not, we should use the name from the latest version. - if (addedPlatform.name != plat.name) { + if (addedPlatform.name !== plat.name) { addedPlatform.name = plat.name; }