Removed TC state code from insight and debug server components
This commit is contained in:
@@ -75,10 +75,6 @@ namespace Bloom
|
||||
Logger::info("Starting Insight");
|
||||
this->setThreadState(ThreadState::STARTING);
|
||||
|
||||
this->eventListener.registerCallbackForEventType<Events::TargetControllerStateChanged>(
|
||||
std::bind(&Insight::onTargetControllerStateChangedEvent, this, std::placeholders::_1)
|
||||
);
|
||||
|
||||
this->eventListener.registerCallbackForEventType<Events::TargetExecutionStopped>(
|
||||
std::bind(&Insight::onTargetStoppedEvent, this, std::placeholders::_1)
|
||||
);
|
||||
@@ -350,33 +346,6 @@ namespace Bloom
|
||||
);
|
||||
}
|
||||
|
||||
void Insight::onTargetControllerStateChangedEvent(const Events::TargetControllerStateChanged& event) {
|
||||
using TargetController::TargetControllerState;
|
||||
|
||||
if (event.state == TargetControllerState::SUSPENDED) {
|
||||
emit this->insightSignals->targetControllerSuspended();
|
||||
return;
|
||||
}
|
||||
|
||||
if (event.state == TargetControllerState::ACTIVE) {
|
||||
const auto getTargetDescriptorTask = QSharedPointer<GetTargetDescriptor>(
|
||||
new GetTargetDescriptor(),
|
||||
&QObject::deleteLater
|
||||
);
|
||||
|
||||
QObject::connect(
|
||||
getTargetDescriptorTask.get(),
|
||||
&GetTargetDescriptor::targetDescriptor,
|
||||
this,
|
||||
[this] (Targets::TargetDescriptor targetDescriptor) {
|
||||
emit this->insightSignals->targetControllerResumed(targetDescriptor);
|
||||
}
|
||||
);
|
||||
|
||||
InsightWorker::queueTask(getTargetDescriptorTask);
|
||||
}
|
||||
}
|
||||
|
||||
void Insight::onProgrammingModeEnabledEvent(const Events::ProgrammingModeEnabled& event) {
|
||||
emit this->insightSignals->programmingModeEnabled();
|
||||
}
|
||||
|
||||
@@ -128,7 +128,6 @@ namespace Bloom
|
||||
void onTargetResetEvent(const Events::TargetReset& event);
|
||||
void onTargetRegistersWrittenEvent(const Events::RegistersWrittenToTarget& event);
|
||||
void onTargetMemoryWrittenEvent(const Events::MemoryWrittenToTarget& event);
|
||||
void onTargetControllerStateChangedEvent(const Events::TargetControllerStateChanged& event);
|
||||
void onProgrammingModeEnabledEvent(const Events::ProgrammingModeEnabled& event);
|
||||
void onProgrammingModeDisabledEvent(const Events::ProgrammingModeDisabled& event);
|
||||
};
|
||||
|
||||
@@ -37,8 +37,6 @@ namespace Bloom
|
||||
void targetReset();
|
||||
void targetRegistersWritten(const Bloom::Targets::TargetRegisters& targetRegisters, const QDateTime& timestamp);
|
||||
void targetMemoryWritten(Bloom::Targets::TargetMemoryType memoryType, Targets::TargetMemoryAddressRange addressRange);
|
||||
void targetControllerSuspended();
|
||||
void targetControllerResumed(const Bloom::Targets::TargetDescriptor& targetDescriptor);
|
||||
void programmingModeEnabled();
|
||||
void programmingModeDisabled();
|
||||
|
||||
|
||||
@@ -260,18 +260,6 @@ namespace Bloom
|
||||
// InsightSignal connections
|
||||
auto* insightSignals = InsightSignals::instance();
|
||||
|
||||
QObject::connect(
|
||||
insightSignals,
|
||||
&InsightSignals::targetControllerSuspended,
|
||||
this,
|
||||
&InsightWindow::onTargetControllerSuspended
|
||||
);
|
||||
QObject::connect(
|
||||
insightSignals,
|
||||
&InsightSignals::targetControllerResumed,
|
||||
this,
|
||||
&InsightWindow::onTargetControllerResumed
|
||||
);
|
||||
QObject::connect(
|
||||
insightSignals,
|
||||
&InsightSignals::targetStateUpdated,
|
||||
@@ -905,19 +893,6 @@ namespace Bloom
|
||||
);
|
||||
}
|
||||
|
||||
void InsightWindow::onTargetControllerSuspended() {
|
||||
if (this->activated) {
|
||||
this->deactivate();
|
||||
}
|
||||
}
|
||||
|
||||
void InsightWindow::onTargetControllerResumed(const TargetDescriptor& targetDescriptor) {
|
||||
if (!this->activated) {
|
||||
this->targetDescriptor = targetDescriptor;
|
||||
this->activate();
|
||||
}
|
||||
}
|
||||
|
||||
void InsightWindow::onTargetStateUpdate(TargetState newState) {
|
||||
this->targetState = newState;
|
||||
|
||||
|
||||
@@ -128,8 +128,6 @@ namespace Bloom
|
||||
void adjustPanels();
|
||||
void adjustMinimumSize();
|
||||
|
||||
void onTargetControllerSuspended();
|
||||
void onTargetControllerResumed(const Bloom::Targets::TargetDescriptor& targetDescriptor);
|
||||
void onTargetStateUpdate(Targets::TargetState newState);
|
||||
void refresh();
|
||||
void refreshPinStates();
|
||||
|
||||
Reference in New Issue
Block a user