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

Tidying

Browse Source
This commit is contained in:
Nav
2021-06-30 03:10:27 +01:00
parent e1962ba61a
commit 21bf197801
4 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/Avr8Generic.hpp
View File

@@ -155,7 +155,7 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
SPM = 0xA0,
/**
* The REGISTER_FILE memory type can be used to read &write to general purpose registers.
* The REGISTER_FILE memory type can be used to read & write to general purpose registers.
*
* Only available in debugging mode and with XMEGA and UPDI config variants. The SRAM memory type can be used
* to access general purpose registers when other variants are in use.

13
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.cpp
View File

@@ -489,13 +489,16 @@ void EdbgAvr8Interface::configure(const TargetConfig& targetConfig) {
if (!this->family.has_value()) {
if (this->physicalInterface == PhysicalInterface::JTAG) {
throw InvalidConfig("Cannot use JTAG physical interface with ambiguous target name - please specify the"
" exact name of the target in your configuration file. See https://bloom.oscillate.io/docs/supported-targets");
throw InvalidConfig("The JTAG physical interface cannot be used with an ambiguous target name"
" - please specify the exact name of the target in your configuration file. "
"See https://bloom.oscillate.io/docs/supported-targets"
);
} else if (this->physicalInterface == PhysicalInterface::UPDI) {
throw InvalidConfig("Cannot use UPDI physical interface with ambiguous target name - please "
"specify the exact name of the target in your configuration file. "
"See https://bloom.oscillate.io/docs/supported-targets");
throw InvalidConfig("The UPDI physical interface cannot be used with an ambiguous target name"
" - please specify the exact name of the target in your configuration file. "
"See https://bloom.oscillate.io/docs/supported-targets"
);
}
}

1
src/TargetController/TargetController.cpp
View File

@@ -237,7 +237,6 @@ void TargetController::resume() {
std::bind(&TargetController::onSetPinStateEvent, this, std::placeholders::_1)
);
Logger::debug("TC resumed");
this->state = TargetControllerState::ACTIVE;
this->eventManager.triggerEvent(
std::make_shared<TargetControllerStateReported>(this->state)

3
src/Targets/Microchip/AVR/AVR8/Avr8.cpp
View File

@@ -93,8 +93,7 @@ void Avr8::loadTargetParameters() {
auto cpuInstance = cpuPeripheralModule.instancesMappedByName.at("cpu");
if (cpuInstance.registerGroupsMappedByName.contains("cpu")) {
auto cpuRegisterGroup = cpuInstance.registerGroupsMappedByName.at("cpu");
cpuRegistersOffset = cpuRegisterGroup.offset.value_or(0);
cpuRegistersOffset = cpuInstance.registerGroupsMappedByName.at("cpu").offset.value_or(0);
}
}
}