Skip to content

afc_timing: add new upstream debug records. #49

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

Merged
ericonr merged 3 commits into from
Mar 18, 2025
Merged

afc_timing: add new upstream debug records. #49

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
ab5898d
build: use uhal version v0.10.0.
ericonr Mar 18, 2025
67352eb
build: don't build uhal tests.
ericonr Mar 18, 2025
9194107
afc_timing: add new upstream debug records.
ericonr Nov 14, 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
2 changes: 1 addition & 1 deletion build/docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ services:
command: bash -c "build/uhal.sh && lnls-build-static-ioc afc-epics-ioc"
environment:
SKIP_CLEAN: 1
UHAL_VERSION: v0.9.1
UHAL_VERSION: v0.10.0
2 changes: 1 addition & 1 deletion build/uhal.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ cd /tmp/uhal
git checkout $UHAL_VERSION

if [ ! -d build/ ]; then
LDFLAGS=-static meson setup --buildtype debugoptimized -Dpcie_opt=true build/
LDFLAGS=-static meson setup --buildtype debugoptimized -Dpcie_opt=true -Dbuild-tests=false build/
fi

samu -C build/
Expand Down
88 changes: 88 additions & 0 deletions utcaApp/Db/afc_timing.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,91 @@ record(longin, "$(P)$(R)Alive-Mon"){
field(INP,"@asyn($(PORT))ALIVE")
field(SCAN,"I/O Intr")
}

record(bo, "$(P)$(R)UpstreamDebugEn-Sel"){
field(DTYP, "asynInt32")
field(DESC, "Enable upstream debug")
field(PINI, YES)
field(ZNAM, "Dsbl")
field(ONAM, "Enbl")
field(OUT, "@asyn($(PORT))DBG_EN")
}
record(bi, "$(P)$(R)UpstreamDebugEn-Sts"){
field(DTYP, "asynInt32")
field(DESC, "Enable upstream debug")
field(PINI, YES)
field(ZNAM, "Dsbl")
field(ONAM, "Enbl")
field(INP, "@asyn($(PORT))DBG_EN")
field(SCAN, "I/O Intr")
}

record(bo, "$(P)$(R)UpstreamDebugCounterRst-Cmd"){
field(DTYP, "asynInt32")
field(DESC, "Reset debug counter")
field(OUT, "@asyn($(PORT))DBG_COUNTER_RST")
field(PINI, YES)
field(MASK, 1)
field(HIGH, 1)
field(ZNAM, nothing)
field(ONAM, reset)
}

record(longout, "$(P)$(R)UpstreamDebugEvtIn-SP"){
field(DTYP, "asynInt32")
field(DESC, "Downstream start event")
field(PINI, YES)
field(OUT, "@asyn($(PORT))DBG_EVT_DS_START")
}
record(longin, "$(P)$(R)UpstreamDebugEvtIn-RB"){
field(DTYP, "asynInt32")
field(DESC, "Downstream start event")
field(INP, "@asyn($(PORT))DBG_EVT_DS_START")
field(SCAN, "I/O Intr")
}

record(longout, "$(P)$(R)UpstreamDebugEvtOut-SP"){
field(DTYP, "asynInt32")
field(DESC, "Upstream event")
field(PINI, YES)
field(OUT, "@asyn($(PORT))DBG_EVT_US")
}
record(longin, "$(P)$(R)UpstreamDebugEvtOut-RB"){
field(DTYP, "asynInt32")
field(DESC, "Upstream event")
field(INP, "@asyn($(PORT))DBG_EVT_US")
field(SCAN, "I/O Intr")
}

record(longout, "$(P)$(R)UpstreamDebugSpacing-SP"){
field(DTYP, "asynInt32")
field(DESC, "Spacing between upstream events")
field(PINI, YES)
field(OUT, "@asyn($(PORT))DBG_EVT_SPACING")
}
record(longin, "$(P)$(R)UpstreamDebugSpacing-RB"){
field(DTYP, "asynInt32")
field(DESC, "Spacing between upstream events")
field(INP, "@asyn($(PORT))DBG_EVT_SPACING")
field(SCAN, "I/O Intr")
}

record(longout, "$(P)$(R)UpstreamDebugReps-SP"){
field(DTYP, "asynInt32")
field(DESC, "Upstream event repetitions")
field(PINI, YES)
field(OUT, "@asyn($(PORT))DBG_EVT_REPS")
}
record(longin, "$(P)$(R)UpstreamDebugReps-RB"){
field(DTYP, "asynInt32")
field(DESC, "Upstream event repetitions")
field(INP, "@asyn($(PORT))DBG_EVT_REPS")
field(SCAN, "I/O Intr")
}

record(longin, "$(P)$(R)UpstreamDebugCounter-Mon"){
field(DTYP, "asynInt32")
field(DESC, "Debug procedure counter")
field(INP, "@asyn($(PORT))DBG_COUNTER")
field(SCAN, "I/O Intr")
}
7 changes: 7 additions & 0 deletions utcaApp/src/afc_timing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,13 @@ class AFCTiming: public UDriver {
{"LOCKED_GT0_LTC", p_last_lock},
{"ALIVE", p_read_only},
ParamInit{"RST_LOCKED_LTCS", p_decoder_controller}.set_wo(),
{"DBG_EN", p_decoder_controller},
ParamInit{"DBG_COUNTER_RST", p_decoder_controller}.set_wo(),
{"DBG_EVT_DS_START", p_decoder_controller},
{"DBG_EVT_US", p_decoder_controller},
{"DBG_EVT_SPACING", p_decoder_controller},
{"DBG_EVT_REPS", p_decoder_controller},
{"DBG_COUNTER", p_read_only},
},
{
ParamInit{"RFREQ_HI", p_read_only}.set_nc(2),
Expand Down