diff --git a/.gitmodules b/.gitmodules index c8ccfb2..dbb2863 100644 --- 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 diff --git a/components/cmdscheduler/cmd_scheduler_uart_dma.cpp b/components/cmdscheduler/cmd_scheduler_uart_dma.cpp index 939110d..55e1245 100644 --- a/components/cmdscheduler/cmd_scheduler_uart_dma.cpp +++ b/components/cmdscheduler/cmd_scheduler_uart_dma.cpp @@ -5,7 +5,7 @@ #include #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" diff --git a/components/cmdscheduler/cmd_scheduler_uart_dma.hpp b/components/cmdscheduler/cmd_scheduler_uart_dma.hpp index fdf2b95..e8c99ef 100644 --- a/components/cmdscheduler/cmd_scheduler_uart_dma.hpp +++ b/components/cmdscheduler/cmd_scheduler_uart_dma.hpp @@ -3,7 +3,7 @@ #include #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 { diff --git a/components/cmdscheduler/cmd_scheduler_v2.cpp b/components/cmdscheduler/cmd_scheduler_v2.cpp index df04d5f..2b665ef 100644 --- a/components/cmdscheduler/cmd_scheduler_v2.cpp +++ b/components/cmdscheduler/cmd_scheduler_v2.cpp @@ -5,7 +5,7 @@ #include #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" diff --git a/components/cmdscheduler/cmd_scheduler_v2.hpp b/components/cmdscheduler/cmd_scheduler_v2.hpp index 9d15cfa..37c2bdf 100644 --- 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" diff --git a/components/eq_20_asb_motor/eq20_servomotor.cpp b/components/eq_20_asb_motor/eq20_servomotor.cpp index 12efcba..5ff8c9e 100644 --- a/components/eq_20_asb_motor/eq20_servomotor.cpp +++ b/components/eq_20_asb_motor/eq20_servomotor.cpp @@ -3,7 +3,7 @@ #include #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; diff --git a/components/errorcode/errorcode.hpp b/components/errorcode/errorcode.hpp index edd7387..d77427a 100644 --- a/components/errorcode/errorcode.hpp +++ b/components/errorcode/errorcode.hpp @@ -1 +1 @@ -#include "sdk\components\zprotocols\errorcode\errorcode.hpp" \ No newline at end of file +#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" \ No newline at end of file diff --git a/components/hardware/uart/zuart_helper.cpp b/components/hardware/uart/zuart_helper.cpp index d5c97ae..3ebf29c 100644 --- 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 diff --git a/components/modbus/modbus_block_host.cpp b/components/modbus/modbus_block_host.cpp index c59655c..cdc870c 100644 --- 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" diff --git a/components/sensors/mcp41xxx/mcp41xxx.hpp b/components/sensors/mcp41xxx/mcp41xxx.hpp index 3434586..54ca871 100644 --- 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 { diff --git a/components/sensors/smtp2/smtp2.cpp b/components/sensors/smtp2/smtp2.cpp index 4b6533d..2a73b09 100644 --- a/components/sensors/smtp2/smtp2.cpp +++ b/components/sensors/smtp2/smtp2.cpp @@ -5,7 +5,7 @@ #include #include -#include "sdk\components\zprotocols\errorcode\errorcode.hpp" +#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" using namespace iflytop; #define TAG "SMTP2" diff --git a/components/sensors/smtp2/smtp2.hpp b/components/sensors/smtp2/smtp2.hpp index a0cb70b..7aa2e0b 100644 --- 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; diff --git a/components/taojingchi_screen/taojingchi_screen_service.cpp b/components/taojingchi_screen/taojingchi_screen_service.cpp index f7d2487..600a83d 100644 --- a/components/taojingchi_screen/taojingchi_screen_service.cpp +++ b/components/taojingchi_screen/taojingchi_screen_service.cpp @@ -5,7 +5,7 @@ #include #include -#include "sdk\components\zprotocols\errorcode\errorcode.hpp" +#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" using namespace iflytop; #define TAG "CMD" diff --git a/components/taojingchi_screen/taojingchi_screen_service.hpp b/components/taojingchi_screen/taojingchi_screen_service.hpp index cc21867..06cbab7 100644 --- a/components/taojingchi_screen/taojingchi_screen_service.hpp +++ b/components/taojingchi_screen/taojingchi_screen_service.hpp @@ -3,7 +3,7 @@ #include #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; diff --git a/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp b/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp index c3e1101..697828f 100644 --- 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 { diff --git a/components/zcancmder/zcanreceiver_master.cpp b/components/zcancmder/zcanreceiver_master.cpp index 1889e98..79490c0 100644 --- 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 #include diff --git a/components/zprotocols/errorcode b/components/zprotocols/errorcode deleted file mode 160000 index deb4337..0000000 --- a/components/zprotocols/errorcode +++ /dev/null @@ -1 +0,0 @@ -Subproject commit deb433723f081f4fd21a3a8278aa4cbdcc13d2d0