From 686a95bd6ada37bbac437f625d3a085808e59f76 Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Fri, 2 Jun 2023 10:09:05 +0800
Subject: [PATCH] update

---
 .project/cmake/deps.cmake            | 1 +
 .project/cmake/host.cmake            | 3 +++
 README.md                            | 7 ++++++-
 dep/iflytopcpp                       | 2 +-
 dep/zlinuxcomponents                 | 2 +-
 src/service/main_control_service.cpp | 3 +--
 src/service/main_control_service.hpp | 2 +-
 src/test/dump_can_driver_info.cpp    | 4 ----
 8 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/.project/cmake/deps.cmake b/.project/cmake/deps.cmake
index 2b7d8e6..878b2eb 100644
--- a/.project/cmake/deps.cmake
+++ b/.project/cmake/deps.cmake
@@ -13,3 +13,4 @@ include(
   ${CMAKE_SOURCE_DIR}/dep/zlinuxcomponents/iflytop_can_protocol_stack/module.cmake
 )
 include(${CMAKE_SOURCE_DIR}/dep/zlinuxcomponents/i2c/module.cmake)
+include(${CMAKE_SOURCE_DIR}/dep/zlinuxcomponents/restful_server/module.cmake)
diff --git a/.project/cmake/host.cmake b/.project/cmake/host.cmake
index 76abd8c..70f63b7 100644
--- a/.project/cmake/host.cmake
+++ b/.project/cmake/host.cmake
@@ -9,6 +9,9 @@ zadd_executable_simple(
   TARGET test_demo.out SRC src/test/test_demo.cpp
 )
 zadd_executable_simple(
+  TARGET restful_server_test.out SRC dep/zlinuxcomponents/restful_server/restful_server_test.cpp
+)
+zadd_executable_simple(
   TARGET
   app.out
   SRC
diff --git a/README.md b/README.md
index a555e7b..0a2074d 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,12 @@ TOOD:
     1. websocket下发一条can指令，can卡能够收到
     2. can卡上报一条指令，websocket能够收到
 
-
+TODO:
+    1. 删除掉虚拟从设备的相关功能
+    2. 增加扩展寄存器包上报拦截汇总功能
+    3. 增加httpRPC借口
+    4. 增加ws事件上报通道
+    5. 增加EEPROM
 ```
 
 ## 编译RK3328
diff --git a/dep/iflytopcpp b/dep/iflytopcpp
index 7c233a6..99f14ad 160000
--- a/dep/iflytopcpp
+++ b/dep/iflytopcpp
@@ -1 +1 @@
-Subproject commit 7c233a645018881baf5da6e83cfd3b2250d16a26
+Subproject commit 99f14adcb365e14574430864194e25f2a2f91b24
diff --git a/dep/zlinuxcomponents b/dep/zlinuxcomponents
index 30d516c..5691111 160000
--- a/dep/zlinuxcomponents
+++ b/dep/zlinuxcomponents
@@ -1 +1 @@
-Subproject commit 30d516c35407b43df206927af3734a42a1abdd10
+Subproject commit 56911115467fcf5f1022531ed2234a3f9baf1a66
diff --git a/src/service/main_control_service.cpp b/src/service/main_control_service.cpp
index 062dde8..f9f8a89 100644
--- a/src/service/main_control_service.cpp
+++ b/src/service/main_control_service.cpp
@@ -3,7 +3,6 @@
 #include "configs/project_setting.hpp"
 #include "iflytopcpp/core/components/stringutils.hpp"
 #include "version.hpp"
-#include "zlinuxcomponents/iflytop_can_protocol_stack/iflytop_can_protocol_utils.hpp"
 using namespace iflytop;
 using namespace core;
 using namespace std;
@@ -12,7 +11,7 @@ void MainControlService::initialize() {
   GET_TO_SERVICE(m_zconfig);
   localVirtualCanSlaveInitialize();
   iflytopCanProtocolControler.reset(new IflytopCanProtocolControler());
-  iflytopCanProtocolControler->initialize(m_zconfig->get_pipettingRobotCanIFName(), m_zconfig->get_iflytopSubDeviceCanBitrate(), false);
+  iflytopCanProtocolControler->initialize(m_zconfig->get_iflytopSubDeviceCanIFName(), m_zconfig->get_iflytopSubDeviceCanBitrate(), false);
   iflytopCanProtocolControler->start();
 };
 
diff --git a/src/service/main_control_service.hpp b/src/service/main_control_service.hpp
index 9a83a57..2b4f98e 100644
--- a/src/service/main_control_service.hpp
+++ b/src/service/main_control_service.hpp
@@ -25,7 +25,7 @@
 #include "iflytopcpp/core/components/timer/simple_timer.hpp"
 #include "zlinuxcomponents/alsaplayer/smart_soundbox_player.hpp"
 #include "zlinuxcomponents/iflytop_can_protocol_stack/iflytop_can_protocol_controler.hpp"
-#include "zlinuxcomponents/iflytop_can_protocol_stack/iflytop_virtual_can_slave.hpp"
+#include "zlinuxcomponents/iflytop_can_protocol_stack/basic/iflytop_virtual_can_slave.hpp"
 
 /**
  * @brief
diff --git a/src/test/dump_can_driver_info.cpp b/src/test/dump_can_driver_info.cpp
index 6efbdf9..2b65805 100644
--- a/src/test/dump_can_driver_info.cpp
+++ b/src/test/dump_can_driver_info.cpp
@@ -38,10 +38,6 @@ class Main {
   }
   void onSIGINT() { exit(0); }
   int  main(int argCount, char* argValues[]) {
-    if (argCount < 3) {
-      logger->info("Usage: {} canName canBaudrate", argValues[0]);
-      return 1;
-    }
     SocketCan::dumpCanDriverInfo(argValues[1], atoi(argValues[2]));
     return 0;
   }