From 1f6a086fc0bf8c2587f0d38dd78f022c890341de Mon Sep 17 00:00:00 2001 From: nwaters Date: Thu, 8 Feb 2024 10:53:58 -0800 Subject: [PATCH] MNT: rebuild with minor optics lib change --- .../_Config/PLC/tmo_optics.xti | 72 +- .../tmo_optics/tmo_optics.plcproj | 5 - lcls-plc-tmo-optics/tmo_optics/tmo_optics.tmc | 739 +++++++++--------- 3 files changed, 404 insertions(+), 412 deletions(-) diff --git a/lcls-plc-tmo-optics/_Config/PLC/tmo_optics.xti b/lcls-plc-tmo-optics/_Config/PLC/tmo_optics.xti index e2f98ff..5b7539f 100644 --- a/lcls-plc-tmo-optics/_Config/PLC/tmo_optics.xti +++ b/lcls-plc-tmo-optics/_Config/PLC/tmo_optics.xti @@ -1349,7 +1349,7 @@ External Setpoint Generation: - + tmo_optics Instance {08500001-0000-0000-F000-000000000064} @@ -2546,41 +2546,6 @@ External Setpoint Generation: PRG_PMPS.fbArbiterIO.xTxPDO_state BIT - - PRG_MR1K4_SOMS.fbCoolingPanel.fbFlow_1.iRaw - - INT - - - PRG_MR1K4_SOMS.fbCoolingPanel.fbPress_1.iRaw - - INT - - - PRG_MR1K4_SOMS.fbCoolingPanel.fbFlow_2.iRaw - - INT - - - PRG_MR2K4_KBO.fbCoolingPanel.fbFlow_1.iRaw - - INT - - - PRG_MR2K4_KBO.fbCoolingPanel.fbPress_1.iRaw - - INT - - - PRG_MR3K4_KBO.fbCoolingPanel.fbFlow_1.iRaw - - INT - - - PRG_MR3K4_KBO.fbCoolingPanel.fbPress_1.iRaw - - INT - GVL_M2K4_RTD.nM2K4US_RTD_3 INT @@ -2726,6 +2691,41 @@ External Setpoint Generation: GVL_M5K4_RTD.nM5K4_Chin_Tail_RTD.iRaw INT + + PRG_MR1K4_SOMS.fbCoolingPanel.fbFlow_1.iRaw + + INT + + + PRG_MR1K4_SOMS.fbCoolingPanel.fbPress_1.iRaw + + INT + + + PRG_MR1K4_SOMS.fbCoolingPanel.fbFlow_2.iRaw + + INT + + + PRG_MR2K4_KBO.fbCoolingPanel.fbFlow_1.iRaw + + INT + + + PRG_MR2K4_KBO.fbCoolingPanel.fbPress_1.iRaw + + INT + + + PRG_MR3K4_KBO.fbCoolingPanel.fbFlow_1.iRaw + + INT + + + PRG_MR3K4_KBO.fbCoolingPanel.fbPress_1.iRaw + + INT + PlcTask Outputs diff --git a/lcls-plc-tmo-optics/tmo_optics/tmo_optics.plcproj b/lcls-plc-tmo-optics/tmo_optics/tmo_optics.plcproj index 3c5b5d6..e60639f 100644 --- a/lcls-plc-tmo-optics/tmo_optics/tmo_optics.plcproj +++ b/lcls-plc-tmo-optics/tmo_optics/tmo_optics.plcproj @@ -204,11 +204,6 @@ TcUnit, 1.0.1.0 (www.tcunit.org) - - - Content - - diff --git a/lcls-plc-tmo-optics/tmo_optics/tmo_optics.tmc b/lcls-plc-tmo-optics/tmo_optics/tmo_optics.tmc index 758ad94..be46b6a 100644 --- a/lcls-plc-tmo-optics/tmo_optics/tmo_optics.tmc +++ b/lcls-plc-tmo-optics/tmo_optics/tmo_optics.tmc @@ -1,5 +1,5 @@ - + ComSerialLineMode_t @@ -55204,212 +55204,6 @@ The BPTM will throw an error if the arbiter does not have enough space for the t - - FB_AnalogInput - 320 - - iRaw - INT - Connect this input to the terminal - 16 - 32 - - - ItemType - Input - - - TcAddressType - Input - - - - - iTermBits - UINT - The number of bits correlated with the terminal's max value. This is not necessarily the resolution parameter. - 16 - 48 - - - ItemType - Input - - - - - fTermMax - LREAL - The fReal value correlated with the terminal's max value - 64 - 64 - - - ItemType - Input - - - - - fTermMin - LREAL - The fReal value correlated with the terminal's min value - 64 - 128 - - - ItemType - Input - - - - - fReal - LREAL - The real value read from the output - 64 - 192 - - - ItemType - Output - - - - - fScale - LREAL - 64 - 256 - - - - PouType - FunctionBlock - - - - - FB_Axilon_Cooling_1f1p - 832 - - fFlow_1_val - LREAL - Mirrors with 1 Cooling Flow Meter and 1 Pressure Meter - 64 - 64 - - - ItemType - Output - - - pytmc - - pv: FWM:1 - field: EGU lpm - field: HIGH 2.3 - field: HIHI 3.0 - field: LOW 1.7 - field: LOLO 1.5 - field: LSV MINOR - field: LLSV MAJOR - field: HSV MINOR - field: HHSV MAJOR - autosave_pass0: HIGH HIHI LOW LOLO LSV LLSV HSV HHSV - io: i - - - - - - fPress_1_val - LREAL - 64 - 128 - - - ItemType - Output - - - pytmc - - pv: PRSM:1 - field: EGU bar - field: LOW 0.1 - field: LSV MAJOR - autosave_pass0: LOW LSV - io: i - - - - - - fbFlow_1 - FB_AnalogInput - 320 - 192 - - - fbPress_1 - FB_AnalogInput - 320 - 512 - - - - PouType - FunctionBlock - - - - - FB_Axilon_Cooling_2f1p - 1216 - FB_Axilon_Cooling_1f1p - - fFlow_2_val - LREAL - 64 - 832 - - - ItemType - Output - - - pytmc - - pv: FWM:2 - field: EGU lpm - field: HIGH 2.3 - field: HIHI 3.0 - field: LOW 1.7 - field: LOLO 1.5 - field: LSV MINOR - field: LLSV MAJOR - field: HSV MINOR - field: HHSV MAJOR - autosave_pass0: HIGH HIHI LOW LOLO LSV LLSV HSV HHSV - io: i - - - - - - fbFlow_2 - FB_AnalogInput - 320 - 896 - - - - PouType - FunctionBlock - - - FB_MirrorTwoCoatingProtection 192768 @@ -67984,6 +67778,209 @@ The BPTM will throw an error if the arbiter does not have enough space for the t + + FB_AnalogInput + 320 + + iRaw + INT + Connect this input to the terminal + 16 + 32 + + + ItemType + Input + + + TcAddressType + Input + + + + + iTermBits + UINT + The number of bits correlated with the terminal's max value. This is not necessarily the resolution parameter. + 16 + 48 + + + ItemType + Input + + + + + fTermMax + LREAL + The fReal value correlated with the terminal's max value + 64 + 64 + + + ItemType + Input + + + + + fTermMin + LREAL + The fReal value correlated with the terminal's min value + 64 + 128 + + + ItemType + Input + + + + + fReal + LREAL + The real value read from the output + 64 + 192 + + + ItemType + Output + + + + + fScale + LREAL + 64 + 256 + + + + PouType + FunctionBlock + + + + + FB_Axilon_Cooling_1f1p + 832 + + fFlow_1_val + LREAL + Mirrors with 1 Cooling Flow Meter and 1 Pressure Meter + 64 + 64 + + + ItemType + Output + + + pytmc + + pv: FWM:1 + field: EGU lpm + field: HIGH 2.3 + field: HIHI 3.0 + field: LOW 1.7 + field: LOLO 1.5 + field: LSV MINOR + field: LLSV MAJOR + field: HSV MINOR + field: HHSV MAJOR + io: i + + + + + + fPress_1_val + LREAL + 64 + 128 + + + ItemType + Output + + + pytmc + + pv: PRSM:1 + field: EGU bar + field: LOW 0.1 + field: LSV MAJOR + io: i + + + + + + fbFlow_1 + FB_AnalogInput + 320 + 192 + + + fbPress_1 + FB_AnalogInput + 320 + 512 + + + + PouType + FunctionBlock + + + + + FB_Axilon_Cooling_2f1p + 1216 + FB_Axilon_Cooling_1f1p + + fFlow_2_val + LREAL + 64 + 832 + + + ItemType + Output + + + pytmc + + pv: FWM:2 + field: EGU lpm + field: HIGH 2.3 + field: HIHI 3.0 + field: LOW 1.7 + field: LOLO 1.5 + field: LSV MINOR + field: LLSV MAJOR + field: HSV MINOR + field: HHSV MAJOR + io: i + + + + + + fbFlow_2 + FB_AnalogInput + 320 + 896 + + + + PouType + FunctionBlock + + + @@ -68048,7 +68045,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t 0 SerialIO Inputs 0 - 84148224 + 84082688 GVL_SerialIO.Serial_stComIn_M1K4 Better have your inputs and outputs! @@ -68071,7 +68068,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t 1 SerialIO Outputs 0 - 84148224 + 84082688 GVL_SerialIO.Serial_stComOut_M1K4 192 @@ -68092,7 +68089,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t 3 SerialIO Internal 0 - 84148224 + 84082688 P_Serial_Com.fbSerialLineControl_EL6001_M1K4 10432 @@ -68190,7 +68187,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t 19 PiezoDriver Internal 1 - 84148224 + 84082688 PiezoSerial.fbE621SerialDriver_M1K4 PI Serial @@ -68286,7 +68283,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t 32 PlcTask Inputs 2 - 84148224 + 84082688 Main.bDreamEnable1 MR4K4 MR5K4 STO button @@ -71748,97 +71745,6 @@ The BPTM will throw an error if the arbiter does not have enough space for the t 663033377 - - PRG_MR1K4_SOMS.fbCoolingPanel.fbFlow_1.iRaw - Connect this input to the terminal - 16 - INT - - - TcAddressType - Input - - - 663194272 - - - PRG_MR1K4_SOMS.fbCoolingPanel.fbPress_1.iRaw - Connect this input to the terminal - 16 - INT - - - TcAddressType - Input - - - 663194592 - - - PRG_MR1K4_SOMS.fbCoolingPanel.fbFlow_2.iRaw - Connect this input to the terminal - 16 - INT - - - TcAddressType - Input - - - 663194976 - - - PRG_MR2K4_KBO.fbCoolingPanel.fbFlow_1.iRaw - Connect this input to the terminal - 16 - INT - - - TcAddressType - Input - - - 663195488 - - - PRG_MR2K4_KBO.fbCoolingPanel.fbPress_1.iRaw - Connect this input to the terminal - 16 - INT - - - TcAddressType - Input - - - 663195808 - - - PRG_MR3K4_KBO.fbCoolingPanel.fbFlow_1.iRaw - Connect this input to the terminal - 16 - INT - - - TcAddressType - Input - - - 663196320 - - - PRG_MR3K4_KBO.fbCoolingPanel.fbPress_1.iRaw - Connect this input to the terminal - 16 - INT - - - TcAddressType - Input - - - 663196640 - GVL_M2K4_RTD.nM2K4US_RTD_3 16 @@ -72406,12 +72312,103 @@ The BPTM will throw an error if the arbiter does not have enough space for the t 663785248 + + PRG_MR1K4_SOMS.fbCoolingPanel.fbFlow_1.iRaw + Connect this input to the terminal + 16 + INT + + + TcAddressType + Input + + + 671841376 + + + PRG_MR1K4_SOMS.fbCoolingPanel.fbPress_1.iRaw + Connect this input to the terminal + 16 + INT + + + TcAddressType + Input + + + 671841696 + + + PRG_MR1K4_SOMS.fbCoolingPanel.fbFlow_2.iRaw + Connect this input to the terminal + 16 + INT + + + TcAddressType + Input + + + 671842080 + + + PRG_MR2K4_KBO.fbCoolingPanel.fbFlow_1.iRaw + Connect this input to the terminal + 16 + INT + + + TcAddressType + Input + + + 671842592 + + + PRG_MR2K4_KBO.fbCoolingPanel.fbPress_1.iRaw + Connect this input to the terminal + 16 + INT + + + TcAddressType + Input + + + 671842912 + + + PRG_MR3K4_KBO.fbCoolingPanel.fbFlow_1.iRaw + Connect this input to the terminal + 16 + INT + + + TcAddressType + Input + + + 671843424 + + + PRG_MR3K4_KBO.fbCoolingPanel.fbPress_1.iRaw + Connect this input to the terminal + 16 + INT + + + TcAddressType + Input + + + 671843744 + 33 PlcTask Outputs 2 - 84148224 + 84082688 Main.M1.Axis.PlcToNc 1024 @@ -73386,7 +73383,7 @@ The BPTM will throw an error if the arbiter does not have enough space for the t 35 PlcTask Internal 2 - 84148224 + 84082688 DefaultGlobals.stSys Included for you @@ -82771,70 +82768,6 @@ MR2K4 X ENC CNT 663167808 - - PRG_MR1K4_SOMS.fbCoolingPanel - M1K4 Flow Press Sensors - 1216 - FB_Axilon_Cooling_2f1p - - - TcLinkTo - .fbFlow_1.iRaw := TIIB[EL3054_M1K4_FWM_PRSM]^AI Standard Channel 1^Value; - .fbFlow_2.iRaw := TIIB[EL3054_M1K4_FWM_PRSM]^AI Standard Channel 2^Value; - .fbPress_1.iRaw := TIIB[EL3054_M1K4_FWM_PRSM]^AI Standard Channel 3^Value - - - - pytmc - - pv: MR1K4:SOMS - - - - 663194048 - - - PRG_MR2K4_KBO.fbCoolingPanel - M2K4 Flow Press Sensors - 832 - FB_Axilon_Cooling_1f1p - - - TcLinkTo - .fbFlow_1.iRaw := TIIB[EL3054_FWM_PRSM]^AI Standard Channel 1^Value; - .fbPress_1.iRaw := TIIB[EL3054_FWM_PRSM]^AI Standard Channel 3^Value - - - - pytmc - - pv: MR2K4:KBO - - - - 663195264 - - - PRG_MR3K4_KBO.fbCoolingPanel - M3K4 Flow Press Sensors - 832 - FB_Axilon_Cooling_1f1p - - - TcLinkTo - .fbFlow_1.iRaw := TIIB[EL3054_FWM_PRSM]^AI Standard Channel 2^Value; - .fbPress_1.iRaw := TIIB[EL3054_FWM_PRSM]^AI Standard Channel 3^Value - - - - pytmc - - pv: MR3K4:KBO - - - - 663196096 - P_StripeProtections.fbStripProtMR1K4 @@ -84170,12 +84103,76 @@ Silicon surface: RBV <= 4820000: 0000_0000_0001_1110 (allow everything betwee 665785952 + + PRG_MR1K4_SOMS.fbCoolingPanel + M1K4 Flow Press Sensors + 1216 + FB_Axilon_Cooling_2f1p + + + TcLinkTo + .fbFlow_1.iRaw := TIIB[EL3054_M1K4_FWM_PRSM]^AI Standard Channel 1^Value; + .fbFlow_2.iRaw := TIIB[EL3054_M1K4_FWM_PRSM]^AI Standard Channel 2^Value; + .fbPress_1.iRaw := TIIB[EL3054_M1K4_FWM_PRSM]^AI Standard Channel 3^Value + + + + pytmc + + pv: MR1K4:SOMS + + + + 671841152 + + + PRG_MR2K4_KBO.fbCoolingPanel + M2K4 Flow Press Sensors + 832 + FB_Axilon_Cooling_1f1p + + + TcLinkTo + .fbFlow_1.iRaw := TIIB[EL3054_FWM_PRSM]^AI Standard Channel 1^Value; + .fbPress_1.iRaw := TIIB[EL3054_FWM_PRSM]^AI Standard Channel 3^Value + + + + pytmc + + pv: MR2K4:KBO + + + + 671842368 + + + PRG_MR3K4_KBO.fbCoolingPanel + M3K4 Flow Press Sensors + 832 + FB_Axilon_Cooling_1f1p + + + TcLinkTo + .fbFlow_1.iRaw := TIIB[EL3054_FWM_PRSM]^AI Standard Channel 2^Value; + .fbPress_1.iRaw := TIIB[EL3054_FWM_PRSM]^AI Standard Channel 3^Value + + + + pytmc + + pv: MR3K4:KBO + + + + 671843200 + 36 PlcTask Retains 2 - 84148224 + 84082688 PMPS_GVL.SuccessfulPreemption Any time BPTM applies a new BP request which is confirmed @@ -84255,7 +84252,7 @@ Silicon surface: RBV <= 4820000: 0000_0000_0001_1110 (allow everything betwee ChangeDate - 2024-02-08T10:47:06 + 2024-02-08T10:53:23 GeneratedCodeSize