Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
e3-require
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Jira
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ESS EPICS Environment
wrappers
e3-require
Commits
3e2b6a01
Commit
3e2b6a01
authored
2 years ago
by
Douglas Araujo
Browse files
Options
Downloads
Patches
Plain Diff
Updated PV-names to be ESS compliant
parent
58fce33c
No related branches found
No related tags found
1 merge request
!109
Update the pv names
Pipeline
#123620
passed with warnings
2 years ago
Changes
3
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.md
+1
-0
1 addition, 0 deletions
CHANGELOG.md
require-ess/Db/moduleversion.template
+23
-20
23 additions, 20 deletions
require-ess/Db/moduleversion.template
require-ess/src/require.c
+4
-4
4 additions, 4 deletions
require-ess/src/require.c
with
28 additions
and
24 deletions
CHANGELOG.md
+
1
−
0
View file @
3e2b6a01
...
...
@@ -30,6 +30,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
*
Drop file extension from
`build_number.sh`
*
Rename
`setE3Env.bash`
to
`activate`
*
Add alias from
`setE3Env.bash`
to
`activate`
*
Updated PV-names to be ESS compliant, and remove VERSIONS PV
## [4.0.0]
...
...
This diff is collapsed.
Click to expand it.
require-ess/Db/moduleversion.template
+
23
−
20
View file @
3e2b6a01
record
(waveform, "$(REQUIRE_IOC):M
ODULES
")
record(waveform, "$(REQUIRE_IOC):M
odules
")
{
field (DESC, "List of loaded modules")
field (FTVL, "STRING")
field (NELM, "$(MODULE_COUNT)")
field (PINI, "YES")
field(DESC, "Names of loaded modules")
field(FTVL, "STRING")
field(NELM, "$(MODULE_COUNT)")
field(PINI, "YES")
field(DISP, "1")
}
record (waveform, "$(REQUIRE_IOC):V
ERSIONS
")
record (waveform, "$(REQUIRE_IOC):V
ersions
")
{
field (DESC, "Versions of loaded modules")
field (FTVL, "STRING")
...
...
@@ -14,26 +15,28 @@ record (waveform, "$(REQUIRE_IOC):VERSIONS")
field (PINI, "YES")
}
record
(waveform, "$(REQUIRE_IOC):M
OD_VER
")
record(waveform, "$(REQUIRE_IOC):M
oduleVersions
")
{
field (DESC, "List of loaded modules")
field (FTVL, "CHAR")
field (NELM, "$(BUFFER_SIZE)")
field (PINI, "YES")
field(DESC, "Name and version of the loaded modules")
field(FTVL, "CHAR")
field(NELM, "$(BUFFER_SIZE)")
field(PINI, "YES")
field(DISP, "1")
}
record
(stringin, "$(REQUIRE_IOC):$(MODULE)
_VER
")
record(stringin, "$(REQUIRE_IOC):$(MODULE)
Version
")
{
field (DESC, "Module $(MODULE) version")
field (VAL, "$(VERSION)")
field (PINI, "YES")
field(DESC, "Module $(MODULE) version")
field(VAL, "$(VERSION)")
field(PINI, "YES")
field(DISP, "1")
}
record(stringin,"$(REQUIRE_IOC):BaseVersion")
{
field
(DESC,"EPICS Base
V
ersion")
field
(DTYP,"getenv")
field
(INP,"@EPICS_VERSION_FULL")
field
(PINI,"YES")
field
(DISP,
1
)
field(DESC,
"EPICS Base
v
ersion")
field(DTYP,
"getenv")
field(INP,
"@EPICS_VERSION_FULL")
field(PINI,
"YES")
field(DISP,
"1"
)
}
This diff is collapsed.
Click to expand it.
require-ess/src/require.c
+
4
−
4
View file @
3e2b6a01
...
...
@@ -328,12 +328,12 @@ static void fillModuleListRecord(initHookState state) {
if
(
requireDebug
)
printf
(
"require: fillModuleListRecord
\n
"
);
have_modules
=
(
getRecordHandle
(
":M
ODULES
"
,
DBF_STRING
,
moduleCount
,
&
modules
)
==
0
);
(
getRecordHandle
(
":M
odules
"
,
DBF_STRING
,
moduleCount
,
&
modules
)
==
0
);
have_versions
=
(
getRecordHandle
(
":V
ERSIONS
"
,
DBF_STRING
,
moduleCount
,
&
versions
)
==
0
);
(
getRecordHandle
(
":V
ersions
"
,
DBF_STRING
,
moduleCount
,
&
versions
)
==
0
);
moduleListBufferSize
+=
moduleCount
*
maxModuleNameLength
;
have_modver
=
(
getRecordHandle
(
":M
OD_VER
"
,
DBF_CHAR
,
moduleListBufferSize
,
have_modver
=
(
getRecordHandle
(
":M
oduleVersions
"
,
DBF_CHAR
,
moduleListBufferSize
,
&
modver
)
==
0
);
for
(
m
=
loadedModules
,
i
=
0
;
m
;
m
=
m
->
next
,
i
++
)
{
...
...
@@ -1339,4 +1339,4 @@ static void requireRegister(void) {
}
epicsExportRegistrar
(
requireRegister
);
epicsExportAddress
(
int
,
requireDebug
);
epicsExportAddress
(
int
,
requireDebug
);
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment