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

Replaced RetrieveTargetPinStates event with TC command

Browse Source
This commit is contained in:
Nav
2022-05-01 00:07:12 +01:00
parent 7c4e39dd03
commit 870c4ba3d7
10 changed files with 75 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/TargetController/TargetControllerComponent.cpp
View File

@@ -34,10 +34,12 @@ namespace Bloom::TargetController
using Commands::SetBreakpoint;
using Commands::RemoveBreakpoint;
using Commands::SetProgramCounter;
using Commands::GetTargetPinStates;
using Responses::Response;
using Responses::TargetRegistersRead;
using Responses::TargetMemoryRead;
using Responses::TargetPinStates;
TargetControllerComponent::TargetControllerComponent(
const ProjectConfig& projectConfig,
@@ -399,11 +401,11 @@ namespace Bloom::TargetController
this->deregisterCommandHandler(SetBreakpoint::type);
this->deregisterCommandHandler(RemoveBreakpoint::type);
this->deregisterCommandHandler(SetProgramCounter::type);
this->deregisterCommandHandler(GetTargetPinStates::type);
this->eventListener->deregisterCallbacksForEventType<Events::DebugSessionFinished>();
this->eventListener->deregisterCallbacksForEventType<Events::ExtractTargetDescriptor>();
this->eventListener->deregisterCallbacksForEventType<Events::InsightThreadStateChanged>();
this->eventListener->deregisterCallbacksForEventType<Events::RetrieveTargetPinStates>();
this->eventListener->deregisterCallbacksForEventType<Events::SetTargetPinState>();
this->eventListener->deregisterCallbacksForEventType<Events::RetrieveStackPointerFromTarget>();
@@ -470,6 +472,10 @@ namespace Bloom::TargetController
std::bind(&TargetControllerComponent::handleSetProgramCounter, this, std::placeholders::_1)
);
this->registerCommandHandler<GetTargetPinStates>(
std::bind(&TargetControllerComponent::handleGetTargetPinStates, this, std::placeholders::_1)
);
this->eventListener->registerCallbackForEventType<Events::DebugSessionFinished>(
std::bind(&TargetControllerComponent::onDebugSessionFinishedEvent, this, std::placeholders::_1)
);
@@ -478,10 +484,6 @@ namespace Bloom::TargetController
std::bind(&TargetControllerComponent::onExtractTargetDescriptor, this, std::placeholders::_1)
);
this->eventListener->registerCallbackForEventType<Events::RetrieveTargetPinStates>(
std::bind(&TargetControllerComponent::onRetrieveTargetPinStatesEvent, this, std::placeholders::_1)
);
this->eventListener->registerCallbackForEventType<Events::SetTargetPinState>(
std::bind(&TargetControllerComponent::onSetPinStateEvent, this, std::placeholders::_1)
);
@@ -877,25 +879,8 @@ namespace Bloom::TargetController
return std::make_unique<Response>();
}
void TargetControllerComponent::onRetrieveTargetPinStatesEvent(const Events::RetrieveTargetPinStates& event) {
try {
if (this->target->getState() != TargetState::STOPPED) {
throw TargetOperationFailure(
"Invalid target state - target must be stopped before pin states can be retrieved"
);
}
auto pinStatesRetrieved = std::make_shared<Events::TargetPinStatesRetrieved>();
pinStatesRetrieved->correlationId = event.id;
pinStatesRetrieved->variantId = event.variantId;
pinStatesRetrieved->pinSatesByNumber = this->target->getPinStates(event.variantId);
EventManager::triggerEvent(pinStatesRetrieved);
} catch (const TargetOperationFailure& exception) {
Logger::error("Failed to retrieve target pin states - " + exception.getMessage());
this->emitErrorEvent(event.id, exception.getMessage());
}
std::unique_ptr<TargetPinStates> TargetControllerComponent::handleGetTargetPinStates(GetTargetPinStates& command) {
return std::make_unique<TargetPinStates>(this->target->getPinStates(command.variantId));
}
void TargetControllerComponent::onSetPinStateEvent(const Events::SetTargetPinState& event) {