doryan/BloomPatched
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- Renamed build script for brief target descriptor generation

Browse Source 
- Created new TargetService class
- Moved brief target descriptor mapping to new TargetService class
- Replaced CMake custom commands with custom targets, for TDF validation and brief target descriptor generation build scripts
- Moved BriefTargetDescriptor into separate header file
This commit is contained in:
Nav
2024-03-02 01:59:55 +00:00
parent e75ce8b403
commit 4aa8ed30de
12 changed files with 182 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/TargetController/TargetControllerComponent.cpp
View File

@@ -375,25 +375,23 @@ namespace TargetController
};
}
std::unique_ptr<Targets::Target> TargetControllerComponent::constructTargetFromBrief(
const TargetDescription::GeneratedMapping::BriefTargetDescriptor &targetBrief
) {
std::unique_ptr<Target> TargetControllerComponent::constructTarget(const BriefTargetDescriptor& briefDescriptor) {
using Services::PathService;
if (targetBrief.targetFamily == TargetFamily::AVR_8) {
if (briefDescriptor.family == TargetFamily::AVR_8) {
return std::make_unique<Microchip::Avr::Avr8Bit::Avr8>(
this->environmentConfig.targetConfig,
Microchip::Avr::Avr8Bit::TargetDescription::TargetDescriptionFile(
PathService::targetDescriptionDirPath() + "/" + targetBrief.relativeTdfPath
PathService::targetDescriptionDirPath() + "/" + briefDescriptor.relativeTdfPath
)
);
}
if (targetBrief.targetFamily == TargetFamily::RISC_V) {
if (briefDescriptor.family == TargetFamily::RISC_V) {
return std::make_unique<RiscV::RiscV>(
this->environmentConfig.targetConfig,
RiscV::TargetDescription::TargetDescriptionFile(
PathService::targetDescriptionDirPath() + "/" + targetBrief.relativeTdfPath
PathService::targetDescriptionDirPath() + "/" + briefDescriptor.relativeTdfPath
)
);
}
@@ -470,10 +468,9 @@ namespace TargetController
const auto& targetName = this->environmentConfig.targetConfig.name;
static const auto supportedDebugTools = this->getSupportedDebugTools();
static const auto targetsByConfigValue = TargetDescription::TargetDescriptionFile::mapping();
const auto debugToolIt = supportedDebugTools.find(debugToolName);
const auto targetBriefIt = targetsByConfigValue.find(targetName);
const auto briefTargetDescriptor = Services::TargetService::briefDescriptor(targetName);
if (debugToolIt == supportedDebugTools.end()) {
throw Exceptions::InvalidConfig(
@@ -481,7 +478,7 @@ namespace TargetController
);
}
if (targetBriefIt == targetsByConfigValue.end()) {
if (!briefTargetDescriptor.has_value()) {
throw Exceptions::InvalidConfig(
"Target name (\"" + targetName + "\") not recognised. Please check your configuration!"
);
@@ -497,7 +494,7 @@ namespace TargetController
Logger::info("Debug tool serial: " + this->debugTool->getSerialNumber());
Logger::info("Debug tool firmware version: " + this->debugTool->getFirmwareVersionString());
this->target = this->constructTargetFromBrief(targetBriefIt->second);
this->target = this->constructTarget(*briefTargetDescriptor);
const auto& targetDescriptor = this->getTargetDescriptor();
if (!this->target->supportsDebugTool(this->debugTool.get())) {