Skip to content

GitLab

Commit ea4a8a42 authored by Graziano Scalamera's avatar Graziano Scalamera
Browse files

Add new turbo pumps

parent d4bf533f
Hide whitespace changes
Inline Side-by-side
plcesa-srv.labels.txt
View file @ ea4a8a42
......@@ -28,15 +28,15 @@ db50 12.7 FCCVLV_PFE_F01_06 BOOL FALSE
db50 13.0 FS_PFE_F01_01 BOOL FALSE
db50 13.1 FCO_SH_PFE_F01_01 BOOL FALSE
db50 13.2 FCC_SH_PFE_F01_01 BOOL FALSE
db50 13.3 s1331 BOOL FALSE
db50 13.4 s7211 BOOL FALSE
db50 13.5 s73 BOOL FALSE
db50 13.6 s75 BOOL FALSE
db50 13.3 PS_OK_TMP300_PFE_F01_01 BOOL FALSE Alimentatore ON
db50 13.4 PS_OK_TMP80_PFE_F01_01 BOOL FALSE Alimentatore ON
db50 13.5 s135 BOOL FALSE
db50 13.6 s136 BOOL FALSE
db50 13.7 s137 BOOL FALSE
db50 14.0 VAC_AL_SIP55_MBDFEL01_08 BOOL FALSE I da Q53_0 INTCK UH
db50 14.1 COND_99a107_OK BOOL FALSE I da Q53_1 INTCK UH
db50 14.2 s142 BOOL FALSE
db50 14.3 s1431 BOOL FALSE
db50 14.2 PS_OK_TMP500_PFE_F01_01 BOOL FALSE Alimentatore ON
db50 14.3 PS_OK_TMP500_PFE_F01_02 BOOL FALSE Alimentatore ON
db50 14.4 s1441 BOOL FALSE
db50 14.5 s145 BOOL FALSE
db50 14.6 Ready_VGSRG_PFE_F01_01 BOOL FALSE
......@@ -354,10 +354,10 @@ db50 53.5 S721 BOOL FALSE
db50 53.6 S1621 BOOL FALSE
db50 53.7 S2521 BOOL FALSE
db50 54.0 VGSRG_PFE_F02_011 BOOL FALSE
db50 54.1 S5411 BOOL FALSE
db50 54.2 S5421 BOOL FALSE
db50 54.3 S5431 BOOL FALSE
db50 54.4 S5441 BOOL FALSE
db50 54.1 PS_OK_TMP300_PFE_F02_01 BOOL FALSE Alimentatore ON
db50 54.2 PS_OK_TMP80_PFE_F02_01 BOOL FALSE Alimentatore ON
db50 54.3 PS_OK_TMP500_PFE_F02_01 BOOL FALSE Alimentatore ON
db50 54.4 PS_OK_TMP500_PFE_F02_02 BOOL FALSE Alimentatore ON
db50 54.5 S5451 BOOL FALSE
db50 54.6 S5461 BOOL FALSE
db50 54.7 OPERATION_PFE_F02_011 BOOL FALSE interruttore a chiave c_c_
......@@ -1326,10 +1326,10 @@ db50 192.0 TMP_95_80_PFE_F02_03 BOOL FALSE
db50 192.1 TMP_95_300_PFE_F02_02 BOOL FALSE
db50 192.2 s206 BOOL FALSE
db50 192.3 s2061 BOOL FALSE
db50 192.4 S2022 BOOL FALSE
db50 192.5 S2023 BOOL FALSE
db50 192.6 S2024 BOOL FALSE
db50 192.7 S2025 BOOL FALSE
db50 192.4 PS_ABI_TMP300_PFE_F01_01 BOOL FALSE Alimentatore ABI
db50 192.5 PS_ABI_TMP80_PFE_F01_01 BOOL FALSE Alimentatore ABI
db50 192.6 PS_ABI_TMP500_PFE_F01_01 BOOL FALSE Alimentatore ABI
db50 192.7 PS_ABI_TMP500_PFE_F01_02 BOOL FALSE Alimentatore ABI
db50 193.0 TMP_40_300_PFE_F01_01 BOOL FALSE
db50 193.1 TMP_40_80_PFE_F01_01 BOOL FALSE
db50 193.2 TMP_40_500_PFE_F01_01 BOOL FALSE
......@@ -1350,10 +1350,10 @@ db50 195.0 TMP_40_80_PFE_F02_03 BOOL FALSE
db50 195.1 TMP_40_300_PFE_F02_02 BOOL FALSE
db50 195.2 S2092 BOOL FALSE
db50 195.3 S2093 BOOL FALSE
db50 195.4 S2094 BOOL FALSE
db50 195.5 S2095 BOOL FALSE
db50 195.6 S2096 BOOL FALSE
db50 195.7 S2097 BOOL FALSE
db50 195.4 PS_ABI_TMP300_PFE_F02_01 BOOL FALSE Alimentatore ABI
db50 195.5 PS_ABI_TMP80_PFE_F02_01 BOOL FALSE Alimentatore ABI
db50 195.6 PS_ABI_TMP500_PFE_F02_01 BOOL FALSE Alimentatore ABI
db50 195.7 PS_ABI_TMP500_PFE_F02_02 BOOL FALSE Alimentatore ABI
db50 196.0 COND200 BOOL FALSE
db50 196.1 COND201 BOOL FALSE
db50 196.2 COND202 BOOL FALSE
......@@ -2121,15 +2121,15 @@ db53 12.7 FCCVLV_PFE_F01_06 BOOL FALSE
db53 13.0 FS_PFE_F01_01 BOOL FALSE
db53 13.1 FCO_SH_PFE_F01_01 BOOL FALSE
db53 13.2 FCC_SH_PFE_F01_01 BOOL FALSE
db53N 13.3 S32 BOOL FALSE
db53N 13.4 s12721 BOOL FALSE
db53N 13.5 s1273 BOOL FALSE
db53N 13.6 s1275 BOOL FALSE
db53 13.3 PS_OK_TMP300_PFE_F01_01 BOOL FALSE Alimentatore ON
db53 13.4 PS_OK_TMP80_PFE_F01_01 BOOL FALSE Alimentatore ON
db53N 13.5 s135 BOOL FALSE
db53N 13.6 s136 BOOL FALSE
db53N 13.7 SP137 BOOL FALSE
db53 14.0 VAC_AL_SIP55_MBDFEL01_08 BOOL FALSE I da Q53_0 INTCK UH
db53 14.1 COND_99a107_OK BOOL FALSE I da Q53_1 INTCK UH
db53N 14.2 s142 BOOL FALSE
db53N 14.3 s1431 BOOL FALSE
db53 14.2 PS_OK_TMP500_PFE_F01_01 BOOL FALSE Alimentatore ON
db53 14.3 PS_OK_TMP500_PFE_F01_02 BOOL FALSE Alimentatore ON
db53N 14.4 s1441 BOOL FALSE
db53N 14.5 s145 BOOL FALSE
db53 14.6 Ready_VGSRG_PFE_F01_01 BOOL FALSE
......@@ -2447,10 +2447,10 @@ db53N 53.5 S721 BOOL FALSE
db53N 53.6 S1621 BOOL FALSE da Q53.2 di UH
db53N 53.7 S2521 BOOL FALSE da Q53.3 di UH
db53 54.0 VGSRG_PFE_F02_011 BOOL FALSE
db53N 54.1 S5411 BOOL FALSE
db53N 54.2 S5421 BOOL FALSE
db53N 54.3 S5431 BOOL FALSE
db53N 54.4 S5441 BOOL FALSE
db53 54.1 PS_OK_TMP300_PFE_F02_01 BOOL FALSE Alimentatore ON
db53 54.2 PS_OK_TMP80_PFE_F02_01 BOOL FALSE Alimentatore ON
db53 54.3 PS_OK_TMP500_PFE_F02_01 BOOL FALSE Alimentatore ON
db53 54.4 PS_OK_TMP500_PFE_F02_02 BOOL FALSE Alimentatore ON
db53N 54.5 S5451 BOOL FALSE
db53N 54.6 S5461 BOOL FALSE
db53 54.7 OPERATION_PFE_F02_011 BOOL FALSE interruttore a chiave c_c_ = operation (scatoletta)
......@@ -3419,10 +3419,10 @@ db53 192.0 TMP_95_80_PFE_F02_03 BOOL FALSE
db53 192.1 TMP_95_300_PFE_F02_02 BOOL FALSE
db53N 192.2 s206 BOOL FALSE
db53N 192.3 s2061 BOOL FALSE
db53N 192.4 S2022 BOOL FALSE
db53N 192.5 S2023 BOOL FALSE
db53N 192.6 S2024 BOOL FALSE
db53N 192.7 S2025 BOOL FALSE
db53 192.4 PS_ABI_TMP300_PFE_F01_01 BOOL FALSE Alimentatore ABI
db53 192.5 PS_ABI_TMP80_PFE_F01_01 BOOL FALSE Alimentatore ABI
db53 192.6 PS_ABI_TMP500_PFE_F01_01 BOOL FALSE Alimentatore ABI
db53 192.7 PS_ABI_TMP500_PFE_F01_02 BOOL FALSE Alimentatore ABI
db53 193.0 TMP_40_300_PFE_F01_01 BOOL FALSE
db53 193.1 TMP_40_80_PFE_F01_01 BOOL FALSE
db53 193.2 TMP_40_500_PFE_F01_01 BOOL FALSE
......@@ -3443,10 +3443,10 @@ db53 195.0 TMP_40_80_PFE_F02_03 BOOL FALSE
db53 195.1 TMP_40_300_PFE_F02_02 BOOL FALSE
db53N 195.2 S2092 BOOL FALSE
db53N 195.3 S2093 BOOL FALSE
db53N 195.4 S2094 BOOL FALSE
db53N 195.5 S2095 BOOL FALSE
db53N 195.6 S2096 BOOL FALSE
db53N 195.7 S2097 BOOL FALSE
db53 195.4 PS_ABI_TMP300_PFE_F02_01 BOOL FALSE Alimentatore ABI
db53 195.5 PS_ABI_TMP80_PFE_F02_01 BOOL FALSE Alimentatore ABI
db53 195.6 PS_ABI_TMP500_PFE_F02_01 BOOL FALSE Alimentatore ABI
db53 195.7 PS_ABI_TMP500_PFE_F02_02 BOOL FALSE Alimentatore ABI
db53N 196.0 COND200 BOOL FALSE
db53N 196.1 COND201 BOOL FALSE
db53N 196.2 COND202 BOOL FALSE
......
src/PLCesall.cpp
View file @ ea4a8a42
......@@ -757,8 +757,8 @@ void PLCesall::send_cmd(const Tango::DevVarShortArray *argin)
DEBUG_STREAM<<"cmd "<<argin->length()<< " code: "<<(*argin)[0]<<endl;
memset(&prepared_cmd, 0, sizeof(intlck_cmd));
// prepared_cmd.actDB = 0;
int code = (*argin)[0];
int parm;
uint16_t code = (uint16_t)(*argin)[0];
uint16_t parm;
int16_t val;
switch(code){
case ECHO_MESG_STAT_SYS_CMD:
......@@ -792,10 +792,10 @@ void PLCesall::send_cmd(const Tango::DevVarShortArray *argin)
DEBUG_STREAM<<"PLCesall::send_cmd(): sending cmd opn-cls: "<<code<<" arg: "<<(*argin)[1] <<endl;
memset(&prepared_cmd, 0, sizeof(intlck_cmd));
prepared_cmd.actDB = code;
parm = (*argin)[1];
parm = (uint16_t)(*argin)[1];
if((parm<CMD_OPN_VLV_PFE_F0102_01) || (parm>MAX_COMMAND))
{
DEBUG_STREAM <<"PLCvacll::send_cmd(): wrong parameter "<<parm<<endl;
DEBUG_STREAM <<"PLCvacll::send_cmd(): wrong parameter "<<parm<< " out of range ["<<CMD_OPN_VLV_PFE_F0102_01<<","<<MAX_COMMAND<<"]" << endl;
}
else{
DEBUG_STREAM<<"PLCvacll::send_cmd(): ----sending block "<<blkcodes[parm]<<" mask 0x"<<hex<<maskcodes[parm]<<dec<<endl;
......
src/PLCesall.h
View file @ ea4a8a42
......@@ -339,7 +339,16 @@
#define CMD_SET_CCD_POS_TMRA_03 138 //SET CCD_POS_TMRA_03
#define CMD_UNSET_CCD_POS_TMRA_03 139 //UNSET CCD_POS_TMRA_03
#define MAX_COMMAND CMD_UNSET_CCD_POS_TMRA_03
#define CMD_ABI_TMP300_PFE_F01_01 140 //CMD_ABI_TMP300_PFE_F02_01
#define CMD_NOTABI_TMP300_PFE_F01_01 141 //CMD_NOTABI_TMP300_PFE_F02_01
#define CMD_ABI_TMP80_PFE_F01_01 142 //CMD_ABI_TMP80_PFE_F02_01
#define CMD_NOTABI_TMP80_PFE_F01_01 143 //CMD_NOTABI_TMP80_PFE_F02_01
#define CMD_ABI_TMP500_PFE_F01_01 144 //CMD_ABI_TMP500_PFE_F02_01
#define CMD_NOTABI_TMP500_PFE_F01_01 145 //CMD_NOTABI_TMP500_PFE_F02_01
#define CMD_ABI_TMP500_PFE_F01_02 146 //CMD_ABI_TMP500_PFE_F02_02
#define CMD_NOTABI_TMP500_PFE_F01_02 147 //CMD_NOTABI_TMP500_PFE_F02_02
#define MAX_COMMAND CMD_NOTABI_TMP500_PFE_F01_02
static int blkcodes[] = { //byte offset from actDB
......@@ -349,8 +358,8 @@ static int blkcodes[] = { //byte offset from actDB
6, //START_PPM1_PFE_FEL12_04 3
6, //START_PPM1_PFE_FEL12_05 4
6, //START_PPM1_PFE_FEL12_06 5
6, //START_PPM1_PFE_FEL12_07 6
6, //START_PPM1_PFE_FEL12_08 7
6, //START_PPM1_PFE_FEL12_07 6 //con 303 CMD_ABI_TMP300_PFE_F01_01 con 404 CMD_ABI_TMP300_PFE_F02_01
6, //START_PPM1_PFE_FEL12_08 7 //con 303 CMD_NOTABI_TMP300_PFE_F01_01 con 404 CMD_NOTABI_TMP300_PFE_F02_01
8, //CMD_OPN_VLV_PFE_F0102_01 8 //CMD_OPN_VLV_POS_03
8, //CMD_CLD_VLV_PFE_F0102_01 9 //CMD_CLD_VLV_POS_03
8, //CMD_OPN_VLV_PFE_F0102_02 10 //CMD_OPN_VLV_POS_04
......@@ -482,7 +491,15 @@ static int blkcodes[] = { //byte offset from actDB
17, // 136 ///con 707 SET CCD_POS_TMRA_01
17, // 137 ///con 707 UNSET CCD_POS_TMRA_01
17, // 138 ///con 707 SET CCD_POS_TMRA_03
17 // 139 ///con 707 UNSET CCD_POS_TMRA_03
17, // 139 ///con 707 UNSET CCD_POS_TMRA_03
6, // 140 //con 303 CMD_ABI_TMP300_PFE_F01_01 /con 404 CMD_ABI_TMP300_PFE_F02_01 //8.6
6, // 141 //con 303 CMD_NOTABI_TMP300_PFE_F01_01 /con 404 CMD_NOTABI_TMP300_PFE_F02_01 //8.7
7, // 142 //con 303 CMD_ABI_TMP80_PFE_F01_01 /con 404 CMD_ABI_TMP80_PFE_F02_01 //9.0
7, // 143 //con 303 CMD_NOTABI_TMP80_PFE_F01_01 /con 404 CMD_NOTABI_TMP80_PFE_F02_01 //9.1
7, // 144 //con 303 CMD_ABI_TMP500_PFE_F01_01 /con 404 CMD_ABI_TMP500_PFE_F02_01 //9.2
7, // 145 //con 303 CMD_NOTABI_TMP500_PFE_F01_01 /con 404 CMD_NOTABI_TMP500_PFE_F02_01 //9.3
7, // 146 //con 303 CMD_ABI_TMP500_PFE_F01_02 /con 404 CMD_ABI_TMP500_PFE_F02_02 //9.4
7 // 147 //con 303 CMD_NOTABI_TMP500_PFE_F01_02 /con 404 CMD_NOTABI_TMP500_PFE_F02_02 //9.5
};
static u_int maskcodes[] = {
......@@ -492,8 +509,8 @@ static u_int maskcodes[] = {
0x08, //START_PPM1_PFE_FEL12_04 3
0x10, //START_PPM1_PFE_FEL12_05 4
0x20, //START_PPM1_PFE_FEL12_06 5
0x40, //START_PPM1_PFE_FEL12_07 6
0x80, //START_PPM1_PFE_FEL12_08 7
0x40, //START_PPM1_PFE_FEL12_07 6 //con 303 CMD_ABI_TMP300_PFE_F01_01
0x80, //START_PPM1_PFE_FEL12_08 7 //con 303 CMD_NOTABI_TMP300_PFE_F01_01
0x01, //CMD_OPN_VLV_PFE_F0102_01 8 //CMD_OPN_VLV_POS_03
0x02, //CMD_CLD_VLV_PFE_F0102_01 9 //CMD_CLD_VLV_POS_03
0x04, //CMD_OPN_VLV_PFE_F0102_02 10 //CMD_OPN_VLV_POS_04
......@@ -625,7 +642,15 @@ static u_int maskcodes[] = {
0x00, // 136 ///con 707 SET CCD_POS_TMRA_01
0x01, // 137 ///con 707 UNSET CCD_POS_TMRA_01
0x02, // 138 ///con 707 SET CCD_POS_TMRA_03
0x04 // 139 ///con 707 UNSET CCD_POS_TMRA_03
0x04, // 139 ///con 707 UNSET CCD_POS_TMRA_03
0x40, // 140 //con 303 CMD_ABI_TMP300_PFE_F01_01 /con 404 CMD_ABI_TMP300_PFE_F02_01 //8.6
0x80, // 141 //con 303 CMD_NOTABI_TMP300_PFE_F01_01 /con 404 CMD_NOTABI_TMP300_PFE_F02_01 //8.7
0x01, // 142 //con 303 CMD_ABI_TMP80_PFE_F01_01 /con 404 CMD_ABI_TMP80_PFE_F02_01 //9.0
0x02, // 143 //con 303 CMD_NOTABI_TMP80_PFE_F01_01 /con 404 CMD_NOTABI_TMP80_PFE_F02_01 //9.1
0x04, // 144 //con 303 CMD_ABI_TMP500_PFE_F01_01 /con 404 CMD_ABI_TMP500_PFE_F02_01 //9.2
0x08, // 145 //con 303 CMD_NOTABI_TMP500_PFE_F01_01 /con 404 CMD_NOTABI_TMP500_PFE_F02_01 //9.3
0x10, // 146 //con 303 CMD_ABI_TMP500_PFE_F01_02 /con 404 CMD_ABI_TMP500_PFE_F02_02 //9.4
0x20 // 147 //con 303 CMD_NOTABI_TMP500_PFE_F01_02 /con 404 CMD_NOTABI_TMP500_PFE_F02_02 //9.5
};
static const char *cmd_names[][FELCMDCODES] = {
......@@ -768,7 +793,15 @@ static const char *cmd_names[][FELCMDCODES] = {
{"","","CMD_SET_CCD_POS_TMRA_01","",""}, //136
{"","","CMD_UNSET_CCD_POS_TMRA_01","",""}, //137
{"","","CMD_SET_CCD_POS_TMRA_03","",""}, //138
{"","","CMD_UNSET_CCD_POS_TMRA_03","",""} //139
{"","","CMD_UNSET_CCD_POS_TMRA_03","",""}, //139
{"CMD_ABI_TMP300_PFE_F01_01","CMD_ABI_TMP300_PFE_F02_01","","",""}, //140
{"CMD_NOTABI_TMP300_PFE_F01_01","CMD_NOTABI_TMP300_PFE_F02_01","","",""}, //141
{"CMD_ABI_TMP80_PFE_F01_01","CMD_ABI_TMP80_PFE_F02_01","","",""}, //142
{"CMD_NOTABI_TMP80_PFE_F01_01","CMD_NOTABI_TMP80_PFE_F02_01","","",""}, //143
{"CMD_ABI_TMP500_PFE_F01_01","CMD_ABI_TMP500_PFE_F02_01","","",""}, //144
{"CMD_NOTABI_TMP500_PFE_F01_01","CMD_NOTABI_TMP500_PFE_F02_01","","",""}, //145
{"CMD_ABI_TMP500_PFE_F01_02","CMD_ABI_TMP500_PFE_F02_02","","",""}, //146
{"CMD_NOTABI_TMP500_PFE_F01_02","CMD_NOTABI_TMP500_PFE_F02_02","","",""} //147
};
static const char *cmd_comments[][FELCMDCODES] = {
......@@ -911,7 +944,15 @@ static const char *cmd_comments[][FELCMDCODES] = {
{"","","SET CCD_POS_TMRA_01","",""}, //136
{"","","UNSET CCD_POS_TMRA_01","",""}, //137
{"","","SET CCD_POS_TMRA_03","",""}, //138
{"","","UNSET CCD_POS_TMRA_03","",""} //139
{"","","UNSET CCD_POS_TMRA_03","",""}, //139
{"CMD ABI TMP300_PFE_F01_01 (ON)","CMD ABI TMP300_PFE_F02_01 (ON)","","",""}, //140
{"CMD NOTABI TMP300_PFE_F01_01 (OFF)","CMD NOTABI TMP300_PFE_F02_01 (OFF)","","",""}, //141
{"CMD ABI TMP80_PFE_F01_01 (ON)","CMD ABI TMP80_PFE_F02_01 (ON)","","",""}, //142
{"CMD NOTABI TMP80_PFE_F01_01 (OFF)","CMD NOTABI TMP80_PFE_F02_01 (OFF)","","",""}, //143
{"CMD ABI TMP500_PFE_F01_01 (ON)","CMD ABI TMP500_PFE_F02_01 (ON)","","",""}, //144
{"CMD NOTABI TMP500_PFE_F01_01 (OFF)","CMD NOTABI TMP500_PFE_F02_01 (OFF)","","",""}, //145
{"CMD ABI TMP500_PFE_F01_02 (ON)","CMD ABI TMP500_PFE_F02_02 (ON)","","",""}, //146
{"CMD NOTABI TMP500_PFE_F01_02 (OFF)","CMD NOTABI TMP500_PFE_F02_02 (OFF)","","",""} //147
};
static int felcodes[] = {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment