Skip to content
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

utcaApp: build with PVXS qsrv. #19

Merged
merged 3 commits into from
Dec 3, 2024
Merged

utcaApp: build with PVXS qsrv. #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f7db752
utcaApp: build with PVXS qsrv.
ericonr Aug 9, 2023
f3195f4
pos_calc: add Monit-Mon QSRV group.
ericonr Nov 21, 2024
d6289b7
acq: add BPM data NTTable.
ericonr Nov 22, 2024
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
1 change: 1 addition & 0 deletions configure/RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ EPICS_BASE = $(TOP)/../epics-7
ASYN = $(EPICS_BASE)/../asyn
AUTOSAVE = $(EPICS_BASE)/../autosave
RETOOLS = $(EPICS_BASE)/../retools
PVXS = $(EPICS_BASE)/../pvxs

# Set RULES here if you want to use build rules from somewhere
# other than EPICS_BASE:
Expand Down
5 changes: 5 additions & 0 deletions utcaApp/Db/bpm_data.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,9 @@ record(aai, "$(P)$(R)$(ACQ_NAME)Ampl$(ADC)Data"){
field(FTVL, "LONG")
field(SCAN, "I/O Intr")
field(INP, "@asyn($(PORT),$(ADDR))ADC")
info(Q:group, {
"$(P)$(R)$(ACQ_NAME)Data-Mon": {
"value.$(ADC)": {+type: "plain", +channel: "VAL"}
}
})
}
21 changes: 21 additions & 0 deletions utcaApp/Db/bpm_pos_data.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,45 @@ record(aai,"$(P)$(R)$(ACQ_NAME)PosXData") {
field(EGU, "nm")
field(NELM, "$(NELM)")
field(FTVL, "DOUBLE")
info(Q:group, {
"$(P)$(R)$(ACQ_NAME)Data-Mon": {
"value.X": {+type: "plain", +channel: "VAL"}
}
})
}

record(aai,"$(P)$(R)$(ACQ_NAME)PosYData") {
field(EGU, "nm")
field(NELM, "$(NELM)")
field(FTVL, "DOUBLE")
info(Q:group, {
"$(P)$(R)$(ACQ_NAME)Data-Mon": {
"value.Y": {+type: "plain", +channel: "VAL"}
}
})
}

record(aai,"$(P)$(R)$(ACQ_NAME)SumData") {
field(EGU, "au")
field(NELM, "$(NELM)")
field(FTVL, "DOUBLE")
info(Q:group, {
"$(P)$(R)$(ACQ_NAME)Data-Mon": {
"value.S": {+type: "plain", +channel: "VAL"}
}
})
}

record(aai,"$(P)$(R)$(ACQ_NAME)PosQData") {
field(EGU, "nm")
field(NELM, "$(NELM)")
field(FTVL, "DOUBLE")
info(Q:group, {
"$(P)$(R)$(ACQ_NAME)Data-Mon": {
"value.Q": {+type: "plain", +channel: "VAL", +trigger: "*"},
"": {+type: "meta", +channel: "VAL"}
}
})
}

record(aao,"$(P)$(R)$(ACQ_NAME)_PolyXArrayCoeff-SP") {
Expand Down
52 changes: 52 additions & 0 deletions utcaApp/Db/pos_calc.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,37 @@ record(longin,"$(P)$(R)PosQOffset-RB"){
field(EGU, "nm")
}

record(aai, "$(P)$(R)TableLabels-Cte"){
field(FTVL, STRING)
field(NELM, 8)
field(INP, {const: [
"Amplitude A",
"Amplitude B",
"Amplitude C",
"Amplitude D",
"Q",
"Sum",
"Position X",
"Position Y"
]})
info(Q:group, {
"$(P)$(R)Monit-Mon": {
labels: {+type: "plain", +channel: "VAL"},
descriptor: {+type: "const", +const: "monit-rate data"}
},
"$(P)$(R)GENData-Mon": {
+id: "epics:nt/NTTable:1.0",
labels: {+type: "plain", +channel: "VAL"},
descriptor: {+type: "const", +const: "general acquisition core data"}
},
"$(P)$(R)PMData-Mon": {
+id: "epics:nt/NTTable:1.0",
labels: {+type: "plain", +channel: "VAL"},
descriptor: {+type: "const", +const: "post-mortem acquisition core data"}
},
})
}

record(longin, "$(P)$(R)AmpFIFOEvent"){
field(DTYP, "asynInt32")
field(SCAN, "I/O Intr")
Expand Down Expand Up @@ -158,24 +189,45 @@ record(ai,"$(P)$(R)PosX-Mon"){
field(DESC,"Monitoring Position X")
field(EGU, "nm")
field(MDEL, -1)
info(Q:group, {
"$(P)$(R)Monit-Mon": {
"value.X": {+type: "plain", +channel: "VAL"}
}
})
}

record(ai,"$(P)$(R)PosY-Mon"){
field(DESC,"Monitoring Position Y")
field(EGU, "nm")
field(MDEL, -1)
info(Q:group, {
"$(P)$(R)Monit-Mon": {
"value.Y": {+type: "plain", +channel: "VAL"}
}
})
}

record(ai,"$(P)$(R)PosQ-Mon"){
field(DESC,"Monitoring Position Q")
field(EGU, "nm")
field(MDEL, -1)
info(Q:group, {
"$(P)$(R)Monit-Mon": {
"value.Q": {+type: "plain", +channel: "VAL", +trigger: "*"},
"": {+type: "meta", +channel: "VAL"}
}
})
}

record(ai,"$(P)$(R)Sum-Mon"){
field(DESC,"Monitoring Sum")
field(EGU, "au")
field(MDEL, -1)
info(Q:group, {
"$(P)$(R)Monit-Mon": {
"value.S": {+type: "plain", +channel: "VAL"}
}
})
}

record(bo,"$(P)$(R)FOFBPhaseSyncEn-Sel"){
Expand Down
5 changes: 5 additions & 0 deletions utcaApp/Db/pos_calc_adc.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,9 @@ record(longin,"$(P)$(R)Ampl$(ADC)-Mon"){
field(INP,"@asyn($(PORT),$(ADDR))AMPFIFO_MONIT_AMP")
field(EGU, "au")
field(MDEL, -1)
info(Q:group, {
"$(P)$(R)Monit-Mon": {
"value.$(ADC)": {+type: "plain", +channel: "VAL"}
}
})
}
3 changes: 3 additions & 0 deletions utcaApp/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,9 @@ utca_SRCS += utca_registerRecordDeviceDriver.cpp
utca_SRCS_DEFAULT += utcaMain.cpp
utca_SRCS_vxWorks += -nil-

utca_DBD += pvxsIoc.dbd
utca_LIBS += pvxsIoc pvxs

# Finally link IOC to the EPICS Base libraries
utca_LIBS += $(EPICS_BASE_IOC_LIBS)

Expand Down