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
f2f670aa
Commit
f2f670aa
authored
Oct 16, 2019
by
Nicolas Tappret
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix CommandList not working and add check if DeviceList property is size > 0
parent
bbf51d30
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
16 deletions
+12
-16
AttributeCombiner.cpp
AttributeCombiner.cpp
+5
-16
AttributeCombinerClass.cpp
AttributeCombinerClass.cpp
+7
-0
No files found.
AttributeCombiner.cpp
View file @
f2f670aa
...
...
@@ -167,6 +167,11 @@ void AttributeCombiner::init_device()
attr_DeviceList_read
=
new
Tango
::
DevString
[
4096
];
/*----- PROTECTED REGION ID(AttributeCombiner::init_device) ENABLED START -----*/
if
(
deviceList
.
size
()
==
0
)
{
cerr
<<
device_name
<<
":deviceList is mandatory for the start of the device server"
<<
endl
;
exit
(
1
);
}
set_state
(
Tango
::
ON
);
set_status
(
"ON"
);
...
...
@@ -1781,21 +1786,5 @@ void AttributeCombiner::add_dynamic_commands()
}
return
Tango
::
ALARM
;
}
// //--------------------------------------------------------
// /**
// * Command saveReference related method
// * Description: for create dynamicaly a commande for save live attribute to reference attribute
// *
// */
// //--------------------------------------------------------
// void AttributeCombiner::save_reference(Tango::Command &command)
// {
// DEBUG_STREAM << "AttributeCombiner::" << command.get_name() << " - " << device_name << endl;
//
// // Add your own code
//
// }
/*----- PROTECTED REGION END -----*/
// AttributeCombiner::namespace_ending
}
// namespace
AttributeCombinerClass.cpp
View file @
f2f670aa
...
...
@@ -560,6 +560,13 @@ void AttributeCombinerClass::device_factory(const Tango::DevVarStringArray *devl
/*----- PROTECTED REGION ID(AttributeCombinerClass::device_factory_after) ENABLED START -----*/
// Add your own code
for
(
unsigned
long
i
=
1
;
i
<=
devlist_ptr
->
length
()
;
i
++
)
{
// Add dynamic attributes if any
AttributeCombiner
*
dev
=
static_cast
<
AttributeCombiner
*>
(
device_list
[
device_list
.
size
()
-
i
]);
dev
->
add_dynamic_commands
();
}
/*----- PROTECTED REGION END -----*/
// AttributeCombinerClass::device_factory_after
}
...
...
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