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

Corrected bug with leaving programming mode on Snap and PICkit 4 debug tools

Browse Source
This commit is contained in:
Nav
2023-05-08 02:44:03 +01:00
parent 61d608989d
commit 1f57ca3f21
4 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/DebugToolDrivers/Microchip/MplabPickit4/MplabPickit4.cpp
View File

@@ -18,6 +18,7 @@ namespace Bloom::DebugToolDrivers
try { try {
EdbgDevice::init(); EdbgDevice::init();
this->edbgAvr8Interface->setReactivateJtagTargetPostProgrammingMode(true);
} catch (const DeviceNotFound& exception) { } catch (const DeviceNotFound& exception) {
/* /*

1
src/DebugToolDrivers/Microchip/MplabSnap/MplabSnap.cpp
View File

@@ -18,6 +18,7 @@ namespace Bloom::DebugToolDrivers
try { try {
EdbgDevice::init(); EdbgDevice::init();
this->edbgAvr8Interface->setReactivateJtagTargetPostProgrammingMode(true);
} catch (const DeviceNotFound& exception) { } catch (const DeviceNotFound& exception) {
/* /*

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

@@ -898,6 +898,12 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
} }
this->programmingModeEnabled = false; this->programmingModeEnabled = false;
if (this->configVariant == Avr8ConfigVariant::MEGAJTAG && this->reactivateJtagTargetPostProgrammingMode) {
this->deactivatePhysical();
this->targetAttached = false;
this->activate();
}
} }
std::map<Family, std::map<PhysicalInterface, Avr8ConfigVariant>> std::map<Family, std::map<PhysicalInterface, Avr8ConfigVariant>>

6
src/DebugToolDrivers/Protocols/CMSIS-DAP/VendorSpecific/EDBG/AVR/EdbgAvr8Interface.hpp
View File

@@ -74,6 +74,10 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
this->maximumMemoryAccessSizePerRequest = maximumSize; this->maximumMemoryAccessSizePerRequest = maximumSize;
} }
void setReactivateJtagTargetPostProgrammingMode(bool reactivateJtagTargetPostProgrammingMode) {
this->reactivateJtagTargetPostProgrammingMode = reactivateJtagTargetPostProgrammingMode;
}
/* /*
* The public methods below implement the interface defined by the Avr8Interface class. * The public methods below implement the interface defined by the Avr8Interface class.
* See the comments in that class for more info on the expected behaviour of each method. * See the comments in that class for more info on the expected behaviour of each method.
@@ -328,6 +332,8 @@ namespace Bloom::DebugToolDrivers::Protocols::CmsisDap::Edbg::Avr
*/ */
std::optional<Targets::TargetMemorySize> maximumMemoryAccessSizePerRequest; std::optional<Targets::TargetMemorySize> maximumMemoryAccessSizePerRequest;
bool reactivateJtagTargetPostProgrammingMode = false;
/** /**
* We keep record of the current target state for caching purposes. We'll only refresh the target state if the * We keep record of the current target state for caching purposes. We'll only refresh the target state if the
* target is running. If it has already stopped, then we assume it cannot transition to a running state without * target is running. If it has already stopped, then we assume it cannot transition to a running state without