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

Création station Du Collège

Browse Source
This commit is contained in:
zonetest 2017-08-22 14:26:56 -04:00
parent 79645ef3c8
commit 627c95b716
5 changed files with 161 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Configuration/ZT.cfg
View File

@ -72,10 +72,11 @@ ENGLOG=3
#STATION=ANGRIGNON #STATION=ANGRIGNON
#STATION=HENRI_BOURASSA #STATION=HENRI_BOURASSA
#STATION=COTE_VERTU #STATION=COTE_VERTU
STATION=BERRI_UQAM #STATION=BERRI_UQAM
#STATION=LONGUEIL #STATION=LONGUEIL
#STATION=SAINT_MICHEL #STATION=SAINT_MICHEL
#STATION=SNOWDON_L5 #STATION=SNOWDON_L5
#STATION=MONTMORENCY #STATION=MONTMORENCY
#STATION=MONTMORENCY_10_12 #STATION=MONTMORENCY_10_12
#STATION=MONTMORENCY_10_22 #STATION=MONTMORENCY_10_22
STATION=DU_COLLEGE

6
ZT.pro
View File

@ -114,7 +114,8 @@ SOURCES += \
sources/Modbus/ModbusMaster.cpp \ sources/Modbus/ModbusMaster.cpp \
sources/Modbus/ModbusRepository.cpp \ sources/Modbus/ModbusRepository.cpp \
sources/Modbus/ModbusCCMgr.cpp \ sources/Modbus/ModbusCCMgr.cpp \
sources/Modbus/ModbusTKTransport.cpp sources/Modbus/ModbusTKTransport.cpp \
sources/Stations/DuCollege.cpp
HEADERS += \ HEADERS += \
sources/MainPanel.h \ sources/MainPanel.h \
@ -228,7 +229,8 @@ HEADERS += \
sources/Modbus/ModbusRepository.h \ sources/Modbus/ModbusRepository.h \
sources/Modbus/ModbusCCMgr.h \ sources/Modbus/ModbusCCMgr.h \
sources/Modbus/ModbusCCDefs.h \ sources/Modbus/ModbusCCDefs.h \
sources/Modbus/ModbusTKTransport.h sources/Modbus/ModbusTKTransport.h \
sources/Stations/DuCollege.h
#QMAKE_LIBDIR += ./ExtLib #QMAKE_LIBDIR += ./ExtLib
#QT += network #QT += network

156
sources/Stations/DuCollege.cpp
View File

@ -29,7 +29,7 @@
/* ************************************************************************** */ /* ************************************************************************** */
#include "Angrignon.h" #include "DuCollege.h"
#include <QtGlobal> #include <QtGlobal>
#ifndef WINDOWS_OS #ifndef WINDOWS_OS
#include "ExternalIOMgr.h" #include "ExternalIOMgr.h"
@ -37,130 +37,114 @@
#endif #endif
//rydy //rydy
CAngrignonStation::CAngrignonStation() CDuCollegeStation::CDuCollegeStation()
{ {
//All the inherited variables from base class must be initialized here //All the inherited variables from base class must be initialized here
//according to the physical implementation in the station. //according to the physical implementation in the station.
mNbExtInputModules430 = ANGRIGNON_NB_EXTERNAL_INPUT_430_MODULES; mNbExtInputModules430 = DUCOLLEGE_NB_EXTERNAL_INPUT_430_MODULES;
mNbExtOutputModules440 = ANGRIGNON_NB_EXTERNAL_OUTPUT_440_MODULES; mNbExtOutputModules440 = DUCOLLEGE_NB_EXTERNAL_OUTPUT_440_MODULES;
mNbExtMixedModules470 = ANGRIGNON_NB_EXTERNAL_MIXED_470_MODULES; mNbExtMixedModules470 = DUCOLLEGE_NB_EXTERNAL_MIXED_470_MODULES;
mStationPhysicalKey = ANGRIGNON_STATION_KEY; mStationPhysicalKey = DUCOLLEGE_STATION_KEY;
//Initialize mask structures //Initialize mask structures
// //
mStationInputMasks.InputZT1S1Mask = ANGRIGNON_ZT1_S1_MASK; mStationInputMasks.InputZT1S1Mask = DUCOLLEGE_ZT1_S1_MASK;
mStationInputMasks.InputZT1S2Mask = ANGRIGNON_ZT1_S2_MASK; mStationInputMasks.InputZT1S2Mask = DUCOLLEGE_ZT1_S2_MASK;
mStationInputMasks.InputZT1PIMask = ANGRIGNON_ZT1_PI_MASK; mStationInputMasks.InputZT1PIMask = DUCOLLEGE_ZT1_PI_MASK;
mStationInputMasks.InputZT1PEMask = ANGRIGNON_ZT1_PE_MASK; mStationInputMasks.InputZT1PEMask = DUCOLLEGE_ZT1_PE_MASK;
mStationInputMasks.InputZT1FNMask = ANGRIGNON_ZT1_FN_MASK; mStationInputMasks.InputZT1FNMask = DUCOLLEGE_ZT1_FN_MASK;
mStationInputMasks.InputZT2S1Mask = ANGRIGNON_ZT2_S1_MASK;
mStationInputMasks.InputZT2PIMask = ANGRIGNON_ZT2_PI_MASK;
mStationInputMasks.InputZT2PEMask = ANGRIGNON_ZT2_PE_MASK;
//External (ethernet) input module masks //External (ethernet) input module masks
mStationInputMasks.InputZT1ITIMask = ANGRIGNON_IN_ZT1_ITI_MASK; mStationInputMasks.InputZT1ITIMask = DUCOLLEGE_IN_ZT1_ITI_MASK;
mStationInputMasks.InputZT2ITIMask = ANGRIGNON_IN_ZT2_ITI_MASK; mStationInputMasks.InputZT1ANMask = DUCOLLEGE_IN_ZT1_AN_MASK;
mStationInputMasks.InputZT1ANMask = ANGRIGNON_IN_ZT1_AN_MASK; mStationInputMasks.InputZT1ARFMask = DUCOLLEGE_IN_ZT1_ARF_MASK;
mStationInputMasks.InputZT2ANMask = ANGRIGNON_IN_ZT2_AN_MASK; mStationInputMasks.InputStationIDMask = DUCOLLEGE_IN_STATION_ID_MASK;
mStationInputMasks.InputZT1ARFMask = ANGRIGNON_IN_ZT1_ARF_MASK;
mStationInputMasks.InputZT2ARFMask = ANGRIGNON_IN_ZT2_ARF_MASK;
mStationInputMasks.InputStationIDMask = ANGRIGNON_IN_STATION_ID_MASK;
//Logic input masks //Logic input masks
mStationInputMasks.InputCDVZT1ApproachMask = ANGRIGNON_IN_CDV_11A_MASK; mStationInputMasks.InputCDVZT1ApproachMask = DUCOLLEGE_IN_CDV_12B_MASK;
mStationInputMasks.InputCDVZT1Mask = ANGRIGNON_IN_CDV_11B_MASK; mStationInputMasks.InputCDVZT1Mask = DUCOLLEGE_IN_CDV_13A_MASK;
mStationInputMasks.InputCDVZT2ApproachMask = ANGRIGNON_IN_CDV_12B_MASK;
mStationInputMasks.InputCDVZT2Mask = ANGRIGNON_IN_CDV_13A_MASK;
//Output masks //Output masks
mStationOutputMasks.OutputVP1Mask = ANGRIGNON_OUT_VP1_MASK; mStationOutputMasks.OutputVP1Mask = DUCOLLEGE_OUT_VP1_MASK;
mStationOutputMasks.OutputVP2Mask = ANGRIGNON_OUT_VP2_MASK; mStationOutputMasks.OutputVP2Mask = DUCOLLEGE_OUT_VP2_MASK;
mStationOutputMasks.OutputVP3Mask = ANGRIGNON_OUT_VP3_MASK; mStationOutputMasks.OutputVP3Mask = DUCOLLEGE_OUT_VP3_MASK;
mStationOutputMasks.OutputVP4Mask = ANGRIGNON_OUT_VP4_MASK; mStationOutputMasks.OutputVP4Mask = DUCOLLEGE_OUT_VP4_MASK;
mStationOutputMasks.OutputVP5Mask = ANGRIGNON_OUT_VP5_MASK; mStationOutputMasks.OutputVP5Mask = DUCOLLEGE_OUT_VP5_MASK;
mStationOutputMasks.OutputVP6Mask = ANGRIGNON_OUT_VP6_MASK; mStationOutputMasks.OutputVP6Mask = DUCOLLEGE_OUT_VP6_MASK;
mStationOutputMasks.OutputVF1Mask = ANGRIGNON_OUT_VF1_MASK; mStationOutputMasks.OutputVF1Mask = DUCOLLEGE_OUT_VF1_MASK;
mStationOutputMasks.OutputVF2Mask = ANGRIGNON_OUT_VF2_MASK; mStationOutputMasks.OutputVF2Mask = DUCOLLEGE_OUT_VF2_MASK;
mStationOutputMasks.OutputVF3Mask = ANGRIGNON_OUT_VF3_MASK; mStationOutputMasks.OutputVF3Mask = DUCOLLEGE_OUT_VF3_MASK;
mStationOutputMasks.OutputVF4Mask = ANGRIGNON_OUT_VF4_MASK; mStationOutputMasks.OutputVF4Mask = DUCOLLEGE_OUT_VF4_MASK;
mStationOutputMasks.OutputVF5Mask = ANGRIGNON_OUT_VF5_MASK; mStationOutputMasks.OutputVF5Mask = DUCOLLEGE_OUT_VF5_MASK;
mStationOutputMasks.OutputWP1Mask = ANGRIGNON_OUT_WP1_MASK; mStationOutputMasks.OutputWP1Mask = DUCOLLEGE_OUT_WP1_MASK;
mStationOutputMasks.OutputWP2Mask = ANGRIGNON_OUT_WP2_MASK; mStationOutputMasks.OutputWP2Mask = DUCOLLEGE_OUT_WP2_MASK;
mStationOutputMasks.OutputWP3Mask = ANGRIGNON_OUT_WP3_MASK; mStationOutputMasks.OutputWP3Mask = DUCOLLEGE_OUT_WP3_MASK;
mStationOutputMasks.OutputWP4Mask = ANGRIGNON_OUT_WP4_MASK; mStationOutputMasks.OutputWP4Mask = DUCOLLEGE_OUT_WP4_MASK;
mStationOutputMasks.OutputWP5Mask = ANGRIGNON_OUT_WP5_MASK; mStationOutputMasks.OutputWP5Mask = DUCOLLEGE_OUT_WP5_MASK;
mStationOutputMasks.OutputWP6Mask = ANGRIGNON_OUT_WP6_MASK; mStationOutputMasks.OutputWP6Mask = DUCOLLEGE_OUT_WP6_MASK;
mStationOutputMasks.OutputDPEMask = ANGRIGNON_OUT_DPE_MASK; mStationOutputMasks.OutputDPEMask = DUCOLLEGE_OUT_DPE_MASK;
mStationOutputMasks.OutputDPIMask = ANGRIGNON_OUT_DPI_MASK; mStationOutputMasks.OutputDPIMask = DUCOLLEGE_OUT_DPI_MASK;
mStationOutputMasks.OutputV00Mask = ANGRIGNON_OUT_V00_MASK; mStationOutputMasks.OutputV00Mask = DUCOLLEGE_OUT_V00_MASK;
mStationOutputMasks.OutputDPGMask = ANGRIGNON_OUT_DPG_MASK; mStationOutputMasks.OutputDPGMask = DUCOLLEGE_OUT_DPG_MASK;
mStationOutputMasks.OutputDFRMask = ANGRIGNON_OUT_DFR_MASK; mStationOutputMasks.OutputDFRMask = DUCOLLEGE_OUT_DFR_MASK;
mStationOutputMasks.OutputRFMask = ANGRIGNON_OUT_RF_MASK; mStationOutputMasks.OutputRFMask = DUCOLLEGE_OUT_RF_MASK;
mStationOutputMasks.OutputRF2Mask = ANGRIGNON_OUT_RF2_MASK; mStationOutputMasks.OutputRF2Mask = DUCOLLEGE_OUT_RF2_MASK;
mStationOutputMasks.OutputVELMask = ANGRIGNON_OUT_VEL_MASK; mStationOutputMasks.OutputVELMask = DUCOLLEGE_OUT_VEL_MASK;
mStationOutputMasks.OutputVEL2Mask = ANGRIGNON_OUT_VEL2_MASK; mStationOutputMasks.OutputVEL2Mask = DUCOLLEGE_OUT_VEL2_MASK;
mStationOutputMasks.OutputDPI2Mask = ANGRIGNON_OUT_DPI2_MASK; mStationOutputMasks.OutputDPI2Mask = DUCOLLEGE_OUT_DPI2_MASK;
mStationOutputMasks.OutputDPE2Mask = ANGRIGNON_OUT_DPE2_MASK; mStationOutputMasks.OutputDPE2Mask = DUCOLLEGE_OUT_DPE2_MASK;
mStationOutputMasks.OutputV002Mask = ANGRIGNON_OUT_V002_MASK; mStationOutputMasks.OutputV002Mask = DUCOLLEGE_OUT_V002_MASK;
mStationOutputMasks.OutputPEQ1Mask = ANGRIGNON_OUT_PEQ1_MASK; mStationOutputMasks.OutputPEQ1Mask = DUCOLLEGE_OUT_PEQ1_MASK;
mStationOutputMasks.OutputPEQ2Mask = ANGRIGNON_OUT_PEQ2_MASK; mStationOutputMasks.OutputPEQ2Mask = DUCOLLEGE_OUT_PEQ2_MASK;
mStationOutputMasks.OutputWatchdogMask = ANGRIGNON_OUT_WATCHDOG_MASK; mStationOutputMasks.OutputWatchdogMask = DUCOLLEGE_OUT_WATCHDOG_MASK;
mAnalogAcqChannels.SDFAcquisitionChannel = ANGRIGNON_SDF_ACQUISITION_CHANNEL; mAnalogAcqChannels.SDFAcquisitionChannel = DUCOLLEGE_SDF_ACQUISITION_CHANNEL;
mStationHasZT2 = true; mStationHasZT2 = false;
mTextualStationName = "Angrignon"; mTextualStationName = "Du Collège";
mTextualShortName = "ANG"; mTextualShortName = "COLG";
} }
unsigned int CAngrignonStation::BuildStationCDVList() unsigned int CDuCollegeStation::BuildStationCDVList()
{ {
CCDV *NewCDV; CCDV *NewCDV;
mCDVList.empty(); mCDVList.empty();
NewCDV = new CCDV(ANGRIGNON_IN_ZT2_ITI_MASK,ANGRIGNON_IN_CDV_14B_MASK,CDV_NORMAL_TYPE,"14B",1,0); NewCDV = new CCDV(DUCOLLEGE_IN_ZT1_ITI_MASK,DUCOLLEGE_IN_CDV_14C_MASK,CDV_NORMAL_TYPE,"14C",2,9);
mCDVList.append(NewCDV); mCDVList.append(NewCDV);
NewCDV = new CCDV(ANGRIGNON_IN_ZT2_ITI_MASK,ANGRIGNON_IN_CDV_14A_MASK,CDV_NORMAL_TYPE,"14A",1,1); NewCDV = new CCDV(DUCOLLEGE_IN_ZT1_ITI_MASK,DUCOLLEGE_IN_CDV_14B_MASK,CDV_NORMAL_TYPE,"14B",2,8);
mCDVList.append(NewCDV); mCDVList.append(NewCDV);
NewCDV = new CCDV(ANGRIGNON_IN_ZT2_ITI_MASK,ANGRIGNON_IN_CDV_13BC_MASK,CDV_NORMAL_TYPE,"13BC",1,2); NewCDV = new CCDV(DUCOLLEGE_IN_ZT1_ITI_MASK,DUCOLLEGE_IN_CDV_14A_MASK,CDV_NORMAL_TYPE,"14A",2,7);
mZT2AlarmAutoAcquireCDV = NewCDV;
mCDVList.append(NewCDV);
NewCDV = new CCDV(ANGRIGNON_IN_ZT2_ITI_MASK,ANGRIGNON_IN_CDV_13A_MASK,CDV_NORMAL_TYPE,"13A ZT2",1,3);
mZT2CDV = NewCDV;
mZT2ApproachCDV = NewCDV;
mCDVList.append(NewCDV);
NewCDV = new CCDV(ANGRIGNON_IN_ZT1_ITI_MASK,ANGRIGNON_IN_CDV_12B_MASK,CDV_NORMAL_TYPE,"12B",1,4);
mCDVList.append(NewCDV);
NewCDV->SetCDVDeck(true);
NewCDV = new CCDV(ANGRIGNON_IN_ZT1_ITI_MASK,ANGRIGNON_IN_CDV_12A_MASK,CDV_NORMAL_TYPE,"12A",1,5);
mZT1AlarmAutoAcquireCDV = NewCDV; mZT1AlarmAutoAcquireCDV = NewCDV;
mCDVList.append(NewCDV);
NewCDV = new CCDV(DUCOLLEGE_IN_ZT1_ITI_MASK,DUCOLLEGE_IN_CDV_13B_MASK,CDV_NORMAL_TYPE,"13B",2,6);
mZT1SubsequentCDV = NewCDV; mZT1SubsequentCDV = NewCDV;
mCDVList.append(NewCDV); mCDVList.append(NewCDV);
NewCDV->SetCDVDeck(true);
NewCDV = new CCDV(DUCOLLEGE_IN_ZT1_ITI_MASK,DUCOLLEGE_IN_CDV_13A_MASK,CDV_NORMAL_TYPE,"13A ZT",2,5);
NewCDV = new CCDV(ANGRIGNON_IN_ZT1_ITI_MASK,ANGRIGNON_IN_CDV_11B_MASK,CDV_NORMAL_TYPE,"11B ZT1",1,6);
mZT1CDV = NewCDV; mZT1CDV = NewCDV;
mCDVList.append(NewCDV); mCDVList.append(NewCDV);
NewCDV = new CCDV(DUCOLLEGE_IN_ZT1_ITI_MASK,DUCOLLEGE_IN_CDV_12A_MASK,CDV_NORMAL_TYPE,"12A",2,3);
mCDVList.append(NewCDV);
NewCDV->SetCDVDeck(true);
NewCDV = new CCDV(ANGRIGNON_IN_ZT1_ITI_MASK,ANGRIGNON_IN_CDV_11A_MASK,CDV_NORMAL_TYPE,"11A",1,7); NewCDV = new CCDV(DUCOLLEGE_IN_ZT1_ITI_MASK,DUCOLLEGE_IN_CDV_12B_MASK,CDV_NORMAL_TYPE,"12B",2,4);
NewCDV->SetCDVDeck(true);
mZT1ApproachCDV = NewCDV; mZT1ApproachCDV = NewCDV;
mCDVList.append(NewCDV); mCDVList.append(NewCDV);
NewCDV = new CCDV(ANGRIGNON_IN_ZT1_ITI_MASK,ANGRIGNON_IN_CDV_10B_MASK,CDV_NORMAL_TYPE,"10B",1,8);
NewCDV = new CCDV(0,DUCOLLEGE_IN_CDV_11B_MASK,CDV_NORMAL_TYPE,"11B",2,2);
mCDVList.append(NewCDV); mCDVList.append(NewCDV);
NewCDV = new CCDV(0,DUCOLLEGE_IN_CDV_11A_MASK,CDV_NORMAL_TYPE,"11A",2,1);
mCDVList.append(NewCDV);
return RET_OK; return RET_OK;
} }

138
sources/Stations/DuCollege.h
View File

@ -16,7 +16,7 @@
/* ************************************************************************** */ /* ************************************************************************** */
/* Revision: /* Revision:
### 20121217 JFM ### 20170822 JFM
Verision d'origine. Verision d'origine.
### YYYYMMDD Description du besoin ou du bug ### YYYYMMDD Description du besoin ou du bug
@ -25,88 +25,88 @@
/* ************************************************************************** */ /* ************************************************************************** */
#ifndef Angrignon_H #ifndef DuCollege_H
#define Angrignon_H #define DuCollege_H
#include "Station.h" #include "Station.h"
#define ANGRIGNON_STATION_KEY 0x0010000 #define DUCOLLEGE_STATION_KEY 0x0011111 //JFM A CONFIRMER...
#define ANGRIGNON_NB_EXTERNAL_INPUT_430_MODULES 1 #define DUCOLLEGE_NB_EXTERNAL_INPUT_430_MODULES 1
#define ANGRIGNON_NB_EXTERNAL_OUTPUT_440_MODULES 1 #define DUCOLLEGE_NB_EXTERNAL_OUTPUT_440_MODULES 1
#define ANGRIGNON_NB_EXTERNAL_MIXED_470_MODULES 0 #define DUCOLLEGE_NB_EXTERNAL_MIXED_470_MODULES 0
//Since it's necessary to execute a very fast acquisition and analysis //Since it's necessary to execute a very fast acquisition and analysis
//of magnetic sensors through the PCI I/O adapter, we will use masks //of magnetic sensors through the PCI I/O adapter, we will use masks
//instead of bitfields for those sensors. This will accelerate //instead of bitfields for those sensors. This will accelerate
//treatment by avoiding the use of a memcpy(). //treatment by avoiding the use of a memcpy().
#define ANGRIGNON_ZT1_S1_MASK 0x00000001 #define DUCOLLEGE_ZT1_S1_MASK 0x00000001
#define ANGRIGNON_ZT1_S2_MASK 0x00000002 #define DUCOLLEGE_ZT1_S2_MASK 0x00000002
#define ANGRIGNON_ZT1_PI_MASK 0x00000004 #define DUCOLLEGE_ZT1_PI_MASK 0x00000004
#define ANGRIGNON_ZT1_PE_MASK 0x00000008 #define DUCOLLEGE_ZT1_PE_MASK 0x00000008
#define ANGRIGNON_ZT1_FN_MASK 0x00000010 #define DUCOLLEGE_ZT1_FN_MASK 0x00000010
#define ANGRIGNON_ZT2_S1_MASK 0x00000020 #define DUCOLLEGE_ZT2_S1_MASK 0x00000020
#define ANGRIGNON_ZT2_PI_MASK 0x00000040 #define DUCOLLEGE_ZT2_PI_MASK 0x00000040
#define ANGRIGNON_ZT2_PE_MASK 0x00000080 #define DUCOLLEGE_ZT2_PE_MASK 0x00000080
//External (ethernet) input module masks for Angrignon //External (ethernet) input module masks for DUCOLLEGE
#define ANGRIGNON_IN_CDV_12A_MASK 0x00000001 #define DUCOLLEGE_IN_CDV_11A_MASK 0x00000001
#define ANGRIGNON_IN_CDV_12B_MASK 0x00000002 #define DUCOLLEGE_IN_CDV_11B_MASK 0x00000002
#define ANGRIGNON_IN_CDV_11B_MASK 0x00000004 #define DUCOLLEGE_IN_CDV_12A_MASK 0x00000004
#define ANGRIGNON_IN_CDV_11A_MASK 0x00000008 #define DUCOLLEGE_IN_CDV_12B_MASK 0x00000008
#define ANGRIGNON_IN_CDV_10B_MASK 0x00000010 #define DUCOLLEGE_IN_CDV_13A_MASK 0x00000010
#define ANGRIGNON_IN_CDV_13A_MASK 0x00000020 #define DUCOLLEGE_IN_CDV_13B_MASK 0x00000020
#define ANGRIGNON_IN_CDV_14A_MASK 0x00000040 #define DUCOLLEGE_IN_CDV_14A_MASK 0x00000040
#define ANGRIGNON_IN_CDV_13BC_MASK 0x00000080 #define DUCOLLEGE_IN_CDV_14B_MASK 0x00000080
#define ANGRIGNON_IN_CDV_14B_MASK 0x00000100 #define DUCOLLEGE_IN_CDV_14C_MASK 0x00000100
#define ANGRIGNON_IN_ZT1_ITI_MASK 0x00000200 #define DUCOLLEGE_IN_ZT1_ITI_MASK 0x00000200
#define ANGRIGNON_IN_ZT2_ITI_MASK 0x00000400 //#define DUCOLLEGE_IN_ZT2_ITI_MASK 0x00000400
#define ANGRIGNON_IN_ZT1_AN_MASK 0x00000800 #define DUCOLLEGE_IN_ZT1_AN_MASK 0x00000800
#define ANGRIGNON_IN_ZT2_AN_MASK 0x00001000 //#define DUCOLLEGE_IN_ZT2_AN_MASK 0x00001000
#define ANGRIGNON_IN_ZT1_ARF_MASK 0x00002000 #define DUCOLLEGE_IN_ZT1_ARF_MASK 0x00002000
#define ANGRIGNON_IN_ZT2_ARF_MASK 0x00004000 //#define DUCOLLEGE_IN_ZT2_ARF_MASK 0x00004000
#define ANGRIGNON_IN_STATION_ID_MASK 0x00078000 #define DUCOLLEGE_IN_STATION_ID_MASK 0x00078000
//External (ethernet) output module masks for Angrignon //External (ethernet) output module masks for DUCOLLEGE
#define ANGRIGNON_OUT_VP1_MASK 0x00000001 #define DUCOLLEGE_OUT_VP1_MASK 0x00000001
#define ANGRIGNON_OUT_VP2_MASK 0x00000002 #define DUCOLLEGE_OUT_VP2_MASK 0x00000002
#define ANGRIGNON_OUT_VP3_MASK 0x00000004 #define DUCOLLEGE_OUT_VP3_MASK 0x00000004
#define ANGRIGNON_OUT_VP4_MASK 0x00000008 #define DUCOLLEGE_OUT_VP4_MASK 0x00000008
#define ANGRIGNON_OUT_VP5_MASK 0x00000010 #define DUCOLLEGE_OUT_VP5_MASK 0x00000010
#define ANGRIGNON_OUT_VP6_MASK 0x00000020 #define DUCOLLEGE_OUT_VP6_MASK 0x00000020
#define ANGRIGNON_OUT_VF1_MASK 0x00000040 #define DUCOLLEGE_OUT_VF1_MASK 0x00000040
#define ANGRIGNON_OUT_VF2_MASK 0x00000080 #define DUCOLLEGE_OUT_VF2_MASK 0x00000080
#define ANGRIGNON_OUT_VF3_MASK 0x00000100 #define DUCOLLEGE_OUT_VF3_MASK 0x00000100
#define ANGRIGNON_OUT_VF4_MASK 0x00000200 #define DUCOLLEGE_OUT_VF4_MASK 0x00000200
#define ANGRIGNON_OUT_VF5_MASK 0x00000400 #define DUCOLLEGE_OUT_VF5_MASK 0x00000400
#define ANGRIGNON_OUT_WP1_MASK 0x00000800 #define DUCOLLEGE_OUT_WP1_MASK 0x00000800
#define ANGRIGNON_OUT_WP2_MASK 0x00001000 #define DUCOLLEGE_OUT_WP2_MASK 0x00001000
#define ANGRIGNON_OUT_WP3_MASK 0x00002000 #define DUCOLLEGE_OUT_WP3_MASK 0x00002000
#define ANGRIGNON_OUT_WP4_MASK 0x00004000 #define DUCOLLEGE_OUT_WP4_MASK 0x00004000
#define ANGRIGNON_OUT_WP5_MASK 0x00008000 #define DUCOLLEGE_OUT_WP5_MASK 0x00008000
#define ANGRIGNON_OUT_WP6_MASK 0x00010000 #define DUCOLLEGE_OUT_WP6_MASK 0x00010000
#define ANGRIGNON_OUT_DPE_MASK 0x00020000 #define DUCOLLEGE_OUT_DPE_MASK 0x00020000
#define ANGRIGNON_OUT_DPI_MASK 0x00040000 #define DUCOLLEGE_OUT_DPI_MASK 0x00040000
#define ANGRIGNON_OUT_V00_MASK 0x00080000 #define DUCOLLEGE_OUT_V00_MASK 0x00080000
#define ANGRIGNON_OUT_DPG_MASK 0x00100000 #define DUCOLLEGE_OUT_DPG_MASK 0x00100000
#define ANGRIGNON_OUT_DFR_MASK 0x00200000 #define DUCOLLEGE_OUT_DFR_MASK 0x00200000
#define ANGRIGNON_OUT_RF_MASK 0x00400000 #define DUCOLLEGE_OUT_RF_MASK 0x00400000
#define ANGRIGNON_OUT_RF2_MASK 0x00800000 #define DUCOLLEGE_OUT_RF2_MASK 0x00800000
#define ANGRIGNON_OUT_VEL_MASK 0x01000000 #define DUCOLLEGE_OUT_VEL_MASK 0x01000000
#define ANGRIGNON_OUT_VEL2_MASK 0x02000000 #define DUCOLLEGE_OUT_VEL2_MASK 0x02000000
#define ANGRIGNON_OUT_DPI2_MASK 0x04000000 #define DUCOLLEGE_OUT_DPI2_MASK 0x04000000
#define ANGRIGNON_OUT_DPE2_MASK 0x08000000 #define DUCOLLEGE_OUT_DPE2_MASK 0x08000000
#define ANGRIGNON_OUT_V002_MASK 0x10000000 #define DUCOLLEGE_OUT_V002_MASK 0x10000000
#define ANGRIGNON_OUT_PEQ1_MASK 0x20000000 #define DUCOLLEGE_OUT_PEQ1_MASK 0x20000000
#define ANGRIGNON_OUT_PEQ2_MASK 0x40000000 #define DUCOLLEGE_OUT_PEQ2_MASK 0x40000000
#define ANGRIGNON_OUT_WATCHDOG_MASK 0x80000000 #define DUCOLLEGE_OUT_WATCHDOG_MASK 0x80000000
#define ANGRIGNON_SDF_ACQUISITION_CHANNEL 0 #define DUCOLLEGE_SDF_ACQUISITION_CHANNEL 0
class CAngrignonStation : public CStation class CDuCollegeStation : public CStation
{ {
public: public:
CAngrignonStation(); CDuCollegeStation();
private: private:
@ -115,5 +115,5 @@ private:
}; };
#endif // Angrignon_H #endif // DuCollege_H

9
sources/Zonetest.cpp
View File

@ -46,6 +46,7 @@
#include "Montmorency1022.h" #include "Montmorency1022.h"
#include "SaintMichel.h" #include "SaintMichel.h"
#include "Snowdon.h" #include "Snowdon.h"
#include "DuCollege.h"
#include "SimulatorIOManager.h" #include "SimulatorIOManager.h"
#include "SimulatorLazerProbesMgr.h" #include "SimulatorLazerProbesMgr.h"
#include "SimulatorPCIIO.h" #include "SimulatorPCIIO.h"
@ -666,6 +667,10 @@ unsigned int CZoneTest::InitStation()
{ {
StationName = "SNOWDON_L5"; StationName = "SNOWDON_L5";
} }
else if((key & DUCOLLEGE_IN_STATION_ID_MASK) == DUCOLLEGE_STATION_KEY)
{
StationName = "DU_COLLEGE";
}
else else
{ {
CEngLog::instance()->AddLogString(QString("ERREUR. Clef électrique de station inconnue: ") + StationName,2); CEngLog::instance()->AddLogString(QString("ERREUR. Clef électrique de station inconnue: ") + StationName,2);
@ -720,6 +725,10 @@ unsigned int CZoneTest::InitStation()
{ {
mZTStation = new CMontmorency1022Station(); mZTStation = new CMontmorency1022Station();
} }
else if(StationName == "DU_COLLEGE")
{
mZTStation = new CDuCollegeStation();
}
else else
{ {