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

- Correction de l'assignation des I/O pour MMO

Browse Source 
- Changement des registres Modbus pour accomoder l'implémentation bidon de la CC
- Ajout de certains flags dans les fichiers de passage et dans le GUI
This commit is contained in:
jfmartel
2018-09-21 09:54:56 -04:00
parent acd2f50631
commit 727d1db66f
9 changed files with 61 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sources/Stations/Montmorency.cpp
+1 -1
View File
@@ -221,7 +221,7 @@ unsigned int CMontmorencyStation::BuildStationCDVList()
// NewSwitchCDV = new CSwitchCDV(0,MONTMORENCY_IN_ZT1_10_22_ITI_MASK,MONTMORENCY_IN_CDV_21BC_MASK,CDV_SWITCH_TYPE,"21BC",2,6);
// mCDVList.append((CCDV*)NewSwitchCDV);
NewCDV = new CCDV(MONTMORENCY_IN_ZT1_10_22_ITI_MASK,MONTMORENCY_IN_CDV_21BC_MASK,CDV_NORMAL_TYPE,"21B",2,6);
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;
sources/Stations/Montmorency.h
+5 -4
View File
@@ -64,11 +64,12 @@
#define MONTMORENCY_IN_ZT1_ARF_MASK 0x00002000
#define MONTMORENCY_IN_ZT2_ARF_MASK 0x00004000
#define MONTMORENCY_IN_STATION_ID_MASK 0x00078000
#define MONTMORENCY_IN_CDV_21BC_MASK 0x00080000
#define MONTMORENCY_IN_CDV_22A_MASK 0x00100000
#define MONTMORENCY_IN_CDV_21AB_MASK 0x00080000
#define MONTMORENCY_IN_10_22_AN1_MASK 0x00100000 //Unused duplicate status of CDV10B introduced by error when merging the two ZT. Should be AN1 if needed...
#define MONTMORENCY_IN_CDV_22BC_MASK 0x00200000
#define MONTMORENCY_IN_10_22_AN1_MASK 0x00400000
#define MONTMORENCY_IN_ZT1_10_22_ITI_MASK 0x00800000
#define MONTMORENCY_IN_ZT1_10_22_ITI_MASK 0x00400000
#define MONTMORENCY_IN_CDV_22A_MASK 0x00800000
#define MONTMORENCY_IN_CDV_11AP_MASK 0x01000000 //Unused duplicate status of CDV11A introduced by error when merging the two ZT
//External (ethernet) output module masks for MONTMORENCY
#define MONTMORENCY_OUT_VP1_MASK 0x00000001