From 049e643b139652247636ddb1564345bb299b1aab Mon Sep 17 00:00:00 2001 From: zhaohe Date: Wed, 21 Aug 2024 10:20:51 +0800 Subject: [PATCH] update --- hmp110/hmp110.cpp | 2 +- hmp110/hmp110.hpp | 4 ++-- hpp272/hpp272.cpp | 2 +- hpp272/hpp272.hpp | 4 ++-- modbus/modbus_block_host.hpp | 2 +- preportional_valve/preportional_valve_ctrl.hpp | 4 ++-- pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.cpp | 2 +- pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.hpp | 4 ++-- tmcdriver/tmc51x0/tmc51x0.cpp | 4 ++-- tmcdriver/tmc51x0/tmc51x0.hpp | 6 +++--- zcanreceiver/zcanreceiver.cpp | 2 +- zcanreceiver/zcanreceiver.hpp | 2 +- zcanreceiver_old/zcanreceiver.cpp | 4 ++-- zcanreceiver_old/zcanreceiver.hpp | 2 +- 14 files changed, 22 insertions(+), 22 deletions(-) diff --git a/hmp110/hmp110.cpp b/hmp110/hmp110.cpp index 3456fa0..c9f32a7 100644 --- a/hmp110/hmp110.cpp +++ b/hmp110/hmp110.cpp @@ -1,6 +1,6 @@ #include "hmp110.hpp" -#include "zsdk/modbus/modbus_block_host.hpp" +#include "stm32basic/modbus/modbus_block_host.hpp" using namespace iflytop; diff --git a/hmp110/hmp110.hpp b/hmp110/hmp110.hpp index e4c4da4..ef7298e 100644 --- a/hmp110/hmp110.hpp +++ b/hmp110/hmp110.hpp @@ -2,8 +2,8 @@ #include #include -#include "zsdk/modbus/modbus_block_host.hpp" -#include "zsdk/zsdk.hpp" +#include "stm32basic/modbus/modbus_block_host.hpp" +#include "stm32basic/zsdk.hpp" namespace iflytop { diff --git a/hpp272/hpp272.cpp b/hpp272/hpp272.cpp index fc2acc1..d0f9378 100644 --- a/hpp272/hpp272.cpp +++ b/hpp272/hpp272.cpp @@ -1,6 +1,6 @@ #include "hpp272.hpp" -#include "zsdk/modbus/modbus_block_host.hpp" +#include "stm32basic/modbus/modbus_block_host.hpp" using namespace iflytop; diff --git a/hpp272/hpp272.hpp b/hpp272/hpp272.hpp index 329309e..33ee71b 100644 --- a/hpp272/hpp272.hpp +++ b/hpp272/hpp272.hpp @@ -3,8 +3,8 @@ #include #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 { diff --git a/modbus/modbus_block_host.hpp b/modbus/modbus_block_host.hpp index 8d3a68f..6fcfbed 100644 --- a/modbus/modbus_block_host.hpp +++ b/modbus/modbus_block_host.hpp @@ -1,6 +1,6 @@ #pragma once // -#include "zsdk/zbasic.h" +#include "stm32basic/zbasic.h" #include "../mutex.hpp" namespace iflytop { diff --git a/preportional_valve/preportional_valve_ctrl.hpp b/preportional_valve/preportional_valve_ctrl.hpp index 282a19f..d239661 100644 --- a/preportional_valve/preportional_valve_ctrl.hpp +++ b/preportional_valve/preportional_valve_ctrl.hpp @@ -3,8 +3,8 @@ #include #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 * diff --git a/pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.cpp b/pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.cpp index 0f39d66..8b4488c 100644 --- a/pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.cpp +++ b/pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.cpp @@ -1,6 +1,6 @@ #include "pxx_pressure_sensor_bus.hpp" -#include "zsdk/modbus/modbus_block_host.hpp" +#include "stm32basic/modbus/modbus_block_host.hpp" using namespace iflytop; diff --git a/pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.hpp b/pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.hpp index 2d9822d..52eb5d5 100644 --- a/pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.hpp +++ b/pxx_pressure_sensor_driver/pxx_pressure_sensor_bus.hpp @@ -3,8 +3,8 @@ #include #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 { diff --git a/tmcdriver/tmc51x0/tmc51x0.cpp b/tmcdriver/tmc51x0/tmc51x0.cpp index bc080cc..e5f3deb 100644 --- a/tmcdriver/tmc51x0/tmc51x0.cpp +++ b/tmcdriver/tmc51x0/tmc51x0.cpp @@ -4,8 +4,8 @@ #include "reg/TMC5130_Fields.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; diff --git a/tmcdriver/tmc51x0/tmc51x0.hpp b/tmcdriver/tmc51x0/tmc51x0.hpp index 11dd1bf..6f60e77 100644 --- a/tmcdriver/tmc51x0/tmc51x0.hpp +++ b/tmcdriver/tmc51x0/tmc51x0.hpp @@ -5,12 +5,12 @@ #include #include -#include "zsdk/zbasic.h" -#include "zsdk/zgpio.hpp" +#include "stm32basic/zbasic.h" +#include "stm32basic/zgpio.hpp" // #include "../tmc/tmc_type.h" #include "reg/TMC5130_Type.h" -#include "zsdk/mutex.hpp" +#include "stm32basic/mutex.hpp" namespace iflytop { /** * @brief diff --git a/zcanreceiver/zcanreceiver.cpp b/zcanreceiver/zcanreceiver.cpp index 1602532..f93e28c 100644 --- a/zcanreceiver/zcanreceiver.cpp +++ b/zcanreceiver/zcanreceiver.cpp @@ -1,7 +1,7 @@ #include "zcanreceiver.hpp" #include "../mutex.hpp" -#include "zstm32/zstm32.hpp" +#include "stm32halport/stm32halport.hpp" #define TAG "zcan" #ifndef ENABLE_OLD_CAN_PROTOCOL #define CANHANDLER &hcan1 diff --git a/zcanreceiver/zcanreceiver.hpp b/zcanreceiver/zcanreceiver.hpp index f123afb..e83f018 100644 --- a/zcanreceiver/zcanreceiver.hpp +++ b/zcanreceiver/zcanreceiver.hpp @@ -4,7 +4,7 @@ #pragma once #include "project_configs.h" -#include "zsdk/zbasic.h" +#include "stm32basic/zbasic.h" #ifndef ENABLE_OLD_CAN_PROTOCOL #include "transmit_disfection_protocol/transmit_disfection_protocol.hpp" diff --git a/zcanreceiver_old/zcanreceiver.cpp b/zcanreceiver_old/zcanreceiver.cpp index 4cb1e14..975490f 100644 --- a/zcanreceiver_old/zcanreceiver.cpp +++ b/zcanreceiver_old/zcanreceiver.cpp @@ -5,7 +5,7 @@ #include #include -#include "zsdk/zbasic.h" +#include "stm32basic/zbasic.h" @@ -14,7 +14,7 @@ #define OVER_TIME_MS 100 #ifdef ENABLE_OLD_CAN_PROTOCOL -#include "zstm32/zstm32.hpp" +#include "stm32halport/stm32halport.hpp" extern "C" { void HAL_CAN_TxMailbox0CompleteCallback(CAN_HandleTypeDef *hcan) { ZLOGI(TAG, "HAL_CAN_TxMailbox0CompleteCallback"); } diff --git a/zcanreceiver_old/zcanreceiver.hpp b/zcanreceiver_old/zcanreceiver.hpp index 168177f..effa953 100644 --- a/zcanreceiver_old/zcanreceiver.hpp +++ b/zcanreceiver_old/zcanreceiver.hpp @@ -7,7 +7,7 @@ #include #include "project_configs.h" -#include "zsdk/zbasic.h" +#include "stm32basic/zbasic.h" #ifdef ENABLE_OLD_CAN_PROTOCOL