Creation de la version V1.21

Version 1.21
-Correction d'un bug dans le calcul de l'adresse IP du Gateway
-Ajout de la désactivation du log d'ingénierie dans le script de mise à
   jour
-Correction d'un bug d'écriture dans un registre SEI
-Ajout de la composition du train dans le fichier LOG
-Suite au passage du train test, changement des CDV d'acquitement des
alarmes à Montmorency.  12A -> (12A & 11A) et 22A -> (22A & 21B).

sources/Stations/Montmorency.cpp

@@ -122,7 +122,7 @@ unsigned int CMontmorencyStation::UpdateStationMasks(unsigned int ExtInputData)
 			mStationInputMasks.InputZT1ITIMask = MONTMORENCY_IN_ZT1_10_12_ITI_MASK;
 			mStationInputMasks.InputZT1ANMask = MONTMORENCY_IN_10_12_AN1_MASK;
 			mCurZT1Itinerary = MONTMORENCY_ZT1_10_12_ITINERARY;
-			mZT1AlarmAutoAcquireCDV = m10_12AlarmAutoAcquireCDV;
+            mZT1AlarmAutoAcquireCDV = m10_12AlarmAutoAcquireCDV_2;  //Not used but it's better to assign it.
             mZT1SubsequentCDV = m10_12SubsequentCDV;
             qDebug("Itinéraire 10/12 configuré");
 		}
@@ -135,7 +135,7 @@ unsigned int CMontmorencyStation::UpdateStationMasks(unsigned int ExtInputData)
 			mStationInputMasks.InputZT1ITIMask = MONTMORENCY_IN_ZT1_10_22_ITI_MASK;
 			mStationInputMasks.InputZT1ANMask = MONTMORENCY_IN_10_22_AN1_MASK;
 			mCurZT1Itinerary = MONTMORENCY_ZT1_10_22_ITINERARY;
-			mZT1AlarmAutoAcquireCDV = m10_22AlarmAutoAcquireCDV;
+            mZT1AlarmAutoAcquireCDV = m10_22AlarmAutoAcquireCDV_2; //Not used but it's better to assign it.
             mZT1SubsequentCDV = m10_22SubsequentCDV;
             qDebug("Itinéraire 10/22 configuré");
 		}
@@ -165,6 +165,37 @@ int CMontmorencyStation::GetCurrentITI()
     }
 }
 
+bool CMontmorencyStation::IsZT1AlarmAutoAcquireCDVOccupied()
+{
+    if(GetCurrentITI() == ZT_PRIMARY_ITI)   // itinéraire 10/12
+    {
+        if(m10_12AlarmAutoAcquireCDV_1->IsOccupied())
+        {
+            return true;
+        }
+        else if(m10_12AlarmAutoAcquireCDV_2->IsOccupied())
+        {
+            return true;
+        }
+
+        return false;
+    }
+    else        // Itinéraire 10/22
+    {
+        if(m10_22AlarmAutoAcquireCDV_1->IsOccupied())
+        {
+            return true;
+        }
+        else if(m10_22AlarmAutoAcquireCDV_2->IsOccupied())
+        {
+            return true;
+        }
+
+        return false;
+    }
+}
+
+
 unsigned int CMontmorencyStation::BuildStationCDVList()
 {
     CCDV *NewCDV;
@@ -192,12 +223,13 @@ unsigned int CMontmorencyStation::BuildStationCDVList()
 
 	NewCDV = new CCDV(MONTMORENCY_IN_ZT1_10_12_ITI_MASK,MONTMORENCY_IN_CDV_12A_MASK,CDV_NORMAL_TYPE,"12A",1,5);
 	mZT1AlarmAutoAcquireCDV = NewCDV;
-    m10_12AlarmAutoAcquireCDV = NewCDV;	//Memorize it...
+    m10_12AlarmAutoAcquireCDV_2 = NewCDV;	//Memorize it...
     mCDVList.append(NewCDV);
     NewCDV->SetCDVDeck(true);
 
 	NewCDV = new CCDV(MONTMORENCY_IN_ZT1_10_12_ITI_MASK,MONTMORENCY_IN_CDV_11B_MASK,CDV_NORMAL_TYPE,"11B",1,6);
     mCDVList.append(NewCDV);
+    m10_12AlarmAutoAcquireCDV_1 = NewCDV;
 
 	CSwitchCDV *NewSwitchCDV = new CSwitchCDV(MONTMORENCY_IN_ZT1_10_12_ITI_MASK,MONTMORENCY_IN_ZT1_10_22_ITI_MASK,MONTMORENCY_IN_CDV_11A_MASK,CDV_SWITCH_TYPE,"11A",1,7);
 	mCDVList.append((CCDV*)NewSwitchCDV);
@@ -213,7 +245,7 @@ unsigned int CMontmorencyStation::BuildStationCDVList()
 	mCDVList.append(NewCDV);
 
 	NewCDV = new CCDV(MONTMORENCY_IN_ZT1_10_22_ITI_MASK,MONTMORENCY_IN_CDV_22A_MASK,CDV_NORMAL_TYPE,"22A",2,5);
-    m10_22AlarmAutoAcquireCDV = NewCDV; //Memorize it.
+    m10_22AlarmAutoAcquireCDV_2 = NewCDV; //Memorize it.
 	mCDVList.append(NewCDV);
 
 
@@ -224,6 +256,7 @@ unsigned int CMontmorencyStation::BuildStationCDVList()
     NewCDV = new CCDV(MONTMORENCY_IN_ZT1_10_22_ITI_MASK,MONTMORENCY_IN_CDV_21AB_MASK,CDV_NORMAL_TYPE,"21B",2,6);
     mCDVList.append(NewCDV);
     m10_22SubsequentCDV = NewCDV;
+    m10_22AlarmAutoAcquireCDV_1 = NewCDV; //Memorize it.
 
 
 

sources/Stations/Montmorency.h

@@ -115,12 +115,13 @@ public:
 	 virtual GenericInputMasks_t *GetInputMasks(void);
 	 virtual unsigned int UpdateStationMasks(unsigned int ExtInputData);
      virtual int GetCurrentITI();
+     virtual bool IsZT1AlarmAutoAcquireCDVOccupied();
 
 
 private:
 	 virtual unsigned int BuildStationCDVList();
 	 int mCurZT1Itinerary;
-	 CCDV *m10_12AlarmAutoAcquireCDV, *m10_22AlarmAutoAcquireCDV;
+     CCDV *m10_12AlarmAutoAcquireCDV_1,*m10_12AlarmAutoAcquireCDV_2, *m10_22AlarmAutoAcquireCDV_1, *m10_22AlarmAutoAcquireCDV_2;
      CCDV *m10_12SubsequentCDV, *m10_22SubsequentCDV;
 
 	 enum eMontmorencyZT1Itineraries