8 files changed, 36 insertions(+), 63 deletions(-)

M module-apps/application-antenna/CMakeLists.txt
M module-services/service-antenna/CMakeLists.txt
M module-services/service-antenna/ServiceAntenna.cpp
M module-services/service-antenna/api/AntennaServiceAPI.cpp
R module-services/service-antenna/{ => include}/service-antenna/AntennaMessage.hpp
R module-services/service-antenna/{ => include}/service-antenna/AntennaServiceAPI.hpp
R module-services/service-antenna/{ => include}/service-antenna/ServiceAntenna.hpp
R module-services/service-antenna/{ => include}/service-antenna/ServiceState.hpp

@@ 36,6 36,7 @@ target_compile_definitions(application-antenna
 target_link_libraries(application-antenna
     PRIVATE
         apps-common
+        service-antenna
         service-cellular
 )
 

@@ 1,24 1,33 @@
-project(service-antenna)
+add_library(service-antenna STATIC)
 
-set(SOURCES
-    ServiceAntenna.cpp
-    api/AntennaServiceAPI.cpp
+target_sources(service-antenna
+    PRIVATE
+        api/AntennaServiceAPI.cpp
+        ServiceAntenna.cpp
+    PUBLIC
+        include/service-antenna/AntennaMessage.hpp
+        include/service-antenna/AntennaServiceAPI.hpp
+        include/service-antenna/ServiceAntenna.hpp
+        include/service-antenna/ServiceState.hpp
 )
 
-add_library(${PROJECT_NAME} STATIC ${SOURCES})
-
-target_link_libraries(${PROJECT_NAME}
+target_link_libraries(service-antenna
     PRIVATE
+        eventstore
         module-apps
         module-cellular
         module-utils
         service-cellular
-        eventstore
+    PUBLIC
+        messagetype
+        module-bsp
+        module-sys
+        service-db
 )
 
-target_include_directories(${PROJECT_NAME}
+target_include_directories(service-antenna
+    PRIVATE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/service-antenna>
     PUBLIC
-        ${CMAKE_CURRENT_LIST_DIR}
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
 )
-
-

@@ 1,25 1,21 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include "service-antenna/ServiceAntenna.hpp"
-#include "service-antenna/AntennaMessage.hpp"
-#include "service-antenna/AntennaServiceAPI.hpp"
-#include "service-antenna/ServiceState.hpp"
-
-#include <service-appmgr/model/ApplicationManager.hpp>
+#include <AntennaMessage.hpp>
+#include <AntennaServiceAPI.hpp>
+#include <ServiceAntenna.hpp>
+#include <ServiceState.hpp>
 
 #include <at/response.hpp>
-
-#include <log.hpp>
 #include <EventStore.hpp>
-
+#include <log.hpp>
 #include <MessageType.hpp>
-#include <projdefs.h>
 #include <module-sys/Timers/TimerFactory.hpp>
-#include <service-cellular/State.hpp>
-#include <service-cellular/CellularServiceAPI.hpp>
+#include <projdefs.h>
+#include <service-appmgr/model/ApplicationManager.hpp>
 #include <service-cellular/CellularMessage.hpp>
-
+#include <service-cellular/CellularServiceAPI.hpp>
+#include <service-cellular/State.hpp>
 #include <ticks.hpp>
 
 #include <algorithm>

@@ 1,17 1,8 @@
 // Copyright (c) 2017-2021, Mudita Sp. z.o.o. All rights reserved.
 // For licensing, see https://github.com/mudita/MuditaOS/LICENSE.md
 
-#include <service-antenna/AntennaServiceAPI.hpp>
-
-#include <service-antenna/AntennaMessage.hpp>
-#include <service-antenna/ServiceAntenna.hpp>
-
-#include <MessageType.hpp>
-#include <Service/Common.hpp>
-#include <Service/Message.hpp>
-
-#include <memory>
-#include <utility>
+#include "AntennaMessage.hpp"
+#include "AntennaServiceAPI.hpp"
 
 namespace sys
 {

@@ 5,9 5,6 @@
 
 #include "ServiceAntenna.hpp"
 
-#include <MessageType.hpp>
-#include <Service/Message.hpp>
-
 class AntennaLockRequestMessage : public sys::DataMessage
 {
   public:

@@ 5,9 5,6 @@
 
 #include "ServiceAntenna.hpp"
 
-#include <MessageType.hpp>
-#include <Service/Message.hpp>
-
 namespace sys
 {
     class Service;


@@ 15,7 12,6 @@ namespace sys
 
 namespace AntennaServiceAPI
 {
-
     void CSQChange(sys::Service *serv);
     bool LockRequest(sys::Service *serv, antenna::lockState request);
     bool GetLockState(sys::Service *serv, antenna::lockState &state);

@@ 3,28 3,13 @@
 
 #pragma once
 
+#include "ServiceState.hpp"
+
 #include <bsp/cellular/bsp_cellular.hpp>
-#include <MessageType.hpp>
-#include <Service/Common.hpp>
-#include <Service/Message.hpp>
-#include <Service/Service.hpp>
-#include <Service/Worker.hpp>
 #include <Timers/TimerHandle.hpp>
 #include <service-db/DBServiceName.hpp>
 #include <module-sys/PhoneModes/Observer.hpp>
 
-#include <algorithm>
-#include <cassert>
-#include <cstdint>
-#include <memory>
-
-#include "ServiceState.hpp"
-
-namespace state
-{
-    template <typename T> class State;
-} // namespace state
-
 namespace service::name
 {
     constexpr inline auto antenna = "ServiceAntenna";

@@ 3,9 3,7 @@
 
 #pragma once
 
-#include "Service/Service.hpp"
-#include "Service/Message.hpp"
-#include "MessageType.hpp"
+#include <Service/Service.hpp>
 
 namespace state
 {