jfmartel/ZT
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrections mineures (V1.17)

Browse Source 
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
This commit is contained in:
jfmartel 2018-10-30 07:39:58 -04:00
parent fdae65b7cb
commit e52aa5d878
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sources/Modbus/ModbusTKTransport.cpp
View File

@ -58,7 +58,10 @@ int CModbusTKTransport::ClearTK(int ZT)
PannesReg &= ~ZT1_V00_ALARM_FLAG_MASK; PannesReg &= ~ZT1_V00_ALARM_FLAG_MASK;
PannesReg &= ~ZT1_PEQ1_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... //Clear repo now...
mModbusRepo->WriteMultipleRegs(MODBUS_ZT1_ALARM_DATA_BASE_REG_ADD,Data); mModbusRepo->WriteMultipleRegs(MODBUS_ZT1_ALARM_DATA_BASE_REG_ADD,Data);

3
sources/Stations/Montmorency.cpp
View File

@ -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); NewCDV = new CCDV(MONTMORENCY_IN_ZT1_10_12_ITI_MASK,MONTMORENCY_IN_CDV_12A_MASK,CDV_NORMAL_TYPE,"12A",1,5);
mZT1AlarmAutoAcquireCDV = NewCDV; mZT1AlarmAutoAcquireCDV = NewCDV;
mCDVList.append(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); NewCDV = new CCDV(MONTMORENCY_IN_ZT1_10_12_ITI_MASK,MONTMORENCY_IN_CDV_11B_MASK,CDV_NORMAL_TYPE,"11B",1,6);
mCDVList.append(NewCDV); mCDVList.append(NewCDV);
@ -213,11 +214,13 @@ unsigned int CMontmorencyStation::BuildStationCDVList()
m10_22AlarmAutoAcquireCDV = NewCDV; //Memorize it. 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); NewCDV = new CCDV(MONTMORENCY_IN_ZT1_10_22_ITI_MASK,MONTMORENCY_IN_CDV_22A_MASK,CDV_NORMAL_TYPE,"22A",2,5);
mCDVList.append(NewCDV); 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); // 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); // mCDVList.append((CCDV*)NewSwitchCDV);

7
sources/ZTVersion.h
View File

@ -28,9 +28,14 @@
#ifndef ZTVERSION_H #ifndef ZTVERSION_H
#define ZTVERSION_H #define ZTVERSION_H
#define ZT_SOFT_VERSION "V1.16" #define ZT_SOFT_VERSION "V1.17"
//LOG DES CHANGEMENTS //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 //Version 1.16
//-Implantation de la communicationp Modbus avec la Commande Centralisée. Ceci implique //-Implantation de la communicationp Modbus avec la Commande Centralisée. Ceci implique
// plusieurs changements. // plusieurs changements.

4
sources/Zonetest.cpp
View File

@ -1073,7 +1073,7 @@ bool CZoneTest::EnterMaintenanceModeRequest()
void CZoneTest::ExitMaintenanceModeRequest() void CZoneTest::ExitMaintenanceModeRequest()
{ {
if(CZTConfigMgr::instance()->GetModbusCCEnabled() == true) if(mZTSettings->mUseModbusCC == true)
{ {
mModbusCCMgr->SetZTWatchdogEnabled(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. //THIS IS NOT FOR CPU WATCHDOG BUT FOR EXTERNAL WATCHDOG "VIGIE" INSIDE THE T.A.
void CZoneTest::SetWatchdogEnabled(bool Enabled) void CZoneTest::SetWatchdogEnabled(bool Enabled)
{ {
if(CZTConfigMgr::instance()->GetModbusCCEnabled() == true) if(mZTSettings->mUseModbusCC == true)
{ {
mModbusCCMgr->SetZTWatchdogEnabled(Enabled); mModbusCCMgr->SetZTWatchdogEnabled(Enabled);
} }