From ad0c1194eda2a82c8f3f99bd9a7abbfcee04503c Mon Sep 17 00:00:00 2001 From: algin Date: Tue, 11 Jul 2023 12:55:52 +0300 Subject: [PATCH] =?UTF-8?q?fix(UML-1462):=20=D0=98=D1=81=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=BB=D0=B5=D0=BD=20=D0=B1=D0=B0=D0=B3=20=D1=81=20=D0=B1?= =?UTF-8?q?=D0=B5=D1=81=D0=BA=D0=BE=D0=BD=D0=B5=D1=87=D0=BD=D0=BE=D0=B9=20?= =?UTF-8?q?=D1=80=D0=B5=D0=BA=D1=83=D1=80=D1=81=D0=B8=D0=B5=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/free_rtos/ethernet_industry/eth_ecat_packer.hpp | 2 +- components/free_rtos/ethernet_industry/eth_ecat_telegram.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/components/free_rtos/ethernet_industry/eth_ecat_packer.hpp b/components/free_rtos/ethernet_industry/eth_ecat_packer.hpp index 6c242a5..cc63297 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat_packer.hpp +++ b/components/free_rtos/ethernet_industry/eth_ecat_packer.hpp @@ -75,7 +75,7 @@ struct PackFunctor : public PackFunctorBase { struct UnpackFunctorBase { uint8_t *raw; - bool skip; + const bool skip; template void operator()(DataT& data) { diff --git a/components/free_rtos/ethernet_industry/eth_ecat_telegram.cpp b/components/free_rtos/ethernet_industry/eth_ecat_telegram.cpp index c93dc0e..6eb92f7 100644 --- a/components/free_rtos/ethernet_industry/eth_ecat_telegram.cpp +++ b/components/free_rtos/ethernet_industry/eth_ecat_telegram.cpp @@ -103,6 +103,8 @@ void EcatTelegram::transfer() { if(stat == false) { DebugP_log((char*)"telegram transfer error !\r\n"); + datagram_queue_.clear(); + return; }