From bfb5613725442b208dd485d5c184741e370781fd Mon Sep 17 00:00:00 2001 From: zhaohe Date: Sun, 2 Jun 2024 17:49:01 +0800 Subject: [PATCH] recode --- chip/api/zi_api.hpp | 2 +- components/api/zi_dc_motor_ctrl_module.hpp | 2 +- components/api/zi_eeprom.hpp | 2 +- components/api/zi_pwm_fan_ctrl_module.hpp | 2 +- components/api/zi_pwm_pump_ctrl_module.hpp | 2 +- components/api/zi_temperature_sensor.hpp | 2 +- components/api/zi_uart_receiver.hpp | 2 +- components/api/zi_uart_sender.hpp | 2 +- components/hardware/adc/z_simple_adc.hpp | 2 +- components/hardware/uart/zuart_helper.cpp | 2 +- components/mini_servo_motor/mini_servo_motor_ctrl_module.cpp | 2 +- components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp | 2 +- components/modbus/modbus_block_host.cpp | 2 +- components/pipette_module/pipette_ctrl_module_v2.hpp | 2 +- components/sensors/i2ceeprom/m24lrxxe_i2c_eeprom.hpp | 2 +- components/sensors/i2ceeprom/p24c16_eeprom.hpp | 2 +- components/sensors/m3078/m3078_code_scaner.hpp | 2 +- components/sensors/mcp41xxx/mcp41xxx.hpp | 2 +- components/sensors/smtp2/smtp2.cpp | 2 +- components/sensors/smtp2/smtp2.hpp | 2 +- components/step_motor_ctrl_module/step_motor_ctrl_module.cpp | 2 +- components/water_cooling_temperature_control_module/pid_module.hpp | 2 +- .../water_cooling_temperature_control_module/pwm_ctrl_module.cpp | 2 +- .../water_cooling_temperature_control_module.cpp | 2 +- components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp | 2 +- components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp | 2 +- components/zcancmder/basic.hpp | 2 +- components/zcancmder/zcan_board_module.hpp | 2 +- components/zcancmder/zcan_protocol_parser.hpp | 4 ++-- components/zcancmder/zcanreceiver.hpp | 2 +- 30 files changed, 31 insertions(+), 31 deletions(-) diff --git a/chip/api/zi_api.hpp b/chip/api/zi_api.hpp index c22d274..2e28de8 100644 --- a/chip/api/zi_api.hpp +++ b/chip/api/zi_api.hpp @@ -1,5 +1,5 @@ #pragma once #include "zi_adc.hpp" -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" #include "zi_temperature.hpp" #include "zi_pwm_ctrl.hpp" \ No newline at end of file diff --git a/components/api/zi_dc_motor_ctrl_module.hpp b/components/api/zi_dc_motor_ctrl_module.hpp index f076cb5..524d08a 100644 --- a/components/api/zi_dc_motor_ctrl_module.hpp +++ b/components/api/zi_dc_motor_ctrl_module.hpp @@ -3,7 +3,7 @@ #include -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" namespace iflytop { using namespace std; diff --git a/components/api/zi_eeprom.hpp b/components/api/zi_eeprom.hpp index 4a58c98..a7d31f6 100644 --- a/components/api/zi_eeprom.hpp +++ b/components/api/zi_eeprom.hpp @@ -3,7 +3,7 @@ #include -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" namespace iflytop { using namespace std; diff --git a/components/api/zi_pwm_fan_ctrl_module.hpp b/components/api/zi_pwm_fan_ctrl_module.hpp index 55f5329..55a62c7 100644 --- a/components/api/zi_pwm_fan_ctrl_module.hpp +++ b/components/api/zi_pwm_fan_ctrl_module.hpp @@ -3,7 +3,7 @@ #include -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" namespace iflytop { using namespace std; diff --git a/components/api/zi_pwm_pump_ctrl_module.hpp b/components/api/zi_pwm_pump_ctrl_module.hpp index c2578fe..c926997 100644 --- a/components/api/zi_pwm_pump_ctrl_module.hpp +++ b/components/api/zi_pwm_pump_ctrl_module.hpp @@ -3,7 +3,7 @@ #include -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" namespace iflytop { using namespace std; diff --git a/components/api/zi_temperature_sensor.hpp b/components/api/zi_temperature_sensor.hpp index 6351936..44b2e3b 100644 --- a/components/api/zi_temperature_sensor.hpp +++ b/components/api/zi_temperature_sensor.hpp @@ -3,7 +3,7 @@ #include -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" namespace iflytop { using namespace std; diff --git a/components/api/zi_uart_receiver.hpp b/components/api/zi_uart_receiver.hpp index ac17892..9ca99a3 100644 --- a/components/api/zi_uart_receiver.hpp +++ b/components/api/zi_uart_receiver.hpp @@ -3,7 +3,7 @@ #include -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" namespace iflytop { using namespace std; diff --git a/components/api/zi_uart_sender.hpp b/components/api/zi_uart_sender.hpp index f3275cd..f26401a 100644 --- a/components/api/zi_uart_sender.hpp +++ b/components/api/zi_uart_sender.hpp @@ -3,7 +3,7 @@ #include -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" namespace iflytop { using namespace std; diff --git a/components/hardware/adc/z_simple_adc.hpp b/components/hardware/adc/z_simple_adc.hpp index 4aed4ce..64a4243 100644 --- a/components/hardware/adc/z_simple_adc.hpp +++ b/components/hardware/adc/z_simple_adc.hpp @@ -2,7 +2,7 @@ #include #include "sdk\chip\api\zi_adc.hpp" -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" #include "sdk\os\zos.hpp" #ifdef HAL_ADC_MODULE_ENABLED namespace iflytop { diff --git a/components/hardware/uart/zuart_helper.cpp b/components/hardware/uart/zuart_helper.cpp index 32abed3..767c01b 100644 --- a/components/hardware/uart/zuart_helper.cpp +++ b/components/hardware/uart/zuart_helper.cpp @@ -1,6 +1,6 @@ #include "zuart_helper.hpp" -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.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 32cb081..ac8b961 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 "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" using namespace iflytop; using namespace std; #define TAG "MiniRobotCtrlModule" diff --git a/components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp b/components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp index b77eede..c2db6c0 100644 --- a/components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp +++ b/components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp @@ -4,7 +4,7 @@ // #include "feite_servo_motor.hpp" #include "sdk/components/zprotocols/zcancmder/api/i_mini_servo_module.hpp" -#include "a8000_protocol\api\api.hpp" +#include "a8000_protocol\protocol.hpp" namespace iflytop { class MiniRobotCtrlModule : public I_MiniServoModule, public ZIModule, public ZIMotor { diff --git a/components/modbus/modbus_block_host.cpp b/components/modbus/modbus_block_host.cpp index cba5b06..97648e4 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 "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" using namespace iflytop; #define TAG "ModbusBlockHost" diff --git a/components/pipette_module/pipette_ctrl_module_v2.hpp b/components/pipette_module/pipette_ctrl_module_v2.hpp index f552708..597d6c7 100644 --- a/components/pipette_module/pipette_ctrl_module_v2.hpp +++ b/components/pipette_module/pipette_ctrl_module_v2.hpp @@ -2,7 +2,7 @@ // #include "sdk/os/zos.hpp" #include "sdk\components\sensors\smtp2\smtp2.hpp" -#include "a8000_protocol\api\api.hpp" +#include "a8000_protocol\protocol.hpp" // #include "StepMotorCtrlModule" /** diff --git a/components/sensors/i2ceeprom/m24lrxxe_i2c_eeprom.hpp b/components/sensors/i2ceeprom/m24lrxxe_i2c_eeprom.hpp index 38eb9cf..802ae9c 100644 --- a/components/sensors/i2ceeprom/m24lrxxe_i2c_eeprom.hpp +++ b/components/sensors/i2ceeprom/m24lrxxe_i2c_eeprom.hpp @@ -1,5 +1,5 @@ #include "sdk\components\api\zi_eeprom.hpp" -#include "a8000_protocol\api\api.hpp" +#include "a8000_protocol\protocol.hpp" #include "sdk\os\zos.hpp" #ifdef HAL_I2C_MODULE_ENABLED diff --git a/components/sensors/i2ceeprom/p24c16_eeprom.hpp b/components/sensors/i2ceeprom/p24c16_eeprom.hpp index 9ddfa23..09dadb5 100644 --- a/components/sensors/i2ceeprom/p24c16_eeprom.hpp +++ b/components/sensors/i2ceeprom/p24c16_eeprom.hpp @@ -1,5 +1,5 @@ #include "sdk\components\api\zi_eeprom.hpp" -#include "a8000_protocol\api\api.hpp" +#include "a8000_protocol\protocol.hpp" #include "sdk\os\zos.hpp" #ifdef HAL_I2C_MODULE_ENABLED diff --git a/components/sensors/m3078/m3078_code_scaner.hpp b/components/sensors/m3078/m3078_code_scaner.hpp index 6264d61..90ea98d 100644 --- a/components/sensors/m3078/m3078_code_scaner.hpp +++ b/components/sensors/m3078/m3078_code_scaner.hpp @@ -4,7 +4,7 @@ #pragma once #include "sdk/os/zos.hpp" -#include "a8000_protocol\api\api.hpp" +#include "a8000_protocol\protocol.hpp" /** * @brief diff --git a/components/sensors/mcp41xxx/mcp41xxx.hpp b/components/sensors/mcp41xxx/mcp41xxx.hpp index 0090c33..cf4e1ba 100644 --- a/components/sensors/mcp41xxx/mcp41xxx.hpp +++ b/components/sensors/mcp41xxx/mcp41xxx.hpp @@ -1,5 +1,5 @@ #pragma once -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.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 1a2c1e8..64c6023 100644 --- a/components/sensors/smtp2/smtp2.cpp +++ b/components/sensors/smtp2/smtp2.cpp @@ -5,7 +5,7 @@ #include #include -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" using namespace iflytop; #define TAG "SMTP2" diff --git a/components/sensors/smtp2/smtp2.hpp b/components/sensors/smtp2/smtp2.hpp index da5da37..0064fde 100644 --- a/components/sensors/smtp2/smtp2.hpp +++ b/components/sensors/smtp2/smtp2.hpp @@ -1,5 +1,5 @@ #pragma once -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" #include "sdk\os\zos.hpp" namespace iflytop { using namespace std; 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 b34a446..edc63b1 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 "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" #include "sdk\components\flash\znvs.hpp" using namespace iflytop; #define TAG "SMCM" diff --git a/components/water_cooling_temperature_control_module/pid_module.hpp b/components/water_cooling_temperature_control_module/pid_module.hpp index 7a0f59b..add6a17 100644 --- a/components/water_cooling_temperature_control_module/pid_module.hpp +++ b/components/water_cooling_temperature_control_module/pid_module.hpp @@ -3,7 +3,7 @@ #include -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" namespace iflytop { using namespace std; diff --git a/components/water_cooling_temperature_control_module/pwm_ctrl_module.cpp b/components/water_cooling_temperature_control_module/pwm_ctrl_module.cpp index db7592e..6c350a2 100644 --- a/components/water_cooling_temperature_control_module/pwm_ctrl_module.cpp +++ b/components/water_cooling_temperature_control_module/pwm_ctrl_module.cpp @@ -1,6 +1,6 @@ #include "pwm_ctrl_module.hpp" -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" using namespace iflytop; #define TAG "PWM_SCM" void PWMSpeedCtrlModule::initialize(config_t* pcfg) { diff --git a/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.cpp b/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.cpp index 07cc4cc..b29d17b 100644 --- a/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.cpp +++ b/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.cpp @@ -1,7 +1,7 @@ #include "water_cooling_temperature_control_module.hpp" #include "sdk\components\flash\znvs.hpp" -#include "a8000_protocol\api\api.hpp" +#include "a8000_protocol\protocol.hpp" using namespace iflytop; diff --git a/components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp b/components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp index 817d141..3bf4cd8 100644 --- a/components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp +++ b/components/xy_robot_ctrl_module/xy_robot_ctrl_module.cpp @@ -2,7 +2,7 @@ #include -#include "a8000_protocol\api\errorcode.hpp" +#include "a8000_protocol\protocol.hpp" #include "sdk\components\flash\znvs.hpp" using 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 9f48109..09f4cae 100644 --- a/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp +++ b/components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp @@ -3,7 +3,7 @@ #include "sdk/os/zos.hpp" #include "sdk\components\tmc\basic\tmc_ic_interface.hpp" #include "sdk\components\zcancmder\zcanreceiver.hpp" -#include "a8000_protocol\api\api.hpp" +#include "a8000_protocol\protocol.hpp" #include "sdk\components\zprotocols\zcancmder\api\i_xyrobot_ctrl_module.hpp" namespace iflytop { diff --git a/components/zcancmder/basic.hpp b/components/zcancmder/basic.hpp index d750b8a..e176ec9 100644 --- a/components/zcancmder/basic.hpp +++ b/components/zcancmder/basic.hpp @@ -4,7 +4,7 @@ #pragma once #include "sdk/os/zos.hpp" -#include "a8000_protocol\api\api.hpp" +#include "a8000_protocol\protocol.hpp" namespace iflytop { namespace zcr { diff --git a/components/zcancmder/zcan_board_module.hpp b/components/zcancmder/zcan_board_module.hpp index e81e602..2d7184a 100644 --- a/components/zcancmder/zcan_board_module.hpp +++ b/components/zcancmder/zcan_board_module.hpp @@ -8,7 +8,7 @@ #include "sdk/chip/api/zi_api.hpp" #include "sdk/chip/api/zi_temperature.hpp" #include "sdk\chip\api\zi_adc.hpp" -#include "a8000_protocol\api\api.hpp" +#include "a8000_protocol\protocol.hpp" /** * @brief diff --git a/components/zcancmder/zcan_protocol_parser.hpp b/components/zcancmder/zcan_protocol_parser.hpp index afb3ea5..abb0277 100644 --- a/components/zcancmder/zcan_protocol_parser.hpp +++ b/components/zcancmder/zcan_protocol_parser.hpp @@ -1,7 +1,7 @@ #pragma once #include -#include "a8000_protocol\api\api.hpp" -#include "a8000_protocol\cmdid.hpp" +#include "a8000_protocol\protocol.hpp" +#include "a8000_protocol\i_zcanreceiver.hpp" namespace iflytop { class ZCanProtocolParser : public IZCanReceiverListener { diff --git a/components/zcancmder/zcanreceiver.hpp b/components/zcancmder/zcanreceiver.hpp index 37fffec..2aff09f 100644 --- a/components/zcancmder/zcanreceiver.hpp +++ b/components/zcancmder/zcanreceiver.hpp @@ -5,7 +5,7 @@ #pragma once #include "basic.hpp" #include "sdk/os/zos.hpp" -#include "a8000_protocol\api\api.hpp" +#include "a8000_protocol\protocol.hpp" #ifdef HAL_CAN_MODULE_ENABLED namespace iflytop { using namespace zcr;