Skip to content
This repository was archived by the owner on May 17, 2023. It is now read-only.

Commit d7e40b0

Browse files
melissa-aguiarmelissa-aguiar
committed
Merge branch 'devel'
2 parents ed8e038 + dc60df5 commit d7e40b0

File tree

5 files changed

+1021
-287
lines changed

5 files changed

+1021
-287
lines changed

‎FOFBApp/Db/FOFBData.template

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,16 @@ record(ao,"$(P)$(R)PSOffsetWav$(RTM_CHAN)-SP"){
3333
field(DESC,"set waveform offset")
3434
field(PINI,"YES")
3535
field(SCAN,"Passive")
36+
field(PREC,"15")
3637
field(FLNK,"$(P)$(R)$(ACQ_NAME)ConvArrayDataC$(RTM_CHAN) CPP NMS")
37-
field(VAL, "1")
38+
field(VAL, "0")
3839
}
3940

4041
record(ao,"$(P)$(R)PSGainWav$(RTM_CHAN)-SP"){
4142
field(DESC,"set waveform gain")
4243
field(PINI,"YES")
4344
field(SCAN,"Passive")
44-
field(PREC,"8")
45+
field(PREC,"15")
4546
field(FLNK,"$(P)$(R)$(ACQ_NAME)ConvArrayDataC$(RTM_CHAN) CPP NMS")
4647
field(VAL, "1")
4748
}

‎FOFBApp/Db/FOFBRtm.template

Lines changed: 42 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -13,29 +13,41 @@
1313
record(longin,"$(P)$(R)PSStatus-RB"){
1414
field(DTYP,"asynUInt32Digital")
1515
field(DESC,"get RTM LAMP status register")
16+
field(PINI,"YES")
1617
field(SCAN,"I/O Intr")
1718
field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_STA")
1819
}
1920

20-
record(longout,"$(P)$(R)PSDacDataWb-SP"){
21+
record(mbbo,"$(P)$(R)PSDacDataWb-SP"){
2122
field(DTYP,"asynUInt32Digital")
2223
field(DESC,"set enable data from WB for DACs")
2324
field(PINI,"YES")
2425
field(SCAN,"Passive")
2526
field(OUT,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CTL_DAC_DATA_FROM_WB")
27+
field(NOBT,"1")
28+
field(ZRVL,"0")
29+
field(ONVL,"1")
30+
field(ZRST,"off")
31+
field(ONST,"on")
2632
field(VAL, "0")
2733
}
28-
record(longin,"$(P)$(R)PSDacDataWb-RB"){
34+
record(mbbi,"$(P)$(R)PSDacDataWb-RB"){
2935
field(DTYP,"asynUInt32Digital")
3036
field(DESC,"get enable data from WB for DACs")
3137
field(SCAN,"I/O Intr")
3238
field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CTL_DAC_DATA_FROM_WB")
39+
field(NOBT,"1")
40+
field(ZRVL,"0")
41+
field(ONVL,"1")
42+
field(ZRST,"off")
43+
field(ONST,"on")
3344
field(VAL, "0")
3445
}
3546

3647
record(mbbi,"$(P)$(R)PSAmpOverCurrFlagL$(RTM_CHAN)-Sts"){
3748
field(DTYP,"asynUInt32Digital")
3849
field(DESC,"get amplifier left overcurrent flag")
50+
field(PINI,"YES")
3951
field(SCAN,"I/O Intr")
4052
field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_STA_AMP_IFLAG_L")
4153
field(NOBT,"1")
@@ -48,6 +60,7 @@ record(mbbi,"$(P)$(R)PSAmpOverCurrFlagL$(RTM_CHAN)-Sts"){
4860
record(mbbi,"$(P)$(R)PSAmpOverTempFlagL$(RTM_CHAN)-Sts"){
4961
field(DTYP,"asynUInt32Digital")
5062
field(DESC,"get amplifier left overtemperature flag")
63+
field(PINI,"YES")
5164
field(SCAN,"I/O Intr")
5265
field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_STA_AMP_TFLAG_L")
5366
field(NOBT,"1")
@@ -60,6 +73,7 @@ record(mbbi,"$(P)$(R)PSAmpOverTempFlagL$(RTM_CHAN)-Sts"){
6073
record(mbbi,"$(P)$(R)PSAmpOverCurrFlagR$(RTM_CHAN)-Sts"){
6174
field(DTYP,"asynUInt32Digital")
6275
field(DESC,"get amplifier right overcurrent flag")
76+
field(PINI,"YES")
6377
field(SCAN,"I/O Intr")
6478
field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_STA_AMP_IFLAG_R")
6579
field(NOBT,"1")
@@ -72,6 +86,7 @@ record(mbbi,"$(P)$(R)PSAmpOverCurrFlagR$(RTM_CHAN)-Sts"){
7286
record(mbbi,"$(P)$(R)PSAmpOverTempFlagR$(RTM_CHAN)-Sts"){
7387
field(DTYP,"asynUInt32Digital")
7488
field(DESC,"get amplifier right overtemperature flag")
89+
field(PINI,"YES")
7590
field(SCAN,"I/O Intr")
7691
field(INP,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_STA_AMP_TFLAG_R")
7792
field(NOBT,"1")
@@ -90,8 +105,8 @@ record(mbbo,"$(P)$(R)PSAmpEn$(RTM_CHAN)-Sel"){
90105
field(NOBT,"1")
91106
field(ZRVL,"0")
92107
field(ONVL,"1")
93-
field(ZRST,"disable")
94-
field(ONST,"enable")
108+
field(ZRST,"off")
109+
field(ONST,"on")
95110
field(VAL, "0")
96111
}
97112
record(mbbi,"$(P)$(R)PSAmpEn$(RTM_CHAN)-Sts"){
@@ -102,8 +117,8 @@ record(mbbi,"$(P)$(R)PSAmpEn$(RTM_CHAN)-Sts"){
102117
field(NOBT,"1")
103118
field(ZRVL,"0")
104119
field(ONVL,"1")
105-
field(ZRST,"disable")
106-
field(ONST,"enable")
120+
field(ZRST,"off")
121+
field(ONST,"on")
107122
field(VAL, "0")
108123
}
109124

@@ -116,8 +131,8 @@ record(mbbo,"$(P)$(R)PSOpenLoopTriangWavEn$(RTM_CHAN)-Sel"){
116131
field(NOBT,"1")
117132
field(ZRVL,"0")
118133
field(ONVL,"1")
119-
field(ZRST,"disable")
120-
field(ONST,"enable")
134+
field(ZRST,"off")
135+
field(ONST,"on")
121136
field(VAL, "0")
122137
}
123138
record(mbbi,"$(P)$(R)PSOpenLoopTriangWavEn$(RTM_CHAN)-Sts"){
@@ -128,8 +143,8 @@ record(mbbi,"$(P)$(R)PSOpenLoopTriangWavEn$(RTM_CHAN)-Sts"){
128143
field(NOBT,"1")
129144
field(ZRVL,"0")
130145
field(ONVL,"1")
131-
field(ZRST,"disable")
132-
field(ONST,"enable")
146+
field(ZRST,"off")
147+
field(ONST,"on")
133148
field(VAL, "0")
134149
}
135150

@@ -142,8 +157,8 @@ record(mbbo,"$(P)$(R)PSOpenLoopSquareWavEn$(RTM_CHAN)-Sel"){
142157
field(NOBT,"1")
143158
field(ZRVL,"0")
144159
field(ONVL,"1")
145-
field(ZRST,"disable")
146-
field(ONST,"enable")
160+
field(ZRST,"off")
161+
field(ONST,"on")
147162
field(VAL, "0")
148163
}
149164
record(mbbi,"$(P)$(R)PSOpenLoopSquareWavEn$(RTM_CHAN)-Sts"){
@@ -154,8 +169,8 @@ record(mbbi,"$(P)$(R)PSOpenLoopSquareWavEn$(RTM_CHAN)-Sts"){
154169
field(NOBT,"1")
155170
field(ZRVL,"0")
156171
field(ONVL,"1")
157-
field(ZRST,"disable")
158-
field(ONST,"enable")
172+
field(ZRST,"off")
173+
field(ONST,"on")
159174
field(VAL, "0")
160175
}
161176

@@ -168,8 +183,8 @@ record(mbbo,"$(P)$(R)PSClosedLoopSquareWavSPEn$(RTM_CHAN)-Sel"){
168183
field(NOBT,"1")
169184
field(ZRVL,"0")
170185
field(ONVL,"1")
171-
field(ZRST,"disable")
172-
field(ONST,"enable")
186+
field(ZRST,"off")
187+
field(ONST,"on")
173188
field(VAL, "0")
174189
}
175190
record(mbbi,"$(P)$(R)PSClosedLoopSquareWavSPEn$(RTM_CHAN)-Sts"){
@@ -180,8 +195,8 @@ record(mbbi,"$(P)$(R)PSClosedLoopSquareWavSPEn$(RTM_CHAN)-Sts"){
180195
field(NOBT,"1")
181196
field(ZRVL,"0")
182197
field(ONVL,"1")
183-
field(ZRST,"disable")
184-
field(ONST,"enable")
198+
field(ZRST,"off")
199+
field(ONST,"on")
185200
field(VAL, "0")
186201
}
187202

@@ -194,8 +209,8 @@ record(mbbo,"$(P)$(R)PSPIEn$(RTM_CHAN)-Sel"){
194209
field(NOBT,"1")
195210
field(ZRVL,"0")
196211
field(ONVL,"1")
197-
field(ZRST,"disable")
198-
field(ONST,"enable")
212+
field(ZRST,"off")
213+
field(ONST,"on")
199214
field(VAL, "0")
200215
}
201216
record(mbbi,"$(P)$(R)PSPIEn$(RTM_CHAN)-Sts"){
@@ -206,8 +221,8 @@ record(mbbi,"$(P)$(R)PSPIEn$(RTM_CHAN)-Sts"){
206221
field(NOBT,"1")
207222
field(ZRVL,"0")
208223
field(ONVL,"1")
209-
field(ZRST,"disable")
210-
field(ONST,"enable")
224+
field(ZRST,"off")
225+
field(ONST,"on")
211226
field(VAL, "0")
212227
}
213228

@@ -236,8 +251,8 @@ record(mbbo,"$(P)$(R)PSDacWr$(RTM_CHAN)-SP"){
236251
field(NOBT,"1")
237252
field(ZRVL,"0")
238253
field(ONVL,"1")
239-
field(ZRST,"disable")
240-
field(ONST,"enable")
254+
field(ZRST,"off")
255+
field(ONST,"on")
241256
field(VAL, "0")
242257
}
243258
record(mbbi,"$(P)$(R)PSDacWr$(RTM_CHAN)-RB"){
@@ -248,8 +263,8 @@ record(mbbi,"$(P)$(R)PSDacWr$(RTM_CHAN)-RB"){
248263
field(NOBT,"1")
249264
field(ZRVL,"0")
250265
field(ONVL,"1")
251-
field(ZRST,"disable")
252-
field(ONST,"enable")
266+
field(ZRST,"off")
267+
field(ONST,"on")
253268
field(VAL, "0")
254269
}
255270

@@ -337,7 +352,7 @@ record(longout,"$(P)$(R)PSCurrRaw$(RTM_CHAN)-SP"){
337352
field(PINI,"YES")
338353
field(SCAN,"Passive")
339354
field(OUT,"@asynMask($(PORT),$(ADDR),0xFFFFFFFF,$(TIMEOUT))RTMLAMP_OHWR_CH_0_PI_SP_DATA")
340-
field(VAL, "2")
355+
field(VAL, "0")
341356
}
342357
record(longin,"$(P)$(R)PSCurrRaw$(RTM_CHAN)-Mon"){
343358
field(DTYP,"asynUInt32Digital")

0 commit comments

Comments
 (0)