From 2f1ea1b5e5ff45bbebbfe9b116df8b6f36a8a4ce Mon Sep 17 00:00:00 2001 From: jfmartel Date: Thu, 21 Sep 2017 07:28:56 -0400 Subject: [PATCH] =?UTF-8?q?Creation=20d'une=20fonction=20de=20reset=20du?= =?UTF-8?q?=20flag=20d'inhibition.=20Non=20utilis=C3=A9e=20pour=20l'instan?= =?UTF-8?q?t...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources/Modbus/ModbusCCMgr.cpp | 28 ++++++++++++++++++++++++++++ sources/Modbus/ModbusCCMgr.h | 2 ++ 2 files changed, 30 insertions(+) diff --git a/sources/Modbus/ModbusCCMgr.cpp b/sources/Modbus/ModbusCCMgr.cpp index addb993..bfa9cea 100644 --- a/sources/Modbus/ModbusCCMgr.cpp +++ b/sources/Modbus/ModbusCCMgr.cpp @@ -239,6 +239,21 @@ bool CModbusCCMgr::GetZT1InhibitionFlag() return false; } +int CModbusCCMgr::ClearZT1InhibitionFlag() +{ + bool OK = false; + qint16 Reg = mModbusRepo->GetSingleReg(MODBUS_CC_AN_BASE_REG_ADD,&OK); + + if(OK) + { + Reg &= ~MODBUS_CC_INHIBIT_ZT1_FLAG_MASK; + mModbusRepo->WriteSingleReg(MODBUS_CC_AN_BASE_REG_ADD,Reg); + return RET_OK; + + } + return RET_ERROR; +} + bool CModbusCCMgr::GetZT2InhibitionFlag() { bool OK = false; @@ -260,7 +275,20 @@ bool CModbusCCMgr::GetZT2InhibitionFlag() return false; } +int CModbusCCMgr::ClearZT2InhibitionFlag() +{ + bool OK = false; + qint16 Reg = mModbusRepo->GetSingleReg(MODBUS_CC_AN_BASE_REG_ADD,&OK); + if(OK) + { + Reg &= ~MODBUS_CC_INHIBIT_ZT2_FLAG_MASK; + mModbusRepo->WriteSingleReg(MODBUS_CC_AN_BASE_REG_ADD,Reg); + return RET_OK; + + } + return RET_ERROR; +} QList CModbusCCMgr::GetZT1TrainComposition() { diff --git a/sources/Modbus/ModbusCCMgr.h b/sources/Modbus/ModbusCCMgr.h index a6206fd..6aac0d2 100644 --- a/sources/Modbus/ModbusCCMgr.h +++ b/sources/Modbus/ModbusCCMgr.h @@ -44,7 +44,9 @@ public: QList GetZT1TrainComposition(); QList GetZT2TrainComposition(); bool GetZT1InhibitionFlag(); + int ClearZT1InhibitionFlag(); bool GetZT2InhibitionFlag(); + int ClearZT2InhibitionFlag(); qint16 GetZT1TrainType(); qint16 GetZT2TrainType();