From 0b1c74eae6fefe58464a3860309df104708f53f1 Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sat, 6 Apr 2024 11:31:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=94=99=E8=AF=AF=E7=A0=81?= =?UTF-8?q?=E7=9A=84=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/cmdscheduler/cmd_scheduler_uart_dma.cpp | 2 +- components/cmdscheduler/cmd_scheduler_uart_dma.hpp | 2 +- components/cmdscheduler/cmd_scheduler_v2.cpp | 2 +- components/cmdscheduler/cmd_scheduler_v2.hpp | 2 +- components/errorcode/errorcode.hpp | 1 - components/hardware/uart/zuart_helper.cpp | 2 +- components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp | 2 +- components/modbus/modbus_block_host.cpp | 2 +- components/step_motor_ctrl_module/step_motor_ctrl_module.cpp | 2 +- components/zcancmder/zcanreceiver_master.cpp | 2 +- components/zprotocols/errorcode/README.md | 2 -- components/zprotocols/errorcode/errorcode.hpp | 1 - 12 files changed, 9 insertions(+), 13 deletions(-) delete mode 100644 components/errorcode/errorcode.hpp delete mode 100644 components/zprotocols/errorcode/README.md delete mode 100644 components/zprotocols/errorcode/errorcode.hpp 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/errorcode/errorcode.hpp b/components/errorcode/errorcode.hpp deleted file mode 100644 index edd7387..0000000 --- a/components/errorcode/errorcode.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "sdk\components\zprotocols\errorcode\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/mini_servo_motor/mini_servo_motor_ctrl_module.cpp b/components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp index e1d5944..d363339 100644 --- a/components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp +++ b/components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp @@ -1,6 +1,6 @@ #include "mini_servo_motor_ctrl_module.hpp" -#include "sdk\components\errorcode\errorcode.hpp" +#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" using namespace iflytop; using namespace std; #define TAG "MiniRobotCtrlModule" 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/step_motor_ctrl_module/step_motor_ctrl_module.cpp b/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp index 9a0372d..690ac89 100644 --- a/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp +++ b/components/step_motor_ctrl_module/step_motor_ctrl_module.cpp @@ -3,7 +3,7 @@ #include #include -#include "sdk/components/errorcode/errorcode.hpp" +#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" #include "sdk\components\flash\znvs.hpp" using namespace iflytop; #define TAG "SMCM" 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/README.md b/components/zprotocols/errorcode/README.md deleted file mode 100644 index 8d33d60..0000000 --- a/components/zprotocols/errorcode/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# errorcode - diff --git a/components/zprotocols/errorcode/errorcode.hpp b/components/zprotocols/errorcode/errorcode.hpp deleted file mode 100644 index d77427a..0000000 --- a/components/zprotocols/errorcode/errorcode.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" \ No newline at end of file