Skip to content

Make QSRV aware of waveforms which are strings #584

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
ericonr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Make QSRV aware of waveforms which are strings #584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions ADApp/Db/ADBase.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,6 +433,7 @@ record(waveform, "$(P)$(R)StatusMessage_RBV")
field(FTVL, "CHAR")
field(NELM, "256")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

record(waveform, "$(P)$(R)StringToServer_RBV")
Expand All @@ -442,6 +443,7 @@ record(waveform, "$(P)$(R)StringToServer_RBV")
field(FTVL, "CHAR")
field(NELM, "256")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

record(waveform, "$(P)$(R)StringFromServer_RBV")
Expand All @@ -451,6 +453,7 @@ record(waveform, "$(P)$(R)StringFromServer_RBV")
field(FTVL, "CHAR")
field(NELM, "256")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

################################################################@###
Expand Down
1 change: 1 addition & 0 deletions ADApp/Db/ADPrefixes.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,6 @@ record(waveform, "$(P)$(R)ChannelPrefixes")
{
field(FTVL, "CHAR")
field(NELM, "$(NELEMENTS)")
info(Q:form, "String")
}

2 changes: 2 additions & 0 deletions ADApp/Db/NDArrayBase.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,6 +782,7 @@ record(waveform, "$(P)$(R)NDAttributesMacros")
field(FTVL, "CHAR")
field(NELM, "256")
info(autosaveFields, "VAL")
info(Q:form, "String")
}

###################################################################
Expand All @@ -796,6 +797,7 @@ record(waveform, "$(P)$(R)NDAttributesFile")
field(FTVL, "CHAR")
field(NELM, "$(XMLSIZE=256)")
info(autosaveFields, "VAL")
info(Q:form, "String")
}

###################################################################
Expand Down
2 changes: 2 additions & 0 deletions ADApp/Db/NDAttributeN.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ record(waveform, "$(P)$(R)AttrName")
field(INP, "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))ATTR_ATTRNAME")
field(FTVL, "CHAR")
field(NELM, "256")
info(Q:form, "String")
}

record(waveform, "$(P)$(R)AttrName_RBV")
Expand All @@ -41,6 +42,7 @@ record(waveform, "$(P)$(R)AttrName_RBV")
field(FTVL, "CHAR")
field(NELM, "256")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

###################################################################
Expand Down
1 change: 1 addition & 0 deletions ADApp/Db/NDBadPixel.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ record(waveform, "$(P)$(R)FileName")
field(INP, "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))BAD_PIXEL_FILE_NAME")
field(FTVL, "CHAR")
field(NELM, "256")
info(Q:form, "String")
}
2 changes: 2 additions & 0 deletions ADApp/Db/NDCircularBuff.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ record(waveform, "$(P)$(R)TriggerCalc") {
field(FTVL, "CHAR")
field(NELM, "256")
field(PINI, "1")
info(Q:form, "String")
}

# # Trigger calculation readback
Expand All @@ -100,6 +101,7 @@ record(waveform, "$(P)$(R)TriggerCalc_RBV") {
field(FTVL, "CHAR")
field(NELM, "256")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

# # Trigger calculation value
Expand Down
1 change: 1 addition & 0 deletions ADApp/Db/NDCodec.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,4 +259,5 @@ record(waveform, "$(P)$(R)CodecError")
field(SCAN, "I/O Intr")
field(FTVL, "CHAR")
field(NELM, "256")
info(Q:form, "String")
}
8 changes: 8 additions & 0 deletions ADApp/Db/NDFile.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ record(waveform, "$(P)$(R)FilePath")
field(FTVL, "CHAR")
field(NELM, "256")
info(autosaveFields, "VAL")
info(Q:form, "String")
}

record(waveform, "$(P)$(R)FilePath_RBV")
Expand All @@ -26,6 +27,7 @@ record(waveform, "$(P)$(R)FilePath_RBV")
field(FTVL, "CHAR")
field(NELM, "256")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

record(bi, "$(P)$(R)FilePathExists_RBV")
Expand Down Expand Up @@ -65,6 +67,7 @@ record(waveform, "$(P)$(R)FileName")
field(FTVL, "CHAR")
field(NELM, "256")
info(autosaveFields, "VAL")
info(Q:form, "String")
}

record(waveform, "$(P)$(R)FileName_RBV")
Expand All @@ -74,6 +77,7 @@ record(waveform, "$(P)$(R)FileName_RBV")
field(FTVL, "CHAR")
field(NELM, "256")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

record(longout, "$(P)$(R)FileNumber")
Expand Down Expand Up @@ -123,6 +127,7 @@ record(waveform, "$(P)$(R)FileTemplate")
field(FTVL, "CHAR")
field(NELM, "256")
info(autosaveFields, "VAL")
info(Q:form, "String")
}

record(waveform, "$(P)$(R)FileTemplate_RBV")
Expand All @@ -132,6 +137,7 @@ record(waveform, "$(P)$(R)FileTemplate_RBV")
field(FTVL, "CHAR")
field(NELM, "256")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

# Full filename, including path
Expand All @@ -142,6 +148,7 @@ record(waveform, "$(P)$(R)FullFileName_RBV")
field(FTVL, "CHAR")
field(NELM, "512")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

# Autosave flag
Expand Down Expand Up @@ -350,6 +357,7 @@ record(waveform, "$(P)$(R)WriteMessage")
field(FTVL, "CHAR")
field(NELM, "256")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

record(bo, "$(P)$(R)LazyOpen")
Expand Down
3 changes: 3 additions & 0 deletions ADApp/Db/NDFileHDF5.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -820,6 +820,7 @@ record(waveform, "$(P)$(R)XMLErrorMsg_RBV")
field(FTVL, "CHAR")
field(NELM, "256")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

record(bi, "$(P)$(R)XMLValid_RBV")
Expand All @@ -843,6 +844,7 @@ record(waveform, "$(P)$(R)XMLFileName")
field(FTVL, "CHAR")
field(NELM, "$(XMLSIZE=2048)")
info(autosaveFields, "VAL")
info(Q:form, "String")
}

record(waveform, "$(P)$(R)XMLFileName_RBV")
Expand All @@ -852,6 +854,7 @@ record(waveform, "$(P)$(R)XMLFileName_RBV")
field(FTVL, "CHAR")
field(NELM, "$(XMLSIZE=2048)")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

record(bi, "$(P)$(R)SWMRSupported_RBV")
Expand Down
4 changes: 4 additions & 0 deletions ADApp/Db/NDFileNexus.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ record(waveform, "$(P)$(R)TemplateFilePath")
field(FTVL, "CHAR")
field(NELM, "256")
info(autosaveFields, "VAL")
info(Q:form, "String")
}

record(waveform, "$(P)$(R)TemplateFilePath_RBV")
Expand All @@ -43,6 +44,7 @@ record(waveform, "$(P)$(R)TemplateFilePath_RBV")
field(FTVL, "CHAR")
field(NELM, "256")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

# Template Filename
Expand All @@ -54,6 +56,7 @@ record(waveform, "$(P)$(R)TemplateFileName")
field(FTVL, "CHAR")
field(NELM, "256")
info(autosaveFields, "VAL")
info(Q:form, "String")
}

record(waveform, "$(P)$(R)TemplateFileName_RBV")
Expand All @@ -63,6 +66,7 @@ record(waveform, "$(P)$(R)TemplateFileName_RBV")
field(FTVL, "CHAR")
field(NELM, "256")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

record(bi, "$(P)$(R)FileTemplateValid")
Expand Down
2 changes: 2 additions & 0 deletions ADApp/Db/NDOverlayN.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,7 @@ record(waveform, "$(P)$(R)DisplayText")
field(FTVL, "CHAR")
field(NELM, "256")
info(autosaveFields, "VAL")
info(Q:form, "String")
}

record(waveform, "$(P)$(R)DisplayText_RBV")
Expand All @@ -401,6 +402,7 @@ record(waveform, "$(P)$(R)DisplayText_RBV")
field(FTVL, "CHAR")
field(NELM, "256")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

record(stringout, "$(P)$(R)TimeStampFormat")
Expand Down
2 changes: 2 additions & 0 deletions ADApp/Db/NDPosPlugin.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ record(waveform, "$(P)$(R)Filename")
field(INP, "@asyn($(PORT),$(ADDR=0),$(TIMEOUT=1))NDPos_Filename")
field(FTVL, "CHAR")
field(NELM, "1000000")
info(Q:form, "String")
}

record(waveform, "$(P)$(R)Filename_RBV")
Expand All @@ -26,6 +27,7 @@ record(waveform, "$(P)$(R)Filename_RBV")
field(FTVL, "CHAR")
field(NELM, "1000000")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}

record(bi, "$(P)$(R)FileValid_RBV")
Expand Down
1 change: 1 addition & 0 deletions ADApp/Db/NDPva.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ record(waveform, "$(P)$(R)PvName_RBV")
field(FTVL, "CHAR")
field(NELM, "256")
field(SCAN, "I/O Intr")
info(Q:form, "String")
}
Loading