From 8234b9d4bb05ca5031c3a474a3b7daafb8c6e56c Mon Sep 17 00:00:00 2001 From: Laputin Evgeny Date: Mon, 26 Jun 2023 15:22:30 +0000 Subject: [PATCH] =?UTF-8?q?refactor:=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BA=20=D0=B8=D0=BD=D0=BA=D0=BB=D1=8E=D0=B4?= =?UTF-8?q?=D0=B0=D0=BC=20free=5Frtos/=20=D0=B4=D0=BB=D1=8F=20=D0=B8=D0=B7?= =?UTF-8?q?=D0=B1=D0=B5=D0=B6=D0=B0=D0=BD=D0=B8=D1=8F=20=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D1=84=D0=BB=D0=B8=D0=BA=D1=82=D0=BE=D0=B2=20=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=20=D0=B2=20=D0=BA=D0=BE=D0=B4=D0=B5,=20=D0=BA=D0=BE?= =?UTF-8?q?=D1=82=D0=BE=D1=80=D1=8B=D0=B9=20=D0=B1=D1=83=D0=B4=D0=B5=D1=82?= =?UTF-8?q?=20=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C=D0=B7=D0=BE=D0=B2=D0=B0?= =?UTF-8?q?=D1=82=D1=8C=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=83=D1=8E=20=D0=B1?= =?UTF-8?q?=D0=B8=D0=B1=D0=BB=D0=B8=D0=BE=D1=82=D0=B5=D0=BA=D1=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/free_rtos/clock/clock.cpp | 2 +- components/free_rtos/ethernet/eth.cpp | 6 ++--- components/free_rtos/ethernet/eth.hpp | 16 ++++++------- components/free_rtos/ethernet/eth_ioctl.c | 2 +- components/free_rtos/ethernet/eth_rx_flow.cpp | 2 +- components/free_rtos/ethernet/eth_rx_flow.hpp | 12 +++++----- .../free_rtos/ethernet/eth_task_settings.hpp | 2 +- components/free_rtos/ethernet/eth_tx_flow.cpp | 2 +- components/free_rtos/ethernet/eth_tx_flow.hpp | 4 ++-- .../free_rtos/ethernet/eth_tx_flow_iface.hpp | 4 ++-- components/free_rtos/ethernet/eth_vlan.c | 2 +- components/free_rtos/ethernet/eth_vlan.h | 2 +- .../CoE/eth_ecat_pdo_fmmu.cpp | 2 +- .../CoE/eth_ecat_pdo_fmmu.hpp | 8 +++---- .../CoE/eth_ecat_sdo_mailbox.cpp | 2 +- .../CoE/eth_ecat_sdo_mailbox.hpp | 2 +- .../free_rtos/ethernet_industry/eth_ecat.cpp | 2 +- .../free_rtos/ethernet_industry/eth_ecat.hpp | 24 +++++++++---------- .../ethernet_industry/eth_ecat_api.cpp | 2 +- .../ethernet_industry/eth_ecat_api.hpp | 10 ++++---- .../ethernet_industry/eth_ecat_buffer.cpp | 2 +- .../ethernet_industry/eth_ecat_buffer.hpp | 2 +- .../ethernet_industry/eth_ecat_command.hpp | 8 +++---- .../eth_ecat_custom_promise.hpp | 12 +++++----- .../ethernet_industry/eth_ecat_datagram.hpp | 12 +++++----- .../ethernet_industry/eth_ecat_eeprom.hpp | 4 ++-- .../ethernet_industry/eth_ecat_telegram.cpp | 4 ++-- .../ethernet_industry/eth_ecat_telegram.hpp | 4 ++-- components/free_rtos/ethernet_ip/eth_arp.cpp | 8 +++---- components/free_rtos/ethernet_ip/eth_arp.hpp | 10 ++++---- .../free_rtos/ethernet_ip/eth_checksum.c | 2 +- components/free_rtos/ethernet_ip/eth_icmp.cpp | 8 +++---- components/free_rtos/ethernet_ip/eth_icmp.hpp | 2 +- components/free_rtos/ethernet_ip/eth_ip.cpp | 10 ++++---- components/free_rtos/ethernet_ip/eth_ip.hpp | 10 ++++---- .../free_rtos/ethernet_ip/eth_ip_checksum.c | 2 +- .../free_rtos/ethernet_ip/eth_ip_iface.hpp | 4 ++-- .../free_rtos/ethernet_ip/eth_stack.cpp | 8 +++---- .../free_rtos/ethernet_ip/eth_stack.hpp | 16 ++++++------- .../free_rtos/ethernet_ip/eth_stack_iface.hpp | 6 ++--- .../free_rtos/ethernet_ip/eth_udp_client.cpp | 12 +++++----- .../free_rtos/ethernet_ip/eth_udp_client.hpp | 10 ++++---- .../free_rtos/ethernet_ip/eth_udp_server.cpp | 8 +++---- .../free_rtos/ethernet_ip/eth_udp_server.hpp | 8 +++---- .../ethernet_ip/eth_udp_server_iface.hpp | 2 +- components/free_rtos/gpio/gpio.cpp | 2 +- .../free_rtos/handler_store/handler_store.cpp | 2 +- .../free_rtos/handler_store/handler_store.hpp | 2 +- components/free_rtos/mutex/mutex.cpp | 2 +- components/free_rtos/task/task.cpp | 2 +- components/free_rtos/timer/timer.cpp | 3 ++- components/free_rtos/timer_sw/timer_sw.cpp | 2 +- 52 files changed, 149 insertions(+), 148 deletions(-) diff --git a/components/free_rtos/clock/clock.cpp b/components/free_rtos/clock/clock.cpp index c8b3182..3ac4134 100644 --- a/components/free_rtos/clock/clock.cpp +++ b/components/free_rtos/clock/clock.cpp @@ -4,7 +4,7 @@ * Created on: 13 ìàð. 2023 ã. * Author: sychev */ -#include "clock/clock.hpp" +#include "free_rtos/clock/clock.hpp" bool free_rtos::Clock::init(uint32_t period_ms, Callback cbk, void * arg) { diff --git a/components/free_rtos/ethernet/eth.cpp b/components/free_rtos/ethernet/eth.cpp index bcdc6ec..f33bbee 100644 --- a/components/free_rtos/ethernet/eth.cpp +++ b/components/free_rtos/ethernet/eth.cpp @@ -4,9 +4,9 @@ * Created on: 9 ���. 2023 �. * Author: sychev */ -#include "ethernet/eth.hpp" -#include "ethernet/eth_vlan.h" -#include "ethernet/eth_ioctl.h" +#include "free_rtos/ethernet/eth.hpp" +#include "free_rtos/ethernet/eth_vlan.h" +#include "free_rtos/ethernet/eth_ioctl.h" #include #include diff --git a/components/free_rtos/ethernet/eth.hpp b/components/free_rtos/ethernet/eth.hpp index c64b6cb..092d2bd 100644 --- a/components/free_rtos/ethernet/eth.hpp +++ b/components/free_rtos/ethernet/eth.hpp @@ -8,13 +8,13 @@ #ifndef FREE_RTOS_ETHERNET_ETH_HPP_ #define FREE_RTOS_ETHERNET_ETH_HPP_ -#include "ethernet/eth_task_settings.hpp" -#include "ethernet/eth_rx_flow.hpp" -#include "ethernet/eth_tx_flow.hpp" +#include "free_rtos/ethernet/eth_task_settings.hpp" +#include "free_rtos/ethernet/eth_rx_flow.hpp" +#include "free_rtos/ethernet/eth_tx_flow.hpp" -#include "semaphore/semaphore.hpp" -#include "ethernet/eth_frame.h" -#include "task/task.hpp" +#include "free_rtos/semaphore/semaphore.hpp" +#include "free_rtos/ethernet/eth_frame.h" +#include "free_rtos/task/task.hpp" #include #include @@ -22,9 +22,9 @@ #include #include -#include "ethernet/eth_types.h" +#include "free_rtos/ethernet/eth_types.h" -#include "ethernet_ip/eth_stack.hpp" +#include "free_rtos/ethernet_ip/eth_stack.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet/eth_ioctl.c b/components/free_rtos/ethernet/eth_ioctl.c index d9455ae..520f183 100644 --- a/components/free_rtos/ethernet/eth_ioctl.c +++ b/components/free_rtos/ethernet/eth_ioctl.c @@ -4,7 +4,7 @@ * Created on: 10 ìàð. 2023 ã. * Author: sychev */ -#include "ethernet/eth_ioctl.h" +#include "free_rtos/ethernet/eth_ioctl.h" #include diff --git a/components/free_rtos/ethernet/eth_rx_flow.cpp b/components/free_rtos/ethernet/eth_rx_flow.cpp index a0e86ee..2716ffc 100644 --- a/components/free_rtos/ethernet/eth_rx_flow.cpp +++ b/components/free_rtos/ethernet/eth_rx_flow.cpp @@ -4,7 +4,7 @@ * Created on: 7 ���. 2023 �. * Author: sychev */ -#include "ethernet/eth_rx_flow.hpp" +#include "free_rtos/ethernet/eth_rx_flow.hpp" #include #include diff --git a/components/free_rtos/ethernet/eth_rx_flow.hpp b/components/free_rtos/ethernet/eth_rx_flow.hpp index eb63441..e3095f5 100644 --- a/components/free_rtos/ethernet/eth_rx_flow.hpp +++ b/components/free_rtos/ethernet/eth_rx_flow.hpp @@ -11,13 +11,13 @@ #include #include -#include "handler_store/handler_store.hpp" -#include "semaphore/semaphore.hpp" -#include "task/task.hpp" +#include "free_rtos/handler_store/handler_store.hpp" +#include "free_rtos/semaphore/semaphore.hpp" +#include "free_rtos/task/task.hpp" -#include "ethernet/eth_task_settings.hpp" -#include "ethernet/eth_frame.h" -#include "ethernet_ip/eth_stack_iface.hpp" +#include "free_rtos/ethernet/eth_task_settings.hpp" +#include "free_rtos/ethernet/eth_frame.h" +#include "free_rtos/ethernet_ip/eth_stack_iface.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet/eth_task_settings.hpp b/components/free_rtos/ethernet/eth_task_settings.hpp index 22d2627..eb6fe7a 100644 --- a/components/free_rtos/ethernet/eth_task_settings.hpp +++ b/components/free_rtos/ethernet/eth_task_settings.hpp @@ -10,7 +10,7 @@ #include -#include "task/task.hpp" +#include "free_rtos/task/task.hpp" namespace free_rtos { static constexpr uint32_t RX_TASK_PRIORITY = Task::TaskPriorityHiest - 2; diff --git a/components/free_rtos/ethernet/eth_tx_flow.cpp b/components/free_rtos/ethernet/eth_tx_flow.cpp index 3f03aef..cba6382 100644 --- a/components/free_rtos/ethernet/eth_tx_flow.cpp +++ b/components/free_rtos/ethernet/eth_tx_flow.cpp @@ -4,7 +4,7 @@ * Created on: 7 ���. 2023 �. * Author: sychev */ -#include "ethernet/eth_tx_flow.hpp" +#include "free_rtos/ethernet/eth_tx_flow.hpp" #include diff --git a/components/free_rtos/ethernet/eth_tx_flow.hpp b/components/free_rtos/ethernet/eth_tx_flow.hpp index 68eb0ad..bbfb069 100644 --- a/components/free_rtos/ethernet/eth_tx_flow.hpp +++ b/components/free_rtos/ethernet/eth_tx_flow.hpp @@ -11,8 +11,8 @@ #include #include -#include "ethernet/eth_tx_flow_iface.hpp" -#include "handler_store/handler_store.hpp" +#include "free_rtos/ethernet/eth_tx_flow_iface.hpp" +#include "free_rtos/handler_store/handler_store.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet/eth_tx_flow_iface.hpp b/components/free_rtos/ethernet/eth_tx_flow_iface.hpp index af4324e..6cd4ad6 100644 --- a/components/free_rtos/ethernet/eth_tx_flow_iface.hpp +++ b/components/free_rtos/ethernet/eth_tx_flow_iface.hpp @@ -9,8 +9,8 @@ #define FREE_RTOS_ETHERNET_ETH_TX_FLOW_IFACE_HPP_ #include -#include "ethernet/eth_types.h" -#include "handler_store/handler_store.hpp" +#include "free_rtos/ethernet/eth_types.h" +#include "free_rtos/handler_store/handler_store.hpp" class EthTxFlowIface { public: diff --git a/components/free_rtos/ethernet/eth_vlan.c b/components/free_rtos/ethernet/eth_vlan.c index a9328c9..aba0c9a 100644 --- a/components/free_rtos/ethernet/eth_vlan.c +++ b/components/free_rtos/ethernet/eth_vlan.c @@ -4,7 +4,7 @@ * Created on: 9 ìàð. 2023 ã. * Author: sychev */ -#include "ethernet/eth_vlan.h" +#include "free_rtos/ethernet/eth_vlan.h" #include #include diff --git a/components/free_rtos/ethernet/eth_vlan.h b/components/free_rtos/ethernet/eth_vlan.h index 1dc39a2..42fd64c 100644 --- a/components/free_rtos/ethernet/eth_vlan.h +++ b/components/free_rtos/ethernet/eth_vlan.h @@ -8,7 +8,7 @@ #ifndef FREE_RTOS_ETHERNET_ETH_VLAN_HPP_ #define FREE_RTOS_ETHERNET_ETH_VLAN_HPP_ -//#include "semaphore/semaphore.hpp" +//#include "free_rtos/semaphore/semaphore.hpp" #include //#include diff --git a/components/free_rtos/ethernet_industry/CoE/eth_ecat_pdo_fmmu.cpp b/components/free_rtos/ethernet_industry/CoE/eth_ecat_pdo_fmmu.cpp index 4b6a45c..42d8079 100644 --- a/components/free_rtos/ethernet_industry/CoE/eth_ecat_pdo_fmmu.cpp +++ b/components/free_rtos/ethernet_industry/CoE/eth_ecat_pdo_fmmu.cpp @@ -5,7 +5,7 @@ * Author: algin */ -#include "ethernet_industry/CoE/eth_ecat_pdo_fmmu.hpp" +#include "free_rtos/ethernet_industry/CoE/eth_ecat_pdo_fmmu.hpp" #include diff --git a/components/free_rtos/ethernet_industry/CoE/eth_ecat_pdo_fmmu.hpp b/components/free_rtos/ethernet_industry/CoE/eth_ecat_pdo_fmmu.hpp index cda86c2..d0d3c29 100644 --- a/components/free_rtos/ethernet_industry/CoE/eth_ecat_pdo_fmmu.hpp +++ b/components/free_rtos/ethernet_industry/CoE/eth_ecat_pdo_fmmu.hpp @@ -8,11 +8,11 @@ #ifndef FREE_RTOS_ETHERNET_INDUSTRY_COE_ETH_ECAT_PDO_FMMU_HPP_ #define FREE_RTOS_ETHERNET_INDUSTRY_COE_ETH_ECAT_PDO_FMMU_HPP_ -#include "semaphore/semaphore.hpp" -#include "mutex/mutex.hpp" +#include "free_rtos/semaphore/semaphore.hpp" +#include "free_rtos/mutex/mutex.hpp" -#include "ethernet_industry/eth_ecat_buffer.hpp" -#include "ethernet_industry/eth_ecat_custom_promise.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_buffer.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_custom_promise.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_industry/CoE/eth_ecat_sdo_mailbox.cpp b/components/free_rtos/ethernet_industry/CoE/eth_ecat_sdo_mailbox.cpp index c41fd4d..94b2c0d 100644 --- a/components/free_rtos/ethernet_industry/CoE/eth_ecat_sdo_mailbox.cpp +++ b/components/free_rtos/ethernet_industry/CoE/eth_ecat_sdo_mailbox.cpp @@ -5,7 +5,7 @@ * Author: algin */ -#include "ethernet_industry/CoE/eth_ecat_sdo_mailbox.hpp" +#include "free_rtos/ethernet_industry/CoE/eth_ecat_sdo_mailbox.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_industry/CoE/eth_ecat_sdo_mailbox.hpp b/components/free_rtos/ethernet_industry/CoE/eth_ecat_sdo_mailbox.hpp index b4ebffd..569dc21 100644 --- a/components/free_rtos/ethernet_industry/CoE/eth_ecat_sdo_mailbox.hpp +++ b/components/free_rtos/ethernet_industry/CoE/eth_ecat_sdo_mailbox.hpp @@ -8,7 +8,7 @@ #ifndef FREE_RTOS_ETHERNET_INDUSTRY_COE_ETH_ECAT_SDO_MAILBOX_HPP_ #define FREE_RTOS_ETHERNET_INDUSTRY_COE_ETH_ECAT_SDO_MAILBOX_HPP_ -#include "ethernet_industry/eth_ecat_buffer.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_buffer.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_industry/eth_ecat.cpp b/components/free_rtos/ethernet_industry/eth_ecat.cpp index 8ce9f8a..76b213a 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat.cpp +++ b/components/free_rtos/ethernet_industry/eth_ecat.cpp @@ -5,7 +5,7 @@ * Author: sychev */ -#include "ethernet_industry/eth_ecat.hpp" +#include "free_rtos/ethernet_industry/eth_ecat.hpp" #include #include diff --git a/components/free_rtos/ethernet_industry/eth_ecat.hpp b/components/free_rtos/ethernet_industry/eth_ecat.hpp index 38c9fc8..43ea62f 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat.hpp +++ b/components/free_rtos/ethernet_industry/eth_ecat.hpp @@ -12,19 +12,19 @@ #include #include -#include "handler_store/handler.hpp" -#include "ethernet/eth_frame.h" -#include "timer/timer.hpp" -#include "mutex/mutex.hpp" -#include "semaphore/semaphore.hpp" +#include "free_rtos/handler_store/handler.hpp" +#include "free_rtos/ethernet/eth_frame.h" +#include "free_rtos/timer/timer.hpp" +#include "free_rtos/mutex/mutex.hpp" +#include "free_rtos/semaphore/semaphore.hpp" -#include "ethernet/eth.hpp" -#include "ethernet_industry/ethercattype.hpp" -#include "ethernet_industry/eth_ecat_types.h" -#include "ethernet_industry/eth_ecat_command.hpp" -#include "ethernet_industry/eth_ecat_datagram.hpp" -#include "ethernet_industry/eth_ecat_telegram.hpp" -#include "ethernet_industry/eth_ecat_eeprom.hpp" +#include "free_rtos/ethernet/eth.hpp" +#include "free_rtos/ethernet_industry/ethercattype.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_types.h" +#include "free_rtos/ethernet_industry/eth_ecat_command.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_datagram.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_telegram.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_eeprom.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_industry/eth_ecat_api.cpp b/components/free_rtos/ethernet_industry/eth_ecat_api.cpp index b79ac36..4d50bdd 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat_api.cpp +++ b/components/free_rtos/ethernet_industry/eth_ecat_api.cpp @@ -5,7 +5,7 @@ * Author: algin */ -#include "ethernet_industry/eth_ecat_api.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_api.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_industry/eth_ecat_api.hpp b/components/free_rtos/ethernet_industry/eth_ecat_api.hpp index 768f3cc..6b6f9ad 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat_api.hpp +++ b/components/free_rtos/ethernet_industry/eth_ecat_api.hpp @@ -10,11 +10,11 @@ #define COMX 1 -#include "ethernet/eth.hpp" -#include "ethernet_industry/eth_ecat.hpp" -#include "ethernet_industry/eth_ecat_buffer.hpp" -#include "ethernet_industry/CoE/eth_ecat_sdo_mailbox.hpp" -#include "ethernet_industry/CoE/eth_ecat_pdo_fmmu.hpp" +#include "free_rtos/ethernet/eth.hpp" +#include "free_rtos/ethernet_industry/eth_ecat.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_buffer.hpp" +#include "free_rtos/ethernet_industry/CoE/eth_ecat_sdo_mailbox.hpp" +#include "free_rtos/ethernet_industry/CoE/eth_ecat_pdo_fmmu.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_industry/eth_ecat_buffer.cpp b/components/free_rtos/ethernet_industry/eth_ecat_buffer.cpp index 5494db4..a663ab3 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat_buffer.cpp +++ b/components/free_rtos/ethernet_industry/eth_ecat_buffer.cpp @@ -5,7 +5,7 @@ * Author: algin */ -#include "ethernet_industry/eth_ecat_buffer.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_buffer.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_industry/eth_ecat_buffer.hpp b/components/free_rtos/ethernet_industry/eth_ecat_buffer.hpp index 91e764a..451ccaa 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat_buffer.hpp +++ b/components/free_rtos/ethernet_industry/eth_ecat_buffer.hpp @@ -12,7 +12,7 @@ #include #include -#include "ethernet_industry/eth_ecat.hpp" +#include "free_rtos/ethernet_industry/eth_ecat.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_industry/eth_ecat_command.hpp b/components/free_rtos/ethernet_industry/eth_ecat_command.hpp index dbdeeaa..9afd11f 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat_command.hpp +++ b/components/free_rtos/ethernet_industry/eth_ecat_command.hpp @@ -12,10 +12,10 @@ #include #include -#include "ethernet_industry/ethercattype.hpp" -#include "ethernet_industry/eth_ecat_types.h" -#include "ethernet_industry/eth_ecat_custom_tuple.hpp" -#include "ethernet_industry/eth_ecat_packer.hpp" +#include "free_rtos/ethernet_industry/ethercattype.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_types.h" +#include "free_rtos/ethernet_industry/eth_ecat_custom_tuple.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_packer.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_industry/eth_ecat_custom_promise.hpp b/components/free_rtos/ethernet_industry/eth_ecat_custom_promise.hpp index e404176..2333a7b 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat_custom_promise.hpp +++ b/components/free_rtos/ethernet_industry/eth_ecat_custom_promise.hpp @@ -10,13 +10,13 @@ #include -#include "semaphore/semaphore.hpp" +#include "free_rtos/semaphore/semaphore.hpp" -#include "ethernet_industry/eth_ecat_queue.hpp" -#include "ethernet_industry/eth_ecat_datagram.hpp" -#include "ethernet_industry/eth_ecat_command.hpp" -#include "ethernet_industry/eth_ecat_custom_tuple.hpp" -#include "ethernet_industry/eth_ecat_packer.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_queue.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_datagram.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_command.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_custom_tuple.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_packer.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_industry/eth_ecat_datagram.hpp b/components/free_rtos/ethernet_industry/eth_ecat_datagram.hpp index 74f5b99..6ae3337 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat_datagram.hpp +++ b/components/free_rtos/ethernet_industry/eth_ecat_datagram.hpp @@ -10,12 +10,12 @@ #include -#include "ethernet_industry/ethercattype.hpp" -#include "ethernet_industry/eth_ecat_types.h" -#include "ethernet_industry/eth_ecat_queue.hpp" -#include "ethernet_industry/eth_ecat_custom_tuple.hpp" -#include "ethernet_industry/eth_ecat_packer.hpp" -#include "ethernet_industry/eth_ecat_command.hpp" +#include "free_rtos/ethernet_industry/ethercattype.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_types.h" +#include "free_rtos/ethernet_industry/eth_ecat_queue.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_custom_tuple.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_packer.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_command.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_industry/eth_ecat_eeprom.hpp b/components/free_rtos/ethernet_industry/eth_ecat_eeprom.hpp index 5e7a10a..1acd494 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat_eeprom.hpp +++ b/components/free_rtos/ethernet_industry/eth_ecat_eeprom.hpp @@ -10,8 +10,8 @@ #include -#include -#include "ethernet_industry/eth_ecat_telegram.hpp" +#include +#include "free_rtos/ethernet_industry/eth_ecat_telegram.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_industry/eth_ecat_telegram.cpp b/components/free_rtos/ethernet_industry/eth_ecat_telegram.cpp index 843891e..c93dc0e 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat_telegram.cpp +++ b/components/free_rtos/ethernet_industry/eth_ecat_telegram.cpp @@ -5,7 +5,7 @@ * Author: algin */ -#include "ethernet_industry/eth_ecat_telegram.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_telegram.hpp" namespace free_rtos { @@ -42,7 +42,7 @@ uint8_t* EcatTelegram::pack(uint8_t *raw) { TEthFrameHeader *p_eth_hdr = new(raw) TEthFrameHeader{ {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, {0x01, 0x01, 0x01, 0x01, 0x01, 0x01}, ETH_PROT_ECAT_LE }; - TEcatFrameHeader *p_hdr = new(raw + sizeof(TEthFrameHeader)) TEcatFrameHeader{ .bits{ .length = 0, + TEcatFrameHeader *p_hdr = new(raw + sizeof(TEthFrameHeader)) TEcatFrameHeader{ .bits = { .length = 0, .type = static_cast(ec_network::PROTOCOL_TYPE) } }; uint8_t *p_datagram_first = raw + sizeof(TEthFrameHeader) + sizeof(TEcatFrameHeader); uint8_t *p_datagram_last = p_datagram_first; diff --git a/components/free_rtos/ethernet_industry/eth_ecat_telegram.hpp b/components/free_rtos/ethernet_industry/eth_ecat_telegram.hpp index 319591c..42245c3 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat_telegram.hpp +++ b/components/free_rtos/ethernet_industry/eth_ecat_telegram.hpp @@ -8,9 +8,9 @@ #ifndef FREE_RTOS_ETHERNET_INDUSTRY_ETH_ECAT_TELEGRAM_HPP_ #define FREE_RTOS_ETHERNET_INDUSTRY_ETH_ECAT_TELEGRAM_HPP_ -#include "ethernet/eth.hpp" +#include "free_rtos/ethernet/eth.hpp" -#include "ethernet_industry/eth_ecat_datagram.hpp" +#include "free_rtos/ethernet_industry/eth_ecat_datagram.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_ip/eth_arp.cpp b/components/free_rtos/ethernet_ip/eth_arp.cpp index 7ecb722..edbe0f1 100644 --- a/components/free_rtos/ethernet_ip/eth_arp.cpp +++ b/components/free_rtos/ethernet_ip/eth_arp.cpp @@ -4,10 +4,10 @@ * Created on: 13 ���. 2023 �. * Author: sychev */ -#include "ethernet_ip/eth_arp.hpp" -#include "ethernet/eth_frame.h" -#include "ethernet_ip/eth_prots_id.h" -#include "ethernet_ip/eth_ip_types.h" +#include "free_rtos/ethernet_ip/eth_arp.hpp" +#include "free_rtos/ethernet/eth_frame.h" +#include "free_rtos/ethernet_ip/eth_prots_id.h" +#include "free_rtos/ethernet_ip/eth_ip_types.h" #include diff --git a/components/free_rtos/ethernet_ip/eth_arp.hpp b/components/free_rtos/ethernet_ip/eth_arp.hpp index 413d743..205775a 100644 --- a/components/free_rtos/ethernet_ip/eth_arp.hpp +++ b/components/free_rtos/ethernet_ip/eth_arp.hpp @@ -10,11 +10,11 @@ #include #include -#include "ethernet_ip/eth_arp_iface.hpp" -#include "ethernet_ip/eth_stack_iface.hpp" -#include "handler_store/handler.hpp" -#include "clock/clock.hpp" -#include "timer_sw/timer_sw.hpp" +#include "free_rtos/ethernet_ip/eth_arp_iface.hpp" +#include "free_rtos/ethernet_ip/eth_stack_iface.hpp" +#include "free_rtos/handler_store/handler.hpp" +#include "free_rtos/clock/clock.hpp" +#include "free_rtos/timer_sw/timer_sw.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_ip/eth_checksum.c b/components/free_rtos/ethernet_ip/eth_checksum.c index 05ee2fd..5b74278 100644 --- a/components/free_rtos/ethernet_ip/eth_checksum.c +++ b/components/free_rtos/ethernet_ip/eth_checksum.c @@ -4,7 +4,7 @@ * Created on: 13 ìàð. 2023 ã. * Author: sychev */ -#include "ethernet_ip/eth_checksum.h" +#include "free_rtos/ethernet_ip/eth_checksum.h" uint16_t eth_calcChksum(uint32_t sum, uint8_t * const data, uint16_t len) { diff --git a/components/free_rtos/ethernet_ip/eth_icmp.cpp b/components/free_rtos/ethernet_ip/eth_icmp.cpp index 3a2d3b9..93b9129 100644 --- a/components/free_rtos/ethernet_ip/eth_icmp.cpp +++ b/components/free_rtos/ethernet_ip/eth_icmp.cpp @@ -4,10 +4,10 @@ * Created on: 14 ���. 2023 �. * Author: sychev */ -#include "ethernet_ip/eth_icmp.hpp" -#include "ethernet_ip/eth_icmp_types.h" -#include "ethernet_ip/eth_ip_checksum.h" -#include "base/swap.h" +#include "free_rtos/ethernet_ip/eth_icmp.hpp" +#include "free_rtos/ethernet_ip/eth_icmp_types.h" +#include "free_rtos/ethernet_ip/eth_ip_checksum.h" +#include "free_rtos/base/swap.h" int32_t free_rtos::EthIcmp::Process(uint8_t * p_data, uint32_t len) { diff --git a/components/free_rtos/ethernet_ip/eth_icmp.hpp b/components/free_rtos/ethernet_ip/eth_icmp.hpp index 108dc18..6d13f4f 100644 --- a/components/free_rtos/ethernet_ip/eth_icmp.hpp +++ b/components/free_rtos/ethernet_ip/eth_icmp.hpp @@ -8,7 +8,7 @@ #ifndef FREE_RTOS_ETHERNET_IP_ETH_ICMP_HPP_ #define FREE_RTOS_ETHERNET_IP_ETH_ICMP_HPP_ -#include "handler_store/handler.hpp" +#include "free_rtos/handler_store/handler.hpp" #include #include diff --git a/components/free_rtos/ethernet_ip/eth_ip.cpp b/components/free_rtos/ethernet_ip/eth_ip.cpp index e59205d..bb75af4 100644 --- a/components/free_rtos/ethernet_ip/eth_ip.cpp +++ b/components/free_rtos/ethernet_ip/eth_ip.cpp @@ -4,12 +4,12 @@ * Created on: 13 ���. 2023 �. * Author: sychev */ -#include "ethernet_ip/eth_ip.hpp" -#include "ethernet_ip/eth_ip_types.h" -#include "ethernet_ip/eth_checksum.h" +#include "free_rtos/ethernet_ip/eth_ip.hpp" +#include "free_rtos/ethernet_ip/eth_ip_types.h" +#include "free_rtos/ethernet_ip/eth_checksum.h" -#include "ethernet/eth_frame.h" -#include "base/swap.h" +#include "free_rtos/ethernet/eth_frame.h" +#include "free_rtos/base/swap.h" #include diff --git a/components/free_rtos/ethernet_ip/eth_ip.hpp b/components/free_rtos/ethernet_ip/eth_ip.hpp index c62594d..b60f4a8 100644 --- a/components/free_rtos/ethernet_ip/eth_ip.hpp +++ b/components/free_rtos/ethernet_ip/eth_ip.hpp @@ -8,11 +8,11 @@ #ifndef FREE_RTOS_ETHERNET_IP_ETH_IP_HPP_ #define FREE_RTOS_ETHERNET_IP_ETH_IP_HPP_ -#include "handler_store/handler_store.hpp" -#include "ethernet_ip/eth_stack_iface.hpp" -#include "ethernet/eth_frame.h" -#include "ethernet_ip/eth_arp_iface.hpp" -#include "ethernet_ip/eth_ip_iface.hpp" +#include "free_rtos/handler_store/handler_store.hpp" +#include "free_rtos/ethernet_ip/eth_stack_iface.hpp" +#include "free_rtos/ethernet/eth_frame.h" +#include "free_rtos/ethernet_ip/eth_arp_iface.hpp" +#include "free_rtos/ethernet_ip/eth_ip_iface.hpp" #include diff --git a/components/free_rtos/ethernet_ip/eth_ip_checksum.c b/components/free_rtos/ethernet_ip/eth_ip_checksum.c index 8e12615..f41bc51 100644 --- a/components/free_rtos/ethernet_ip/eth_ip_checksum.c +++ b/components/free_rtos/ethernet_ip/eth_ip_checksum.c @@ -5,7 +5,7 @@ * Author: sychev */ #include "eth_ip_checksum.h" -#include "base/swap.h" +#include "free_rtos/base/swap.h" uint16_t eth_ip_calcChecksum(uint16_t * const data, uint32_t length) { diff --git a/components/free_rtos/ethernet_ip/eth_ip_iface.hpp b/components/free_rtos/ethernet_ip/eth_ip_iface.hpp index 9de2b2c..e06eedc 100644 --- a/components/free_rtos/ethernet_ip/eth_ip_iface.hpp +++ b/components/free_rtos/ethernet_ip/eth_ip_iface.hpp @@ -9,8 +9,8 @@ #define FREE_RTOS_ETHERNET_IP_ETH_IP_IFACE_HPP_ #include -#include "ethernet/eth_types.h" -#include "ethernet/eth_frame.h" +#include "free_rtos/ethernet/eth_types.h" +#include "free_rtos/ethernet/eth_frame.h" class EthIpIface { public: diff --git a/components/free_rtos/ethernet_ip/eth_stack.cpp b/components/free_rtos/ethernet_ip/eth_stack.cpp index 1f18550..b56ff7c 100644 --- a/components/free_rtos/ethernet_ip/eth_stack.cpp +++ b/components/free_rtos/ethernet_ip/eth_stack.cpp @@ -4,11 +4,11 @@ * Created on: 14 ���. 2023 �. * Author: sychev */ -#include "ethernet_ip/eth_stack.hpp" -#include "ethernet_ip/eth_prots_id.h" -#include "ethernet/eth_frame.h" +#include "free_rtos/ethernet_ip/eth_stack.hpp" +#include "free_rtos/ethernet_ip/eth_prots_id.h" +#include "free_rtos/ethernet/eth_frame.h" -#include "ethernet_ip/eth_ip_prots_id.h" +#include "free_rtos/ethernet_ip/eth_ip_prots_id.h" #include diff --git a/components/free_rtos/ethernet_ip/eth_stack.hpp b/components/free_rtos/ethernet_ip/eth_stack.hpp index 552d9c0..97d3e97 100644 --- a/components/free_rtos/ethernet_ip/eth_stack.hpp +++ b/components/free_rtos/ethernet_ip/eth_stack.hpp @@ -8,17 +8,17 @@ #ifndef FREE_RTOS_ETHERNET_IP_ETH_STACK_HPP_ #define FREE_RTOS_ETHERNET_IP_ETH_STACK_HPP_ -#include "ethernet_ip/eth_arp.hpp" -#include "ethernet_ip/eth_ip.hpp" -#include "ethernet_ip/eth_icmp.hpp" -#include "ethernet_ip/eth_udp_server.hpp" +#include "free_rtos/ethernet_ip/eth_arp.hpp" +#include "free_rtos/ethernet_ip/eth_ip.hpp" +#include "free_rtos/ethernet_ip/eth_icmp.hpp" +#include "free_rtos/ethernet_ip/eth_udp_server.hpp" -#include "ethernet_ip/eth_stack_iface.hpp" -#include "handler_store/handler_store.hpp" +#include "free_rtos/ethernet_ip/eth_stack_iface.hpp" +#include "free_rtos/handler_store/handler_store.hpp" -#include "ethernet/eth_types.h" +#include "free_rtos/ethernet/eth_types.h" -#include "ethernet/eth_tx_flow_iface.hpp" +#include "free_rtos/ethernet/eth_tx_flow_iface.hpp" namespace free_rtos { diff --git a/components/free_rtos/ethernet_ip/eth_stack_iface.hpp b/components/free_rtos/ethernet_ip/eth_stack_iface.hpp index f82a375..2d19200 100644 --- a/components/free_rtos/ethernet_ip/eth_stack_iface.hpp +++ b/components/free_rtos/ethernet_ip/eth_stack_iface.hpp @@ -9,9 +9,9 @@ #define FREE_RTOS_ETHERNET_IP_ETH_STACK_IFACE_HPP_ #include -#include "ethernet/eth_types.h" -#include "ethernet/eth_frame.h" -#include "handler_store/handler.hpp" +#include "free_rtos/ethernet/eth_types.h" +#include "free_rtos/ethernet/eth_frame.h" +#include "free_rtos/handler_store/handler.hpp" class EthStackIface { public: diff --git a/components/free_rtos/ethernet_ip/eth_udp_client.cpp b/components/free_rtos/ethernet_ip/eth_udp_client.cpp index 659b4de..65185f7 100644 --- a/components/free_rtos/ethernet_ip/eth_udp_client.cpp +++ b/components/free_rtos/ethernet_ip/eth_udp_client.cpp @@ -4,12 +4,12 @@ * Created on: 15 ìàð. 2023 ã. * Author: sychev */ -#include "ethernet_ip/eth_udp_client.hpp" -#include "base/swap.h" -#include "ethernet_ip/eth_udp_types.h" -#include "ethernet_ip/eth_ip_types.h" -#include "ethernet_ip/eth_checksum.h" -#include "ethernet_ip/eth_ip_prots_id.h" +#include "free_rtos/ethernet_ip/eth_udp_client.hpp" +#include "free_rtos/base/swap.h" +#include "free_rtos/ethernet_ip/eth_udp_types.h" +#include "free_rtos/ethernet_ip/eth_ip_types.h" +#include "free_rtos/ethernet_ip/eth_checksum.h" +#include "free_rtos/ethernet_ip/eth_ip_prots_id.h" #include #include diff --git a/components/free_rtos/ethernet_ip/eth_udp_client.hpp b/components/free_rtos/ethernet_ip/eth_udp_client.hpp index 900374d..a069ec5 100644 --- a/components/free_rtos/ethernet_ip/eth_udp_client.hpp +++ b/components/free_rtos/ethernet_ip/eth_udp_client.hpp @@ -8,11 +8,11 @@ #ifndef FREE_RTOS_ETHERNET_IP_ETH_UDP_CLIENT_HPP_ #define FREE_RTOS_ETHERNET_IP_ETH_UDP_CLIENT_HPP_ -#include "semaphore/semaphore.hpp" -#include "mutex/mutex.hpp" -#include "ethernet/eth_frame.h" -#include "ethernet_ip/eth_ip_iface.hpp" -#include "ethernet/eth_types.h" +#include "free_rtos/semaphore/semaphore.hpp" +#include "free_rtos/mutex/mutex.hpp" +#include "free_rtos/ethernet/eth_frame.h" +#include "free_rtos/ethernet_ip/eth_ip_iface.hpp" +#include "free_rtos/ethernet/eth_types.h" #include #include diff --git a/components/free_rtos/ethernet_ip/eth_udp_server.cpp b/components/free_rtos/ethernet_ip/eth_udp_server.cpp index 446e99a..dcb3c55 100644 --- a/components/free_rtos/ethernet_ip/eth_udp_server.cpp +++ b/components/free_rtos/ethernet_ip/eth_udp_server.cpp @@ -4,10 +4,10 @@ * Created on: 15 ���. 2023 �. * Author: sychev */ -#include "ethernet_ip/eth_udp_server.hpp" -#include "ethernet_ip/eth_udp_types.h" -#include "ethernet_ip/eth_ip_types.h" -#include "base/swap.h" +#include "free_rtos/ethernet_ip/eth_udp_server.hpp" +#include "free_rtos/ethernet_ip/eth_udp_types.h" +#include "free_rtos/ethernet_ip/eth_ip_types.h" +#include "free_rtos/base/swap.h" free_rtos::EthUdpServer::EthUdpServer(EthIpIface& ip_iface) : diff --git a/components/free_rtos/ethernet_ip/eth_udp_server.hpp b/components/free_rtos/ethernet_ip/eth_udp_server.hpp index cc333c9..264293f 100644 --- a/components/free_rtos/ethernet_ip/eth_udp_server.hpp +++ b/components/free_rtos/ethernet_ip/eth_udp_server.hpp @@ -8,10 +8,10 @@ #ifndef FREE_RTOS_ETHERNET_IP_ETH_UDP_SERVER_HPP_ #define FREE_RTOS_ETHERNET_IP_ETH_UDP_SERVER_HPP_ -#include "handler_store/handler_store.hpp" -#include "ethernet_ip/eth_udp_server_iface.hpp" -#include "ethernet_ip/eth_ip_iface.hpp" -#include "ethernet/eth_types.h" +#include "free_rtos/handler_store/handler_store.hpp" +#include "free_rtos/ethernet_ip/eth_udp_server_iface.hpp" +#include "free_rtos/ethernet_ip/eth_ip_iface.hpp" +#include "free_rtos/ethernet/eth_types.h" #include namespace free_rtos { diff --git a/components/free_rtos/ethernet_ip/eth_udp_server_iface.hpp b/components/free_rtos/ethernet_ip/eth_udp_server_iface.hpp index 02506ed..6daf92c 100644 --- a/components/free_rtos/ethernet_ip/eth_udp_server_iface.hpp +++ b/components/free_rtos/ethernet_ip/eth_udp_server_iface.hpp @@ -8,7 +8,7 @@ #ifndef FREE_RTOS_ETHERNET_IP_ETH_UDP_SERVER_IFACE_HPP_ #define FREE_RTOS_ETHERNET_IP_ETH_UDP_SERVER_IFACE_HPP_ -#include "ethernet_ip/eth_udp_client.hpp" +#include "free_rtos/ethernet_ip/eth_udp_client.hpp" #include diff --git a/components/free_rtos/gpio/gpio.cpp b/components/free_rtos/gpio/gpio.cpp index acd4017..f0d8c5e 100644 --- a/components/free_rtos/gpio/gpio.cpp +++ b/components/free_rtos/gpio/gpio.cpp @@ -5,7 +5,7 @@ * Author: sychev */ -#include "gpio/gpio.hpp" +#include "free_rtos/gpio/gpio.hpp" #include free_rtos::Gpio::Gpio(uint32_t num, Dir dir, uint32_t base_address) : diff --git a/components/free_rtos/handler_store/handler_store.cpp b/components/free_rtos/handler_store/handler_store.cpp index 7b1c1d6..f1db07c 100644 --- a/components/free_rtos/handler_store/handler_store.cpp +++ b/components/free_rtos/handler_store/handler_store.cpp @@ -4,7 +4,7 @@ * Created on: 6 ���. 2023 �. * Author: sychev */ -#include "handler_store/handler_store.hpp" +#include "free_rtos/handler_store/handler_store.hpp" bool HandlerStore::Register(uint32_t prot_id, Handler * p_handler) { if (p_handler == nullptr) { diff --git a/components/free_rtos/handler_store/handler_store.hpp b/components/free_rtos/handler_store/handler_store.hpp index 8b38407..787f488 100644 --- a/components/free_rtos/handler_store/handler_store.hpp +++ b/components/free_rtos/handler_store/handler_store.hpp @@ -12,7 +12,7 @@ #include #include -#include "handler_store/handler.hpp" +#include "free_rtos/handler_store/handler.hpp" class HandlerStore { public: diff --git a/components/free_rtos/mutex/mutex.cpp b/components/free_rtos/mutex/mutex.cpp index dc9ad22..8a06b08 100644 --- a/components/free_rtos/mutex/mutex.cpp +++ b/components/free_rtos/mutex/mutex.cpp @@ -4,7 +4,7 @@ * Created on: 26 ñåíò. 2022 ã. * Author: sychev */ -#include "mutex/mutex.hpp" +#include "free_rtos/mutex/mutex.hpp" #include free_rtos::Mutex::Mutex() { diff --git a/components/free_rtos/task/task.cpp b/components/free_rtos/task/task.cpp index 7ee1cce..ee4e63e 100644 --- a/components/free_rtos/task/task.cpp +++ b/components/free_rtos/task/task.cpp @@ -4,7 +4,7 @@ * Created on: 6 ìàð. 2023 ã. * Author: sychev */ -#include "task/task.hpp" +#include "free_rtos/task/task.hpp" bool free_rtos::Task::Create(std::string name, uint32_t priority, TaskFunction task_fun, void * taskArg, int32_t stack_size_bytes) diff --git a/components/free_rtos/timer/timer.cpp b/components/free_rtos/timer/timer.cpp index 5eaf112..e885c6f 100644 --- a/components/free_rtos/timer/timer.cpp +++ b/components/free_rtos/timer/timer.cpp @@ -4,7 +4,8 @@ * Created on: 10 ìàð. 2023 ã. * Author: sychev */ -#include "timer/timer.hpp" +#include "free_rtos/timer/timer.hpp" + #include #include #include diff --git a/components/free_rtos/timer_sw/timer_sw.cpp b/components/free_rtos/timer_sw/timer_sw.cpp index 40333f4..dea0763 100644 --- a/components/free_rtos/timer_sw/timer_sw.cpp +++ b/components/free_rtos/timer_sw/timer_sw.cpp @@ -4,7 +4,7 @@ * Created on: 13 ìàð. 2023 ã. * Author: sychev */ -#include "timer_sw/timer_sw.hpp" +#include "free_rtos/timer_sw/timer_sw.hpp" void TimerSw::start(uint32_t period) { enable_ = true;