diff --git a/Configuration/ZT.cfg b/Configuration/ZT.cfg index b6ef9c0..9410eb6 100644 --- a/Configuration/ZT.cfg +++ b/Configuration/ZT.cfg @@ -79,8 +79,8 @@ ENGLOG=3 #STATION=BERRI_UQAM #STATION=LONGUEIL #STATION=SAINT_MICHEL -STATION=SNOWDON_L5 +#STATION=SNOWDON_L5 #STATION=MONTMORENCY #STATION=MONTMORENCY_10_12 #STATION=MONTMORENCY_10_22 -#STATION=DU_COLLEGE +STATION=DU_COLLEGE diff --git a/Configuration/ZTSettings.ztc b/Configuration/ZTSettings.ztc index d29a83a..7a80b67 100644 Binary files a/Configuration/ZTSettings.ztc and b/Configuration/ZTSettings.ztc differ diff --git a/ZT.pro b/ZT.pro index 20c5d46..f5bf4f1 100644 --- a/ZT.pro +++ b/ZT.pro @@ -291,7 +291,8 @@ OTHER_FILES += \ GetSources.sh \ FTPGetSources.sh \ FwdPort.sh \ - SetPortCap.sh + SetPortCap.sh \ + interfaces INCLUDEPATH += $$PWD/ \ $$PWD/SeaMaxLinux/ \ diff --git a/sources/Modbus/NetworkCfgMgr.cpp b/sources/Modbus/NetworkCfgMgr.cpp index fb0b778..59230cf 100644 --- a/sources/Modbus/NetworkCfgMgr.cpp +++ b/sources/Modbus/NetworkCfgMgr.cpp @@ -76,6 +76,8 @@ int CNetworkCfgMgr::SetTRCPNetworkAddress(QHostAddress Address) //Replace the system file with the temp file. system("cp -f ./interfaces_tmp /etc/network/interfaces"); + CZTLog::instance()->AddLogString(QString("Changement de l'adresse IP: %1").arg(Address.toString()),true); + return RET_OK; diff --git a/sources/Simulator/SimulationScenario.cpp b/sources/Simulator/SimulationScenario.cpp index 77d0dd3..a861138 100644 --- a/sources/Simulator/SimulationScenario.cpp +++ b/sources/Simulator/SimulationScenario.cpp @@ -48,12 +48,12 @@ unsigned int CSimulationScenario::CreateScenario() { -// //MPM10 +/// //MPM10 // InsertNewStep(STEP_ACTION_REGISTER_ZT1_ITI,300); // InsertNewStep(STEP_ACTION_OCCUPY_ZT1_APPROACH,300); // InsertNewStep(STEP_ACTION_OCCUPY_ZT1,300); -// for(int bogie = 1; bogie <= 3; bogie++) +// for(int bogie = 1; bogie <= 18; bogie++) // { // //if(bogie != 5 /*&& bogie != 6*/) @@ -104,104 +104,104 @@ unsigned int CSimulationScenario::CreateScenario() -// //ZT2 +/// //ZT2 - InsertNewStep(STEP_ACTION_REGISTER_ZT2_ITI,300); - InsertNewStep(STEP_ACTION_OCCUPY_ZT2,300); +// InsertNewStep(STEP_ACTION_REGISTER_ZT2_ITI,300); +// InsertNewStep(STEP_ACTION_OCCUPY_ZT2,300); - for(int bogie = 1; bogie <= 18; bogie++) - { - InsertNewStep(STEP_ACTION_ACTIVATE_ZT2_S1,SENSOR_DELAY); - InsertNewStep(STEP_ACTION_DEACTIVATE_ZT2_S1,BOGIE_DELAY); +// for(int bogie = 1; bogie <= 18; bogie++) +// { +// InsertNewStep(STEP_ACTION_ACTIVATE_ZT2_S1,SENSOR_DELAY); +// InsertNewStep(STEP_ACTION_DEACTIVATE_ZT2_S1,BOGIE_DELAY); - // if(bogie == 5 || bogie == 2) - { - // InsertNewStep(STEP_ACTION_ACTIVATE_ZT2_PPE,5); - // InsertNewStep(STEP_ACTION_DEACTIVATE_ZT2_PPE,1); +// // if(bogie == 5 || bogie == 2) +// { +// // InsertNewStep(STEP_ACTION_ACTIVATE_ZT2_PPE,5); +// // InsertNewStep(STEP_ACTION_DEACTIVATE_ZT2_PPE,1); - } +// } - // if(bogie == 3 || bogie == 10) - { -// InsertNewStep(STEP_ACTION_ACTIVATE_ZT2_PPI,3); -// InsertNewStep(STEP_ACTION_DEACTIVATE_ZT2_PPI,1); +// // if(bogie == 3 || bogie == 10) +// { +//// InsertNewStep(STEP_ACTION_ACTIVATE_ZT2_PPI,3); +//// InsertNewStep(STEP_ACTION_DEACTIVATE_ZT2_PPI,1); - } +// } - //if(bogie != 3) - { - InsertNewStep(STEP_ACTION_ACTIVATE_ZT2_S1,SENSOR_DELAY); - InsertNewStep(STEP_ACTION_DEACTIVATE_ZT2_S1,BOGIE_DELAY); - } +// //if(bogie != 3) +// { +// InsertNewStep(STEP_ACTION_ACTIVATE_ZT2_S1,SENSOR_DELAY); +// InsertNewStep(STEP_ACTION_DEACTIVATE_ZT2_S1,BOGIE_DELAY); +// } - } +// } - InsertNewStep(STEP_ACTION_DESTROY_ZT2_ITI,800); - InsertNewStep(STEP_ACTION_FREE_ZT2,800); +// InsertNewStep(STEP_ACTION_DESTROY_ZT2_ITI,800); +// InsertNewStep(STEP_ACTION_FREE_ZT2,800); //// MR -// InsertNewStep(STEP_ACTION_REGISTER_ZT1_ITI,300); -// InsertNewStep(STEP_ACTION_OCCUPY_ZT1_APPROACH,300); -// InsertNewStep(STEP_ACTION_OCCUPY_ZT1,300); + InsertNewStep(STEP_ACTION_REGISTER_ZT1_ITI,300); + InsertNewStep(STEP_ACTION_OCCUPY_ZT1_APPROACH,300); + InsertNewStep(STEP_ACTION_OCCUPY_ZT1,300); -// for(int bogie = 1; bogie <= 12; bogie++) -// { -// // if(bogie != 5 && bogie != 7) -// InsertNewStep(STEP_ACTION_ACTIVATE_PGI,0); -// InsertNewStep(STEP_ACTION_ACTIVATE_PGE,0); -////V00 DETECTION + for(int bogie = 1; bogie <= 12; bogie++) + { + // if(bogie != 5 && bogie != 7) + InsertNewStep(STEP_ACTION_ACTIVATE_PGI,0); + InsertNewStep(STEP_ACTION_ACTIVATE_PGE,0); +//V00 DETECTION // if(bogie != 9) // { -// InsertNewStep(STEP_ACTION_ACTIVATE_S1,SENSOR_DELAY); + InsertNewStep(STEP_ACTION_ACTIVATE_S1,SENSOR_DELAY); // } -// InsertNewStep(STEP_ACTION_DEACTIVATE_S1,BOGIE_DELAY); -// InsertNewStep(STEP_ACTION_DEACTIVATE_PGI,0); -// InsertNewStep(STEP_ACTION_DEACTIVATE_PGE,0); + InsertNewStep(STEP_ACTION_DEACTIVATE_S1,BOGIE_DELAY); + InsertNewStep(STEP_ACTION_DEACTIVATE_PGI,0); + InsertNewStep(STEP_ACTION_DEACTIVATE_PGE,0); -////FN DETECTION -// if(bogie != 5 && bogie != 8 && bogie != 3) -// InsertNewStep(STEP_ACTION_ACTIVATE_FN,0); +//FN DETECTION + // if(bogie != 5 && bogie != 8 && bogie != 3) + InsertNewStep(STEP_ACTION_ACTIVATE_FN,0); -// InsertNewStep(STEP_ACTION_ACTIVATE_S1,SENSOR_DELAY); -// InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY); -// InsertNewStep(STEP_ACTION_DEACTIVATE_S1,BOGIE_DELAY); + InsertNewStep(STEP_ACTION_ACTIVATE_S1,SENSOR_DELAY); + InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY); + InsertNewStep(STEP_ACTION_DEACTIVATE_S1,BOGIE_DELAY); -////PPI DETECTION -//// if(bogie == 6 || bogie == 9) -//// InsertNewStep(STEP_ACTION_ACTIVATE_PPI,0); +//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); +//FN DETECTION + // if(bogie != 5 && bogie != 8 && bogie != 3) + InsertNewStep(STEP_ACTION_DEACTIVATE_FN,0); -//// InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY); -// InsertNewStep(STEP_ACTION_DEACTIVATE_S2,BOGIE_DELAY); +// InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY); + InsertNewStep(STEP_ACTION_DEACTIVATE_S2,BOGIE_DELAY); -////PPI DETECTION -//// if(bogie == 6 || bogie == 9) -//// InsertNewStep(STEP_ACTION_DEACTIVATE_PPI,0); +//PPI DETECTION +// if(bogie == 6 || bogie == 9) +// InsertNewStep(STEP_ACTION_DEACTIVATE_PPI,0); -// // if(bogie != 2 && bogie != 11) -// InsertNewStep(STEP_ACTION_ACTIVATE_PGI,0); -// // if(bogie != 2 && bogie != 11) -// InsertNewStep(STEP_ACTION_ACTIVATE_PGE,0); -// InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY); -// InsertNewStep(STEP_ACTION_DEACTIVATE_S2,BOGIE_DELAY); -// InsertNewStep(STEP_ACTION_DEACTIVATE_PGI,0); -// InsertNewStep(STEP_ACTION_DEACTIVATE_PGE,0); + // if(bogie != 2 && bogie != 11) + InsertNewStep(STEP_ACTION_ACTIVATE_PGI,0); + // if(bogie != 2 && bogie != 11) + InsertNewStep(STEP_ACTION_ACTIVATE_PGE,0); + InsertNewStep(STEP_ACTION_ACTIVATE_S2,SENSOR_DELAY); + InsertNewStep(STEP_ACTION_DEACTIVATE_S2,BOGIE_DELAY); + InsertNewStep(STEP_ACTION_DEACTIVATE_PGI,0); + InsertNewStep(STEP_ACTION_DEACTIVATE_PGE,0); -// } + } -// 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); -// InsertNewStep(STEP_ACTION_FREE_ZT1_APPROACH,800); + InsertNewStep(STEP_ACTION_FREE_ZT1_APPROACH,800); return RET_OK; } diff --git a/sources/Stations/DuCollege.cpp b/sources/Stations/DuCollege.cpp index bfd9ee1..a310e5e 100644 --- a/sources/Stations/DuCollege.cpp +++ b/sources/Stations/DuCollege.cpp @@ -61,6 +61,7 @@ CDuCollegeStation::CDuCollegeStation() //External (ethernet) input module masks mStationInputMasks.InputZT1ITIMask = DUCOLLEGE_IN_ZT1_V2_ITI_MASK; + mStationInputMasks.InputZT1_AltITIMask = DUCOLLEGE_IN_ZT1_12_14_ITI_MASK; mStationInputMasks.InputZT1ANMask = DUCOLLEGE_IN_ZT1_AN_MASK; mStationInputMasks.InputZT1ARFMask = DUCOLLEGE_IN_ZT1_ARF_MASK; mStationInputMasks.InputZT2ITIMask = 0; @@ -123,13 +124,13 @@ unsigned int CDuCollegeStation::BuildStationCDVList() mCDVList.empty(); unsigned int SP2_V2_12_14_ItiMask = DUCOLLEGE_IN_ZT1_12_14_ITI_MASK | DUCOLLEGE_IN_ZT1_V2_ITI_MASK | DUCOLLEGE_IN_ZT1_SP2_ITI_MASK; - NewCDV = new CCDV(DUCOLLEGE_IN_ZT1_12_14_ITI_MASK,DUCOLLEGE_IN_CDV_14C_MASK,CDV_NORMAL_TYPE,"14C",1,1); + NewCDV = new CCDV(SP2_V2_12_14_ItiMask,DUCOLLEGE_IN_CDV_14C_MASK,CDV_NORMAL_TYPE,"14C",1,1); mCDVList.append(NewCDV); - NewCDV = new CCDV(DUCOLLEGE_IN_ZT1_12_14_ITI_MASK,DUCOLLEGE_IN_CDV_14B_MASK,CDV_NORMAL_TYPE,"14B",1,2); + NewCDV = new CCDV(SP2_V2_12_14_ItiMask,DUCOLLEGE_IN_CDV_14B_MASK,CDV_NORMAL_TYPE,"14B",1,2); mCDVList.append(NewCDV); - NewCDV = new CCDV(DUCOLLEGE_IN_ZT1_12_14_ITI_MASK,DUCOLLEGE_IN_CDV_14A_MASK,CDV_NORMAL_TYPE,"14A",1,3); + NewCDV = new CCDV(SP2_V2_12_14_ItiMask,DUCOLLEGE_IN_CDV_14A_MASK,CDV_NORMAL_TYPE,"14A",1,3); mZT1AlarmAutoAcquireCDV = NewCDV; mCDVList.append(NewCDV); @@ -208,11 +209,11 @@ int CDuCollegeStation::GetCurrentITI() return ZT_PRIMARY_ITI; -// if(mCurZT1Itinerary == DUCOLLEGE_ZT1_NO_ITINERARY || mCurZT1Itinerary == DUCOLLEGE_12_14_ITINERARY) +// if(mCurZT1Itinerary == DUCOLLEGE_ZT1_NO_ITINERARY || mCurZT1Itinerary == DUCOLLEGE_SP2_V2_ITINERARY) // { // return ZT_PRIMARY_ITI; // } -// else if(mCurZT1Itinerary == DUCOLLEGE_SP2_V2_ITINERARY) +// else if(mCurZT1Itinerary == DUCOLLEGE_12_14_ITINERARY) // { // return ZT_SECONDARY_ITI; // }