diff --git a/.gitmodules b/.gitmodules index dbb2863..e2352f4 100644 --- a/.gitmodules +++ b/.gitmodules @@ -3,7 +3,4 @@ url = zwsd@192.168.1.3:zprotocols/zcancmder.git [submodule "components/zprotocols/errorcode"] path = components/zprotocols/errorcode - 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:project_boditech_vidas_a8000_v3/a8000_protocol.git + url = zwsd@192.168.1.3:zprotocols/errorcode.git \ No newline at end of file diff --git a/chip/api/zi_api.hpp b/chip/api/zi_api.hpp index c906f30..c22d274 100644 --- a/chip/api/zi_api.hpp +++ b/chip/api/zi_api.hpp @@ -1,5 +1,5 @@ #pragma once #include "zi_adc.hpp" -#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.hpp" #include "zi_temperature.hpp" #include "zi_pwm_ctrl.hpp" \ No newline at end of file diff --git a/components/algorithm/pid_module.hpp b/components/algorithm/pid_module.hpp index 50a9ded..7a0f59b 100644 --- a/components/algorithm/pid_module.hpp +++ b/components/algorithm/pid_module.hpp @@ -3,7 +3,7 @@ #include -#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.hpp" namespace iflytop { using namespace std; diff --git a/components/api/zi_dc_motor_ctrl_module.hpp b/components/api/zi_dc_motor_ctrl_module.hpp index b0e8897..f076cb5 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 "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.hpp" namespace iflytop { using namespace std; diff --git a/components/api/zi_eeprom.hpp b/components/api/zi_eeprom.hpp index db2b084..4a58c98 100644 --- a/components/api/zi_eeprom.hpp +++ b/components/api/zi_eeprom.hpp @@ -3,7 +3,7 @@ #include -#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.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 79af681..55f5329 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 "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.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 ae2e82b..c2578fe 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 "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.hpp" namespace iflytop { using namespace std; diff --git a/components/api/zi_temperature_sensor.hpp b/components/api/zi_temperature_sensor.hpp index 937be52..6351936 100644 --- a/components/api/zi_temperature_sensor.hpp +++ b/components/api/zi_temperature_sensor.hpp @@ -3,7 +3,7 @@ #include -#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.hpp" namespace iflytop { using namespace std; diff --git a/components/api/zi_uart_receiver.hpp b/components/api/zi_uart_receiver.hpp index 8714299..ac17892 100644 --- a/components/api/zi_uart_receiver.hpp +++ b/components/api/zi_uart_receiver.hpp @@ -3,7 +3,7 @@ #include -#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.hpp" namespace iflytop { using namespace std; diff --git a/components/api/zi_uart_sender.hpp b/components/api/zi_uart_sender.hpp index f6dc264..f3275cd 100644 --- a/components/api/zi_uart_sender.hpp +++ b/components/api/zi_uart_sender.hpp @@ -3,7 +3,7 @@ #include -#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.hpp" namespace iflytop { using namespace std; diff --git a/components/errorcode/errorcode.hpp b/components/errorcode/errorcode.hpp index d77427a..58abe8a 100644 --- a/components/errorcode/errorcode.hpp +++ b/components/errorcode/errorcode.hpp @@ -1 +1 @@ -#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" \ No newline at end of file +#include "a8000_protocol\api\errorcode.hpp" \ No newline at end of file diff --git a/components/hardware/adc/z_simple_adc.hpp b/components/hardware/adc/z_simple_adc.hpp index b31de30..4aed4ce 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 "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.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 3ebf29c..32abed3 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\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.hpp" using namespace iflytop; #define __DEBUG 0 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 aa2b607..a056654 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 "sdk\components\zprotocols\zcancmder_v2\api\api.hpp" +#include "a8000_protocol\api\api.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 cdc870c..cba5b06 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\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.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 6e6b7ee..f552708 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 "sdk\components\zprotocols\zcancmder_v2\api\api.hpp" +#include "a8000_protocol\api\api.hpp" // #include "StepMotorCtrlModule" /** diff --git a/components/sensors/i2ceeprom/m24lrxxe_i2c_eeprom.hpp b/components/sensors/i2ceeprom/m24lrxxe_i2c_eeprom.hpp index 5d68ab6..38eb9cf 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 "sdk\components\zprotocols\zcancmder_v2\api\api.hpp" +#include "a8000_protocol\api\api.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 1ce31ea..9ddfa23 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 "sdk\components\zprotocols\zcancmder_v2\api\api.hpp" +#include "a8000_protocol\api\api.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 e83b598..6264d61 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 "sdk\components\zprotocols\zcancmder_v2\api\api.hpp" +#include "a8000_protocol\api\api.hpp" /** * @brief diff --git a/components/sensors/mcp41xxx/mcp41xxx.hpp b/components/sensors/mcp41xxx/mcp41xxx.hpp index 54ca871..0090c33 100644 --- a/components/sensors/mcp41xxx/mcp41xxx.hpp +++ b/components/sensors/mcp41xxx/mcp41xxx.hpp @@ -1,5 +1,5 @@ #pragma once -#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\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 2a73b09..1a2c1e8 100644 --- a/components/sensors/smtp2/smtp2.cpp +++ b/components/sensors/smtp2/smtp2.cpp @@ -5,7 +5,7 @@ #include #include -#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.hpp" using namespace iflytop; #define TAG "SMTP2" diff --git a/components/sensors/smtp2/smtp2.hpp b/components/sensors/smtp2/smtp2.hpp index 7aa2e0b..da5da37 100644 --- a/components/sensors/smtp2/smtp2.hpp +++ b/components/sensors/smtp2/smtp2.hpp @@ -1,5 +1,5 @@ #pragma once -#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.hpp" #include "sdk\os\zos.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 79fe8fc..db7592e 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 "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp" +#include "a8000_protocol\api\errorcode.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 1e93208..ff85442 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 "sdk\components\zprotocols\zcancmder_v2\api\api.hpp" +#include "a8000_protocol\api\api.hpp" using namespace iflytop; diff --git a/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp b/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp index 55213ac..ba04c34 100644 --- a/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp +++ b/components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp @@ -25,7 +25,7 @@ #include "sdk\components\algorithm\pid_module.hpp" #include "sdk\components\api\zi_temperature_sensor.hpp" #include "sdk\components\ti\drv8710.hpp" -#include "sdk\components\zprotocols\zcancmder_v2\api\zi_module.hpp" +#include "a8000_protocol\api\zi_module.hpp" namespace iflytop { /** 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 697828f..7a0d548 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 "sdk\components\zprotocols\zcancmder_v2\api\api.hpp" +#include "a8000_protocol\api\api.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 f7a5d07..d750b8a 100644 --- a/components/zcancmder/basic.hpp +++ b/components/zcancmder/basic.hpp @@ -4,7 +4,7 @@ #pragma once #include "sdk/os/zos.hpp" -#include "sdk\components\zprotocols\zcancmder_v2\api\api.hpp" +#include "a8000_protocol\api\api.hpp" namespace iflytop { namespace zcr { diff --git a/components/zcancmder/zcan_board_module.hpp b/components/zcancmder/zcan_board_module.hpp index dfe1685..e81e602 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 "sdk\components\zprotocols\zcancmder_v2\api\api.hpp" +#include "a8000_protocol\api\api.hpp" /** * @brief diff --git a/components/zcancmder/zcanreceiver.hpp b/components/zcancmder/zcanreceiver.hpp index 3b29e5f..c587295 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 "sdk\components\zprotocols\zcancmder_v2\api\api.hpp" +#include "a8000_protocol\api\api.hpp" #ifdef HAL_CAN_MODULE_ENABLED namespace iflytop { using namespace zcr; diff --git a/components/zprotocols/zcancmder_v2 b/components/zprotocols/zcancmder_v2 deleted file mode 160000 index 1de9d70..0000000 --- a/components/zprotocols/zcancmder_v2 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 1de9d701ea909dd967426b1e728b896351c47d2a