From 004e7234f24d0d62dd41dcce813960a74ad99b12 Mon Sep 17 00:00:00 2001 From: jfmartel Date: Wed, 16 Oct 2024 09:54:35 -0400 Subject: [PATCH] +//Version 1.33 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit +//-Inhibition des déclenchements PEQ avec la désactivation des TK +//-Remise à zéro du Nb de passage aujourd'hui avec le reste à 3h --- sources/Modbus/PIHistorianManager.cpp | 1 + sources/ZTStateMachine.cpp | 14 +++++++------- sources/ZTVersion.h | 6 +++++- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/sources/Modbus/PIHistorianManager.cpp b/sources/Modbus/PIHistorianManager.cpp index f28a1c0..834a25f 100644 --- a/sources/Modbus/PIHistorianManager.cpp +++ b/sources/Modbus/PIHistorianManager.cpp @@ -605,6 +605,7 @@ void CPIHistorianManager::HistorianTimerExpired() mPIHistorianRepo->WriteSingleReg(HISTORIAN_PG_DETECTS_TODAY_REG_ADD,mNbPGToday); mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPI_ZT2_DETECTS_TODAY_REG_ADD,mNbPPIZT2Today); mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPE_ZT2_DETECTS_TODAY_REG_ADD,mNbPPEZT2Today); + mPIHistorianRepo->WriteSingleReg(HISTORIAN_TRAINS_TODAY_REG_ADD,mNbPassagesToday); CEngLog::instance()->AddLogString("Reset des stats historien du jour",2); diff --git a/sources/ZTStateMachine.cpp b/sources/ZTStateMachine.cpp index acbf93d..722b93f 100755 --- a/sources/ZTStateMachine.cpp +++ b/sources/ZTStateMachine.cpp @@ -596,13 +596,13 @@ unsigned int CZTStateMachine::AnalyzeZT1PostDetection() PostAnalyseData = true; //This flag is used to re-analyze the data in case of a mag sensor count error } //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)) + else if((mZT1PEQType == PEQ1_FN_PREDETECTION_TYPE && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_FN].TKActive == false) || + (mZT1PEQType == PEQ1_FN_STUCK_LOW_TYPE && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_FN].TKActive == false) || + (mZT1PEQType == PEQ1_PEXT_PREDETECTION_TYPE && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_PP].TKActive == false) || + (mZT1PEQType == PEQ1_PINT_PREDETECTION_TYPE && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_PP].TKActive == false) || + (mZT1PEQType == PEQ1_LAZER_SENSOR_EXT_PREDETECTION_TYPE && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_PG].TKActive == false) || + (mZT1PEQType == PEQ1_LAZER_SENSOR_INT_PREDETECTION_TYPE && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_PG].TKActive == false) || + (mZT1PEQType == PEQ1_PG_PREDETECTION_TYPE && mZTDetectionConfig->mZTDetectionConfig[DETECTION_FCT_PG].TKActive == false)) { //The PEQ1 is invalid because analysis was deactivated. Remove it from detection buffer. for(int i = 0; i < mZT1DetectionsLog.size(); i++) diff --git a/sources/ZTVersion.h b/sources/ZTVersion.h index 5f206b8..fac0176 100755 --- a/sources/ZTVersion.h +++ b/sources/ZTVersion.h @@ -29,9 +29,13 @@ #ifndef ZTVERSION_H #define ZTVERSION_H -#define ZT_SOFT_VERSION "V1.32" +#define ZT_SOFT_VERSION "V1.33" //LOG DES CHANGEMENTS +//Version 1.33 +//-Inhibition des déclenchements PEQ avec la désactivation des TK +//-Remise à zéro du Nb de passage aujourd'hui avec le reste à 3h + //Version 1.32 //-Ajout des flags d'etat des fonctions de détection dans le fichier log //-Retrait de la possibilité d'inhiber l'analyse des fonctions