From 2741c81576a00340d99a69233a57da3178769231 Mon Sep 17 00:00:00 2001 From: Melissa Aguiar Date: Tue, 25 Jan 2022 09:20:44 -0300 Subject: [PATCH] scripts: update graphical interface --- FOFBApp/Db/FOFBRtm.template | 56 ++++++++-- scripts/pydm_test/rtm_test_minicrate.ui | 139 ++++++++++++++++++------ 2 files changed, 151 insertions(+), 44 deletions(-) diff --git a/FOFBApp/Db/FOFBRtm.template b/FOFBApp/Db/FOFBRtm.template index 4d06fc7..d3827ad 100644 --- a/FOFBApp/Db/FOFBRtm.template +++ b/FOFBApp/Db/FOFBRtm.template @@ -34,60 +34,100 @@ record(longin,"$(P)$(R)RtmLampDacDataFromWb-RB"){ field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CTL_DAC_DATA_FROM_WB") } -record(longout,"$(P)$(R)RtmLampAmpIFlagL$(RTM_CHAN)-SP"){ +record(mbbo,"$(P)$(R)RtmLampAmpIFlagL$(RTM_CHAN)-SP"){ field(DTYP,"asynUInt32Digital") field(DESC,"set amplifier left overcurrent flag") field(PINI,"YES") field(SCAN,"Passive") field(OUT,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_STA_AMP_IFLAG_L") + field(NOBT,"1") + field(ZRVL,"0") + field(ONVL,"1") + field(ZRST,"over") + field(ONST,"ok") } -record(longin,"$(P)$(R)RtmLampAmpIFlagL$(RTM_CHAN)-RB"){ +record(mbbi,"$(P)$(R)RtmLampAmpIFlagL$(RTM_CHAN)-RB"){ field(DTYP,"asynUInt32Digital") field(DESC,"get amplifier left overcurrent flag") field(SCAN,"I/O Intr") field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_STA_AMP_IFLAG_L") + field(NOBT,"1") + field(ZRVL,"0") + field(ONVL,"1") + field(ZRST,"over") + field(ONST,"ok") } -record(longout,"$(P)$(R)RtmLampAmpTFlagL$(RTM_CHAN)-SP"){ +record(mbbo,"$(P)$(R)RtmLampAmpTFlagL$(RTM_CHAN)-SP"){ field(DTYP,"asynUInt32Digital") field(DESC,"set amplifier left overtemperature flag") field(PINI,"YES") field(SCAN,"Passive") field(OUT,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_STA_AMP_TFLAG_L") + field(NOBT,"1") + field(ZRVL,"0") + field(ONVL,"1") + field(ZRST,"over") + field(ONST,"ok") } -record(longin,"$(P)$(R)RtmLampAmpTFlagL$(RTM_CHAN)-RB"){ +record(mbbi,"$(P)$(R)RtmLampAmpTFlagL$(RTM_CHAN)-RB"){ field(DTYP,"asynUInt32Digital") field(DESC,"get amplifier left overtemperature flag") field(SCAN,"I/O Intr") field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_STA_AMP_TFLAG_L") + field(NOBT,"1") + field(ZRVL,"0") + field(ONVL,"1") + field(ZRST,"over") + field(ONST,"ok") } -record(longout,"$(P)$(R)RtmLampAmpIFlagR$(RTM_CHAN)-SP"){ +record(mbbo,"$(P)$(R)RtmLampAmpIFlagR$(RTM_CHAN)-SP"){ field(DTYP,"asynUInt32Digital") field(DESC,"set amplifier right overcurrent flag") field(PINI,"YES") field(SCAN,"Passive") field(OUT,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_STA_AMP_IFLAG_R") + field(NOBT,"1") + field(ZRVL,"0") + field(ONVL,"1") + field(ZRST,"over") + field(ONST,"ok") } -record(longin,"$(P)$(R)RtmLampAmpIFlagR$(RTM_CHAN)-RB"){ +record(mbbi,"$(P)$(R)RtmLampAmpIFlagR$(RTM_CHAN)-RB"){ field(DTYP,"asynUInt32Digital") field(DESC,"get amplifier right overcurrent flag") field(SCAN,"I/O Intr") field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_STA_AMP_IFLAG_R") + field(NOBT,"1") + field(ZRVL,"0") + field(ONVL,"1") + field(ZRST,"over") + field(ONST,"ok") } -record(longout,"$(P)$(R)RtmLampAmpTFlagR$(RTM_CHAN)-SP"){ +record(mbbo,"$(P)$(R)RtmLampAmpTFlagR$(RTM_CHAN)-SP"){ field(DTYP,"asynUInt32Digital") field(DESC,"set amplifier right overtemperature flag") field(PINI,"YES") field(SCAN,"Passive") field(OUT,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_STA_AMP_TFLAG_R") + field(NOBT,"1") + field(ZRVL,"0") + field(ONVL,"1") + field(ZRST,"over") + field(ONST,"ok") } -record(longin,"$(P)$(R)RtmLampAmpTFlagR$(RTM_CHAN)-RB"){ +record(mbbi,"$(P)$(R)RtmLampAmpTFlagR$(RTM_CHAN)-RB"){ field(DTYP,"asynUInt32Digital") field(DESC,"get amplifier right overtemperature flag") field(SCAN,"I/O Intr") field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_STA_AMP_TFLAG_R") + field(NOBT,"1") + field(ZRVL,"0") + field(ONVL,"1") + field(ZRST,"over") + field(ONST,"ok") } record(longout,"$(P)$(R)RtmLampAmpEn$(RTM_CHAN)-SP"){ diff --git a/scripts/pydm_test/rtm_test_minicrate.ui b/scripts/pydm_test/rtm_test_minicrate.ui index 77c930c..49bccd8 100644 --- a/scripts/pydm_test/rtm_test_minicrate.ui +++ b/scripts/pydm_test/rtm_test_minicrate.ui @@ -6,7 +6,7 @@ 0 0 - 1440 + 1390 808 @@ -16,14 +16,14 @@ - 440 + 450 10 - 991 + 931 791 - 1 + 0 @@ -34,7 +34,7 @@ 700 50 - 291 + 249 161 @@ -62,8 +62,75 @@ - - + + + + + + + 0 + 0 + 0 + + + + + + + 78 + 154 + 6 + + + + + + + + + 0 + 0 + 0 + + + + + + + 78 + 154 + 6 + + + + + + + + + 190 + 190 + 190 + + + + + + + 0 + 0 + 0 + + + + + + + + + + + false XX-99SL01:DI-FOFBCtrl:RtmLampAmpIFlagLCH0-RB @@ -90,7 +157,7 @@ - Amplifier Overtermperature + Amplifier Overtermp @@ -142,7 +209,7 @@ 700 230 - 291 + 249 161 @@ -198,7 +265,7 @@ - Amplifier Overtermperature + Amplifier Overtermp @@ -250,7 +317,7 @@ 700 410 - 291 + 249 161 @@ -306,7 +373,7 @@ - Amplifier Overtermperature + Amplifier Overtermp @@ -358,7 +425,7 @@ 700 590 - 291 + 249 161 @@ -414,7 +481,7 @@ - Amplifier Overtermperature + Amplifier Overtermp @@ -910,7 +977,7 @@ 700 50 - 291 + 249 161 @@ -966,7 +1033,7 @@ - Amplifier Overtermperature + Amplifier Overtermp @@ -1018,7 +1085,7 @@ 700 230 - 291 + 249 161 @@ -1074,7 +1141,7 @@ - Amplifier Overtermperature + Amplifier Overtermp @@ -1126,7 +1193,7 @@ 700 410 - 291 + 249 161 @@ -1182,7 +1249,7 @@ - Amplifier Overtermperature + Amplifier Overtermp @@ -1234,7 +1301,7 @@ 700 590 - 291 + 249 161 @@ -1290,7 +1357,7 @@ - Amplifier Overtermperature + Amplifier Overtermp @@ -1347,7 +1414,7 @@ - 1 + 0 @@ -2070,7 +2137,7 @@ - 6 + 0 @@ -5236,8 +5303,8 @@ - 1046 - 10 + 970 + 40 81 21 @@ -5249,10 +5316,10 @@ - 1130 - 6 + 1050 + 40 101 - 31 + 21 @@ -5265,10 +5332,10 @@ - 1270 - 0 + 1230 + 40 121 - 41 + 21 @@ -5278,9 +5345,9 @@ - 1385 - 7 - 21 + 1350 + 40 + 20 21 @@ -5294,8 +5361,8 @@ tabWidget tabWidget_2 gridLayoutWidget - PyDMLabel_3 label_3 + PyDMLabel_3 label_9 PyDMLabel_9