From b785e86b7d8b1fc6247285cd486d7b66f420f150 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Thu, 27 Apr 2023 20:43:08 +0800 Subject: [PATCH] update --- dep/zlinuxcomponents | 2 +- src/configs/project_setting.hpp | 1 + src/service/iflytop_hardware_ws_service.cpp | 2 +- src/service/main_control_service.cpp | 1 + 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/dep/zlinuxcomponents b/dep/zlinuxcomponents index c0d81c0..af3cd09 160000 --- a/dep/zlinuxcomponents +++ b/dep/zlinuxcomponents @@ -1 +1 @@ -Subproject commit c0d81c03b27786308a632063f146ecb34f1f2aee +Subproject commit af3cd09d01d8dd7125161574972f7ea1847016a2 diff --git a/src/configs/project_setting.hpp b/src/configs/project_setting.hpp index 0c527f6..fac8c71 100644 --- a/src/configs/project_setting.hpp +++ b/src/configs/project_setting.hpp @@ -6,4 +6,5 @@ *******************************************************************************/ #define REG_REBOOT_FLAG 0x0000 // 重启标识 +#define REG_DEVICE_ID 0x0001 // 重启标识 #define REG_EXCEPTION_FLAG 0x0100 // 异常标志位 \ No newline at end of file diff --git a/src/service/iflytop_hardware_ws_service.cpp b/src/service/iflytop_hardware_ws_service.cpp index 4d92200..e74e874 100644 --- a/src/service/iflytop_hardware_ws_service.cpp +++ b/src/service/iflytop_hardware_ws_service.cpp @@ -31,7 +31,7 @@ void IflytopWSService::initialize() { m_server->start(); // m_server->wait(); logger->info("IflytopWSService initialize done"); - m_initialized = false; + m_initialized = true; } void IflytopWSService::sendMessage(const string& message) { if (!m_initialized) { diff --git a/src/service/main_control_service.cpp b/src/service/main_control_service.cpp index 399595c..7f62317 100644 --- a/src/service/main_control_service.cpp +++ b/src/service/main_control_service.cpp @@ -120,6 +120,7 @@ void MainControlService::localVirtualCanSlaveInitialize() { m_localVirtualCanSlave.reset(new IflytopVirtualCanSlave()); m_localVirtualCanSlave->initialize(LINUX_HARDWARE_ID); m_localVirtualCanSlave->activeReg(REG_REBOOT_FLAG, icps::kw | icps::kr, 0); + m_localVirtualCanSlave->activeReg(REG_DEVICE_ID, icps::kr, LINUX_HARDWARE_ID); m_localVirtualCanSlave->activeReg(REG_EXCEPTION_FLAG, icps::kw | icps::kr, 0); m_localVirtualCanSlave->setOnHostRegisterReadEvent( // [this](icps::Reg_t& reg, int32_t& value) { //