Moved TargetController components into new 'TargetController' namespace.

src/Application.cpp

@@ -351,13 +351,13 @@ namespace Bloom
     }
 
     void Application::startTargetController() {
-        this->targetController = std::make_unique<TargetControllerComponent>(
+        this->targetController = std::make_unique<TargetController::TargetControllerComponent>(
             this->projectConfig.value(),
             this->environmentConfig.value()
         );
 
         this->targetControllerThread = std::thread(
-            &TargetControllerComponent::run,
+            &TargetController::TargetControllerComponent::run,
             this->targetController.get()
         );
 

src/Application.hpp

@@ -76,7 +76,7 @@ namespace Bloom
          * std::unique_ptr for the debug server (for polymorphism), I thought I'd keep it consistent and just use
          * std::unique_ptr for lazy loading.
          */
-        std::unique_ptr<TargetControllerComponent> targetController = nullptr;
+        std::unique_ptr<TargetController::TargetControllerComponent> targetController = nullptr;
         std::thread targetControllerThread;
 
         /**

src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.cpp

@@ -8,6 +8,8 @@
 
 namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
 {
+    using TargetController::TargetControllerConsole;
+
     using ResponsePackets::ErrorResponsePacket;
     using ResponsePackets::ResponsePacket;
 

src/DebugServer/Gdb/AvrGdb/CommandPackets/ReadMemory.hpp

@@ -31,6 +31,9 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
 
         explicit ReadMemory(const RawPacketType& rawPacket);
 
-        void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
+        void handle(
+            DebugSession& debugSession,
+            TargetController::TargetControllerConsole& targetControllerConsole
+        ) override;
     };
 }

src/DebugServer/Gdb/AvrGdb/CommandPackets/WriteMemory.cpp

@@ -8,6 +8,8 @@
 
 namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
 {
+    using TargetController::TargetControllerConsole;
+
     using ResponsePackets::ErrorResponsePacket;
     using ResponsePackets::OkResponsePacket;
 

src/DebugServer/Gdb/AvrGdb/CommandPackets/WriteMemory.hpp

@@ -31,6 +31,9 @@ namespace Bloom::DebugServer::Gdb::AvrGdb::CommandPackets
 
         explicit WriteMemory(const RawPacketType& rawPacket);
 
-        void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
+        void handle(
+            DebugSession& debugSession,
+            TargetController::TargetControllerConsole& targetControllerConsole
+        ) override;
     };
 }

src/DebugServer/Gdb/CommandPackets/CommandPacket.cpp

@@ -13,6 +13,8 @@
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
+    using TargetController::TargetControllerConsole;
+
     using ResponsePackets::ResponsePacket;
     using ResponsePackets::OkResponsePacket;
     using ResponsePackets::TargetStopped;

src/DebugServer/Gdb/CommandPackets/CommandPacket.hpp

@@ -46,6 +46,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
          *
          * @param targetControllerConsole
          */
-        virtual void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole);
+        virtual void handle(
+            DebugSession& debugSession,
+            TargetController::TargetControllerConsole& targetControllerConsole
+        );
     };
 }

src/DebugServer/Gdb/CommandPackets/ContinueExecution.cpp

@@ -7,6 +7,8 @@
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
+    using TargetController::TargetControllerConsole;
+
     using ResponsePackets::ErrorResponsePacket;
     using Exceptions::Exception;
 

src/DebugServer/Gdb/CommandPackets/ContinueExecution.hpp

@@ -26,6 +26,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
 
         explicit ContinueExecution(const RawPacketType& rawPacket);
 
-        void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
+        void handle(
+            DebugSession& debugSession,
+            TargetController::TargetControllerConsole& targetControllerConsole
+        ) override;
     };
 }

src/DebugServer/Gdb/CommandPackets/InterruptExecution.cpp

@@ -9,6 +9,8 @@
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
+    using TargetController::TargetControllerConsole;
+
     using ResponsePackets::TargetStopped;
     using ResponsePackets::ErrorResponsePacket;
     using Exceptions::Exception;

src/DebugServer/Gdb/CommandPackets/InterruptExecution.hpp

@@ -17,6 +17,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
     public:
         explicit InterruptExecution(const RawPacketType& rawPacket): CommandPacket(rawPacket) {}
 
-        void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
+        void handle(
+            DebugSession& debugSession,
+            TargetController::TargetControllerConsole& targetControllerConsole
+        ) override;
     };
 }

src/DebugServer/Gdb/CommandPackets/Monitor.cpp

@@ -6,6 +6,8 @@
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
+    using TargetController::TargetControllerConsole;
+
     using ResponsePackets::EmptyResponsePacket;
 
     Monitor::Monitor(const RawPacketType& rawPacket)

src/DebugServer/Gdb/CommandPackets/Monitor.hpp

@@ -19,6 +19,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
 
         explicit Monitor(const RawPacketType& rawPacket);
 
-        void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
+        void handle(
+            DebugSession& debugSession,
+            TargetController::TargetControllerConsole& targetControllerConsole
+        ) override;
     };
 }

src/DebugServer/Gdb/CommandPackets/ReadRegisters.cpp

@@ -9,6 +9,8 @@
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
+    using TargetController::TargetControllerConsole;
+
     using Targets::TargetRegister;
     using Targets::TargetRegisterDescriptors;
 

src/DebugServer/Gdb/CommandPackets/ReadRegisters.hpp

@@ -27,6 +27,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
 
         explicit ReadRegisters(const RawPacketType& rawPacket);
 
-        void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
+        void handle(
+            DebugSession& debugSession,
+            TargetController::TargetControllerConsole& targetControllerConsole
+        ) override;
     };
 }

src/DebugServer/Gdb/CommandPackets/RemoveBreakpoint.cpp

@@ -12,6 +12,8 @@
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
+    using TargetController::TargetControllerConsole;
+
     using Targets::TargetBreakpoint;
 
     using ResponsePackets::OkResponsePacket;

src/DebugServer/Gdb/CommandPackets/RemoveBreakpoint.hpp

@@ -28,6 +28,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
 
         explicit RemoveBreakpoint(const RawPacketType& rawPacket);
 
-        void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
+        void handle(
+            DebugSession& debugSession,
+            TargetController::TargetControllerConsole& targetControllerConsole
+        ) override;
     };
 }

src/DebugServer/Gdb/CommandPackets/ResetTarget.cpp

@@ -8,6 +8,8 @@
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
+    using TargetController::TargetControllerConsole;
+
     using ResponsePackets::ErrorResponsePacket;
     using ResponsePackets::ResponsePacket;
 

src/DebugServer/Gdb/CommandPackets/ResetTarget.hpp

@@ -17,6 +17,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
     public:
         explicit ResetTarget(Monitor&& monitorPacket);
 
-        void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
+        void handle(
+            DebugSession& debugSession,
+            TargetController::TargetControllerConsole& targetControllerConsole
+        ) override;
     };
 }

src/DebugServer/Gdb/CommandPackets/SetBreakpoint.cpp

@@ -12,6 +12,8 @@
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
+    using TargetController::TargetControllerConsole;
+
     using Targets::TargetBreakpoint;
 
     using ResponsePackets::OkResponsePacket;

src/DebugServer/Gdb/CommandPackets/SetBreakpoint.hpp

@@ -28,6 +28,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
 
         explicit SetBreakpoint(const RawPacketType& rawPacket);
 
-        void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
+        void handle(
+            DebugSession& debugSession,
+            TargetController::TargetControllerConsole& targetControllerConsole
+        ) override;
     };
 }

src/DebugServer/Gdb/CommandPackets/StepExecution.cpp

@@ -7,6 +7,8 @@
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
+    using TargetController::TargetControllerConsole;
+
     using ResponsePackets::ErrorResponsePacket;
 
     using Exceptions::Exception;

src/DebugServer/Gdb/CommandPackets/StepExecution.hpp

@@ -21,6 +21,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
 
         explicit StepExecution(const RawPacketType& rawPacket);
 
-        void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
+        void handle(
+            DebugSession& debugSession,
+            TargetController::TargetControllerConsole& targetControllerConsole
+        ) override;
     };
 }

src/DebugServer/Gdb/CommandPackets/SupportedFeaturesQuery.cpp

@@ -13,6 +13,8 @@
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
+    using TargetController::TargetControllerConsole;
+
     using ResponsePackets::SupportedFeaturesResponse;
     using ResponsePackets::ErrorResponsePacket;
 

src/DebugServer/Gdb/CommandPackets/SupportedFeaturesQuery.hpp

@@ -32,7 +32,10 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
             return this->supportedFeatures;
         }
 
-        void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
+        void handle(
+            DebugSession& debugSession,
+            TargetController::TargetControllerConsole& targetControllerConsole
+        ) override;
 
     private:
         std::set<Feature> supportedFeatures;

src/DebugServer/Gdb/CommandPackets/WriteRegister.cpp

@@ -11,6 +11,8 @@
 
 namespace Bloom::DebugServer::Gdb::CommandPackets
 {
+    using TargetController::TargetControllerConsole;
+
     using Targets::TargetRegister;
     using Targets::TargetRegisterDescriptors;
 

src/DebugServer/Gdb/CommandPackets/WriteRegister.hpp

@@ -19,6 +19,9 @@ namespace Bloom::DebugServer::Gdb::CommandPackets
 
         explicit WriteRegister(const RawPacketType& rawPacket);
 
-        void handle(DebugSession& debugSession, TargetControllerConsole& targetControllerConsole) override;
+        void handle(
+            DebugSession& debugSession,
+            TargetController::TargetControllerConsole& targetControllerConsole
+        ) override;
     };
 }

src/DebugServer/Gdb/GdbRspDebugServer.cpp

@@ -295,7 +295,10 @@ namespace Bloom::DebugServer::Gdb
     }
 
     void GdbRspDebugServer::onTargetControllerStateReported(const Events::TargetControllerStateReported& event) {
-        if (event.state == TargetControllerState::SUSPENDED && this->activeDebugSession.has_value()) {
+        if (
+            event.state == TargetController::TargetControllerState::SUSPENDED
+            && this->activeDebugSession.has_value()
+        ) {
             Logger::warning("Terminating debug session - TargetController suspended unexpectedly");
             this->terminateActiveDebugSession();
         }

src/DebugServer/Gdb/GdbRspDebugServer.hpp

@@ -112,7 +112,9 @@ namespace Bloom::DebugServer::Gdb
          *
          * See documentation in src/DebugServer/Gdb/README.md for more on how GDB commands are processed.
          */
-        TargetControllerConsole targetControllerConsole = TargetControllerConsole(this->eventListener);
+        TargetController::TargetControllerConsole targetControllerConsole = TargetController::TargetControllerConsole(
+            this->eventListener
+        );
 
         /**
          * Listening socket address

src/EventManager/Events/TargetControllerStateReported.hpp

@@ -13,8 +13,8 @@ namespace Bloom::Events
         static constexpr EventType type = EventType::TARGET_CONTROLLER_STATE_REPORTED;
         static inline const std::string name = "TargetControllerStateReported";
 
-        TargetControllerState state;
+        TargetController::TargetControllerState state;
-        explicit TargetControllerStateReported(TargetControllerState state): state(state) {};
+        explicit TargetControllerStateReported(TargetController::TargetControllerState state): state(state) {};
 
         [[nodiscard]] EventType getType() const override {
             return TargetControllerStateReported::type;

src/Insight/Insight.hpp

@@ -78,7 +78,9 @@ namespace Bloom
             this->insightProjectSettings
         );
 
-        TargetControllerConsole targetControllerConsole = TargetControllerConsole(this->eventListener);
+        TargetController::TargetControllerConsole targetControllerConsole = TargetController::TargetControllerConsole(
+            this->eventListener
+        );
 
         /**
          * Insight consists of two threads - the main thread where the main Qt event loop runs (for the GUI), and

src/Insight/InsightWorker/InsightWorker.cpp

@@ -119,12 +119,16 @@ namespace Bloom
     }
 
     void InsightWorker::onTargetControllerStateReportedEvent(const Events::TargetControllerStateReported& event) {
-        if (this->lastTargetControllerState == TargetControllerState::ACTIVE
+        using TargetController::TargetControllerState;
+
+        if (
+            this->lastTargetControllerState == TargetControllerState::ACTIVE
             && event.state == TargetControllerState::SUSPENDED
         ) {
             emit this->targetControllerSuspended();
 
-        } else if (this->lastTargetControllerState == TargetControllerState::SUSPENDED
+        } else if (
+            this->lastTargetControllerState == TargetControllerState::SUSPENDED
             && event.state == TargetControllerState::ACTIVE
         ) {
             try {

src/Insight/InsightWorker/InsightWorker.hpp

@@ -49,8 +49,11 @@ namespace Bloom
     private:
         EventListenerPointer eventListener = std::make_shared<EventListener>("InsightWorkerEventListener");
 
-        TargetControllerConsole targetControllerConsole = TargetControllerConsole(*(this->eventListener));
+        TargetController::TargetControllerConsole targetControllerConsole = TargetController::TargetControllerConsole(
-        TargetControllerState lastTargetControllerState = TargetControllerState::ACTIVE;
+            *(this->eventListener)
+        );
+        TargetController::TargetControllerState lastTargetControllerState =
+            TargetController::TargetControllerState::ACTIVE;
 
         QTimer* eventDispatchTimer = nullptr;
 

src/Insight/InsightWorker/Tasks/InsightWorkerTask.cpp

@@ -4,6 +4,8 @@
 
 namespace Bloom
 {
+    using TargetController::TargetControllerConsole;
+
     void InsightWorkerTask::execute(TargetControllerConsole& targetControllerConsole) {
         try {
             this->state = InsightWorkerTaskState::STARTED;

src/Insight/InsightWorker/Tasks/InsightWorkerTask.hpp

@@ -24,7 +24,7 @@ namespace Bloom
 
         InsightWorkerTask(): QObject(nullptr) {};
 
-        void execute(TargetControllerConsole& targetControllerConsole);
+        void execute(TargetController::TargetControllerConsole& targetControllerConsole);
 
     signals:
         void started();
@@ -32,6 +32,6 @@ namespace Bloom
         void completed();
 
     protected:
-        virtual void run(TargetControllerConsole& targetControllerConsole) = 0;
+        virtual void run(TargetController::TargetControllerConsole& targetControllerConsole) = 0;
     };
 }

src/Insight/InsightWorker/Tasks/QueryLatestVersionNumber.cpp

@@ -11,6 +11,8 @@
 
 namespace Bloom
 {
+    using TargetController::TargetControllerConsole;
+
     void QueryLatestVersionNumber::run(TargetControllerConsole& targetControllerConsole) {
         auto* networkAccessManager = new QNetworkAccessManager(this);
         auto queryVersionEndpointUrl = QUrl(QString::fromStdString(Paths::homeDomainName() + "/latest-version"));

src/Insight/InsightWorker/Tasks/QueryLatestVersionNumber.hpp

@@ -18,7 +18,7 @@ namespace Bloom
         void latestVersionNumberRetrieved(const VersionNumber& latestVersionNumber);
 
     protected:
-        void run(TargetControllerConsole& targetControllerConsole) override;
+        void run(TargetController::TargetControllerConsole& targetControllerConsole) override;
 
     private:
         VersionNumber currentVersionNumber;

src/Insight/InsightWorker/Tasks/ReadStackPointer.cpp

@@ -2,6 +2,8 @@
 
 namespace Bloom
 {
+    using TargetController::TargetControllerConsole;
+
     void ReadStackPointer::run(TargetControllerConsole& targetControllerConsole) {
         emit this->stackPointerRead(targetControllerConsole.getStackPointer());
     }

src/Insight/InsightWorker/Tasks/ReadStackPointer.hpp

@@ -15,6 +15,6 @@ namespace Bloom
         void stackPointerRead(std::uint32_t stackPointer);
 
     protected:
-        void run(TargetControllerConsole& targetControllerConsole) override;
+        void run(TargetController::TargetControllerConsole& targetControllerConsole) override;
     };
 }

src/Insight/InsightWorker/Tasks/ReadTargetMemory.cpp

@@ -2,6 +2,8 @@
 
 namespace Bloom
 {
+    using TargetController::TargetControllerConsole;
+
     void ReadTargetMemory::run(TargetControllerConsole& targetControllerConsole) {
         emit this->targetMemoryRead(
             targetControllerConsole.readMemory(

src/Insight/InsightWorker/Tasks/ReadTargetMemory.hpp

@@ -28,7 +28,7 @@ namespace Bloom
         void targetMemoryRead(Targets::TargetMemoryBuffer buffer);
 
     protected:
-        void run(TargetControllerConsole& targetControllerConsole) override;
+        void run(TargetController::TargetControllerConsole& targetControllerConsole) override;
 
     private:
         Targets::TargetMemoryType memoryType;

src/Insight/InsightWorker/Tasks/ReadTargetRegisters.cpp

@@ -2,6 +2,8 @@
 
 namespace Bloom
 {
+    using TargetController::TargetControllerConsole;
+
     void ReadTargetRegisters::run(TargetControllerConsole& targetControllerConsole) {
         emit this->targetRegistersRead(targetControllerConsole.readRegisters(this->descriptors));
     }

src/Insight/InsightWorker/Tasks/ReadTargetRegisters.hpp

@@ -16,7 +16,7 @@ namespace Bloom
         void targetRegistersRead(Targets::TargetRegisters registers);
 
     protected:
-        void run(TargetControllerConsole& targetControllerConsole) override;
+        void run(TargetController::TargetControllerConsole& targetControllerConsole) override;
 
     private:
         Targets::TargetRegisterDescriptors descriptors;

src/Insight/InsightWorker/Tasks/RefreshTargetPinStates.cpp

@@ -2,6 +2,8 @@
 
 namespace Bloom
 {
+    using TargetController::TargetControllerConsole;
+
     void RefreshTargetPinStates::run(TargetControllerConsole& targetControllerConsole) {
         emit this->targetPinStatesRetrieved(targetControllerConsole.getPinStates(this->variantId));
     }

src/Insight/InsightWorker/Tasks/RefreshTargetPinStates.hpp

@@ -17,7 +17,7 @@ namespace Bloom
         void targetPinStatesRetrieved(Bloom::Targets::TargetPinStateMappingType pinStatesByNumber);
 
     protected:
-        void run(TargetControllerConsole& targetControllerConsole) override;
+        void run(TargetController::TargetControllerConsole& targetControllerConsole) override;
 
     private:
         int variantId;

src/Insight/InsightWorker/Tasks/SetTargetPinState.cpp

@@ -2,6 +2,8 @@
 
 namespace Bloom
 {
+    using TargetController::TargetControllerConsole;
+
     void SetTargetPinState::run(TargetControllerConsole& targetControllerConsole) {
         targetControllerConsole.setPinState(this->pinDescriptor, this->pinState);
     }

src/Insight/InsightWorker/Tasks/SetTargetPinState.hpp

@@ -14,7 +14,7 @@ namespace Bloom
         pinDescriptor(pinDescriptor), pinState(pinState) {}
 
     protected:
-        void run(TargetControllerConsole& targetControllerConsole) override;
+        void run(TargetController::TargetControllerConsole& targetControllerConsole) override;
 
     private:
         Targets::TargetPinDescriptor pinDescriptor;

src/Insight/InsightWorker/Tasks/WriteTargetRegister.cpp

@@ -2,6 +2,8 @@
 
 namespace Bloom
 {
+    using TargetController::TargetControllerConsole;
+
     void WriteTargetRegister::run(TargetControllerConsole& targetControllerConsole) {
         targetControllerConsole.writeRegisters({this->targetRegister});
     }

src/Insight/InsightWorker/Tasks/WriteTargetRegister.hpp

@@ -13,7 +13,7 @@ namespace Bloom
         explicit WriteTargetRegister(const Targets::TargetRegister& targetRegister): targetRegister(targetRegister) {}
 
     protected:
-        void run(TargetControllerConsole& targetControllerConsole) override;
+        void run(TargetController::TargetControllerConsole& targetControllerConsole) override;
 
     private:
         Targets::TargetRegister targetRegister;

src/TargetController/TargetControllerComponent.cpp

@@ -14,7 +14,7 @@
 #include "src/Exceptions/TargetControllerStartupFailure.hpp"
 #include "src/Exceptions/InvalidConfig.hpp"
 
-namespace Bloom
+namespace Bloom::TargetController
 {
     using namespace Bloom::Targets;
     using namespace Bloom::Events;

src/TargetController/TargetControllerComponent.hpp

@@ -20,7 +20,7 @@
 #include "src/EventManager/EventListener.hpp"
 #include "src/EventManager/Events/Events.hpp"
 
-namespace Bloom
+namespace Bloom::TargetController
 {
     /**
      * The TargetController possesses full control of the debugging target and the debug tool.

src/TargetController/TargetControllerConsole.cpp

@@ -3,7 +3,7 @@
 #include "src/EventManager/Events/Events.hpp"
 #include "src/Logger/Logger.hpp"
 
-namespace Bloom
+namespace Bloom::TargetController
 {
     using namespace Bloom::Targets;
     using namespace Bloom::Events;

src/TargetController/TargetControllerConsole.hpp

@@ -17,7 +17,7 @@
 
 #include "src/Exceptions/Exception.hpp"
 
-namespace Bloom
+namespace Bloom::TargetController
 {
     /**
      * The TargetControllerConsole provides an interface to the TargetController.

src/TargetController/TargetControllerState.hpp

@@ -2,7 +2,7 @@
 
 #include <cstdint>
 
-namespace Bloom
+namespace Bloom::TargetController
 {
     enum class TargetControllerState: std::uint8_t
     {