Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
SY900S_Channel
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
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
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software Control System
Tango devices
PowerSupply
SY900S_Channel
Commits
01b9cb3f
Commit
01b9cb3f
authored
Mar 18, 2019
by
Xavier ELATTAOUI
Browse files
Options
Downloads
Patches
Plain Diff
compile error fixed
parent
b28807f2
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
pom.xml
+2
-2
2 additions, 2 deletions
pom.xml
src/SY900S_Channel.cpp
+17
-5
17 additions, 5 deletions
src/SY900S_Channel.cpp
with
19 additions
and
7 deletions
pom.xml
+
2
−
2
View file @
01b9cb3f
...
...
@@ -8,7 +8,7 @@
</parent>
<groupId>
fr.soleil.device
</groupId>
<artifactId>
SY900S_channel-${aol}-${mode}
</artifactId>
<version>
2.2.1
-SNAPSHOT
</version>
<version>
2.2.1
</version>
<packaging>
nar
</packaging>
<name>
SY900S_Channel
</name>
<description>
SY900S_channel device
</description>
...
...
This diff is collapsed.
Click to expand it.
src/SY900S_Channel.cpp
+
17
−
5
View file @
01b9cb3f
...
...
@@ -157,6 +157,8 @@ namespace SY900S_Channel_ns
CREATE_SCALAR_ATTRIBUTE
(
attr_channel_read
);
CREATE_SCALAR_ATTRIBUTE
(
attr_group_read
);
create_SY900S_generic_Proxy
();
}
//+----------------------------------------------------------------------------
...
...
@@ -497,6 +499,13 @@ void SY900S_Channel::write_targetVoltage(Tango::WAttribute &attr)
set_state
(
argout
);
return
argout
;
}
if
(
!
SY900S_generic_Proxy
)
{
argout
=
Tango
::
FAULT
;
set_status
(
"Device initialization failed : no proxy created!"
);
set_state
(
argout
);
return
argout
;
}
try
{
...
...
@@ -558,16 +567,18 @@ void SY900S_Channel::write_targetVoltage(Tango::WAttribute &attr)
{
DEBUG_STREAM
<<
"SY900S_Channel::write_read() entering..."
<<
endl
;
response
.
clear
();
// create a SY900S_generic proxy
if
(
SY900S_generic_Proxy
==
0
)
create_SY900S_generic_Proxy
();
//
if(SY900S_generic_Proxy==0)
//
create_SY900S_generic_Proxy();
try
{
if
(
SY900S_generic_Proxy
)
SY900S_generic_Proxy
->
command_inout
(
"WriteRead"
,
command_to_send
.
c_str
(),
response
);
DEBUG_STREAM
<<
"command_inout(WriteRead) done"
<<
endl
;
return
response
;
}
catch
(
Tango
::
DevFailed
&
df
)
...
...
@@ -582,6 +593,7 @@ void SY900S_Channel::write_targetVoltage(Tango::WAttribute &attr)
(
const
char
*
)
"Cannot send or read data on the socket device "
,
(
const
char
*
)
"SY900S_Channel::write_read()"
);
}
return
response
;
}
//+------------------------------------------------------------------
...
...
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