Moved TargetController components into new 'TargetController' namespace.

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));
-        TargetControllerState lastTargetControllerState = TargetControllerState::ACTIVE;
+        TargetController::TargetControllerConsole targetControllerConsole = TargetController::TargetControllerConsole(
+            *(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;