Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
A
AttributeCombiner
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
1
Issues
1
List
Boards
Labels
Service Desk
Milestones
Jira
Jira
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Accelerators
Generic
AttributeCombiner
Commits
e33a35a8
Commit
e33a35a8
authored
Aug 26, 2020
by
Jean-Luc Pons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Work around for DeviceAttribute extraction issue
parent
4ab2f4f4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
10 deletions
+18
-10
AttributeCombiner.cpp
AttributeCombiner.cpp
+18
-10
No files found.
AttributeCombiner.cpp
View file @
e33a35a8
...
...
@@ -944,17 +944,21 @@ void AttributeCombiner::add_dynamic_commands()
for
(
int
i
=
0
;
i
<
nbDev
;
i
++
)
{
for
(
int
j
=
0
;
j
<
nbAtt
;
j
++
)
{
if
(
!
arl
[
j
][
i
].
has_failed
()
&&
!
arl
[
j
][
i
].
get_data
().
is_empty
()
&&
arl
[
j
][
i
].
group_element_enabled
())
{
if
(
!
arl
[
j
][
i
].
has_failed
()
&&
arl
[
j
][
i
].
group_element_enabled
())
{
vector
<
inType
>
val
;
arl
[
j
][
i
]
>>
val
;
if
(
firstValue
)
{
if
(
val
.
size
()
>
0
)
{
if
(
firstValue
)
{
value
=
val
[
0
];
if
(
item
->
rwType
==
Tango
::
READ_WRITE
)
{
setPoint
=
val
[
1
];
if
(
item
->
rwType
==
Tango
::
READ_WRITE
)
{
setPoint
=
val
[
1
];
}
firstValue
=
false
;
}
else
{
}
else
{
allEqual
=
allEqual
&&
(
val
[
0
]
==
value
);
}
}
else
{
allEqual
=
false
;
}
}
else
{
if
(
arl
[
j
][
i
].
has_failed
()
&&
arl
[
j
][
i
].
group_element_enabled
())
{
...
...
@@ -1149,18 +1153,22 @@ void AttributeCombiner::add_dynamic_commands()
for
(
int
i
=
0
;
i
<
nbDev
;
i
++
)
{
for
(
int
j
=
0
;
j
<
nbAtt
;
j
++
)
{
if
(
arl
[
j
][
i
].
has_failed
()
||
arl
[
j
][
i
].
get_data
().
is_empty
()
)
{
if
(
arl
[
j
][
i
].
has_failed
())
{
readVal
[
i
*
nbAtt
+
j
]
=
invalid
;
if
(
isRW
)
readSetPoint
[
i
*
nbAtt
+
j
]
=
invalid
;
if
(
arl
[
j
][
i
].
has_failed
())
addError
(
i
,
arl
[
j
][
i
]);
addError
(
i
,
arl
[
j
][
i
]);
}
else
{
if
(
arl
[
j
][
i
].
group_element_enabled
())
{
if
(
item
->
type
!=
Tango
::
DEV_STATE
&&
isRW
)
{
vector
<
inType
>
v
;
arl
[
j
][
i
]
>>
v
;
readVal
[
i
*
nbAtt
+
j
]
=
(
outType
)
v
[
0
];
readSetPoint
[
i
*
nbAtt
+
j
]
=
(
outType
)
v
[
1
];
if
(
v
.
size
()
>
0
)
{
readVal
[
i
*
nbAtt
+
j
]
=
(
outType
)
v
[
0
];
readSetPoint
[
i
*
nbAtt
+
j
]
=
(
outType
)
v
[
1
];
}
else
{
readVal
[
i
*
nbAtt
+
j
]
=
invalid
;
if
(
isRW
)
readSetPoint
[
i
*
nbAtt
+
j
]
=
invalid
;
}
}
else
{
inType
v
;
arl
[
j
][
i
]
>>
v
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment