From 8890af415dc5ffe58a2bbd2bf69f9e802e316f46 Mon Sep 17 00:00:00 2001 From: algin Date: Tue, 6 Jun 2023 14:46:20 +0300 Subject: [PATCH] =?UTF-8?q?fix(UML-1462):=20=D0=9F=D0=BE=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D0=B8=D0=BD=D0=B8=D1=86=D0=B8=D0=B0=D0=BB?= =?UTF-8?q?=D0=B8=D0=B7=D0=B0=D1=86=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/free_rtos/ethernet_industry/eth_ecat_api.cpp | 4 +++- components/free_rtos/ethernet_industry/eth_ecat_api.hpp | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/components/free_rtos/ethernet_industry/eth_ecat_api.cpp b/components/free_rtos/ethernet_industry/eth_ecat_api.cpp index f95bc9b..2c042cf 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat_api.cpp +++ b/components/free_rtos/ethernet_industry/eth_ecat_api.cpp @@ -11,9 +11,11 @@ namespace free_rtos { Eth *EthEcatApi::eth_{nullptr}; -bool EthEcatApi::init(Eth& eth, TEthMacPorts port_id, uint16_t address_base) { +void EthEcatApi::init(Eth& eth) { eth_ = ð +} +bool EthEcatApi::config_init(TEthMacPorts port_id, uint16_t address_base) { bool status = false; get_ecat().Init(port_id); diff --git a/components/free_rtos/ethernet_industry/eth_ecat_api.hpp b/components/free_rtos/ethernet_industry/eth_ecat_api.hpp index 67e3270..42c68c8 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat_api.hpp +++ b/components/free_rtos/ethernet_industry/eth_ecat_api.hpp @@ -20,7 +20,8 @@ namespace free_rtos { class EthEcatApi { public: - static bool init(Eth& eth, TEthMacPorts port_id, uint16_t address_base); + static void init(Eth& eth); + static bool config_init(TEthMacPorts port_id, uint16_t address_base); static void process(); // Внутри бесконечный цикл. Запускать в отдельном потоке static std::vector& get_ecat_pdo_map();