Browse Source

update

master
zhaohe 2 years ago
parent
commit
b785e86b7d
  1. 2
      dep/zlinuxcomponents
  2. 1
      src/configs/project_setting.hpp
  3. 2
      src/service/iflytop_hardware_ws_service.cpp
  4. 1
      src/service/main_control_service.cpp

2
dep/zlinuxcomponents

@ -1 +1 @@
Subproject commit c0d81c03b27786308a632063f146ecb34f1f2aee
Subproject commit af3cd09d01d8dd7125161574972f7ea1847016a2

1
src/configs/project_setting.hpp

@ -6,4 +6,5 @@
*******************************************************************************/
#define REG_REBOOT_FLAG 0x0000 // 重启标识
#define REG_DEVICE_ID 0x0001 // 重启标识
#define REG_EXCEPTION_FLAG 0x0100 // 异常标志位

2
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) {

1
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) { //

Loading…
Cancel
Save