Skip to content

Commit 636bbe3

Browse files
Move DisabledSensors_RBV to module template
These PVs are module-based, so they must belong to the module.template file, which makes them properly replicated for all the detector modules by the model substitution files. Move it there. Fixes: 8e92516 (Move module-specific records to dedicated template, 2025-02-27)
1 parent 9e9d865 commit 636bbe3

3 files changed

Lines changed: 14 additions & 42 deletions

File tree

RELEASE.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,10 @@ released versions.
1111

1212
- **Breaking**: Rename disabled sensors PVs (Henrique F. Simoes)
1313
- Rename them from `DisabledSensorsM<n>_RBV` to `M<n>:DisabledSensors_RBV`
14-
where `<n>` is from 1 up to 4.
14+
where `<n>` is the module number.
15+
- Export `DisabledSensors_RBV` based on the number of modules (Henrique F.
16+
Simoes)
17+
- Expose it for each module given the detector model instead of 4 modules.
1518

1619
## 2.6.0
1720

pimegaApp/Db/module.template

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,16 @@ record(waveform, "$(P)$(R)$(MODULE)Sensor_Temperature_RBV") {
3131
field(PREC, "2")
3232
}
3333

34+
record(waveform, "$(P)$(R)$(MODULE)DisabledSensors_RBV")
35+
{
36+
field(DESC, "Disabled sensors")
37+
field(DTYP, "asynInt32ArrayIn")
38+
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT)MODULE_DISABLED_SENSORS")
39+
field(FTVL, "LONG")
40+
field(NELM, "36")
41+
field(SCAN, "I/O Intr")
42+
}
43+
3444
record(ai,"$(P)$(R)$(MODULE)Medipix_AvgTemperature_RBV") {
3545
field(DESC, "Medipix average temperature")
3646
field(DTYP, "asynFloat64")

pimegaApp/Db/pimega.template

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1116,47 +1116,6 @@ record(bo, "$(P)$(R)CheckSensors") {
11161116
field(OUT, "@asyn($(PORT),$(ADDR),$(TIMEOUT))CHECK_SENSORS")
11171117
}
11181118

1119-
record(waveform, "$(P)$(R)M1:DisabledSensors_RBV")
1120-
{
1121-
field(DESC, "Disabled Sensors Reaback")
1122-
field(DTYP, "asynInt32ArrayIn")
1123-
field(INP, "@asyn($(PORT),0,$(TIMEOUT)MODULE_DISABLED_SENSORS")
1124-
field(FTVL, "LONG")
1125-
field(NELM, "36")
1126-
field(SCAN, "I/O Intr")
1127-
}
1128-
1129-
record(waveform, "$(P)$(R)M2:DisabledSensors_RBV")
1130-
{
1131-
field(DESC, "Disabled Sensors Reaback")
1132-
field(DTYP, "asynInt32ArrayIn")
1133-
field(INP, "@asyn($(PORT),1,$(TIMEOUT)MODULE_DISABLED_SENSORS")
1134-
field(FTVL, "LONG")
1135-
field(NELM, "36")
1136-
field(SCAN, "I/O Intr")
1137-
}
1138-
1139-
record(waveform, "$(P)$(R)M3:DisabledSensors_RBV")
1140-
{
1141-
field(DESC, "Disabled Sensors Reaback")
1142-
field(DTYP, "asynInt32ArrayIn")
1143-
field(INP, "@asyn($(PORT),2,$(TIMEOUT)MODULE_DISABLED_SENSORS")
1144-
field(FTVL, "LONG")
1145-
field(NELM, "36")
1146-
field(SCAN, "I/O Intr")
1147-
}
1148-
1149-
record(waveform, "$(P)$(R)M4:DisabledSensors_RBV")
1150-
{
1151-
field(DESC, "Disabled Sensors Reaback")
1152-
field(DTYP, "asynInt32ArrayIn")
1153-
field(INP, "@asyn($(PORT),3,$(TIMEOUT)MODULE_DISABLED_SENSORS")
1154-
field(FTVL, "LONG")
1155-
field(NELM, "36")
1156-
field(SCAN, "I/O Intr")
1157-
}
1158-
1159-
11601119
record(bi,"$(P)$(R)SendDAC_Done_RBV") {
11611120
field(DTYP, "asynInt32")
11621121
field(INP, "@asyn($(PORT),$(ADDR),$(TIMEOUT))SEND_DAC_DONE")

0 commit comments

Comments
 (0)