Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
S
SingleShotAO
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
InputOutput
ADLINK
SingleShotAO
Commits
0fdab6c3
Commit
0fdab6c3
authored
5 months ago
by
Alexandre MALFREYT
Browse files
Options
Downloads
Patches
Plain Diff
cleanup: remove "throw (Tango::DevFailed)"
parent
94945669
No related branches found
No related tags found
1 merge request
!1
Cleanup: clean code (DODD)
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/SingleShotAO.h
+0
-2
0 additions, 2 deletions
src/SingleShotAO.h
src/SingleShotAOManager.cpp
+0
-6
0 additions, 6 deletions
src/SingleShotAOManager.cpp
src/SingleShotAOManager.h
+6
-12
6 additions, 12 deletions
src/SingleShotAOManager.h
with
6 additions
and
20 deletions
src/SingleShotAO.h
+
0
−
2
View file @
0fdab6c3
...
...
@@ -282,7 +282,6 @@ protected :
//- \param property_name Name to use.
template
<
class
T
>
void
store_value_as_property
(
T
value
,
std
::
string
property_name
)
throw
(
Tango
::
DevFailed
)
{
Tango
::
DbDatum
current_value
(
property_name
);
current_value
<<
value
;
...
...
@@ -308,7 +307,6 @@ protected :
//- \param property_name Name od the property to read.
template
<
class
T
>
T
get_memorized_attribute
(
const
std
::
string
&
property_name
)
throw
(
Tango
::
DevFailed
)
{
T
value
;
if
(
!
Tango
::
Util
::
instance
()
->
_UseDb
)
...
...
This diff is collapsed.
Click to expand it.
src/SingleShotAOManager.cpp
+
0
−
6
View file @
0fdab6c3
...
...
@@ -129,7 +129,6 @@ void SingleShotAOManager::write_frequency(double p_frequency)
// SingleShotAOManager::init ()
// ============================================================================
void
SingleShotAOManager
::
init
(
asl
::
SingleShotAO
*
p_ssao
,
unsigned
short
p_nb_chan
,
double
p_frequency
)
throw
(
Tango
::
DevFailed
)
{
m_ssao
=
p_ssao
;
CHECK_SSAO
();
...
...
@@ -159,7 +158,6 @@ void SingleShotAOManager::init(asl::SingleShotAO * p_ssao, unsigned short p_nb_c
// SingleShotAOManager::process_message
// ============================================================================
void
SingleShotAOManager
::
process_message
(
yat
::
Message
&
msg
)
throw
(
Tango
::
DevFailed
)
{
//- handle msg
...
...
@@ -204,7 +202,6 @@ void SingleShotAOManager::process_message (yat::Message& msg)
// SingleShotAOManager::periodic_job_i ()
// ============================================================================
void
SingleShotAOManager
::
periodic_job_i
()
throw
(
Tango
::
DevFailed
)
{
//test all channels
for
(
unsigned
int
l_cpt
=
0
;
l_cpt
<
m_nb_chan
;
l_cpt
++
)
...
...
@@ -270,7 +267,6 @@ double SingleShotAOManager::get_channel(ChannelId_t p_chIdx)
// SingleShotAOManager::write_channel ()
// ============================================================================
void
SingleShotAOManager
::
write_channel
(
ChannelId_t
p_chIdx
,
double
p_val
)
throw
(
Tango
::
DevFailed
)
{
DEBUG_STREAM
<<
"write_channel : "
<<
p_chIdx
<<
" : "
<<
p_val
<<
" : "
<<
endl
;
...
...
@@ -392,7 +388,6 @@ Intial_t SingleShotAOManager::get_initial(ChannelId_t p_chIdx)
// SingleShotAOManager::set_initial ()
// ============================================================================
void
SingleShotAOManager
::
set_initial
(
ChannelId_t
p_chIdx
,
Intial_t
p_initial
)
throw
(
Tango
::
DevFailed
)
{
if
(
m_isRunning
[
p_chIdx
])
{
...
...
@@ -418,7 +413,6 @@ Speed_t SingleShotAOManager::get_speed(ChannelId_t p_chIdx)
// SingleShotAOManager::set_speed ()
// ============================================================================
void
SingleShotAOManager
::
set_speed
(
ChannelId_t
p_chIdx
,
Intial_t
p_speed
)
throw
(
Tango
::
DevFailed
)
{
if
(
m_isRunning
[
p_chIdx
])
{
...
...
This diff is collapsed.
Click to expand it.
src/SingleShotAOManager.h
+
6
−
12
View file @
0fdab6c3
...
...
@@ -49,15 +49,13 @@ public:
std
::
string
get_status
();
//- init
void
init
(
asl
::
SingleShotAO
*
p_ssao
,
unsigned
short
p_nb_chan
,
double
p_frequency
)
throw
(
Tango
::
DevFailed
);
void
init
(
asl
::
SingleShotAO
*
p_ssao
,
unsigned
short
p_nb_chan
,
double
p_frequency
);
//- get current channel value
double
get_channel
(
ChannelId_t
p_chIdx
);
//- write channel
void
write_channel
(
ChannelId_t
p_chIdx
,
double
p_val
)
throw
(
Tango
::
DevFailed
);
void
write_channel
(
ChannelId_t
p_chIdx
,
double
p_val
);
//- change period
void
write_frequency
(
double
p_frequency
);
...
...
@@ -66,23 +64,20 @@ public:
Intial_t
get_initial
(
ChannelId_t
p_chIdx
);
//- set inital
void
set_initial
(
ChannelId_t
p_chIdx
,
Intial_t
p_initial
)
throw
(
Tango
::
DevFailed
);
void
set_initial
(
ChannelId_t
p_chIdx
,
Intial_t
p_initial
);
//- get speed
Speed_t
get_speed
(
ChannelId_t
p_chIdx
);
//- set speed
void
set_speed
(
ChannelId_t
p_chIdx
,
Intial_t
p_speed
)
throw
(
Tango
::
DevFailed
);
void
set_speed
(
ChannelId_t
p_chIdx
,
Intial_t
p_speed
);
//- abort
void
abort
();
protected:
//- process_message (implements yat4tango::DeviceTask pure virtual method)
virtual
void
process_message
(
yat
::
Message
&
msg
)
throw
(
Tango
::
DevFailed
);
virtual
void
process_message
(
yat
::
Message
&
msg
);
private:
...
...
@@ -93,8 +88,7 @@ private:
std
::
string
m_status
;
//- periodic job
void
periodic_job_i
()
throw
(
Tango
::
DevFailed
);
void
periodic_job_i
();
//- the underlying single shot AO object
asl
::
SingleShotAO
*
m_ssao
;
...
...
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