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

Renamed 'updateDwenFuseBit' AVR8 param to 'manageDwenFuseBit'

Browse Source
This commit is contained in:
Nav
2022-09-18 13:02:33 +01:00
parent 42c42203c2
commit 8bec04e15a
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,7 +92,7 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit
} }
if ( if (
this->targetConfig->updateDwenFuseBit && this->avrIspInterface == nullptr this->targetConfig->manageDwenFuseBit && this->avrIspInterface == nullptr
&& this->targetConfig->physicalInterface == PhysicalInterface::DEBUG_WIRE && this->targetConfig->physicalInterface == PhysicalInterface::DEBUG_WIRE
) { ) {
Logger::warning( Logger::warning(
@@ -157,7 +157,7 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit
this->avr8DebugInterface->activate(); this->avr8DebugInterface->activate();
} catch (const Exceptions::DebugWirePhysicalInterfaceError& debugWireException) { } catch (const Exceptions::DebugWirePhysicalInterfaceError& debugWireException) {
if (!this->targetConfig->updateDwenFuseBit) { if (!this->targetConfig->manageDwenFuseBit) {
throw TargetOperationFailure( throw TargetOperationFailure(
"Failed to activate debugWire physical interface - check target connection and DWEN fuse " "Failed to activate debugWire physical interface - check target connection and DWEN fuse "
"bit. Bloom can manage the DWEN fuse bit automatically. For instructions on enabling this " "bit. Bloom can manage the DWEN fuse bit automatically. For instructions on enabling this "

7
src/Targets/Microchip/AVR/AVR8/Avr8TargetConfig.cpp
View File

@@ -27,8 +27,13 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit
this->physicalInterface = Avr8TargetConfig::debugPhysicalInterfacesByConfigName.at(physicalInterfaceName); this->physicalInterface = Avr8TargetConfig::debugPhysicalInterfacesByConfigName.at(physicalInterfaceName);
// The 'manageDwenFuseBit' param used to be 'updateDwenFuseBit' - we still support the old, for now.
if (targetNode["updateDwenFuseBit"]) { if (targetNode["updateDwenFuseBit"]) {
this->updateDwenFuseBit = targetNode["updateDwenFuseBit"].as<bool>(); this->manageDwenFuseBit = targetNode["updateDwenFuseBit"].as<bool>();
}
if (targetNode["manageDwenFuseBit"]) {
this->manageDwenFuseBit = targetNode["manageDwenFuseBit"].as<bool>();
} }
if (targetNode["cycleTargetPowerPostDwenUpdate"]) { if (targetNode["cycleTargetPowerPostDwenUpdate"]) {

4
src/Targets/Microchip/AVR/AVR8/Avr8TargetConfig.hpp
View File

@@ -43,12 +43,12 @@ namespace Bloom::Targets::Microchip::Avr::Avr8Bit
bool disableDebugWireOnDeactivate = false; bool disableDebugWireOnDeactivate = false;
/** /**
* The updateDwenFuseBit flag determines if Bloom should manage the DWEN fuse bit, for debugWire sessions. * The manageDwenFuseBit flag determines if Bloom should manage the DWEN fuse bit, for debugWire sessions.
* *
* This parameter is optional, and the function is disabled by default. Users must explicitly enable it in * This parameter is optional, and the function is disabled by default. Users must explicitly enable it in
* their target configuration. * their target configuration.
*/ */
bool updateDwenFuseBit = false; bool manageDwenFuseBit = false;
/** /**
* For debug tools that provide target power management functions (such as some evaluation boards), Bloom can * For debug tools that provide target power management functions (such as some evaluation boards), Bloom can