From 76940e6bd08c2df40a9ddadaabe5bf7674825593 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 13 Aug 2023 16:56:34 +0800 Subject: [PATCH] update --- iflytoplinuxsdk | 2 +- src/main_control_service.hpp | 17 ++++++++--------- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/iflytoplinuxsdk b/iflytoplinuxsdk index 9fbd847..3671588 160000 --- a/iflytoplinuxsdk +++ b/iflytoplinuxsdk @@ -1 +1 @@ -Subproject commit 9fbd8473108b10c6d0e69ed663fa27fee5d4dfa0 +Subproject commit 3671588f43030f703af6e2f39bcc3f578f45f6e9 diff --git a/src/main_control_service.hpp b/src/main_control_service.hpp index 1be99e3..275fa20 100644 --- a/src/main_control_service.hpp +++ b/src/main_control_service.hpp @@ -13,20 +13,18 @@ #include #include -#include "iflytop/core/spdlogfactory/logger.hpp" #include "iflytop/components/restful_server/restful_server.hpp" +#include "iflytop/core/components/jobs/work_queue.hpp" +#include "iflytop/core/components/timer/simple_timer.hpp" +#include "iflytop/core/spdlogfactory/logger.hpp" +#include "iflytoplinuxsdk/src/iflytop/components/iflytop_front_end_service/iflytop_front_end_service.hpp" // #include "configs/gconfig.hpp" #include "zservice_container/zservice_container.hpp" - // -#include "configs/gconfig.hpp" -#include "iflytop/core/components/jobs/work_queue.hpp" -#include "iflytop/core/components/timer/simple_timer.hpp" -// #include "zlinuxcomponents/iflytop_can_protocol_stack/basic/iflytop_virtual_can_slave.hpp" -// #include "zlinuxcomponents/iflytop_can_protocol_stack/iflytop_can_protocol_controler.hpp" // +#include "src/service/iflytop_can_host_device.hpp" /** * @brief @@ -46,8 +44,9 @@ using namespace core; class MainControlService : public enable_shared_from_this { ENABLE_LOGGER(MainControlService); - shared_ptr m_zconfig; - shared_ptr m_restfulServer; + shared_ptr m_zconfig; + shared_ptr m_restfulServer; + shared_ptr m_iflytopwsService; public: MainControlService(){};