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

Encore problème de reset des stats du jour

Browse Source
This commit is contained in:
jfmartel 2024-08-05 09:55:11 -04:00
parent ae4c5b4738
commit c1ce25c4c6
3 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
UpdateZT.sh
View File

@ -3,8 +3,8 @@
#ZT Update Script V1.0 #ZT Update Script V1.0
ZTVERSION=V1.30 ZTVERSION=V1.31
VERSIONROOT=ZoneTest_V130 #Nom du répertoire sur la clef USB contenant la nouvelle version VERSIONROOT=ZoneTest_V131 #Nom du répertoire sur la clef USB contenant la nouvelle version
ARCHIVEDIR=/home/zonetest/Archives ARCHIVEDIR=/home/zonetest/Archives
ZTEXECDIR=/home/zonetest/ZT ZTEXECDIR=/home/zonetest/ZT
USBEXECDIR=$VERSIONROOT/EXE USBEXECDIR=$VERSIONROOT/EXE

18
sources/Modbus/PIHistorianManager.cpp
View File

@ -436,6 +436,8 @@ int CPIHistorianManager::NewZT1Passage(CZTPassageInfo ZT1PassageInfo)
mNbPPIZT1Today += NbDeclPPI; mNbPPIZT1Today += NbDeclPPI;
mNbPPEZT1Today += NbDeclPPE; mNbPPEZT1Today += NbDeclPPE;
}
mPIHistorianRepo->WriteSingleReg(HISTORIAN_DETECTIONS_TODAY_REG_ADD,mNbDeclToday); mPIHistorianRepo->WriteSingleReg(HISTORIAN_DETECTIONS_TODAY_REG_ADD,mNbDeclToday);
mPIHistorianRepo->WriteSingleReg(HISTORIAN_DETECTIONS_TOTAL_REG_ADD,ZT1PassageInfo.mNbDeclenchements); mPIHistorianRepo->WriteSingleReg(HISTORIAN_DETECTIONS_TOTAL_REG_ADD,ZT1PassageInfo.mNbDeclenchements);
mPIHistorianRepo->WriteSingleReg(HISTORIAN_FN_DETECTS_TODAY_REG_ADD,mNbFNToday); mPIHistorianRepo->WriteSingleReg(HISTORIAN_FN_DETECTS_TODAY_REG_ADD,mNbFNToday);
@ -443,9 +445,6 @@ int CPIHistorianManager::NewZT1Passage(CZTPassageInfo ZT1PassageInfo)
mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPE_ZT1_DETECTS_TODAY_REG_ADD,mNbPPEZT1Today); mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPE_ZT1_DETECTS_TODAY_REG_ADD,mNbPPEZT1Today);
mPIHistorianRepo->WriteSingleReg(HISTORIAN_PG_DETECTS_TODAY_REG_ADD,mNbPGToday); mPIHistorianRepo->WriteSingleReg(HISTORIAN_PG_DETECTS_TODAY_REG_ADD,mNbPGToday);
}
return RET_OK; return RET_OK;
} }
@ -563,13 +562,16 @@ int CPIHistorianManager::NewZT2Passage(CZTPassageInfo ZT2PassageInfo)
mNbPPIZT2Today += NbDeclPPI; mNbPPIZT2Today += NbDeclPPI;
mNbPPEZT2Today += NbDeclPPE; mNbPPEZT2Today += NbDeclPPE;
}
mPIHistorianRepo->WriteSingleReg(HISTORIAN_TRAINS_TODAY_REG_ADD,mNbPassagesToday); mPIHistorianRepo->WriteSingleReg(HISTORIAN_TRAINS_TODAY_REG_ADD,mNbPassagesToday);
mPIHistorianRepo->WriteSingleReg(HISTORIAN_DETECTIONS_TOTAL_REG_ADD,ZT2PassageInfo.mNbDeclenchements); mPIHistorianRepo->WriteSingleReg(HISTORIAN_DETECTIONS_TOTAL_REG_ADD,ZT2PassageInfo.mNbDeclenchements);
mPIHistorianRepo->WriteSingleReg(HISTORIAN_DETECTIONS_TODAY_REG_ADD,mNbDeclToday); mPIHistorianRepo->WriteSingleReg(HISTORIAN_DETECTIONS_TODAY_REG_ADD,mNbDeclToday);
mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPI_ZT2_DETECTS_TODAY_REG_ADD,mNbPPIZT2Today); mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPI_ZT2_DETECTS_TODAY_REG_ADD,mNbPPIZT2Today);
mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPE_ZT2_DETECTS_TODAY_REG_ADD,mNbPPEZT2Today); mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPE_ZT2_DETECTS_TODAY_REG_ADD,mNbPPEZT2Today);
}
return RET_OK; return RET_OK;
} }
void CPIHistorianManager::StartHistorianTimer() void CPIHistorianManager::StartHistorianTimer()
@ -595,6 +597,14 @@ void CPIHistorianManager::HistorianTimerExpired()
mTodaysDate = QDate::currentDate(); mTodaysDate = QDate::currentDate();
mPIHistorianRepo->WriteSingleReg(HISTORIAN_DETECTIONS_TODAY_REG_ADD,mNbDeclToday);
mPIHistorianRepo->WriteSingleReg(HISTORIAN_FN_DETECTS_TODAY_REG_ADD,mNbFNToday);
mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPI_ZT1_DETECTS_TODAY_REG_ADD,mNbPPIZT1Today);
mPIHistorianRepo->WriteSingleReg(HISTORIAN_PPE_ZT1_DETECTS_TODAY_REG_ADD,mNbPPEZT1Today);
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);
CEngLog::instance()->AddLogString("Reset des stats historien du jour",2); CEngLog::instance()->AddLogString("Reset des stats historien du jour",2);
} }

5
sources/ZTVersion.h
View File

@ -29,9 +29,12 @@
#ifndef ZTVERSION_H #ifndef ZTVERSION_H
#define ZTVERSION_H #define ZTVERSION_H
#define ZT_SOFT_VERSION "V1.30" #define ZT_SOFT_VERSION "V1.31"
//LOG DES CHANGEMENTS //LOG DES CHANGEMENTS
//Version 1.31
//-Finalement finalement pour vrai réglé le problème de reset des stats aujourd'hui.
//Version 1.30 //Version 1.30
//-Finalement réglé le problème de reset du nombre de passages aujourd'hui. //-Finalement réglé le problème de reset du nombre de passages aujourd'hui.