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

Continue dev -> train info from modbus

Browse Source
This commit is contained in:
zonetest
2017-08-24 11:28:07 -04:00
parent 32a2e9bccd
commit fbb173b6b5
12 changed files with 176 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Stations/DuCollege.cpp
+8
View File
@@ -54,16 +54,24 @@ CDuCollegeStation::CDuCollegeStation()
mStationInputMasks.InputZT1PIMask = DUCOLLEGE_ZT1_PI_MASK;
mStationInputMasks.InputZT1PEMask = DUCOLLEGE_ZT1_PE_MASK;
mStationInputMasks.InputZT1FNMask = DUCOLLEGE_ZT1_FN_MASK;
mStationInputMasks.InputZT2S1Mask = DUCOLLEGE_ZT2_S1_MASK;
mStationInputMasks.InputZT2PIMask = DUCOLLEGE_ZT2_PI_MASK;
mStationInputMasks.InputZT2PEMask = DUCOLLEGE_ZT2_PE_MASK;
//External (ethernet) input module masks
mStationInputMasks.InputZT1ITIMask = DUCOLLEGE_IN_ZT1_ITI_MASK;
mStationInputMasks.InputZT1ANMask = DUCOLLEGE_IN_ZT1_AN_MASK;
mStationInputMasks.InputZT1ARFMask = DUCOLLEGE_IN_ZT1_ARF_MASK;
mStationInputMasks.InputZT2ITIMask = DUCOLLEGE_IN_ZT2_ITI_MASK;
mStationInputMasks.InputZT2ANMask = DUCOLLEGE_IN_ZT2_AN_MASK;
mStationInputMasks.InputZT2ARFMask = DUCOLLEGE_IN_ZT2_ARF_MASK;
mStationInputMasks.InputStationIDMask = DUCOLLEGE_IN_STATION_ID_MASK;
//Logic input masks
mStationInputMasks.InputCDVZT1ApproachMask = DUCOLLEGE_IN_CDV_12B_MASK;
mStationInputMasks.InputCDVZT1Mask = DUCOLLEGE_IN_CDV_13A_MASK;
mStationInputMasks.InputCDVZT2ApproachMask = 0;
mStationInputMasks.InputCDVZT2Mask = 0;
//Output masks
mStationOutputMasks.OutputVP1Mask = DUCOLLEGE_OUT_VP1_MASK;
sources/Stations/DuCollege.h
+3 -3
View File
@@ -58,11 +58,11 @@
#define DUCOLLEGE_IN_CDV_14B_MASK 0x00000080
#define DUCOLLEGE_IN_CDV_14C_MASK 0x00000100
#define DUCOLLEGE_IN_ZT1_ITI_MASK 0x00000200
//#define DUCOLLEGE_IN_ZT2_ITI_MASK 0x00000400
#define DUCOLLEGE_IN_ZT2_ITI_MASK 0x00000400
#define DUCOLLEGE_IN_ZT1_AN_MASK 0x00000800
//#define DUCOLLEGE_IN_ZT2_AN_MASK 0x00001000
#define DUCOLLEGE_IN_ZT2_AN_MASK 0x00001000
#define DUCOLLEGE_IN_ZT1_ARF_MASK 0x00002000
//#define DUCOLLEGE_IN_ZT2_ARF_MASK 0x00004000
#define DUCOLLEGE_IN_ZT2_ARF_MASK 0x00004000
#define DUCOLLEGE_IN_STATION_ID_MASK 0x00078000
//External (ethernet) output module masks for DUCOLLEGE