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

Replaced ReportTargetControllerState event with TC command and renamed TargetControllerStateReported event

Browse Source
This commit is contained in:
Nav
2022-04-27 21:27:59 +01:00
parent f42abe1342
commit 687e28718c
12 changed files with 46 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Insight/InsightWorker/InsightWorker.cpp
View File

@@ -3,7 +3,8 @@
#include <QObject>
#include <QTimer>
#include "src/Helpers/Thread.hpp"
#include "src/TargetController/TargetControllerState.hpp"
#include "src/Logger/Logger.hpp"
namespace Bloom
@@ -24,8 +25,8 @@ namespace Bloom
Logger::debug("Starting InsightWorker thread");
EventManager::registerListener(this->eventListener);
this->eventListener->registerCallbackForEventType<Events::TargetControllerStateReported>(
std::bind(&InsightWorker::onTargetControllerStateReportedEvent, this, std::placeholders::_1)
this->eventListener->registerCallbackForEventType<Events::TargetControllerStateChanged>(
std::bind(&InsightWorker::onTargetControllerStateChangedEvent, this, std::placeholders::_1)
);
this->eventListener->registerCallbackForEventType<Events::TargetExecutionStopped>(
@@ -125,19 +126,13 @@ namespace Bloom
emit this->targetRegistersWritten(event.registers, event.createdTimestamp);
}
void InsightWorker::onTargetControllerStateReportedEvent(const Events::TargetControllerStateReported& event) {
void InsightWorker::onTargetControllerStateChangedEvent(const Events::TargetControllerStateChanged& event) {
using TargetController::TargetControllerState;
if (
this->lastTargetControllerState == TargetControllerState::ACTIVE
&& event.state == TargetControllerState::SUSPENDED
) {
if (event.state == TargetControllerState::SUSPENDED) {
emit this->targetControllerSuspended();
} else if (
this->lastTargetControllerState == TargetControllerState::SUSPENDED
&& event.state == TargetControllerState::ACTIVE
) {
} else if (event.state == TargetControllerState::ACTIVE) {
try {
emit this->targetControllerResumed(this->targetControllerConsole.getTargetDescriptor());
@@ -145,7 +140,6 @@ namespace Bloom
Logger::error("Insight resume failed - " + exception.getMessage());
}
}
this->lastTargetControllerState = event.state;
}
void InsightWorker::executeTasks() {

5
src/Insight/InsightWorker/InsightWorker.hpp
View File

@@ -12,7 +12,6 @@
#include "src/EventManager/Events/Events.hpp"
#include "src/TargetController/TargetControllerConsole.hpp"
#include "src/TargetController/TargetControllerState.hpp"
#include "Tasks/InsightWorkerTask.hpp"
@@ -52,8 +51,6 @@ namespace Bloom
TargetController::TargetControllerConsole targetControllerConsole = TargetController::TargetControllerConsole(
*(this->eventListener)
);
TargetController::TargetControllerState lastTargetControllerState =
TargetController::TargetControllerState::ACTIVE;
Targets::TargetState lastTargetState = Targets::TargetState::UNKNOWN;
@@ -67,7 +64,7 @@ namespace Bloom
void onTargetResumedEvent(const Events::TargetExecutionResumed& event);
void onTargetResetEvent(const Events::TargetReset& event);
void onTargetRegistersWrittenEvent(const Events::RegistersWrittenToTarget& event);
void onTargetControllerStateReportedEvent(const Events::TargetControllerStateReported& event);
void onTargetControllerStateChangedEvent(const Events::TargetControllerStateChanged& event);
void executeTasks();
};