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

Prep. essais interface DuCollège

Browse Source 
Vérifications pour tests d'interface CC DuCollège
This commit is contained in:
jfmartel
2018-08-14 13:41:12 -04:00
parent 83ef8cbad9
commit acd2f50631
6 changed files with 81 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Stations/DuCollege.cpp
+6 -5
View File
@@ -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;
// }