Skip to content
Snippets Groups Projects
Commit 75730d36 authored by Saeed Haghtalab's avatar Saeed Haghtalab
Browse files

Merge branch 'master' into 'master'

ICSHWI-17697: Add missing PVs from the TSGDS, CryoB and ACC ODHDS (ICSHWI-17695)

See merge request !163
parents 1fe9bd65 98b9859e
No related branches found
No related tags found
No related merge requests found
......@@ -2051,3 +2051,53 @@ KG-GTA:ODH-PLC-02:ModbusConnectedR
KG-GTA:ODH-PLC-02:S7ConnectedR
KG-GTA:ODH-PLC-02:ModVersionR
KG-GTA:ODH-PLC-02:PLCHashCorrectR
KG-GTA:ODH-PLC-01:ChecksumStd0_Conf
KG-GTA:ODH-PLC-01:ChecksumStd0_check
KG-GTA:ODH-PLC-01:ChecksumStd1_Conf
KG-GTA:ODH-PLC-01:ChecksumStd1_check
KG-GTA:ODH-PLC-01:ChecksumStd2_Conf
KG-GTA:ODH-PLC-01:ChecksumStd2_check
KG-GTA:ODH-PLC-01:ChecksumStd3_Conf
KG-GTA:ODH-PLC-01:ChecksumStd3_check
KG-GTA:ODH-PLC-01:ChecksumStd4_Conf
KG-GTA:ODH-PLC-01:ChecksumStd4_check
KG-GTA:ODH-PLC-01:ChecksumStd5_Conf
KG-GTA:ODH-PLC-01:ChecksumStd5_check
KG-GTA:ODH-PLC-01:ChecksumStd6_Conf
KG-GTA:ODH-PLC-01:ChecksumStd6_check
KG-GTA:ODH-PLC-01:ChecksumStd7_Conf
KG-GTA:ODH-PLC-01:ChecksumStd7_check
KG-GTA:ODH-PLC-01:ChecksumStd_check
KG-GTA:ODH-PLC-01:Checksum_Confirm
KG-GTA:ODH-PLC-01:Checksum_Ok
KG-GTA:ODH-PLC-02:ChecksumGW0_Conf
KG-GTA:ODH-PLC-02:ChecksumGW0_check
KG-GTA:ODH-PLC-02:ChecksumGW1_Conf
KG-GTA:ODH-PLC-02:ChecksumGW1_check
KG-GTA:ODH-PLC-02:ChecksumGW2_Conf
KG-GTA:ODH-PLC-02:ChecksumGW2_check
KG-GTA:ODH-PLC-02:ChecksumGW3_Conf
KG-GTA:ODH-PLC-02:ChecksumGW3_check
KG-GTA:ODH-PLC-02:ChecksumGW4_Conf
KG-GTA:ODH-PLC-02:ChecksumGW4_check
KG-GTA:ODH-PLC-02:ChecksumGW5_Conf
KG-GTA:ODH-PLC-02:ChecksumGW5_check
KG-GTA:ODH-PLC-02:ChecksumGW6_Conf
KG-GTA:ODH-PLC-02:ChecksumGW6_check
KG-GTA:ODH-PLC-02:ChecksumGW7_Conf
KG-GTA:ODH-PLC-02:ChecksumGW7_check
KG-GTA:ODH-PLC-02:ChecksumGW_check
KG-GTA:ODH-PLC-02:MBCommsHash
KG-GTA:ODH-PLC-02:ModbusAddr-RB
KG-GTA:ODH-PLC-02:PLCAddrS
KG-GTA:ODH-PLC-02:PLCFBranchR
KG-GTA:ODH-PLC-02:PLCFCommitR
KG-GTA:ODH-PLC-02:PLCFStatusR
KG-GTA:ODH-PLC-02:PLCFTimestampR
KG-GTA:ODH-PLC-02:S7Addr-RB
KG-GTA:ODH-PLC-02:S7CommsHash
KG-GTA:ODH-PLC-02:UploadParametersCmd
KG-GTA:ODH-PLC-02:UploadParametersS
KG-GTA:ODH-PLC-02:UploadStat-RB
KG-GTA:ODH-PLC-02:UploadStatR
KG-GTA:ODH-PLC-02:iCommsHashToPLC
......@@ -1601,3 +1601,70 @@ TgtGDS:Ctrl-CPU-001:Checksum_Ok
TgtGDS:Ctrl-CPU-001:ChecksumStd_check
TgtGDS:Ctrl-GCPU-001:ChecksumGW_check
TgtGDS:Ctrl-CPU-001:ChecksumFS_check
TgtGDS:Ctrl-CPU-001:ChecksumFS0_Conf
TgtGDS:Ctrl-CPU-001:ChecksumFS0_check
TgtGDS:Ctrl-CPU-001:ChecksumFS1_Conf
TgtGDS:Ctrl-CPU-001:ChecksumFS1_check
TgtGDS:Ctrl-CPU-001:ChecksumFS2_Conf
TgtGDS:Ctrl-CPU-001:ChecksumFS2_check
TgtGDS:Ctrl-CPU-001:ChecksumFS3_Conf
TgtGDS:Ctrl-CPU-001:ChecksumFS3_check
TgtGDS:Ctrl-CPU-001:ChecksumFS4_Conf
TgtGDS:Ctrl-CPU-001:ChecksumFS4_check
TgtGDS:Ctrl-CPU-001:ChecksumFS5_Conf
TgtGDS:Ctrl-CPU-001:ChecksumFS5_check
TgtGDS:Ctrl-CPU-001:ChecksumFS6_Conf
TgtGDS:Ctrl-CPU-001:ChecksumFS6_check
TgtGDS:Ctrl-CPU-001:ChecksumFS7_Conf
TgtGDS:Ctrl-CPU-001:ChecksumFS7_check
TgtGDS:Ctrl-CPU-001:ChecksumStd0_Conf
TgtGDS:Ctrl-CPU-001:ChecksumStd0_check
TgtGDS:Ctrl-CPU-001:ChecksumStd1_Conf
TgtGDS:Ctrl-CPU-001:ChecksumStd1_check
TgtGDS:Ctrl-CPU-001:ChecksumStd2_Conf
TgtGDS:Ctrl-CPU-001:ChecksumStd2_check
TgtGDS:Ctrl-CPU-001:ChecksumStd3_Conf
TgtGDS:Ctrl-CPU-001:ChecksumStd3_check
TgtGDS:Ctrl-CPU-001:ChecksumStd4_Conf
TgtGDS:Ctrl-CPU-001:ChecksumStd4_check
TgtGDS:Ctrl-CPU-001:ChecksumStd5_Conf
TgtGDS:Ctrl-CPU-001:ChecksumStd5_check
TgtGDS:Ctrl-CPU-001:ChecksumStd6_Conf
TgtGDS:Ctrl-CPU-001:ChecksumStd6_check
TgtGDS:Ctrl-CPU-001:ChecksumStd7_Conf
TgtGDS:Ctrl-CPU-001:ChecksumStd7_check
TgtGDS:Ctrl-CPU-001:Checksum_Confirm
TgtGDS:Ctrl-GCPU-001:ChecksumGW0_Conf
TgtGDS:Ctrl-GCPU-001:ChecksumGW0_check
TgtGDS:Ctrl-GCPU-001:ChecksumGW1_Conf
TgtGDS:Ctrl-GCPU-001:ChecksumGW1_check
TgtGDS:Ctrl-GCPU-001:ChecksumGW2_Conf
TgtGDS:Ctrl-GCPU-001:ChecksumGW2_check
TgtGDS:Ctrl-GCPU-001:ChecksumGW3_Conf
TgtGDS:Ctrl-GCPU-001:ChecksumGW3_check
TgtGDS:Ctrl-GCPU-001:ChecksumGW4_Conf
TgtGDS:Ctrl-GCPU-001:ChecksumGW4_check
TgtGDS:Ctrl-GCPU-001:ChecksumGW5_Conf
TgtGDS:Ctrl-GCPU-001:ChecksumGW5_check
TgtGDS:Ctrl-GCPU-001:ChecksumGW6_Conf
TgtGDS:Ctrl-GCPU-001:ChecksumGW6_check
TgtGDS:Ctrl-GCPU-001:ChecksumGW7_Conf
TgtGDS:Ctrl-GCPU-001:ChecksumGW7_check
TgtGDS:Ctrl-GCPU-001:CommsHashToPLCS
TgtGDS:Ctrl-GCPU-001:CommsOK
TgtGDS:Ctrl-GCPU-001:HeartbeatFromPLCR
TgtGDS:Ctrl-GCPU-001:HeartbeatToPLCS
TgtGDS:Ctrl-GCPU-001:MBCommsHash
TgtGDS:Ctrl-GCPU-001:ModbusAddr-RB
TgtGDS:Ctrl-GCPU-001:PLCAddrS
TgtGDS:Ctrl-GCPU-001:PLCFBranchR
TgtGDS:Ctrl-GCPU-001:PLCFCommitR
TgtGDS:Ctrl-GCPU-001:PLCFStatusR
TgtGDS:Ctrl-GCPU-001:PLCFTimestampR
TgtGDS:Ctrl-GCPU-001:S7Addr-RB
TgtGDS:Ctrl-GCPU-001:S7CommsHash
TgtGDS:Ctrl-GCPU-001:UploadParametersCmd
TgtGDS:Ctrl-GCPU-001:UploadParametersS
TgtGDS:Ctrl-GCPU-001:UploadStat-RB
TgtGDS:Ctrl-GCPU-001:UploadStatR
TgtGDS:Ctrl-GCPU-001:iCommsHashToPLC
......@@ -63,6 +63,16 @@ AccODH-AT:Ctrl-GCPU-001:ChecksumGW4_check
AccODH-AT:Ctrl-GCPU-001:ChecksumGW5_check
AccODH-AT:Ctrl-GCPU-001:ChecksumGW6_check
AccODH-AT:Ctrl-GCPU-001:ChecksumGW7_check
AccODH-AT:Ctrl-GCPU-001:CommsHashToPLCS
AccODH-AT:Ctrl-GCPU-001:CommsOK
AccODH-AT:Ctrl-GCPU-001:HeartbeatToPLCS
AccODH-AT:Ctrl-GCPU-001:PLCAddrS
AccODH-AT:Ctrl-GCPU-001:PLCFStatusR
AccODH-AT:Ctrl-GCPU-001:UploadParametersCmd
AccODH-AT:Ctrl-GCPU-001:UploadParametersS
AccODH-AT:Ctrl-GCPU-001:UploadStat-RB
AccODH-AT:Ctrl-GCPU-001:UploadStatR
AccODH-AT:Ctrl-GCPU-001:iCommsHashToPLC
############################################################
## AccODH-AT:
# Acc Zone State
......@@ -113,6 +123,27 @@ AccODH-AT::OdhAlmSts_Active
AccODH-AT::OdhAlmSts_Test
AccODH-AT::PssAlmSts_Active
AccODH-AT::PssAlmSts_Test
AccODH-AT:ODH-Area-001:Alrm
AccODH-AT:ODH-Area-001:Attention
AccODH-AT:ODH-Area-001:BatteryLow
AccODH-AT:ODH-Area-001:ConfirmedAlrm
AccODH-AT:ODH-Area-001:DeviceFailure
AccODH-AT:ODH-Area-001:Error
AccODH-AT:ODH-Area-001:HmiCmdMuteAlrm
AccODH-AT:ODH-Area-001:HmiCmdResetAlrm
AccODH-AT:ODH-Area-001:HmiCmdUnmuteAlrm
AccODH-AT:ODH-Area-001:HwError
AccODH-AT:ODH-Area-001:LowestO2
AccODH-AT:ODH-Area-001:Maintenance
AccODH-AT:ODH-Area-001:MuteAllowed
AccODH-AT:ODH-Area-001:MuteTimeLeft
AccODH-AT:ODH-Area-001:Muted
AccODH-AT:ODH-Area-001:ResetRequired
AccODH-AT:ODH-Area-001:StartUp
AccODH-AT:ODH-Area-001:State
AccODH-AT:ODH-Area-001:Test
AccODH-AT:ODH-Area-001:WarmingUp
AccODH-AT:ODH-Area-001:Warning
############################################################
## AccODH-AT:ODH-RSL-001
# Device failure
......@@ -705,6 +736,7 @@ AccODH-AT:Ctrl-CPU-001:ChecksumStd6_Conf
AccODH-AT:Ctrl-CPU-001:ChecksumStd7_Conf
############################################################
#AccODH-AT:ODH-O2iM-001:O2level
AccODH-AT:ODH-O2iM-001:WarningLatch
AccODH-AT:ODH-O2iM-001:O2imState
AccODH-AT:ODH-O2iM-001:IOStatus_O2Lvl-Curr
AccODH-AT:ODH-O2iM-001:O2Below18
......@@ -727,6 +759,7 @@ AccODH-AT:ODH-O2iM-001:IOStatus_O2Above18
AccODH-AT:ODH-O2iM-001:IOStatus_O2Above19_5
AccODH-AT:ODH-O2iM-001:IOStatus_NoWarning
AccODH-AT:ODH-O2iM-001:IOStatus_AlarmReset
AccODH-AT:ODH-O2iM-002:WarningLatch
AccODH-AT:ODH-O2iM-002:O2level
AccODH-AT:ODH-O2iM-002:O2imState
AccODH-AT:ODH-O2iM-002:IOStatus_O2Lvl-Curr
......@@ -750,6 +783,7 @@ AccODH-AT:ODH-O2iM-002:IOStatus_O2Above18
AccODH-AT:ODH-O2iM-002:IOStatus_O2Above19_5
AccODH-AT:ODH-O2iM-002:IOStatus_NoWarning
AccODH-AT:ODH-O2iM-002:IOStatus_AlarmReset
AccODH-AT:ODH-O2iM-003:WarningLatch
AccODH-AT:ODH-O2iM-003:O2level
AccODH-AT:ODH-O2iM-003:O2imState
AccODH-AT:ODH-O2iM-003:IOStatus_O2Lvl-Curr
......@@ -773,6 +807,7 @@ AccODH-AT:ODH-O2iM-003:IOStatus_O2Above18
AccODH-AT:ODH-O2iM-003:IOStatus_O2Above19_5
AccODH-AT:ODH-O2iM-003:IOStatus_NoWarning
AccODH-AT:ODH-O2iM-003:IOStatus_AlarmReset
AccODH-AT:ODH-O2iM-004:WarningLatch
AccODH-AT:ODH-O2iM-004:O2level
AccODH-AT:ODH-O2iM-004:O2imState
AccODH-AT:ODH-O2iM-004:IOStatus_O2Lvl-Curr
......@@ -796,6 +831,7 @@ AccODH-AT:ODH-O2iM-004:IOStatus_O2Above18
AccODH-AT:ODH-O2iM-004:IOStatus_O2Above19_5
AccODH-AT:ODH-O2iM-004:IOStatus_NoWarning
AccODH-AT:ODH-O2iM-004:IOStatus_AlarmReset
AccODH-AT:ODH-O2iM-005:WarningLatch
AccODH-AT:ODH-O2iM-005:O2level
AccODH-AT:ODH-O2iM-005:O2imState
AccODH-AT:ODH-O2iM-005:IOStatus_O2Lvl-Curr
......@@ -819,6 +855,7 @@ AccODH-AT:ODH-O2iM-005:IOStatus_O2Above18
AccODH-AT:ODH-O2iM-005:IOStatus_O2Above19_5
AccODH-AT:ODH-O2iM-005:IOStatus_NoWarning
AccODH-AT:ODH-O2iM-005:IOStatus_AlarmReset
AccODH-AT:ODH-O2iM-006:WarningLatch
AccODH-AT:ODH-O2iM-006:O2level
AccODH-AT:ODH-O2iM-006:O2imState
AccODH-AT:ODH-O2iM-006:IOStatus_O2Lvl-Curr
......@@ -842,6 +879,7 @@ AccODH-AT:ODH-O2iM-006:IOStatus_O2Above18
AccODH-AT:ODH-O2iM-006:IOStatus_O2Above19_5
AccODH-AT:ODH-O2iM-006:IOStatus_NoWarning
AccODH-AT:ODH-O2iM-006:IOStatus_AlarmReset
AccODH-AT:ODH-O2iM-007:WarningLatch
AccODH-AT:ODH-O2iM-007:O2level
AccODH-AT:ODH-O2iM-007:O2imState
AccODH-AT:ODH-O2iM-007:IOStatus_O2Lvl-Curr
......@@ -865,6 +903,7 @@ AccODH-AT:ODH-O2iM-007:IOStatus_O2Above18
AccODH-AT:ODH-O2iM-007:IOStatus_O2Above19_5
AccODH-AT:ODH-O2iM-007:IOStatus_NoWarning
AccODH-AT:ODH-O2iM-007:IOStatus_AlarmReset
AccODH-AT:ODH-O2iM-008:WarningLatch
AccODH-AT:ODH-O2iM-008:O2level
AccODH-AT:ODH-O2iM-008:O2imState
AccODH-AT:ODH-O2iM-008:IOStatus_O2Lvl-Curr
......@@ -888,6 +927,7 @@ AccODH-AT:ODH-O2iM-008:IOStatus_O2Above18
AccODH-AT:ODH-O2iM-008:IOStatus_O2Above19_5
AccODH-AT:ODH-O2iM-008:IOStatus_NoWarning
AccODH-AT:ODH-O2iM-008:IOStatus_AlarmReset
AccODH-AT:ODH-O2iM-009:WarningLatch
AccODH-AT:ODH-O2iM-009:O2level
AccODH-AT:ODH-O2iM-009:O2imState
AccODH-AT:ODH-O2iM-009:IOStatus_O2Lvl-Curr
......@@ -911,6 +951,7 @@ AccODH-AT:ODH-O2iM-009:IOStatus_O2Above18
AccODH-AT:ODH-O2iM-009:IOStatus_O2Above19_5
AccODH-AT:ODH-O2iM-009:IOStatus_NoWarning
AccODH-AT:ODH-O2iM-009:IOStatus_AlarmReset
AccODH-AT:ODH-O2iM-010:WarningLatch
AccODH-AT:ODH-O2iM-010:O2level
AccODH-AT:ODH-O2iM-010:O2imState
AccODH-AT:ODH-O2iM-010:IOStatus_O2Lvl-Curr
......@@ -934,6 +975,7 @@ AccODH-AT:ODH-O2iM-010:IOStatus_O2Above18
AccODH-AT:ODH-O2iM-010:IOStatus_O2Above19_5
AccODH-AT:ODH-O2iM-010:IOStatus_NoWarning
AccODH-AT:ODH-O2iM-010:IOStatus_AlarmReset
AccODH-AT:ODH-O2iM-011:WarningLatch
AccODH-AT:ODH-O2iM-011:O2level
AccODH-AT:ODH-O2iM-011:O2imState
AccODH-AT:ODH-O2iM-011:IOStatus_O2Lvl-Curr
......@@ -957,6 +999,7 @@ AccODH-AT:ODH-O2iM-011:IOStatus_O2Above18
AccODH-AT:ODH-O2iM-011:IOStatus_O2Above19_5
AccODH-AT:ODH-O2iM-011:IOStatus_NoWarning
AccODH-AT:ODH-O2iM-011:IOStatus_AlarmReset
AccODH-AT:ODH-O2iM-012:WarningLatch
AccODH-AT:ODH-O2iM-012:O2level
AccODH-AT:ODH-O2iM-012:O2imState
AccODH-AT:ODH-O2iM-012:IOStatus_O2Lvl-Curr
......@@ -980,6 +1023,7 @@ AccODH-AT:ODH-O2iM-012:IOStatus_O2Above18
AccODH-AT:ODH-O2iM-012:IOStatus_O2Above19_5
AccODH-AT:ODH-O2iM-012:IOStatus_NoWarning
AccODH-AT:ODH-O2iM-012:IOStatus_AlarmReset
AccODH-AT:ODH-O2iM-013:WarningLatch
AccODH-AT:ODH-O2iM-013:O2level
AccODH-AT:ODH-O2iM-013:O2imState
AccODH-AT:ODH-O2iM-013:IOStatus_O2Lvl-Curr
......@@ -1003,6 +1047,7 @@ AccODH-AT:ODH-O2iM-013:IOStatus_O2Above18
AccODH-AT:ODH-O2iM-013:IOStatus_O2Above19_5
AccODH-AT:ODH-O2iM-013:IOStatus_NoWarning
AccODH-AT:ODH-O2iM-013:IOStatus_AlarmReset
AccODH-AT:ODH-O2iM-014:WarningLatch
AccODH-AT:ODH-O2iM-014:O2level
AccODH-AT:ODH-O2iM-014:O2imState
AccODH-AT:ODH-O2iM-014:IOStatus_O2Lvl-Curr
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment