Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
FemtoCurrentAmplifier
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
MeasureInstruments
FemtoCurrentAmplifier
Commits
daa91213
Commit
daa91213
authored
Nov 16, 2007
by
Florent LANGLOIS
Browse files
Options
Downloads
Patches
Plain Diff
- force write of LN at init
- added try/catch at init
parent
ad6adbc0
No related branches found
No related tags found
No related merge requests found
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
doc/doc_html/index.html
+1
-1
1 addition, 1 deletion
doc/doc_html/index.html
src/FemtoCurrentAmplifier.cpp
+35
-22
35 additions, 22 deletions
src/FemtoCurrentAmplifier.cpp
src/FemtoCurrentAmplifierStateMachine.cpp
+30
-2
30 additions, 2 deletions
src/FemtoCurrentAmplifierStateMachine.cpp
with
66 additions
and
25 deletions
doc/doc_html/index.html
+
1
−
1
View file @
daa91213
...
...
@@ -45,7 +45,7 @@ FemtoCurrentAmplifier Class<Br>
</h1>
<b>
Revision: - Author:
<Br>
Implemented in C++ - CVS repository:
sourceforge(
tango-ds
)
Implemented in C++ - CVS repository: tango-ds
</b>
</center>
<Br>
...
...
This diff is collapsed.
Click to expand it.
src/FemtoCurrentAmplifier.cpp
+
35
−
22
View file @
daa91213
static
const
char
*
RcsId
=
"$Header: /users/chaize/newsvn/cvsroot/Instrumentation/Femto/src/FemtoCurrentAmplifier.cpp,v 1.1
2
2007-
09
-1
9
1
2:28:26
flanglois Exp $"
;
static
const
char
*
RcsId
=
"$Header: /users/chaize/newsvn/cvsroot/Instrumentation/Femto/src/FemtoCurrentAmplifier.cpp,v 1.1
3
2007-
11
-1
6
1
0:55:51
flanglois Exp $"
;
//+=============================================================================
//
// file : FemtoCurrentAmplifier.cpp
...
...
@@ -13,7 +13,7 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
//
// $Author: flanglois $
//
// $Revision: 1.1
2
$
// $Revision: 1.1
3
$
//
// $Log: not supported by cvs2svn $
//
...
...
@@ -143,6 +143,8 @@ namespace FemtoCurrentAmplifier_ns
// Initialise variables to default values
//--------------------------------------------
try
{
get_device_property
();
//- Scalar Attributes
...
...
@@ -155,6 +157,7 @@ namespace FemtoCurrentAmplifier_ns
attr_gain_write
=
0
;
dio_proxy_not_yet_created
=
true
;
creates_dio_proxy
();
if
(
femtoType
==
1
)
MAX_GAIN_INDEX
=
5
;
...
...
@@ -163,8 +166,18 @@ namespace FemtoCurrentAmplifier_ns
mutex
=
new
omni_mutex
();
//- Force gain mode to LN
Tango
::
WAttribute
&
attr1
=
dev_attr
->
get_w_attr_by_name
(
"gainMode"
);
attr1
.
set_write_value
(
true
);
write_gainMode
(
attr1
);
}
catch
(
Tango
::
DevFailed
&
e
)
{
ERROR_STREAM
<<
"Error at init_device: "
<<
string
(
e
.
errors
[
0
].
desc
)
<<
"; try to correct and retry init"
<<
ENDLOG
;
set_state
(
Tango
::
FAULT
);
set_status
(
"Error at init_device, check DIO proxy a retry to Init"
);
}
}
//+----------------------------------------------------------------------------
//
...
...
This diff is collapsed.
Click to expand it.
src/FemtoCurrentAmplifierStateMachine.cpp
+
30
−
2
View file @
daa91213
static
const
char
*
RcsId
=
"$Header: /users/chaize/newsvn/cvsroot/Instrumentation/Femto/src/FemtoCurrentAmplifierStateMachine.cpp,v 1.
3
2007-
09
-1
9
1
2:22:44
flanglois Exp $"
;
static
const
char
*
RcsId
=
"$Header: /users/chaize/newsvn/cvsroot/Instrumentation/Femto/src/FemtoCurrentAmplifierStateMachine.cpp,v 1.
4
2007-
11
-1
6
1
0:55:51
flanglois Exp $"
;
//+=============================================================================
//
// file : FemtoCurrentAmplifierStateMachine.cpp
...
...
@@ -10,7 +10,7 @@ static const char *RcsId = "$Header: /users/chaize/newsvn/cvsroot/Instrumentatio
//
// $Author: flanglois $
//
// $Revision: 1.
3
$
// $Revision: 1.
4
$
//
// $Log: not supported by cvs2svn $
//
...
...
@@ -56,10 +56,14 @@ namespace FemtoCurrentAmplifier_ns
//
//-----------------------------------------------------------------------------
bool
FemtoCurrentAmplifier
::
is_gain_allowed
(
Tango
::
AttReqType
type
)
{
if
(
get_state
()
==
Tango
::
FAULT
)
{
// End of Generated Code
// Re-Start of Generated Code
return
false
;
}
return
true
;
}
//+----------------------------------------------------------------------------
...
...
@@ -70,10 +74,14 @@ bool FemtoCurrentAmplifier::is_gain_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool
FemtoCurrentAmplifier
::
is_coupling_allowed
(
Tango
::
AttReqType
type
)
{
if
(
get_state
()
==
Tango
::
FAULT
)
{
// End of Generated Code
// Re-Start of Generated Code
return
false
;
}
return
true
;
}
//+----------------------------------------------------------------------------
...
...
@@ -84,10 +92,14 @@ bool FemtoCurrentAmplifier::is_coupling_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool
FemtoCurrentAmplifier
::
is_gainMode_allowed
(
Tango
::
AttReqType
type
)
{
if
(
get_state
()
==
Tango
::
FAULT
)
{
// End of Generated Code
// Re-Start of Generated Code
return
false
;
}
return
true
;
}
//+----------------------------------------------------------------------------
...
...
@@ -98,10 +110,14 @@ bool FemtoCurrentAmplifier::is_gainMode_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool
FemtoCurrentAmplifier
::
is_overload_allowed
(
Tango
::
AttReqType
type
)
{
if
(
get_state
()
==
Tango
::
FAULT
)
{
// End of Generated Code
// Re-Start of Generated Code
return
false
;
}
return
true
;
}
//+----------------------------------------------------------------------------
...
...
@@ -112,10 +128,14 @@ bool FemtoCurrentAmplifier::is_overload_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool
FemtoCurrentAmplifier
::
is_outputSignal_allowed
(
Tango
::
AttReqType
type
)
{
if
(
get_state
()
==
Tango
::
FAULT
)
{
// End of Generated Code
// Re-Start of Generated Code
return
false
;
}
return
true
;
}
//+----------------------------------------------------------------------------
...
...
@@ -126,10 +146,14 @@ bool FemtoCurrentAmplifier::is_outputSignal_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool
FemtoCurrentAmplifier
::
is_gainSelected_allowed
(
Tango
::
AttReqType
type
)
{
if
(
get_state
()
==
Tango
::
FAULT
)
{
// End of Generated Code
// Re-Start of Generated Code
return
false
;
}
return
true
;
}
//+----------------------------------------------------------------------------
...
...
@@ -140,10 +164,14 @@ bool FemtoCurrentAmplifier::is_gainSelected_allowed(Tango::AttReqType type)
//
//-----------------------------------------------------------------------------
bool
FemtoCurrentAmplifier
::
is_upperBWLimit_allowed
(
Tango
::
AttReqType
type
)
{
if
(
get_state
()
==
Tango
::
FAULT
)
{
// End of Generated Code
// Re-Start of Generated Code
return
false
;
}
return
true
;
}
...
...
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