Improve decoupling

uweseimet · Jan 23, 2025 · 866a512 · 866a512
1 parent fc9154c
commit 866a512
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 2 deletions.
diff --git a/cpp/command/command_dispatcher.cpp b/cpp/command/command_dispatcher.cpp
@@ -9,8 +9,10 @@
 #include "command_dispatcher.h"
 #include <fstream>
 #include "command_context.h"
+#include "command_executor.h"
 #include "command_image_support.h"
 #include "command_response.h"
+#include "controllers/controller_factory.h"
 #include "protobuf/protobuf_util.h"
 #include "base/property_handler.h"
 #include "shared/s2p_exceptions.h"

diff --git a/cpp/command/command_dispatcher.h b/cpp/command/command_dispatcher.h
@@ -8,7 +8,16 @@
 
 #pragma once
 
-#include "command_executor.h"
+#include <spdlog/spdlog.h>
+#include "shared/s2p_defs.h"
+#include "generated/s2p_interface.pb.h"
+
+class CommandContext;
+class CommandExecutor;
+class ControllerFactory;
+
+using namespace spdlog;
+using namespace s2p_interface;
 
 class CommandDispatcher
 {

diff --git a/cpp/s2p/s2p_core.h b/cpp/s2p/s2p_core.h
@@ -10,12 +10,12 @@
 
 #include <filesystem>
 #include "command/command_dispatcher.h"
+#include "command/command_executor.h"
 #include "base/property_handler.h"
 #include "buses/bus.h"
 #include "s2p_thread.h"
 
 using namespace filesystem;
-using namespace s2p_interface;
 
 class S2p
 {