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

Changement de l'émission des alarmes FN avec erreur de comptage, les alarmes 1 & 18 sont maintenant émises au rang 99.

Browse Source
This commit is contained in:
jfmartel 2017-09-20 15:04:30 -04:00
parent 7a35241f76
commit ad6d417aca
3 changed files with 45 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configuration/ZT.cfg
View File

@ -71,11 +71,11 @@ ENGLOG=3
#STATION=HONORE_BEAUGRAND #STATION=HONORE_BEAUGRAND
#STATION=ANGRIGNON #STATION=ANGRIGNON
#STATION=HENRI_BOURASSA #STATION=HENRI_BOURASSA
#STATION=COTE_VERTU STATION=COTE_VERTU
#STATION=BERRI_UQAM #STATION=BERRI_UQAM
#STATION=LONGUEIL #STATION=LONGUEIL
#STATION=SAINT_MICHEL #STATION=SAINT_MICHEL
STATION=SNOWDON_L5 #STATION=SNOWDON_L5
#STATION=MONTMORENCY #STATION=MONTMORENCY
#STATION=MONTMORENCY_10_12 #STATION=MONTMORENCY_10_12
#STATION=MONTMORENCY_10_22 #STATION=MONTMORENCY_10_22

30
sources/Simulator/SimulationScenario.cpp
View File

@ -153,34 +153,42 @@ unsigned int CSimulationScenario::CreateScenario()
// if(bogie != 5 && bogie != 7) // if(bogie != 5 && bogie != 7)
InsertNewStep(STEP_ACTION_ACTIVATE_PGI,0); InsertNewStep(STEP_ACTION_ACTIVATE_PGI,0);
InsertNewStep(STEP_ACTION_ACTIVATE_PGE,0); InsertNewStep(STEP_ACTION_ACTIVATE_PGE,0);
InsertNewStep(STEP_ACTION_ACTIVATE_S1,SENSOR_DELAY); //V00 DETECTION
// if(bogie != 9)
{
InsertNewStep(STEP_ACTION_ACTIVATE_S1,SENSOR_DELAY);
}
InsertNewStep(STEP_ACTION_DEACTIVATE_S1,BOGIE_DELAY); InsertNewStep(STEP_ACTION_DEACTIVATE_S1,BOGIE_DELAY);
InsertNewStep(STEP_ACTION_DEACTIVATE_PGI,0); InsertNewStep(STEP_ACTION_DEACTIVATE_PGI,0);
InsertNewStep(STEP_ACTION_DEACTIVATE_PGE,0); InsertNewStep(STEP_ACTION_DEACTIVATE_PGE,0);
//FN DETECTION
// if(bogie != 5 && bogie != 8) if(bogie != 5 && bogie != 8 && bogie != 3)
InsertNewStep(STEP_ACTION_ACTIVATE_FN,0); InsertNewStep(STEP_ACTION_ACTIVATE_FN,0);
InsertNewStep(STEP_ACTION_ACTIVATE_S1,SENSOR_DELAY); InsertNewStep(STEP_ACTION_ACTIVATE_S1,SENSOR_DELAY);
InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY); InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY);
InsertNewStep(STEP_ACTION_DEACTIVATE_S1,BOGIE_DELAY); InsertNewStep(STEP_ACTION_DEACTIVATE_S1,BOGIE_DELAY);
// if(bogie == 12)
// InsertNewStep(STEP_ACTION_ACTIVATE_PPI,0);
// if(bogie != 5 && bogie != 8) //PPI DETECTION
// if(bogie == 6 || bogie == 9)
// InsertNewStep(STEP_ACTION_ACTIVATE_PPI,0);
//FN DETECTION
if(bogie != 5 && bogie != 8 && bogie != 3)
InsertNewStep(STEP_ACTION_DEACTIVATE_FN,0); InsertNewStep(STEP_ACTION_DEACTIVATE_FN,0);
// InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY); // InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY);
InsertNewStep(STEP_ACTION_DEACTIVATE_S2,BOGIE_DELAY); InsertNewStep(STEP_ACTION_DEACTIVATE_S2,BOGIE_DELAY);
// if(bogie == 12) //PPI DETECTION
// InsertNewStep(STEP_ACTION_DEACTIVATE_PPI,0); // if(bogie == 6 || bogie == 9)
// InsertNewStep(STEP_ACTION_DEACTIVATE_PPI,0);
if(bogie != 2 && bogie != 11) // if(bogie != 2 && bogie != 11)
InsertNewStep(STEP_ACTION_ACTIVATE_PGI,0); InsertNewStep(STEP_ACTION_ACTIVATE_PGI,0);
if(bogie != 2 && bogie != 11) // if(bogie != 2 && bogie != 11)
InsertNewStep(STEP_ACTION_ACTIVATE_PGE,0); InsertNewStep(STEP_ACTION_ACTIVATE_PGE,0);
InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY); InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY);
InsertNewStep(STEP_ACTION_DEACTIVATE_S2,BOGIE_DELAY); InsertNewStep(STEP_ACTION_DEACTIVATE_S2,BOGIE_DELAY);
InsertNewStep(STEP_ACTION_DEACTIVATE_PGI,0); InsertNewStep(STEP_ACTION_DEACTIVATE_PGI,0);

39
sources/ZTStateMachine.cpp
View File

@ -790,22 +790,31 @@ unsigned int CZTStateMachine::AnalyzeZT1PostDetection()
if(alarms != 0) if(alarms != 0)
{ {
//Send two detections only (rank 1 & 18) when detecting FN errors while in V00 //With Modbus interface, we send as many alarms as there are detections with rank 99 (ZT_DEFAULT_DETECTION_RANK)
QString string; for(int i = 0; i < alarms; i++)
string.sprintf("[POST DETECTION]--> Déclenchement FN avec erreur de comptage (FNCount = %d). Envoi d'alarmes aux rangs 1 et 18.",FNCount); {
//CZTLog::instance()->AddBufferString("Déclenchement FN avec erreur de comptage. Envoi d'alarmes aux rangs 1 et 18.",true); CZTDetectionData *NewDetection = new CZTDetectionData();
CZTLog::instance()->AddBufferString(string,true); NewDetection->mDetectionID = DETECTION_FN_DETECTION;
CZTDetectionData *NewDetection = new CZTDetectionData(); NewDetection->mTimeStamp = 0;
NewDetection->mDetectionID = DETECTION_FN_DETECTION; NewDetection->mRank = ZT_DEFAULT_DETECTION_RANK;
NewDetection->mTimeStamp = 0; mZT1DetectionsLog.append(NewDetection);
NewDetection->mRank = 1; }
mZT1DetectionsLog.append(NewDetection); // //Send two detections only (rank 1 & 18) when detecting FN errors while in V00
// QString string;
// string.sprintf("[POST DETECTION]--> Déclenchement FN avec erreur de comptage (FNCount = %d). Envoi d'alarmes aux rangs 1 et 18.",FNCount);
// //CZTLog::instance()->AddBufferString("Déclenchement FN avec erreur de comptage. Envoi d'alarmes aux rangs 1 et 18.",true);
// CZTLog::instance()->AddBufferString(string,true);
// CZTDetectionData *NewDetection = new CZTDetectionData();
// NewDetection->mDetectionID = DETECTION_FN_DETECTION;
// NewDetection->mTimeStamp = 0;
// NewDetection->mRank = 1;
// mZT1DetectionsLog.append(NewDetection);
NewDetection = new CZTDetectionData(); // NewDetection = new CZTDetectionData();
NewDetection->mDetectionID = DETECTION_FN_DETECTION; // NewDetection->mDetectionID = DETECTION_FN_DETECTION;
NewDetection->mTimeStamp = 0; // NewDetection->mTimeStamp = 0;
NewDetection->mRank = 18; // NewDetection->mRank = 18;
mZT1DetectionsLog.append(NewDetection); // mZT1DetectionsLog.append(NewDetection);
} }
} }