Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
E
Electrometers
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
lib
Electrometers
Commits
03a832c3
"conan-el7-gcc93/Dockerfile" did not exist on "main"
Commit
03a832c3
authored
May 12, 2022
by
Xavier ELATTAOUI
Browse files
Options
Downloads
Patches
Plain Diff
No more french words in status.
parent
f3cb9ce7
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
src/N_PhotoVoltaique.cpp
+1
-1
1 addition, 1 deletion
src/N_PhotoVoltaique.cpp
src/Novelec_MCCE2.cpp
+25
-21
25 additions, 21 deletions
src/Novelec_MCCE2.cpp
with
26 additions
and
22 deletions
src/N_PhotoVoltaique.cpp
+
1
−
1
View file @
03a832c3
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
//
//
// = CONTEXT
// = CONTEXT
// TANGO Project - NovelecElectrometer Support Library
// TANGO Project - NovelecElectrometer Support Library
// PhotoVoltai
que
Types are Type 1, 2 & 3
// PhotoVoltai
c
Types are Type 1, 2 & 3
//
//
// = FILENAME
// = FILENAME
// N_PhotoVoltaique.cpp
// N_PhotoVoltaique.cpp
...
...
This diff is collapsed.
Click to expand it.
src/Novelec_MCCE2.cpp
+
25
−
21
View file @
03a832c3
...
@@ -91,13 +91,13 @@ bool Novelec_MCCE2::init_protocol (void)
...
@@ -91,13 +91,13 @@ bool Novelec_MCCE2::init_protocol (void)
case
0
:
this
->
_MCCE2electroTypeStr
=
"Not connected"
;
case
0
:
this
->
_MCCE2electroTypeStr
=
"Not connected"
;
success
=
false
;
success
=
false
;
break
;
break
;
case
1
:
this
->
_MCCE2electroTypeStr
=
"
P
hotovolta
que UHS
"
;
case
1
:
this
->
_MCCE2electroTypeStr
=
"
UHS p
hotovolta
ic
"
;
_rangeLimit
=
3
;
_rangeLimit
=
3
;
break
;
break
;
case
2
:
this
->
_MCCE2electroTypeStr
=
"
P
hotovolta
que HS
"
;
case
2
:
this
->
_MCCE2electroTypeStr
=
"
HS p
hotovolta
ic
"
;
_rangeLimit
=
7
;
_rangeLimit
=
7
;
break
;
break
;
case
3
:
this
->
_MCCE2electroTypeStr
=
"
P
hotovolta
que MS
"
;
case
3
:
this
->
_MCCE2electroTypeStr
=
"
MS p
hotovolta
ic
"
;
_rangeLimit
=
7
;
_rangeLimit
=
7
;
break
;
break
;
case
4
:
this
->
_MCCE2electroTypeStr
=
"Photoconducteur HS"
;
case
4
:
this
->
_MCCE2electroTypeStr
=
"Photoconducteur HS"
;
...
@@ -258,15 +258,19 @@ std::string Novelec_MCCE2::electrometer_status (void)
...
@@ -258,15 +258,19 @@ std::string Novelec_MCCE2::electrometer_status (void)
short
status
=
0
;
short
status
=
0
;
if
(
!
this
->
_electrometerProtocol
)
if
(
!
this
->
_electrometerProtocol
)
{
throw
electrometer
::
ElectrometerException
(
"INIT_ERROR"
,
throw
electrometer
::
ElectrometerException
(
"INIT_ERROR"
,
"Novelec protocol initialization failed."
,
"Novelec protocol initialization failed."
,
"Novelec_MCCE2::electrometer_status( )."
);
"Novelec_MCCE2::electrometer_status( )."
);
}
NovelecProtocol
*
nproto
=
dynamic_cast
<
NovelecProtocol
*>
(
_electrometerProtocol
);
NovelecProtocol
*
nproto
=
dynamic_cast
<
NovelecProtocol
*>
(
_electrometerProtocol
);
if
(
!
nproto
)
if
(
!
nproto
)
{
throw
electrometer
::
ElectrometerException
(
"BAD_ALLOC"
,
throw
electrometer
::
ElectrometerException
(
"BAD_ALLOC"
,
"Memory allocation failed to query the electrmometer status."
,
"Memory allocation failed to query the electrmometer status."
,
"Novelec_MCCE2::electrometer_status( )."
);
"Novelec_MCCE2::electrometer_status( )."
);
}
/***********************************************************************
/***********************************************************************
DISABLED PART TO INCREASE SERIAL PERFORMANCE
DISABLED PART TO INCREASE SERIAL PERFORMANCE
...
@@ -303,17 +307,17 @@ std::string Novelec_MCCE2::electrometer_status (void)
...
@@ -303,17 +307,17 @@ std::string Novelec_MCCE2::electrometer_status (void)
//- build novelec status
//- build novelec status
if
(
status
&
0x10
)
if
(
status
&
0x10
)
argout
+=
"
En mesure
\n
"
;
argout
+=
"
Measuring
\n
"
;
else
else
argout
+=
"
Hors
mesur
e
\n
"
;
argout
+=
"
Not
me
a
sur
ing
\n
"
;
if
(
status
&
0x20
)
if
(
status
&
0x20
)
argout
+=
"
Paramtres par defaut
\n
"
;
argout
+=
"
Default parameters
\n
"
;
else
else
argout
+=
"Ram OK
\n
"
;
argout
+=
"Ram OK
\n
"
;
if
(
status
&
0x40
)
if
(
status
&
0x40
)
argout
+=
"
Paramtre invalide
\n
"
;
argout
+=
"
Invalid parameter
\n
"
;
else
else
argout
+=
"Param
tre
OK
\n
"
;
argout
+=
"Param
eter
OK
\n
"
;
if
(
status
&
0x80
)
if
(
status
&
0x80
)
{
{
argout
+=
"ERREUR
\n
"
;
argout
+=
"ERREUR
\n
"
;
...
@@ -321,7 +325,7 @@ std::string Novelec_MCCE2::electrometer_status (void)
...
@@ -321,7 +325,7 @@ std::string Novelec_MCCE2::electrometer_status (void)
}
}
else
else
{
{
argout
+=
"
Pas d'
err
eu
r
\n
"
;
argout
+=
"
No
err
o
r
\n
"
;
set_electroState
(
ON
);
set_electroState
(
ON
);
}
}
...
@@ -348,35 +352,35 @@ std::string Novelec_MCCE2::electrometer_status (void)
...
@@ -348,35 +352,35 @@ std::string Novelec_MCCE2::electrometer_status (void)
bool
change_state_to_alarm
=
true
;
bool
change_state_to_alarm
=
true
;
if
(
errors
&
0x01
)
if
(
errors
&
0x01
)
argout
+=
"
Paramtre par dfaut
\n
"
;
argout
+=
"
Default parameter
\n
"
;
if
(
errors
&
0x02
)
if
(
errors
&
0x02
)
argout
+=
"
Erreur srie
\n
"
;
argout
+=
"
Serial error
\n
"
;
if
(
errors
&
0x04
)
if
(
errors
&
0x04
)
argout
+=
"
Paramtre invalide
\n
"
;
argout
+=
"
Invalid parameter
\n
"
;
if
(
errors
&
0x08
)
if
(
errors
&
0x08
)
{
{
argout
+=
"
Electromtre satu
r
\n
"
;
argout
+=
"
Overloaded electromete
r
\n
"
;
change_state_to_alarm
=
false
;
change_state_to_alarm
=
false
;
}
}
if
(
errors
&
0x10
)
if
(
errors
&
0x10
)
{
{
argout
+=
"Ele
c
trom
tre bloqu
(Polarity error ?)
\n
"
;
argout
+=
"Eletrom
eter blocked
(Polarity error ?)
\n
"
;
change_state_to_alarm
=
false
;
change_state_to_alarm
=
false
;
}
}
if
(
errors
&
0x20
)
if
(
errors
&
0x20
)
argout
+=
"HT < limit
e basse
\n
"
;
argout
+=
"HT < l
ow l
imit
\n
"
;
if
(
errors
&
0x40
)
if
(
errors
&
0x40
)
argout
+=
"HT > limit
e haute
\n
"
;
argout
+=
"HT >
high
limit
\n
"
;
if
(
errors
&
0x80
)
if
(
errors
&
0x80
)
argout
+=
"Initiali
s
ation
\n
"
;
argout
+=
"Initiali
z
ation
\n
"
;
if
(
errors
&
0x100
)
if
(
errors
&
0x100
)
argout
+=
"
Dfaut batterie
\n
"
;
argout
+=
"
Battery default
\n
"
;
if
(
errors
&
0x200
)
if
(
errors
&
0x200
)
argout
+=
"
Dfaut d'alimentation
\n
"
;
argout
+=
"
Power supply default
\n
"
;
if
(
errors
&
0x400
)
if
(
errors
&
0x400
)
argout
+=
"
Type d'lectromtre inconnu
\n
"
;
argout
+=
"
Unknown electrometer type
\n
"
;
if
(
errors
&
0x800
)
if
(
errors
&
0x800
)
argout
+=
"
Electromtre dconnect
\n
"
;
argout
+=
"
Disconnected electrometer
\n
"
;
//- set state according to specifications : if "bloqu" or "satur" do not change the state to ALARM !!
//- set state according to specifications : if "bloqu" or "satur" do not change the state to ALARM !!
if
(
change_state_to_alarm
)
if
(
change_state_to_alarm
)
...
...
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