Browse Source

update

transmit_disinfection
zhaohe 12 months ago
parent
commit
049e643b13
  1. 2
      hmp110/hmp110.cpp
  2. 4
      hmp110/hmp110.hpp
  3. 2
      hpp272/hpp272.cpp
  4. 4
      hpp272/hpp272.hpp
  5. 2
      modbus/modbus_block_host.hpp
  6. 4
      preportional_valve/preportional_valve_ctrl.hpp
  7. 2
      pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.cpp
  8. 4
      pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.hpp
  9. 4
      tmcdriver/tmc51x0/tmc51x0.cpp
  10. 6
      tmcdriver/tmc51x0/tmc51x0.hpp
  11. 2
      zcanreceiver/zcanreceiver.cpp
  12. 2
      zcanreceiver/zcanreceiver.hpp
  13. 4
      zcanreceiver_old/zcanreceiver.cpp
  14. 2
      zcanreceiver_old/zcanreceiver.hpp

2
hmp110/hmp110.cpp

@ -1,6 +1,6 @@
#include "hmp110.hpp" #include "hmp110.hpp"
#include "zsdk/modbus/modbus_block_host.hpp"
#include "stm32basic/modbus/modbus_block_host.hpp"
using namespace iflytop; using namespace iflytop;

4
hmp110/hmp110.hpp

@ -2,8 +2,8 @@
#include <stddef.h> #include <stddef.h>
#include <stdio.h> #include <stdio.h>
#include "zsdk/modbus/modbus_block_host.hpp"
#include "zsdk/zsdk.hpp"
#include "stm32basic/modbus/modbus_block_host.hpp"
#include "stm32basic/zsdk.hpp"
namespace iflytop { namespace iflytop {

2
hpp272/hpp272.cpp

@ -1,6 +1,6 @@
#include "hpp272.hpp" #include "hpp272.hpp"
#include "zsdk/modbus/modbus_block_host.hpp"
#include "stm32basic/modbus/modbus_block_host.hpp"
using namespace iflytop; using namespace iflytop;

4
hpp272/hpp272.hpp

@ -3,8 +3,8 @@
#include <stdio.h> #include <stdio.h>
#include "base/config_service.hpp" #include "base/config_service.hpp"
#include "zsdk/modbus/modbus_block_host.hpp"
#include "zsdk/zsdk.hpp"
#include "stm32basic/modbus/modbus_block_host.hpp"
#include "stm32basic/zsdk.hpp"
namespace iflytop { namespace iflytop {

2
modbus/modbus_block_host.hpp

@ -1,6 +1,6 @@
#pragma once #pragma once
// //
#include "zsdk/zbasic.h"
#include "stm32basic/zbasic.h"
#include "../mutex.hpp" #include "../mutex.hpp"
namespace iflytop { namespace iflytop {

4
preportional_valve/preportional_valve_ctrl.hpp

@ -3,8 +3,8 @@
#include <stdio.h> #include <stdio.h>
#include "base/config_service.hpp" #include "base/config_service.hpp"
#include "zsdk/modbus/modbus_block_host.hpp"
#include "zsdk/zsdk.hpp"
#include "stm32basic/modbus/modbus_block_host.hpp"
#include "stm32basic/zsdk.hpp"
/** /**
* @brief * @brief
* *

2
pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.cpp

@ -1,6 +1,6 @@
#include "pxx_pressure_sensor_bus.hpp" #include "pxx_pressure_sensor_bus.hpp"
#include "zsdk/modbus/modbus_block_host.hpp"
#include "stm32basic/modbus/modbus_block_host.hpp"
using namespace iflytop; using namespace iflytop;

4
pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.hpp

@ -3,8 +3,8 @@
#include <stdio.h> #include <stdio.h>
#include "base/config_service.hpp" #include "base/config_service.hpp"
#include "zsdk/modbus/modbus_block_host.hpp"
#include "zsdk/zsdk.hpp"
#include "stm32basic/modbus/modbus_block_host.hpp"
#include "stm32basic/zsdk.hpp"
namespace iflytop { namespace iflytop {

4
tmcdriver/tmc51x0/tmc51x0.cpp

@ -4,8 +4,8 @@
#include "reg/TMC5130_Fields.h" #include "reg/TMC5130_Fields.h"
#include "reg/TMC5130_Register.h" #include "reg/TMC5130_Register.h"
// //
#include "zsdk/mutex.hpp"
#include "zsdk/zspi.hpp"
#include "stm32basic/mutex.hpp"
#include "stm32basic/zspi.hpp"
using namespace iflytop; using namespace iflytop;

6
tmcdriver/tmc51x0/tmc51x0.hpp

@ -5,12 +5,12 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "zsdk/zbasic.h"
#include "zsdk/zgpio.hpp"
#include "stm32basic/zbasic.h"
#include "stm32basic/zgpio.hpp"
// //
#include "../tmc/tmc_type.h" #include "../tmc/tmc_type.h"
#include "reg/TMC5130_Type.h" #include "reg/TMC5130_Type.h"
#include "zsdk/mutex.hpp"
#include "stm32basic/mutex.hpp"
namespace iflytop { namespace iflytop {
/** /**
* @brief * @brief

2
zcanreceiver/zcanreceiver.cpp

@ -1,7 +1,7 @@
#include "zcanreceiver.hpp" #include "zcanreceiver.hpp"
#include "../mutex.hpp" #include "../mutex.hpp"
#include "zstm32/zstm32.hpp"
#include "stm32halport/stm32halport.hpp"
#define TAG "zcan" #define TAG "zcan"
#ifndef ENABLE_OLD_CAN_PROTOCOL #ifndef ENABLE_OLD_CAN_PROTOCOL
#define CANHANDLER &hcan1 #define CANHANDLER &hcan1

2
zcanreceiver/zcanreceiver.hpp

@ -4,7 +4,7 @@
#pragma once #pragma once
#include "project_configs.h" #include "project_configs.h"
#include "zsdk/zbasic.h"
#include "stm32basic/zbasic.h"
#ifndef ENABLE_OLD_CAN_PROTOCOL #ifndef ENABLE_OLD_CAN_PROTOCOL
#include "transmit_disfection_protocol/transmit_disfection_protocol.hpp" #include "transmit_disfection_protocol/transmit_disfection_protocol.hpp"

4
zcanreceiver_old/zcanreceiver.cpp

@ -5,7 +5,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include "zsdk/zbasic.h"
#include "stm32basic/zbasic.h"
@ -14,7 +14,7 @@
#define OVER_TIME_MS 100 #define OVER_TIME_MS 100
#ifdef ENABLE_OLD_CAN_PROTOCOL #ifdef ENABLE_OLD_CAN_PROTOCOL
#include "zstm32/zstm32.hpp"
#include "stm32halport/stm32halport.hpp"
extern "C" { extern "C" {
void HAL_CAN_TxMailbox0CompleteCallback(CAN_HandleTypeDef *hcan) { ZLOGI(TAG, "HAL_CAN_TxMailbox0CompleteCallback"); } void HAL_CAN_TxMailbox0CompleteCallback(CAN_HandleTypeDef *hcan) { ZLOGI(TAG, "HAL_CAN_TxMailbox0CompleteCallback"); }

2
zcanreceiver_old/zcanreceiver.hpp

@ -7,7 +7,7 @@
#include <list> #include <list>
#include "project_configs.h" #include "project_configs.h"
#include "zsdk/zbasic.h"
#include "stm32basic/zbasic.h"
#ifdef ENABLE_OLD_CAN_PROTOCOL #ifdef ENABLE_OLD_CAN_PROTOCOL

Loading…
Cancel
Save