Skip to content

Add DEVSTA PV generation #130

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OCopping wants to merge 8 commits into
base: main
Choose a base branch
from
Open

Add DEVSTA PV generation #130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
99adb6b
Add initial devsta generation prototype
OCopping Sep 23, 2025
a15c51c
Make sure config dir exists for ioc.db
OCopping Sep 23, 2025
c9143cf
Add file header note for autogeneration and add comments
OCopping Sep 24, 2025
1fc9ca5
Add logic to allow for database link flags in devsta PV generation
OCopping Jan 7, 2026
bcd426c
Update b23-services example with DEVSTA for M3
OCopping Jan 7, 2026
b20aead
Update tests
OCopping Jan 7, 2026
731abe3
Rename ioc.db to devsta.db to differentiate from ibek runtime ioc.db
OCopping Jan 7, 2026
de96ec9
Add tests for devsta PV generation
OCopping Jan 8, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 22 additions & 0 deletions example-synoptic/b23-services/config/devsta.db
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
###################################################
## THIS FILE HAS BEEN AUTOGENERATED; DO NOT EDIT ##
###################################################

record(calc, "BL23B-OP-MR-03:DEVSTA")
{
field(ACKT, "NO")
field(CALC, "(A|B|C|D|E|F|G|H|I|J|K|L)>0?1:0")
field(INPA, "BL23B-OP-MR-03:MP:BUSY NPP NMS")
field(INPB, "BL23B-OP-MR-03:MP:DMOV.SEVR NPP MS")
field(INPC, "BL23B-OP-MR-03:MP:SELECT.SEVR NPP MS")
field(INPD, "BL23B-OP-MR-03:PITCH.MOVN NPP MS")
field(INPE, "BL23B-OP-MR-03:YAW.MOVN NPP MS")
field(INPF, "")
field(INPG, "")
field(INPH, "")
field(INPI, "")
field(INPJ, "")
field(INPK, "")
field(INPL, "")
field(SCAN, "1 second")
}
3 changes: 2 additions & 1 deletion example-synoptic/b23-services/synoptic/IMG1.bob
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
<width>351</width>
<height>432</height>
<widget type="embedded" version="2.0.0">
<name>mks937a.mks937aImg</name>
<name>BL23B-VA-IMG-01</name>
<width>301</width>
<height>382</height>
<file>techui-support/bob/mks937a/mks937aImg.bob</file>
<macros>
<P>BL23B-VA-IMG-01</P>
<IOC>https://b23-opis.diamond.ac.uk/bl23b-va-img-01</IOC>
</macros>
<x>0</x>
<y>0</y>
Expand Down
3 changes: 2 additions & 1 deletion example-synoptic/b23-services/synoptic/IMG11.bob
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
<width>351</width>
<height>432</height>
<widget type="embedded" version="2.0.0">
<name>mks937a.mks937aImg</name>
<name>BL23B-VA-IMG-11</name>
<width>301</width>
<height>382</height>
<file>techui-support/bob/mks937a/mks937aImg.bob</file>
<macros>
<P>BL23B-VA-IMG-11</P>
<IOC>https://b23-opis.diamond.ac.uk/bl23b-va-img-11</IOC>
</macros>
<x>0</x>
<y>0</y>
Expand Down
3 changes: 2 additions & 1 deletion example-synoptic/b23-services/synoptic/IMG12.bob
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
<width>351</width>
<height>432</height>
<widget type="embedded" version="2.0.0">
<name>mks937a.mks937aImg</name>
<name>BL23B-VA-IMG-12</name>
<width>301</width>
<height>382</height>
<file>techui-support/bob/mks937a/mks937aImg.bob</file>
<macros>
<P>BL23B-VA-IMG-12</P>
<IOC>https://b23-opis.diamond.ac.uk/bl23b-va-img-12</IOC>
</macros>
<x>0</x>
<y>0</y>
Expand Down
3 changes: 2 additions & 1 deletion example-synoptic/b23-services/synoptic/IONP1.bob
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
<width>351</width>
<height>293</height>
<widget type="embedded" version="2.0.0">
<name>digitelMpc.digitelMpcIonp</name>
<name>BL23B-VA-IONP-01</name>
<width>301</width>
<height>243</height>
<file>techui-support/bob/digitelMpc/digitelMpcIonp.bob</file>
<macros>
<P>BL23B-VA-IONP-01</P>
<IOC>https://b23-opis.diamond.ac.uk/bl23b-va-ionp-01</IOC>
</macros>
<x>0</x>
<y>0</y>
Expand Down
3 changes: 2 additions & 1 deletion example-synoptic/b23-services/synoptic/IONP11.bob
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
<width>351</width>
<height>293</height>
<widget type="embedded" version="2.0.0">
<name>digitelMpc.digitelMpcIonp</name>
<name>BL23B-VA-IONP-11</name>
<width>301</width>
<height>243</height>
<file>techui-support/bob/digitelMpc/digitelMpcIonp.bob</file>
<macros>
<P>BL23B-VA-IONP-11</P>
<IOC>https://b23-opis.diamond.ac.uk/bl23b-va-ionp-11</IOC>
</macros>
<x>0</x>
<y>0</y>
Expand Down
3 changes: 2 additions & 1 deletion example-synoptic/b23-services/synoptic/IONP12.bob
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
<width>351</width>
<height>293</height>
<widget type="embedded" version="2.0.0">
<name>digitelMpc.digitelMpcIonp</name>
<name>BL23B-VA-IONP-12</name>
<width>301</width>
<height>243</height>
<file>techui-support/bob/digitelMpc/digitelMpcIonp.bob</file>
<macros>
<P>BL23B-VA-IONP-12</P>
<IOC>https://b23-opis.diamond.ac.uk/bl23b-va-ionp-12</IOC>
</macros>
<x>0</x>
<y>0</y>
Expand Down
3 changes: 2 additions & 1 deletion example-synoptic/b23-services/synoptic/IONP21.bob
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
<width>351</width>
<height>293</height>
<widget type="embedded" version="2.0.0">
<name>digitelMpc.digitelMpcIonp</name>
<name>BL23B-VA-IONP-21</name>
<width>301</width>
<height>243</height>
<file>techui-support/bob/digitelMpc/digitelMpcIonp.bob</file>
<macros>
<P>BL23B-VA-IONP-21</P>
<IOC>https://b23-opis.diamond.ac.uk/bl23b-va-ionp-21</IOC>
</macros>
<x>0</x>
<y>0</y>
Expand Down
136 changes: 64 additions & 72 deletions example-synoptic/b23-services/synoptic/JsonMap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,76 +317,6 @@
"name": "PIRG2"
}
},
{
"file": "MOD2.bob",
"children": [
{
"file": "techui-support/bob/ADAravis/ADAravis_detail.bob",
"macros": {
"P": "BL23B-DI-MOD-02",
"R": ":CAM:"
}
},
{
"file": "techui-support/bob/ADAravis/NDPluginROI.pvi.bob",
"macros": {
"P": "BL23B-DI-MOD-02",
"R": ":ROI:"
}
},
{
"file": "techui-support/bob/ADAravis/NDPluginStats.pvi.bob",
"macros": {
"P": "BL23B-DI-MOD-02",
"R": ":STAT:"
}
},
{
"file": "techui-support/bob/ADAravis/NDFileHDF5.pvi.bob",
"macros": {
"P": "BL23B-DI-MOD-02",
"R": ":HDF5:"
}
}
]
},
{
"file": "MOD1.bob",
"children": [
{
"file": "techui-support/bob/ADAravis/ADAravis_detail.bob",
"duplicate": true,
"macros": {
"P": "BL23B-DI-MOD-01",
"R": ":CAM:"
}
},
{
"file": "techui-support/bob/ADAravis/NDPluginROI.pvi.bob",
"duplicate": true,
"macros": {
"P": "BL23B-DI-MOD-01",
"R": ":ROI:"
}
},
{
"file": "techui-support/bob/ADAravis/NDPluginStats.pvi.bob",
"duplicate": true,
"macros": {
"P": "BL23B-DI-MOD-01",
"R": ":STAT:"
}
},
{
"file": "techui-support/bob/ADAravis/NDFileHDF5.pvi.bob",
"duplicate": true,
"macros": {
"P": "BL23B-DI-MOD-01",
"R": ":HDF5:"
}
}
]
},
{
"file": "IMG11.bob",
"macros": {
Expand Down Expand Up @@ -501,11 +431,73 @@
},
{
"file": "MOD1.bob",
"duplicate": true
"children": [
{
"file": "techui-support/bob/ADAravis/ADAravis_detail.bob",
"macros": {
"P": "BL23B-DI-MOD-01",
"R": ":CAM:"
}
},
{
"file": "techui-support/bob/ADAravis/NDPluginROI.pvi.bob",
"macros": {
"P": "BL23B-DI-MOD-01",
"R": ":ROI:"
}
},
{
"file": "techui-support/bob/ADAravis/NDPluginStats.pvi.bob",
"macros": {
"P": "BL23B-DI-MOD-01",
"R": ":STAT:"
}
},
{
"file": "techui-support/bob/ADAravis/NDFileHDF5.pvi.bob",
"macros": {
"P": "BL23B-DI-MOD-01",
"R": ":HDF5:"
}
}
]
},
{
"file": "MOD2.bob",
"duplicate": true
"children": [
{
"file": "techui-support/bob/ADAravis/ADAravis_detail.bob",
"duplicate": true,
"macros": {
"P": "BL23B-DI-MOD-02",
"R": ":CAM:"
}
},
{
"file": "techui-support/bob/ADAravis/NDPluginROI.pvi.bob",
"duplicate": true,
"macros": {
"P": "BL23B-DI-MOD-02",
"R": ":ROI:"
}
},
{
"file": "techui-support/bob/ADAravis/NDPluginStats.pvi.bob",
"duplicate": true,
"macros": {
"P": "BL23B-DI-MOD-02",
"R": ":STAT:"
}
},
{
"file": "techui-support/bob/ADAravis/NDFileHDF5.pvi.bob",
"duplicate": true,
"macros": {
"P": "BL23B-DI-MOD-02",
"R": ":HDF5:"
}
}
]
}
]
}
21 changes: 12 additions & 9 deletions example-synoptic/b23-services/synoptic/M3.bob
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,47 +8,50 @@
<width>255</width>
<height>540</height>
<widget type="embedded" version="2.0.0">
<name>:Y</name>
<name>Y</name>
<width>205</width>
<height>120</height>
<file>techui-support/bob/pmac/motor_embed.bob</file>
<macros>
<P>BL23B-OP-MR-03</P>
<M>:Y</M>
<M>Y</M>
<IOC>https://b23-opis.diamond.ac.uk/bl23b-op-mr-03</IOC>
</macros>
<x>0</x>
<y>0</y>
</widget>
<widget type="embedded" version="2.0.0">
<name>:YAW</name>
<name>YAW</name>
<width>205</width>
<height>120</height>
<file>techui-support/bob/pmac/motor_embed.bob</file>
<macros>
<P>BL23B-OP-MR-03</P>
<M>:YAW</M>
<M>YAW</M>
<IOC>https://b23-opis.diamond.ac.uk/bl23b-op-mr-03</IOC>
</macros>
<x>0</x>
<y>150</y>
</widget>
<widget type="embedded" version="2.0.0">
<name>:PITCH</name>
<name>PITCH</name>
<width>205</width>
<height>120</height>
<file>techui-support/bob/pmac/motor_embed.bob</file>
<macros>
<P>BL23B-OP-MR-03</P>
<M>:PITCH</M>
<M>PITCH</M>
<IOC>https://b23-opis.diamond.ac.uk/bl23b-op-mr-03</IOC>
</macros>
<x>0</x>
<y>300</y>
</widget>
<widget type="action_button" version="2.0.0">
<name>pmac.GeoBrick</name>
<name>BL23B-MO-PMAC-01</name>
<width>100</width>
<height>40</height>
<pv_name>BL23B-MO-PMAC-01</pv_name>
<text>pmac.GeoBrick</text>
<pv_name/>
<text>BL23B-MO-PMAC-01</text>
<actions>
<action type="open_display">
<description>Open Display</description>
Expand Down
Loading
Loading