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

Corrections reliées aux détections PEQ1 & PEQ2

Browse Source
This commit is contained in:
jfmartel 2019-01-31 13:26:23 -05:00
parent f28f44f2f1
commit 9ce41f894f
5 changed files with 42 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configuration/ZT.cfg
View File

@ -80,7 +80,7 @@ ENGLOG=3
#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
#STATION=DU_COLLEGE STATION=DU_COLLEGE

2
sources/GuiElements/EngineeringPage.cpp
View File

@ -125,7 +125,7 @@ CEngineeringPage::CEngineeringPage(QGraphicsWidget *Parent)
mExtLazerProbeValue->setPlainText("Sonde Lazer Ext: ?"); mExtLazerProbeValue->setPlainText("Sonde Lazer Ext: ?");
mAnalogSDFValue = new QGraphicsTextItem(this); mAnalogSDFValue = new QGraphicsTextItem(this);
mAnalogSDFValue->setPos(400,80); mAnalogSDFValue->setPos(600,20);
mAnalogSDFValue->setPlainText("4-20mA SDF: ?"); mAnalogSDFValue->setPlainText("4-20mA SDF: ?");

8
sources/Simulator/SimulationScenario.cpp
View File

@ -144,7 +144,7 @@ unsigned int CSimulationScenario::CreateScenario()
//// MR //// MR
InsertNewStep(STEP_ACTION_REGISTER_ZT1_ITI,300); // InsertNewStep(STEP_ACTION_REGISTER_ZT1_ITI,300);
InsertNewStep(STEP_ACTION_OCCUPY_ZT1_APPROACH,300); InsertNewStep(STEP_ACTION_OCCUPY_ZT1_APPROACH,300);
InsertNewStep(STEP_ACTION_OCCUPY_ZT1,300); InsertNewStep(STEP_ACTION_OCCUPY_ZT1,300);
@ -163,7 +163,7 @@ unsigned int CSimulationScenario::CreateScenario()
InsertNewStep(STEP_ACTION_DEACTIVATE_PGE,0); InsertNewStep(STEP_ACTION_DEACTIVATE_PGE,0);
//FN DETECTION //FN DETECTION
// if(bogie != 5 && bogie != 8 && bogie != 3) 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);
@ -175,7 +175,7 @@ unsigned int CSimulationScenario::CreateScenario()
// InsertNewStep(STEP_ACTION_ACTIVATE_PPI,0); // InsertNewStep(STEP_ACTION_ACTIVATE_PPI,0);
//FN DETECTION //FN DETECTION
// if(bogie != 5 && bogie != 8 && bogie != 3) 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);
@ -197,7 +197,7 @@ unsigned int CSimulationScenario::CreateScenario()
} }
InsertNewStep(STEP_ACTION_DESTROY_ZT1_ITI,800); // InsertNewStep(STEP_ACTION_DESTROY_ZT1_ITI,800);
InsertNewStep(STEP_ACTION_FREE_ZT1,800); InsertNewStep(STEP_ACTION_FREE_ZT1,800);

42
sources/ZTStateMachine.cpp
View File

@ -574,7 +574,18 @@ unsigned int CZTStateMachine::AnalyzeZT1PostDetection()
{ {
PostAnalyseData = true; PostAnalyseData = true;
} }
else //If the detection is de-activated, ignore it
else if((mZT1PEQType == PEQ1_FN_PREDETECTION_TYPE && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_FN].AnalysisActive == false) ||
(mZT1PEQType == PEQ1_FN_STUCK_LOW_TYPE && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_FN].AnalysisActive == false) ||
(mZT1PEQType == PEQ1_PEXT_PREDETECTION_TYPE && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_PP].AnalysisActive == false) ||
(mZT1PEQType == PEQ1_PINT_PREDETECTION_TYPE && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_PP].AnalysisActive == false) ||
(mZT1PEQType == PEQ1_LAZER_SENSOR_EXT_PREDETECTION_TYPE && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_PG].AnalysisActive == false) ||
(mZT1PEQType == PEQ1_LAZER_SENSOR_INT_PREDETECTION_TYPE && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_PG].AnalysisActive == false) ||
(mZT1PEQType == PEQ1_PG_PREDETECTION_TYPE && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_PG].AnalysisActive == false))
{
PostAnalyseData = true;
}
else //We need to consider PEQ1. Clear all detections and send only PEQ1...
{ {
PostAnalyseData = false; PostAnalyseData = false;
@ -583,7 +594,10 @@ unsigned int CZTStateMachine::AnalyzeZT1PostDetection()
if(mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_ZT1].AnalysisActive) if(mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_ZT1].AnalysisActive)
{ {
CZTLog::instance()->AddBufferString("Panne équipement ZT1: SDF <collé> à 1",true); if(mZT1PEQType == PEQ1_FN_STUCK_LOW_TYPE)
{
CZTLog::instance()->AddBufferString("Panne équipement ZT1: SDF <collé> à 1",true);
}
CZTDetectionData *NewDetection = new CZTDetectionData(); CZTDetectionData *NewDetection = new CZTDetectionData();
NewDetection->mDetectionID = DETECTION_PEQ1_DETECTION; NewDetection->mDetectionID = DETECTION_PEQ1_DETECTION;
NewDetection->mTimeStamp = 0; NewDetection->mTimeStamp = 0;
@ -1274,19 +1288,19 @@ unsigned int CZTStateMachine::AnalyzeZT2PostDetection()
} }
//If we have a PEQ2, we remove all detections an leave only the PEQ2 one //If we have a PEQ2, we remove all detections an leave only the PEQ2 one
if(PEQ2 == true) if(PEQ2 == true && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_ZT2].AnalysisActive && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_PP2].AnalysisActive)
{ {
for(int i = 0; i < mZT2DetectionsLog.size(); i++) for(int i = 0; i < mZT2DetectionsLog.size(); i++)
{ {
delete mZT2DetectionsLog.at(i); delete mZT2DetectionsLog.at(i);
} }
mZT2DetectionsLog.clear(); mZT2DetectionsLog.clear();
CZTDetectionData *NewDetection = new CZTDetectionData(); CZTDetectionData *NewDetection = new CZTDetectionData();
NewDetection->mDetectionID = DETECTION_PEQ2_DETECTION; NewDetection->mDetectionID = DETECTION_PEQ2_DETECTION;
NewDetection->mTimeStamp = PEQ2Timestamp; NewDetection->mTimeStamp = PEQ2Timestamp;
NewDetection->mRank = ZT_DEFAULT_DETECTION_RANK; NewDetection->mRank = ZT_DEFAULT_DETECTION_RANK;
mZT2DetectionsLog.prepend(NewDetection); mZT2DetectionsLog.prepend(NewDetection);
} }
else else
{ {

8
sources/ZTVersion.h
View File

@ -28,9 +28,15 @@
#ifndef ZTVERSION_H #ifndef ZTVERSION_H
#define ZTVERSION_H #define ZTVERSION_H
#define ZT_SOFT_VERSION "V1.17" #define ZT_SOFT_VERSION "V1.18"
//LOG DES CHANGEMENTS //LOG DES CHANGEMENTS
//Version 1.18
//-Correction du bug qui loggait une erreur de PEQ1 frotteur négatif collé à 1
// systématiquement pour n'importe quelle panne.
//-Changement de l'analyse des pannes équipement pour ne pas émettre d'alarme
// lorsque la détection de panne correspond à un équipement désactivé
//Version 1.17 //Version 1.17
//-Corrections mineures à l'interface graphique //-Corrections mineures à l'interface graphique
//-Possibilité de générer des alarmes en itinéraire secondaire en mode entretien //-Possibilité de générer des alarmes en itinéraire secondaire en mode entretien