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

Côte-Vertu, version modifiée à tester sur site

Browse Source
This commit is contained in:
jfmartel 2021-06-15 06:15:02 -04:00
parent 02b67321bb
commit 0a8da6c882
2 changed files with 42 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
sources/Stations/CoteVertu.cpp
View File

@ -31,6 +31,7 @@
#include "CoteVertu.h" #include "CoteVertu.h"
#include <QtGlobal> #include <QtGlobal>
#include "SwitchCDV.h"
CCoteVertuStation::CCoteVertuStation() CCoteVertuStation::CCoteVertuStation()
{ {
@ -225,35 +226,60 @@ unsigned int CCoteVertuStation::BuildStationCDVList()
NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_12_ITI_MASK,COTEVERTU_IN_CDV_12A_MASK,CDV_NORMAL_TYPE,"12A",1,5); NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_12_ITI_MASK,COTEVERTU_IN_CDV_12A_MASK,CDV_NORMAL_TYPE,"12A",1,5);
mZT1AlarmAutoAcquireCDV = NewCDV; mZT1AlarmAutoAcquireCDV = NewCDV;
mZT1SubsequentCDV = NewCDV;
mCDVList.append(NewCDV); mCDVList.append(NewCDV);
NewCDV->SetCDVDeck(true); NewCDV->SetCDVDeck(true);
m10_12AlarmAutoAcquireCDV_2 = NewCDV;
NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_12_ITI_MASK,COTEVERTU_IN_CDV_11C_MASK,CDV_NORMAL_TYPE,"11C",1,6); NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_12_ITI_MASK,COTEVERTU_IN_CDV_11C_MASK,CDV_NORMAL_TYPE,"11C",1,6);
mCDVList.append(NewCDV); mCDVList.append(NewCDV);
m10_12AlarmAutoAcquireCDV_1 = NewCDV;
NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_12_ITI_MASK,COTEVERTU_IN_CDV_11B_MASK,CDV_NORMAL_TYPE,"11B (ZT1)",1,7); NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_12_ITI_MASK,COTEVERTU_IN_CDV_11B_MASK,CDV_NORMAL_TYPE,"11B",1,7);
mZT1CDV = NewCDV;
mCDVList.append(NewCDV); mCDVList.append(NewCDV);
NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_12_ITI_MASK,COTEVERTU_IN_CDV_11A_MASK,CDV_NORMAL_TYPE,"11A",1,8); // NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_12_ITI_MASK,COTEVERTU_IN_CDV_11A_MASK,CDV_NORMAL_TYPE,"11A",1,8);
mZT1ApproachCDV = NewCDV; // mZT1ApproachCDV = NewCDV;
// mZT1SubsequentCDV = NewCDV;
// mCDVList.append(NewCDV);
CSwitchCDV *NewSwitchCDV = new CSwitchCDV(COTEVERTU_IN_ZT1_10_12_ITI_MASK,COTEVERTU_IN_ZT1_10_22_ITI_MASK,COTEVERTU_IN_CDV_11A_MASK,CDV_SWITCH_TYPE,"11A ",1,8);
mCDVList.append((CCDV*)NewSwitchCDV);
mZT1SubsequentCDV = (CCDV*)NewSwitchCDV;
m10_12SubsequentCDV = NewSwitchCDV;
m10_22SubsequentCDV = NewCDV;
NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_12_ITI_MASK | COTEVERTU_IN_ZT1_10_22_ITI_MASK,COTEVERTU_IN_CDV_10B_MASK,CDV_NORMAL_TYPE,"10B (ZT1)",1,9);
mCDVList.append(NewCDV); mCDVList.append(NewCDV);
mZT1CDV = NewCDV;
NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_12_ITI_MASK | COTEVERTU_IN_ZT1_10_22_ITI_MASK,COTEVERTU_IN_CDV_2S177_179_MASK,CDV_NORMAL_TYPE,"10A",1,10);
NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_12_ITI_MASK,COTEVERTU_IN_CDV_10B_MASK,CDV_NORMAL_TYPE,"10B",1,9);
mCDVList.append(NewCDV);
NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_12_ITI_MASK,COTEVERTU_IN_CDV_2S177_179_MASK,CDV_NORMAL_TYPE,"10A",1,10);
mCDVList.append(NewCDV); mCDVList.append(NewCDV);
mZT1ApproachCDV = NewCDV;
NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_22_ITI_MASK,COTEVERTU_IN_CDV_22B_MASK,CDV_NORMAL_TYPE,"22B",2,4); NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_22_ITI_MASK,COTEVERTU_IN_CDV_22B_MASK,CDV_NORMAL_TYPE,"22B",2,4);
mCDVList.append(NewCDV); mCDVList.append(NewCDV);
NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_22_ITI_MASK,COTEVERTU_IN_CDV_22A_MASK,CDV_NORMAL_TYPE,"22A",2,5);
mCDVList.append(NewCDV);
m10_22AlarmAutoAcquireCDV_2 = NewCDV; //Memorize it.
NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_22_ITI_MASK,COTEVERTU_IN_CDV_21C_MASK,CDV_NORMAL_TYPE,"21C",2,6);
mCDVList.append(NewCDV);
m10_22AlarmAutoAcquireCDV_1 = NewCDV; //Memorize it.
NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_22_ITI_MASK,COTEVERTU_IN_CDV_21B_MASK,CDV_NORMAL_TYPE,"21B",2,7);
mCDVList.append(NewCDV);
// NewCDV = new CCDV(COTEVERTU_IN_ZT1_10_22_ITI_MASK,COTEVERTU_IN_CDV_21A_MASK,CDV_NORMAL_TYPE,"21A",2,8);
// mCDVList.append(NewCDV);
// m10_22SubsequentCDV = NewCDV;
return RET_OK; return RET_OK;

6
sources/ZTVersion.h
View File

@ -29,9 +29,13 @@
#ifndef ZTVERSION_H #ifndef ZTVERSION_H
#define ZTVERSION_H #define ZTVERSION_H
#define ZT_SOFT_VERSION "V1.23" #define ZT_SOFT_VERSION "V1.24"
//LOG DES CHANGEMENTS //LOG DES CHANGEMENTS
//Version 1.24
//-Changements à la station Côte-Vertu pour la nouvelle configuration de la ZT.
//Version 1.23 //Version 1.23
//-Suite à la mise en service du du SEI Angrignon, on a dû changer le CDV d'activation ZT2 //-Suite à la mise en service du du SEI Angrignon, on a dû changer le CDV d'activation ZT2
// car le CDV 13A s'occupe parfois trop tard et la sonde magnétique cause des PEQ2. // car le CDV 13A s'occupe parfois trop tard et la sonde magnétique cause des PEQ2.