jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-12-20 05:57:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: expand boards if available on detected port

Browse Source 
moved the board inference logic from UI to  model

Closes #2175

Signed-off-by: Akos Kitta <a.kitta@arduino.cc>
This commit is contained in:
Akos Kitta
2023-08-19 12:36:43 +02:00
committed by Akos Kitta
parent 5a76be306a
commit db01efead3
5 changed files with 166 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
arduino-ide-extension/src/browser/dialogs/firmware-uploader/firmware-uploader-component.tsx
View File

@@ -9,10 +9,9 @@ import {
ArduinoFirmwareUploader,
FirmwareInfo,
} from '../../../common/protocol/arduino-firmware-uploader';
import {
import type {
BoardList,
BoardListItemWithBoard,
isInferredBoardListItem,
} from '../../../common/protocol/board-list';
import { ArduinoSelect } from '../../widgets/arduino-select';
import { SelectBoardComponent } from '../certificate-uploader/select-board-components';
@@ -63,9 +62,7 @@ export const FirmwareUploaderComponent = ({
}
// fetch the firmwares for the selected board
const board = isInferredBoardListItem(selectedItem)
? selectedItem.inferredBoard
: selectedItem.board;
const board = selectedItem.board;
const firmwaresForFqbn = await firmwareUploader.availableFirmwares(
board.fqbn || ''
);
@@ -89,11 +86,14 @@ export const FirmwareUploaderComponent = ({
(firmware) => firmware.firmware_version === selectedFirmware?.value
);
const selectedBoard = selectedItem?.board;
const selectedPort = selectedItem?.port;
try {
const installStatus =
!!firmwareToFlash &&
!!selectedItem?.board &&
(await flashFirmware(firmwareToFlash, selectedItem?.port));
firmwareToFlash &&
selectedBoard &&
selectedPort &&
(await flashFirmware(firmwareToFlash, selectedPort));
setInstallFeedback((installStatus && 'ok') || 'fail');
} catch {
@@ -106,13 +106,9 @@ export const FirmwareUploaderComponent = ({
if (!item) {
return;
}
const board = isInferredBoardListItem(item)
? item.inferredBoard
: item.board;
const selectedBoard = isInferredBoardListItem(selectedItem)
? selectedItem.inferredBoard
: selectedItem?.board;
const board = item.board;
const port = item.port;
const selectedBoard = selectedItem?.board;
const selectedPort = selectedItem?.port;
if (