From c9dd9876438a7c7ac33f48451f84c82b69a90445 Mon Sep 17 00:00:00 2001 From: Nav Date: Thu, 25 Jul 2024 19:04:13 +0100 Subject: [PATCH] Tidying --- src/Application.cpp | 5 +++-- src/Application.hpp | 9 +-------- src/TargetController/TargetControllerComponent.cpp | 3 +-- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/src/Application.cpp b/src/Application.cpp index a25cf896..929c07f2 100644 --- a/src/Application.cpp +++ b/src/Application.cpp @@ -157,8 +157,9 @@ void Application::startup() { this->startSignalHandler(); Logger::info("Selected environment: \"" + this->selectedEnvironmentName + "\""); - Logger::debug("Number of environments extracted from config: " - + std::to_string(this->projectConfig->environments.size())); + Logger::debug( + "Number of environments extracted from config: " + std::to_string(this->projectConfig->environments.size()) + ); applicationEventListener->registerCallbackForEventType( std::bind(&Application::onTargetControllerThreadStateChanged, this, std::placeholders::_1) diff --git a/src/Application.hpp b/src/Application.hpp index b812a889..078ff1b7 100644 --- a/src/Application.hpp +++ b/src/Application.hpp @@ -31,13 +31,6 @@ #include "src/VersionNumber.hpp" - -/** - * Bloom - a debug interface for embedded systems development on Linux. - * - * This is the main entry-point of execution for the Bloom program. The methods within will run on the main - * thread. If Insight is enabled, execution will be passed over to Insight::run() upon start up. - */ class Application: public QObject, public Thread { Q_OBJECT @@ -68,7 +61,7 @@ private: * * See the SignalHandler class for more on this. */ - SignalHandler signalHandler = SignalHandler(); + SignalHandler signalHandler = {}; std::thread signalHandlerThread; /** diff --git a/src/TargetController/TargetControllerComponent.cpp b/src/TargetController/TargetControllerComponent.cpp index 61c3de27..5a7928bb 100644 --- a/src/TargetController/TargetControllerComponent.cpp +++ b/src/TargetController/TargetControllerComponent.cpp @@ -518,11 +518,10 @@ namespace TargetController Logger::info("Activating target"); this->target->activate(); Logger::info("Target activated"); + Logger::info("Target name: " + this->targetDescriptor->name); this->target->postActivate(); - Logger::info("Target name: " + this->targetDescriptor->name); - this->targetState = std::make_unique( TargetExecutionState::UNKNOWN, TargetMode::DEBUGGING,