update

1 year ago · 6f30b6d5d9
17 changed files with 16 additions and 17 deletions
--- a/.gitmodules
+++ b/.gitmodules
@ -6,4 +6,4 @@
 	url = zwsd@192.168.1.3:zprotocols/errorcode.git
 [submodule "components/zprotocols/zcancmder_v2"]
 	path = components/zprotocols/zcancmder_v2
-	url = zwsd@192.168.1.3:zprotocols/zcancmder_v2.git
+	url = zwsd@192.168.1.3:project_boditech_vidas_a8000_v3/a8000_protocol.git
--- a/components/cmdscheduler/cmd_scheduler_uart_dma.cpp
+++ b/components/cmdscheduler/cmd_scheduler_uart_dma.cpp
@ -5,7 +5,7 @@
 #include <string.h>

 #include "project_configs.h"
-#include "sdk\components\zprotocols\errorcode\errorcode.hpp"
+#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
 using namespace iflytop;

 #define TAG "CMD"
--- a/components/cmdscheduler/cmd_scheduler_uart_dma.hpp
+++ b/components/cmdscheduler/cmd_scheduler_uart_dma.hpp
@ -3,7 +3,7 @@
 #include <string>

 #include "sdk/os/zos.hpp"
-#include "sdk\components\zprotocols\errorcode\errorcode.hpp"
+#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
 #include "sdk\components\zprotocols\zcancmder_v2\api\api.hpp"
 #if 0
 namespace iflytop {
--- a/components/cmdscheduler/cmd_scheduler_v2.cpp
+++ b/components/cmdscheduler/cmd_scheduler_v2.cpp
@ -5,7 +5,7 @@
 #include <string.h>

 #include "project_configs.h"
-#include "sdk\components\zprotocols\errorcode\errorcode.hpp"
+#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
 using namespace iflytop;

 #define TAG "CMD"
--- a/components/cmdscheduler/cmd_scheduler_v2.hpp
+++ b/components/cmdscheduler/cmd_scheduler_v2.hpp
@ -4,7 +4,7 @@

 #include "sdk/os/zos.hpp"
 #include "sdk\components\hardware\uart\zuart_dma_receiver.hpp"
-#include "sdk\components\zprotocols\errorcode\errorcode.hpp"
+#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
 #include "sdk\components\zprotocols\zcancmder_v2\api\api.hpp"
 //
 #include "sdk\components\api\zi_uart_receiver.hpp"
--- a/components/eq_20_asb_motor/eq20_servomotor.cpp
+++ b/components/eq_20_asb_motor/eq20_servomotor.cpp
@ -3,7 +3,7 @@
 #include <stdint.h>

 #include "sdk\components\modbus\modbus_basic.hpp"
-#include "sdk\components\zprotocols\errorcode\errorcode.hpp"
+#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
 using namespace std;
 using namespace iflytop;

--- a/components/errorcode/errorcode.hpp
+++ b/components/errorcode/errorcode.hpp
@ -1 +1 @@
-#include "sdk\components\zprotocols\errorcode\errorcode.hpp"
+#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
--- a/components/hardware/uart/zuart_helper.cpp
+++ b/components/hardware/uart/zuart_helper.cpp
@ -1,6 +1,6 @@
 #include "zuart_helper.hpp"

-#include "sdk\components\zprotocols\errorcode\errorcode.hpp"
+#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"

 using namespace iflytop;
 #define __DEBUG 0
--- a/components/modbus/modbus_block_host.cpp
+++ b/components/modbus/modbus_block_host.cpp
@ -1,7 +1,7 @@
 #include "modbus_block_host.hpp"

 #include "modbus_basic.hpp"
-#include "sdk\components\zprotocols\errorcode\errorcode.hpp"
+#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
 using namespace iflytop;

 #define TAG "ModbusBlockHost"
--- a/components/sensors/mcp41xxx/mcp41xxx.hpp
+++ b/components/sensors/mcp41xxx/mcp41xxx.hpp
@ -1,5 +1,5 @@
 #pragma once
-#include "sdk\components\zprotocols\errorcode\errorcode.hpp"
+#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
 #include "sdk\os\zos.hpp"
 #ifdef HAL_SPI_MODULE_ENABLED
 namespace iflytop {
--- a/components/sensors/smtp2/smtp2.cpp
+++ b/components/sensors/smtp2/smtp2.cpp
@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>

-#include "sdk\components\zprotocols\errorcode\errorcode.hpp"
+#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
 using namespace iflytop;
 #define TAG "SMTP2"

--- a/components/sensors/smtp2/smtp2.hpp
+++ b/components/sensors/smtp2/smtp2.hpp
@ -1,5 +1,5 @@
 #pragma once
-#include "sdk\components\zprotocols\errorcode\errorcode.hpp"
+#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
 #include "sdk\os\zos.hpp"
 namespace iflytop {
 using namespace std;
--- a/components/taojingchi_screen/taojingchi_screen_service.cpp
+++ b/components/taojingchi_screen/taojingchi_screen_service.cpp
@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <string.h>

-#include "sdk\components\zprotocols\errorcode\errorcode.hpp"
+#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
 using namespace iflytop;

 #define TAG "CMD"
--- a/components/taojingchi_screen/taojingchi_screen_service.hpp
+++ b/components/taojingchi_screen/taojingchi_screen_service.hpp
@ -3,7 +3,7 @@
 #include <string>

 #include "sdk/os/zos.hpp"
-#include "sdk\components\zprotocols\errorcode\errorcode.hpp"
+#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"

 namespace iflytop {
 using namespace std;
--- a/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp
+++ b/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp
@ -3,8 +3,8 @@
 #include "sdk/os/zos.hpp"
 #include "sdk\components\tmc\basic\tmc_ic_interface.hpp"
 #include "sdk\components\zcancmder\zcanreceiver.hpp"
-#include "sdk\components\zprotocols\zcancmder\api\i_xyrobot_ctrl_module.hpp"
 #include "sdk\components\zprotocols\zcancmder_v2\api\api.hpp"
+#include "sdk\components\zprotocols\zcancmder\api\i_xyrobot_ctrl_module.hpp"

 namespace iflytop {
 class XYRobotCtrlModule : public I_XYRobotCtrlModule, public ZIXYMotor, public ZIModule {
--- a/components/zcancmder/zcanreceiver_master.cpp
+++ b/components/zcancmder/zcanreceiver_master.cpp
@ -1,7 +1,7 @@
 #include "zcanreceiver_master.hpp"

 #include "project_configs.h"
-#include "sdk\components\zprotocols\errorcode\errorcode.hpp"
+#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
 #ifdef HAL_CAN_MODULE_ENABLED
 #include <stdio.h>
 #include <stdlib.h>
--- a/components/zprotocols/errorcode
+++ b/components/zprotocols/errorcode
@ -1 +0,0 @@
-Subproject commit deb433723f081f4fd21a3a8278aa4cbdcc13d2d0