This commit is contained in:
Ferrari Martino Giordano
2024-07-25 17:29:20 +02:00
parent 4a9ea7db6d
commit 3c9b4e3161
2 changed files with 247 additions and 6472 deletions
File diff suppressed because it is too large Load Diff
+247 -58
View File
@@ -989,16 +989,16 @@
"GB_GCPS_Amplitude_Max_Delta_Read": {
"Type": "float32"
},
"GA_BPS_Voltage_SP_Read": {
"GA_ABPS_BPS_Voltage_SP_Read": {
"Type": "float32"
},
"GA_APS_Voltage_SP_Read": {
"GA_ABPS_APS_Voltage_SP_Read": {
"Type": "float32"
},
"GB_BPS_Voltage_SP_Read": {
"GB_ABPS_BPS_Voltage_SP_Read": {
"Type": "float32"
},
"GB_APS_Voltage_SP_Read": {
"GB_ABPS_APS_Voltage_SP_Read": {
"Type": "float32"
},
"ACK_GCOM_FCT_ABORT_CMD": {
@@ -1459,16 +1459,16 @@
"GB_GCPS_Amplitude_Max_Delta": {
"Type": "float32"
},
"GA_BPS_Voltage_SP": {
"GA_ABPS_BPS_Voltage_SP": {
"Type": "float32"
},
"GA_APS_Voltage_SP": {
"GA_ABPS_APS_Voltage_SP": {
"Type": "float32"
},
"GB_BPS_Voltage_SP": {
"GB_ABPS_BPS_Voltage_SP": {
"Type": "float32"
},
"GB_APS_Voltage_SP": {
"GB_ABPS_APS_Voltage_SP": {
"Type": "float32"
},
"GCOM_HVPS_Voltage_SP": {
@@ -1875,6 +1875,9 @@
"MHVPS_OC": {
"Type": "uint8"
},
"SDNAbsTime": {
"Type": "uint64"
},
"OSMState": {
"Type": "uint8"
},
@@ -1917,6 +1920,9 @@
"PendingSegChange": {
"Type": "uint32"
},
"LOAD_DONE": {
"Type": "uint8"
},
"GA_CCPS_Config_Status": {
"Type": "uint8"
},
@@ -1952,7 +1958,10 @@
"Type": "uint8",
"NumberOfElements": 6
},
"LOAD_DONE": {
"SimTime": {
"Type": "float32"
},
"ACK_GA_FHPS_CONFIG_SEQ_CMD": {
"Type": "uint8"
},
"GB_CCPS_Operation_Pending": {
@@ -2251,16 +2260,16 @@
"GB_GCPS_Sweep_Rate": {
"Type": "float32"
},
"GA_BPS_Voltage_SP": {
"GA_ABPS_BPS_Voltage_SP": {
"Type": "float32"
},
"GA_APS_Voltage_SP": {
"GA_ABPS_APS_Voltage_SP": {
"Type": "float32"
},
"GB_BPS_Voltage_SP": {
"GB_ABPS_BPS_Voltage_SP": {
"Type": "float32"
},
"GB_APS_Voltage_SP": {
"GB_ABPS_APS_Voltage_SP": {
"Type": "float32"
},
"GCOM_HVPS_Voltage_SP": {
@@ -2368,6 +2377,24 @@
"GA_CCPS_CONFIG_SEQ_STAT": {
"Type": "uint8"
},
"GA_FHPS_CONF_CMD": {
"Type": "uint8"
},
"GA_FHPS_CONF_STAT": {
"Type": "uint8"
},
"GA_FHPS_AC_V_IN": {
"Type": "float32"
},
"GA_FHPS_AC_V_INT": {
"Type": "float32"
},
"GA_FHPS_AC_V_OUT": {
"Type": "float32"
},
"GA_FHPS_ACK": {
"Type": "uint8"
},
"ShotTime": {
"Type": "uint32",
"Ignore": 1
@@ -3481,19 +3508,19 @@
"DataSource": "PLCSDNSub",
"Type": "float32"
},
"GA_BPS_Voltage_SP": {
"GA_ABPS_BPS_Voltage_SP": {
"DataSource": "PLCSDNSub",
"Type": "float32"
},
"GA_APS_Voltage_SP": {
"GA_ABPS_APS_Voltage_SP": {
"DataSource": "PLCSDNSub",
"Type": "float32"
},
"GB_BPS_Voltage_SP": {
"GB_ABPS_BPS_Voltage_SP": {
"DataSource": "PLCSDNSub",
"Type": "float32"
},
"GB_APS_Voltage_SP": {
"GB_ABPS_APS_Voltage_SP": {
"DataSource": "PLCSDNSub",
"Type": "float32"
},
@@ -3831,19 +3858,19 @@
"DataSource": "ConfActualDB",
"Type": "float32"
},
"GA_BPS_Voltage_SP": {
"GA_ABPS_BPS_Voltage_SP": {
"DataSource": "ConfActualDB",
"Type": "float32"
},
"GA_APS_Voltage_SP": {
"GA_ABPS_APS_Voltage_SP": {
"DataSource": "ConfActualDB",
"Type": "float32"
},
"GB_BPS_Voltage_SP": {
"GB_ABPS_BPS_Voltage_SP": {
"DataSource": "ConfActualDB",
"Type": "float32"
},
"GB_APS_Voltage_SP": {
"GB_ABPS_APS_Voltage_SP": {
"DataSource": "ConfActualDB",
"Type": "float32"
},
@@ -4580,44 +4607,44 @@
"Alias": "GB_GCPS_Sweep_Rate",
"Type": "float32"
},
"GA_BPS_Voltage_SP_a": {
"Alias": "GA_BPS_Voltage_SP",
"GA_ABPS_BPS_Voltage_SP_a": {
"Alias": "GA_ABPS_BPS_Voltage_SP",
"DataSource": "PLCSDNSub",
"Type": "float32"
},
"GA_BPS_Voltage_SP_b": {
"GA_ABPS_BPS_Voltage_SP_b": {
"DataSource": "ConfActualDB",
"Alias": "GA_BPS_Voltage_SP",
"Alias": "GA_ABPS_BPS_Voltage_SP",
"Type": "float32"
},
"GA_APS_Voltage_SP_a": {
"Alias": "GA_APS_Voltage_SP",
"GA_ABPS_APS_Voltage_SP_a": {
"Alias": "GA_ABPS_APS_Voltage_SP",
"DataSource": "PLCSDNSub",
"Type": "float32"
},
"GA_APS_Voltage_SP_b": {
"GA_ABPS_APS_Voltage_SP_b": {
"DataSource": "ConfActualDB",
"Alias": "GA_APS_Voltage_SP",
"Alias": "GA_ABPS_APS_Voltage_SP",
"Type": "float32"
},
"GB_BPS_Voltage_SP_a": {
"Alias": "GB_BPS_Voltage_SP",
"GB_ABPS_BPS_Voltage_SP_a": {
"Alias": "GB_ABPS_BPS_Voltage_SP",
"DataSource": "PLCSDNSub",
"Type": "float32"
},
"GB_BPS_Voltage_SP_b": {
"GB_ABPS_BPS_Voltage_SP_b": {
"DataSource": "ConfActualDB",
"Alias": "GB_BPS_Voltage_SP",
"Alias": "GB_ABPS_BPS_Voltage_SP",
"Type": "float32"
},
"GB_APS_Voltage_SP_a": {
"Alias": "GB_APS_Voltage_SP",
"GB_ABPS_APS_Voltage_SP_a": {
"Alias": "GB_ABPS_APS_Voltage_SP",
"DataSource": "PLCSDNSub",
"Type": "float32"
},
"GB_APS_Voltage_SP_b": {
"GB_ABPS_APS_Voltage_SP_b": {
"DataSource": "ConfActualDB",
"Alias": "GB_APS_Voltage_SP",
"Alias": "GB_ABPS_APS_Voltage_SP",
"Type": "float32"
},
"GCOM_HVPS_Voltage_SP_a": {
@@ -5561,7 +5588,7 @@
"Alias": "ACK_GA_FHPS_RAMP_CMD"
},
"ACK_GA_FHPS_CONFIG_SEQ_CMD": {
"DataSource": "PLCSDNPub",
"DataSource": "DDB1",
"Type": "uint8",
"Alias": "ACK_GA_FHPS_CONFIG_SEQ_CMD"
},
@@ -6064,6 +6091,48 @@
}
}
},
"+SDNTimeGAM": {
"Class": "IOGAM",
"InputSignals": {
"Time": {
"NumberOfElements": 48,
"Range": [
[
32,
39
]
],
"DataSource": "PLCSDNSub",
"Type": "uint8",
"Alias": "Header"
}
},
"OutputSignals": {
"Time": {
"DataSource": "DDB1",
"Type": "uint64",
"Alias": "SDNAbsTime"
}
}
},
"+SimTimeGAM": {
"Class": "ConversionGAM",
"InputSignals": {
"Time": {
"DataSource": "DDB1",
"Type": "uint64",
"Alias": "SDNAbsTime"
}
},
"OutputSignals": {
"Time": {
"Gain": 1e-06,
"DataSource": "DDB1",
"Type": "float32",
"Alias": "SimTime"
}
}
},
"+ReferenceGAM": {
"Class": "ConstantGAM",
"OutputSignals": {
@@ -6447,8 +6516,8 @@
"Expression": "cpsA_On = (uint8)((Mode == (uint8)1) || (Mode == (uint8)3));\ncpsB_On = (uint8)((Mode == (uint8)2) || (Mode == (uint8)3));"
},
"+FHPSAOnGAM": {
"Class": "ChaiGAM",
"Code": "fun() {\n\tif (State == 105) { \n\t\tCommand = 3; \n\t} else if (APSSwitch == 3){ \n\t\tCommand = 1; \n\t} else { \n\t\tCommand = 0; \n\t} \n}",
"Class": "LuaGAM",
"Code": "function gam() \n\tif (State == 105) then \n\t\tCommand = 3 \n\telseif (APSSwitch == 3) then \n\t\tCommand = 1 \n\telse \n\t\tCommand = 0 \n\tend \nend",
"InputSignals": {
"State": {
"Type": "uint8",
@@ -6470,8 +6539,8 @@
}
},
"+FHPSBOnGAM": {
"Class": "ChaiGAM",
"Code": "fun() {\n\tif (State == 105) { \n\t\tCommand = 3; \n\t} else if (APSSwitch == 3){ \n\t\tCommand = 1; \n\t} else { \n\t\tCommand = 0; \n\t} \n}",
"Class": "LuaGAM",
"Code": "function gam() \n\tif (State == 105) then \n\t\tCommand = 3 \n\telseif (APSSwitch == 3) then \n\t\tCommand = 1 \n\telse \n\t\tCommand = 0 \n\tend \nend",
"InputSignals": {
"State": {
"Type": "uint8",
@@ -6575,10 +6644,40 @@
"Type": "uint8",
"Alias": "GA_CCPS_Config_Status"
},
"GA_FHPS_CONF_CMD": {
"DataSource": "PLCSDNSub",
"Type": "uint8",
"Alias": "GA_FHPS_CONFIG_SEQ_CMD"
},
"GA_FHPS_V_IN": {
"DataSource": "PLCSDNSub",
"Type": "float32",
"Alias": "GA_FHPS_AC_Voltage"
},
"GA_FHPS_V_INT": {
"DataSource": "ConfActualDB",
"Type": "float32",
"Alias": "GA_FHPS_AC_Voltage"
},
"GA_FHPS_V_OUT": {
"DataSource": "GA_FHPS",
"Type": "float32",
"Alias": "AC_Voltage_Read"
},
"GA_FHPS_ACK": {
"DataSource": "DDB1",
"Type": "uint8",
"Alias": "ACK_GA_FHPS_CONFIG_SEQ_CMD"
},
"ShotTime": {
"DataSource": "ABDB",
"Type": "uint32",
"Alias": "ShotTime"
},
"ACK": {
"DataSource": "DDB1",
"Type": "uint8",
"Alias": "ACK_GA_FHPS_CONFIG_SEQ_CMD"
}
},
"OutputSignals": {
@@ -6662,10 +6761,40 @@
"Type": "uint8",
"Alias": "GA_CCPS_CONFIG_SEQ_STAT"
},
"GA_FHPS_CONF_CMD": {
"DataSource": "Logger",
"Type": "uint8",
"Alias": "GA_FHPS_CONF_CMD"
},
"GA_FHPS_V_IN": {
"DataSource": "Logger",
"Type": "float32",
"Alias": "GA_FHPS_AC_V_IN"
},
"GA_FHPS_V_INT": {
"DataSource": "Logger",
"Type": "float32",
"Alias": "GA_FHPS_AC_V_INT"
},
"GA_FHPS_V_OUT": {
"DataSource": "Logger",
"Type": "float32",
"Alias": "GA_FHPS_AC_V_OUT"
},
"GA_FHPS_ACK": {
"DataSource": "Logger",
"Type": "uint8",
"Alias": "GA_FHPS_ACK"
},
"ShotTime": {
"DataSource": "Logger",
"Type": "uint32",
"Alias": "ShotTime"
},
"ACK": {
"DataSource": "PLCSDNPub",
"Type": "uint8",
"Alias": "ACK_GA_FHPS_CONFIG_SEQ_CMD"
}
}
},
@@ -8374,25 +8503,25 @@
"Type": "float32",
"Alias": "GB_GCPS_Amplitude_Max_Delta"
},
"GA_APS_Voltage_SP": {
"GA_ABPS_APS_Voltage_SP": {
"DataSource": "ConfActualDB",
"Type": "float32",
"Alias": "GA_APS_Voltage_SP"
"Alias": "GA_ABPS_APS_Voltage_SP"
},
"GB_APS_Voltage_SP": {
"GB_ABPS_APS_Voltage_SP": {
"DataSource": "ConfActualDB",
"Type": "float32",
"Alias": "GB_APS_Voltage_SP"
"Alias": "GB_ABPS_APS_Voltage_SP"
},
"GA_BPS_Voltage_SP": {
"GA_ABPS_BPS_Voltage_SP": {
"DataSource": "ConfActualDB",
"Type": "float32",
"Alias": "GA_BPS_Voltage_SP"
"Alias": "GA_ABPS_BPS_Voltage_SP"
},
"GB_BPS_Voltage_SP": {
"GB_ABPS_BPS_Voltage_SP": {
"DataSource": "ConfActualDB",
"Type": "float32",
"Alias": "GB_BPS_Voltage_SP"
"Alias": "GB_ABPS_BPS_Voltage_SP"
}
},
"OutputSignals": {
@@ -8456,25 +8585,25 @@
"Type": "float32",
"Alias": "GB_GCPS_Amplitude_Max_Delta_Read"
},
"GA_APS_Voltage_SP_Read": {
"GA_ABPS_APS_Voltage_SP_Read": {
"DataSource": "PLCSDNPub",
"Type": "float32",
"Alias": "GA_APS_Voltage_SP_Read"
"Alias": "GA_ABPS_APS_Voltage_SP_Read"
},
"GB_APS_Voltage_SP_Read": {
"GB_ABPS_APS_Voltage_SP_Read": {
"DataSource": "PLCSDNPub",
"Type": "float32",
"Alias": "GB_APS_Voltage_SP_Read"
"Alias": "GB_ABPS_APS_Voltage_SP_Read"
},
"GA_BPS_Voltage_SP_Read": {
"GA_ABPS_BPS_Voltage_SP_Read": {
"DataSource": "PLCSDNPub",
"Type": "float32",
"Alias": "GA_BPS_Voltage_SP_Read"
"Alias": "GA_ABPS_BPS_Voltage_SP_Read"
},
"GB_BPS_Voltage_SP_Read": {
"GB_ABPS_BPS_Voltage_SP_Read": {
"DataSource": "PLCSDNPub",
"Type": "float32",
"Alias": "GB_BPS_Voltage_SP_Read"
"Alias": "GB_ABPS_BPS_Voltage_SP_Read"
}
}
},
@@ -8807,6 +8936,54 @@
}
}
},
"+SimMCPS_A_GAM": {
"Class": "LuaGAM",
"Code": "last_time = 0\nfunction gam() \n\tif hold_cmd == 1 then \n\t\tramp_done = 0\n\t\tstate = 0\n\tif ramp_cmd == 1 then\n\t\tlast_time = time\n\t\tramp_done = 0\n\t\tstate = 1\n\telif ramp_cmd == 2 then\n\t\tlast_time = time\n\t\tramp_done = 0 \n\t\tstate = 2\n\tend\n\tif state == 2 then\n\t\tlocal dt = time - last_time -- ms?\n\t\tcurrent = current - (sweep_rate/60000.0) * dt\n\t\tif current_rb <= current_sp then\n\t\t\t-- current = current_sp\n\t\t\tstate = 4\n\t\t\tramp_done = 2\n\t\tend \n\telseif state == 1 then\n\t\tlocal dt = time - last_time -- ms?\n\t\tcurrent = current + (sweep_rate/60000.0) * dt\n\t\tif current >= current_sp then\n\t\t\t-- current_rb = current_sp\n\t\t\tstate = 3\n\t\t\tramp_done = 1\n\t\tend \n\tend\n\tlast_time = time\nend",
"InputSignals": {
"ramp_cmd": {
"Type": "uint8",
"DataSource": "PLCSDNSub",
"Alias": "GA_MCPS_RAMP_CMD"
},
"hold_cmd": {
"Type": "uint8",
"DataSource": "PLCSDNSub",
"Alias": "GA_MCPS_HOLD_CMD"
},
"current_sp": {
"Type": "float32",
"DataSource": "ConfActualDB",
"Alias": "GA_MCPS_Current"
},
"sweep_rate": {
"Type": "float32",
"DataSource": "ConfActualDB",
"Alias": "GA_MCPS_Sweep_Rate"
},
"time_ms": {
"Type": "float32",
"DataSource": "DDB1",
"Alias": "SimTime"
}
},
"OutputSignals": {
"state": {
"Type": "uint8",
"DataSource": "PLCSDNPub",
"Alias": "GA_MCPS_STAT"
},
"ramp_done": {
"Type": "uint8",
"DataSource": "PLCSDNPub",
"Alias": "GA_MCPS_RAMP_DONE"
},
"current": {
"Type": "float32",
"DataSource": "PLCSDNPub",
"Alias": "GA_MCPS_Current"
}
}
},
"+LogWFGAM": {
"Class": "IOGAM",
"InputSignals": {
@@ -9072,6 +9249,9 @@
"StatePublisherGAM",
"SegMessageGAM",
"SegStateGAM",
"SDNTimeGAM",
"SimTimeGAM",
"SimMCPS_A_GAM",
"EpicsLogGAM",
"LoggerGAM"
]
@@ -9157,6 +9337,9 @@
"PLCReadBackPubGAM",
"StatePublisherGAM",
"SegStateGAM",
"SDNTimeGAM",
"SimTimeGAM",
"SimMCPS_A_GAM",
"EpicsLogGAM",
"LoggerGAM"
]
@@ -9267,6 +9450,9 @@
"PLCReadBackPubGAM",
"StatePublisherGAM",
"SegStateGAM",
"SDNTimeGAM",
"SimTimeGAM",
"SimMCPS_A_GAM",
"EpicsLogGAM",
"LoggerGAM"
]
@@ -9374,6 +9560,9 @@
"PLCReadBackPubGAM",
"StatePublisherGAM",
"SegStateGAM",
"SDNTimeGAM",
"SimTimeGAM",
"SimMCPS_A_GAM",
"EpicsLogGAM",
"LoggerGAM"
]