Browse Source

update

master
zhaohe 1 year ago
parent
commit
8f876b0ac8
  1. 5
      .gitmodules
  2. 2
      chip/api/zi_api.hpp
  3. 2
      components/algorithm/pid_module.hpp
  4. 2
      components/api/zi_dc_motor_ctrl_module.hpp
  5. 2
      components/api/zi_eeprom.hpp
  6. 2
      components/api/zi_pwm_fan_ctrl_module.hpp
  7. 2
      components/api/zi_pwm_pump_ctrl_module.hpp
  8. 2
      components/api/zi_temperature_sensor.hpp
  9. 2
      components/api/zi_uart_receiver.hpp
  10. 2
      components/api/zi_uart_sender.hpp
  11. 2
      components/errorcode/errorcode.hpp
  12. 2
      components/hardware/adc/z_simple_adc.hpp
  13. 2
      components/hardware/uart/zuart_helper.cpp
  14. 2
      components/mini_servo_motor/mini_servo_motor_ctrl_module.hpp
  15. 2
      components/modbus/modbus_block_host.cpp
  16. 2
      components/pipette_module/pipette_ctrl_module_v2.hpp
  17. 2
      components/sensors/i2ceeprom/m24lrxxe_i2c_eeprom.hpp
  18. 2
      components/sensors/i2ceeprom/p24c16_eeprom.hpp
  19. 2
      components/sensors/m3078/m3078_code_scaner.hpp
  20. 2
      components/sensors/mcp41xxx/mcp41xxx.hpp
  21. 2
      components/sensors/smtp2/smtp2.cpp
  22. 2
      components/sensors/smtp2/smtp2.hpp
  23. 2
      components/water_cooling_temperature_control_module/pwm_ctrl_module.cpp
  24. 2
      components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.cpp
  25. 2
      components/water_cooling_temperature_control_module/water_cooling_temperature_control_module.hpp
  26. 2
      components/xy_robot_ctrl_module/xy_robot_ctrl_module.hpp
  27. 2
      components/zcancmder/basic.hpp
  28. 2
      components/zcancmder/zcan_board_module.hpp
  29. 2
      components/zcancmder/zcanreceiver.hpp
  30. 1
      components/zprotocols/zcancmder_v2

5
.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

2
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"

2
components/algorithm/pid_module.hpp

@ -3,7 +3,7 @@
#include <functional>
#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
#include "a8000_protocol\api\errorcode.hpp"
namespace iflytop {
using namespace std;

2
components/api/zi_dc_motor_ctrl_module.hpp

@ -3,7 +3,7 @@
#include <functional>
#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
#include "a8000_protocol\api\errorcode.hpp"
namespace iflytop {
using namespace std;

2
components/api/zi_eeprom.hpp

@ -3,7 +3,7 @@
#include <functional>
#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
#include "a8000_protocol\api\errorcode.hpp"
namespace iflytop {
using namespace std;

2
components/api/zi_pwm_fan_ctrl_module.hpp

@ -3,7 +3,7 @@
#include <functional>
#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
#include "a8000_protocol\api\errorcode.hpp"
namespace iflytop {
using namespace std;

2
components/api/zi_pwm_pump_ctrl_module.hpp

@ -3,7 +3,7 @@
#include <functional>
#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
#include "a8000_protocol\api\errorcode.hpp"
namespace iflytop {
using namespace std;

2
components/api/zi_temperature_sensor.hpp

@ -3,7 +3,7 @@
#include <functional>
#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
#include "a8000_protocol\api\errorcode.hpp"
namespace iflytop {
using namespace std;

2
components/api/zi_uart_receiver.hpp

@ -3,7 +3,7 @@
#include <functional>
#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
#include "a8000_protocol\api\errorcode.hpp"
namespace iflytop {
using namespace std;

2
components/api/zi_uart_sender.hpp

@ -3,7 +3,7 @@
#include <functional>
#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
#include "a8000_protocol\api\errorcode.hpp"
namespace iflytop {
using namespace std;

2
components/errorcode/errorcode.hpp

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

2
components/hardware/adc/z_simple_adc.hpp

@ -2,7 +2,7 @@
#include <functional>
#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 {

2
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

2
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 {

2
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"

2
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"
/**

2
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

2
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

2
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

2
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 {

2
components/sensors/smtp2/smtp2.cpp

@ -5,7 +5,7 @@
#include <stdlib.h>
#include <string.h>
#include "sdk\components\zprotocols\zcancmder_v2\api\errorcode.hpp"
#include "a8000_protocol\api\errorcode.hpp"
using namespace iflytop;
#define TAG "SMTP2"

2
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;

2
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) {

2
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;

2
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 {
/**

2
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 {

2
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 {

2
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

2
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;

1
components/zprotocols/zcancmder_v2

@ -1 +0,0 @@
Subproject commit 1de9d701ea909dd967426b1e728b896351c47d2a
Loading…
Cancel
Save