Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
fe-vmm-tbl
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
nice
dev-epics-modules
fe-vmm-tbl
Commits
28363704
Commit
28363704
authored
3 months ago
by
Marco Filho
Browse files
Options
Downloads
Patches
Plain Diff
Solve compilation errors.
Mostly just change names of files or classes.
parent
fa45ac89
Loading
Loading
2 merge requests
!7
Major refactor
,
!6
Take API out of EPICS module
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
vmmTblApp/src/vmm_tbl.cpp
+13
-13
13 additions, 13 deletions
vmmTblApp/src/vmm_tbl.cpp
vmmTblApp/src/vmm_tbl.h
+2
-2
2 additions, 2 deletions
vmmTblApp/src/vmm_tbl.h
with
15 additions
and
15 deletions
vmmTblApp/src/vmm_tbl.cpp
+
13
−
13
View file @
28363704
...
@@ -10,7 +10,7 @@ VMMTbl::VMMTbl(RMM* rmm, const char *FENPortName, int ring, int node, int hybrid
...
@@ -10,7 +10,7 @@ VMMTbl::VMMTbl(RMM* rmm, const char *FENPortName, int ring, int node, int hybrid
number_hybrids
(
hybrids
)
number_hybrids
(
hybrids
)
{
{
pVmm
Tbl
API
=
FrontEndFactory
::
createAndRegister
<
V
mmTbl
API
>
(
pVmmAPI
=
FrontEndFactory
::
createAndRegister
<
V
MM
API
>
(
rmm
->
getRMMAPI
(),
rmm
->
getRMMAPI
(),
ring
,
ring
,
node
,
node
,
...
@@ -22,11 +22,11 @@ VMMTbl::VMMTbl(RMM* rmm, const char *FENPortName, int ring, int node, int hybrid
...
@@ -22,11 +22,11 @@ VMMTbl::VMMTbl(RMM* rmm, const char *FENPortName, int ring, int node, int hybrid
rmm
->
updateTopologyPvs
(
ring
,
node
,
"vmmTbl"
);
rmm
->
updateTopologyPvs
(
ring
,
node
,
"vmmTbl"
);
if
(
rmm
->
getRMMAPI
()
->
checkRings
()
==
rmmSuccess
)
{
if
(
rmm
->
getRMMAPI
()
->
checkRings
()
==
rmmSuccess
)
{
for
(
int
hyb
=
0
;
hyb
<
number_hybrids
;
hyb
++
)
{
for
(
int
hyb
=
0
;
hyb
<
number_hybrids
;
hyb
++
)
{
pVmm
Tbl
API
->
enableHybrid
(
hyb
,
true
);
pVmmAPI
->
enableHybrid
(
hyb
,
true
);
setStringParam
(
vmmHybFwVersion_
[
hyb
],
pVmm
Tbl
API
->
readFwVersion
(
hyb
).
c_str
());
setStringParam
(
vmmHybFwVersion_
[
hyb
],
pVmmAPI
->
readFwVersion
(
hyb
).
c_str
());
setStringParam
(
vmmHybId_
[
hyb
],
pVmm
Tbl
API
->
readIDChip
(
hyb
).
c_str
());
setStringParam
(
vmmHybId_
[
hyb
],
pVmmAPI
->
readIDChip
(
hyb
).
c_str
());
setStringParam
(
vmmHybGeoPos_
[
hyb
],
pVmm
Tbl
API
->
readGeoPos
(
hyb
).
c_str
());
setStringParam
(
vmmHybGeoPos_
[
hyb
],
pVmmAPI
->
readGeoPos
(
hyb
).
c_str
());
setIntegerParam
(
vmmHybLinkStatus_
[
hyb
],
std
::
stoi
(
pVmm
Tbl
API
->
checkLinkStatus
(
hyb
)));
setIntegerParam
(
vmmHybLinkStatus_
[
hyb
],
std
::
stoi
(
pVmmAPI
->
checkLinkStatus
(
hyb
)));
}
}
}
}
}
}
...
@@ -91,9 +91,9 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) {
...
@@ -91,9 +91,9 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) {
for
(
int
vmm
=
0
;
vmm
<=
1
;
vmm
++
)
{
for
(
int
vmm
=
0
;
vmm
<=
1
;
vmm
++
)
{
getIntegerParam
(
vmmSelectMonitorVMM0_
+
vmm
,
&
adc_sensor
);
getIntegerParam
(
vmmSelectMonitorVMM0_
+
vmm
,
&
adc_sensor
);
std
::
cout
<<
"adc_sensor"
<<
adc_sensor
<<
std
::
endl
;
std
::
cout
<<
"adc_sensor"
<<
adc_sensor
<<
std
::
endl
;
pVmm
Tbl
API
->
getHybrid
(
0
).
getVMM
(
vmm
).
setRegister
(
"sm5_sm0"
,
adc_sensor
+
64
);
pVmmAPI
->
getHybrid
(
0
).
getVMM
(
vmm
).
setRegister
(
"sm5_sm0"
,
adc_sensor
+
64
);
pVmm
Tbl
API
->
configVMM
(
0
,
vmm
);
pVmmAPI
->
configVMM
(
0
,
vmm
);
int
adc_read
=
pVmm
Tbl
API
->
readADC
(
0
,
vmm
);
int
adc_read
=
pVmmAPI
->
readADC
(
0
,
vmm
);
std
::
cout
<<
"adc_read"
<<
adc_read
<<
std
::
endl
;
std
::
cout
<<
"adc_read"
<<
adc_read
<<
std
::
endl
;
...
@@ -109,11 +109,11 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) {
...
@@ -109,11 +109,11 @@ asynStatus VMMTbl::writeInt32(asynUser *pasynUser, epicsInt32 value) {
else
if
(
function
==
vmmAcquire_
)
{
else
if
(
function
==
vmmAcquire_
)
{
if
(
value
)
pVmm
Tbl
API
->
acquire
(
true
);
if
(
value
)
pVmmAPI
->
acquire
(
true
);
else
pVmm
Tbl
API
->
acquire
(
false
);
else
pVmmAPI
->
acquire
(
false
);
for
(
int
hyb
=
0
;
hyb
<
number_hybrids
;
hyb
++
)
for
(
int
hyb
=
0
;
hyb
<
number_hybrids
;
hyb
++
)
setIntegerParam
(
vmmHybLinkStatus_
[
hyb
],
std
::
stoi
(
pVmm
Tbl
API
->
checkLinkStatus
(
hyb
)));
setIntegerParam
(
vmmHybLinkStatus_
[
hyb
],
std
::
stoi
(
pVmmAPI
->
checkLinkStatus
(
hyb
)));
}
}
return
status
;
return
status
;
...
@@ -146,7 +146,7 @@ asynStatus VMMTbl::writeInt8Array(asynUser *pasynUser, epicsInt8 *value, size_t
...
@@ -146,7 +146,7 @@ asynStatus VMMTbl::writeInt8Array(asynUser *pasynUser, epicsInt8 *value, size_t
for
(
epicsInt8
i
=
0
;
i
<
ncopy
;
++
i
)
{
for
(
epicsInt8
i
=
0
;
i
<
ncopy
;
++
i
)
{
int8Array
.
push_back
(
static_cast
<
int
>
(
value
[
i
])
>=
1
?
1
:
0
);
int8Array
.
push_back
(
static_cast
<
int
>
(
value
[
i
])
>=
1
?
1
:
0
);
pVmm
Tbl
API
->
getHybrid
(
pair
.
hyb
).
getVMM
(
pair
.
vmm
).
setRegister
(
pair
.
rg
.
c_str
(),
pVmmAPI
->
getHybrid
(
pair
.
hyb
).
getVMM
(
pair
.
vmm
).
setRegister
(
pair
.
rg
.
c_str
(),
static_cast
<
int
>
(
value
[
i
]),
static_cast
<
int
>
(
value
[
i
]),
i
);
i
);
}
}
...
...
This diff is collapsed.
Click to expand it.
vmmTblApp/src/vmm_tbl.h
+
2
−
2
View file @
28363704
#pragma once
#pragma once
#include
"rmm.h"
#include
"rmm.h"
#include
"V
mmTbl
API.h"
#include
"V
MM
API.h"
/* Struct to hold Hyb, VMM pair values */
/* Struct to hold Hyb, VMM pair values */
struct
Reg
{
struct
Reg
{
...
@@ -45,6 +45,6 @@ protected:
...
@@ -45,6 +45,6 @@ protected:
private
:
private
:
static
constexpr
const
char
*
driverName
=
"VMMTbl"
;
static
constexpr
const
char
*
driverName
=
"VMMTbl"
;
std
::
shared_ptr
<
V
mmTbl
API
>
pVmm
Tbl
API
;
std
::
shared_ptr
<
V
MM
API
>
pVmmAPI
;
int
number_hybrids
;
int
number_hybrids
;
};
};
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