From 65dc8980d63d08464f2c27ba8d484b723a0648b1 Mon Sep 17 00:00:00 2001 From: Maxwell Schaefer Date: Wed, 4 Dec 2024 14:52:26 -0800 Subject: [PATCH 1/2] Fixed hardware definition source inconsistency between menu and flashing strategy --- src/api/src/services/BinaryFlashingStrategy/index.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/api/src/services/BinaryFlashingStrategy/index.ts b/src/api/src/services/BinaryFlashingStrategy/index.ts index 3f7a0a66..6abfd834 100644 --- a/src/api/src/services/BinaryFlashingStrategy/index.ts +++ b/src/api/src/services/BinaryFlashingStrategy/index.ts @@ -560,7 +560,10 @@ export default class BinaryFlashingStrategyService implements FlashingStrategy { ); let flasherArgs: string[][]; - if (gitRepository.hardwareArtifactUrl) { + if ( + gitRepository.hardwareArtifactUrl && + params.firmware.source !== FirmwareSource.Local + ) { flasherArgs = this.binaryConfigurator.buildBinaryConfigFlags( outputDirectory, firmwareBinFile, From 4608112072b36992d7c49a880f7264b229bce4d4 Mon Sep 17 00:00:00 2001 From: Maxwell Schaefer Date: Wed, 4 Dec 2024 15:21:12 -0800 Subject: [PATCH 2/2] Covered case where no hardware directory exists in local firmware directory --- src/api/src/services/BinaryFlashingStrategy/index.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/api/src/services/BinaryFlashingStrategy/index.ts b/src/api/src/services/BinaryFlashingStrategy/index.ts index 6abfd834..9da809cf 100644 --- a/src/api/src/services/BinaryFlashingStrategy/index.ts +++ b/src/api/src/services/BinaryFlashingStrategy/index.ts @@ -562,7 +562,10 @@ export default class BinaryFlashingStrategyService implements FlashingStrategy { let flasherArgs: string[][]; if ( gitRepository.hardwareArtifactUrl && - params.firmware.source !== FirmwareSource.Local + !( + params.firmware.source === FirmwareSource.Local && + fs.existsSync(path.join(firmwareDescriptionsPath, 'hardware')) + ) ) { flasherArgs = this.binaryConfigurator.buildBinaryConfigFlags( outputDirectory,