From e52aa5d87884263e8ae5a4b9ddd9f6c8f5f3a4de Mon Sep 17 00:00:00 2001
From: jfmartel <jean-francois.martel@stm.info>
Date: Tue, 30 Oct 2018 07:39:58 -0400
Subject: [PATCH] Corrections mineures (V1.17)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Version 1.17
-Corrections mineures à l'interface graphique
-Possibilité de générer des alarmes en itinéraire secondaire en mode
entretien
-Correction de la désactivation de la vigie en mode entretien avec le
Modbus
---
 sources/Modbus/ModbusTKTransport.cpp | 5 ++++-
 sources/Stations/Montmorency.cpp     | 3 +++
 sources/ZTVersion.h                  | 7 ++++++-
 sources/Zonetest.cpp                 | 4 ++--
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/sources/Modbus/ModbusTKTransport.cpp b/sources/Modbus/ModbusTKTransport.cpp
index 57d248d..b6810c2 100644
--- a/sources/Modbus/ModbusTKTransport.cpp
+++ b/sources/Modbus/ModbusTKTransport.cpp
@@ -58,7 +58,10 @@ int CModbusTKTransport::ClearTK(int ZT)
 
         PannesReg &= ~ZT1_V00_ALARM_FLAG_MASK;
         PannesReg &= ~ZT1_PEQ1_ALARM_FLAG_MASK;
-        PannesReg &= ~ZT1_ALARM_ITI_FLAG_MASK;
+
+        //JFM 2018/10/30 Keep the ITI flag so we can generate secondary ITI alarms in maintenance mode.
+        /// PannesReg &= ~ZT1_ALARM_ITI_FLAG_MASK;
+        //
 
         //Clear repo now...
         mModbusRepo->WriteMultipleRegs(MODBUS_ZT1_ALARM_DATA_BASE_REG_ADD,Data);
diff --git a/sources/Stations/Montmorency.cpp b/sources/Stations/Montmorency.cpp
index 40e3f4d..d29f2fc 100644
--- a/sources/Stations/Montmorency.cpp
+++ b/sources/Stations/Montmorency.cpp
@@ -194,6 +194,7 @@ unsigned int CMontmorencyStation::BuildStationCDVList()
 	NewCDV = new CCDV(MONTMORENCY_IN_ZT1_10_12_ITI_MASK,MONTMORENCY_IN_CDV_12A_MASK,CDV_NORMAL_TYPE,"12A",1,5);
 	mZT1AlarmAutoAcquireCDV = NewCDV;
     mCDVList.append(NewCDV);
+    NewCDV->SetCDVDeck(true);
 
 	NewCDV = new CCDV(MONTMORENCY_IN_ZT1_10_12_ITI_MASK,MONTMORENCY_IN_CDV_11B_MASK,CDV_NORMAL_TYPE,"11B",1,6);
     mCDVList.append(NewCDV);
@@ -213,11 +214,13 @@ unsigned int CMontmorencyStation::BuildStationCDVList()
     m10_22AlarmAutoAcquireCDV = NewCDV; //Memorize it.
 
 
+
 	NewCDV = new CCDV(MONTMORENCY_IN_ZT1_10_22_ITI_MASK,MONTMORENCY_IN_CDV_22A_MASK,CDV_NORMAL_TYPE,"22A",2,5);
 
 	mCDVList.append(NewCDV);
 
 
+
 //	NewSwitchCDV = new CSwitchCDV(0,MONTMORENCY_IN_ZT1_10_22_ITI_MASK,MONTMORENCY_IN_CDV_21BC_MASK,CDV_SWITCH_TYPE,"21BC",2,6);
 //	mCDVList.append((CCDV*)NewSwitchCDV);
 
diff --git a/sources/ZTVersion.h b/sources/ZTVersion.h
index 54bf80c..2d55a8f 100644
--- a/sources/ZTVersion.h
+++ b/sources/ZTVersion.h
@@ -28,9 +28,14 @@
 #ifndef ZTVERSION_H
 #define ZTVERSION_H
 
-#define ZT_SOFT_VERSION "V1.16"
+#define ZT_SOFT_VERSION "V1.17"
 
 //LOG DES CHANGEMENTS
+//Version 1.17
+//-Corrections mineures à l'interface graphique
+//-Possibilité de générer des alarmes en itinéraire secondaire en mode entretien
+//-Correction de la désactivation de la vigie en mode entretien avec le Modbus
+
 //Version 1.16
 //-Implantation de la communicationp Modbus avec la Commande Centralisée. Ceci implique
 // plusieurs changements.
diff --git a/sources/Zonetest.cpp b/sources/Zonetest.cpp
index 89ef525..2a389db 100644
--- a/sources/Zonetest.cpp
+++ b/sources/Zonetest.cpp
@@ -1073,7 +1073,7 @@ bool CZoneTest::EnterMaintenanceModeRequest()
 
 void CZoneTest::ExitMaintenanceModeRequest()
 {
-    if(CZTConfigMgr::instance()->GetModbusCCEnabled() == true)
+    if(mZTSettings->mUseModbusCC == true)
     {
         mModbusCCMgr->SetZTWatchdogEnabled(true);
     }
@@ -1098,7 +1098,7 @@ unsigned int CZoneTest::SendTKToPCC(int DetectionID, int Rank)
 //THIS IS NOT FOR CPU WATCHDOG BUT FOR EXTERNAL WATCHDOG "VIGIE" INSIDE THE T.A.
 void CZoneTest::SetWatchdogEnabled(bool Enabled)
 {
-    if(CZTConfigMgr::instance()->GetModbusCCEnabled() == true)
+    if(mZTSettings->mUseModbusCC == true)
     {
         mModbusCCMgr->SetZTWatchdogEnabled(Enabled);
     }