Skip to content
Snippets Groups Projects
Commit 03a832c3 authored by Xavier ELATTAOUI's avatar Xavier ELATTAOUI
Browse files

No more french words in status.

parent f3cb9ce7
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// //
// = CONTEXT // = CONTEXT
// TANGO Project - NovelecElectrometer Support Library // TANGO Project - NovelecElectrometer Support Library
// PhotoVoltaique Types are Type 1, 2 & 3 // PhotoVoltaic Types are Type 1, 2 & 3
// //
// = FILENAME // = FILENAME
// N_PhotoVoltaique.cpp // N_PhotoVoltaique.cpp
......
...@@ -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 = "Photovoltaque UHS"; case 1 : this->_MCCE2electroTypeStr = "UHS photovoltaic";
_rangeLimit = 3; _rangeLimit = 3;
break; break;
case 2 : this->_MCCE2electroTypeStr = "Photovoltaque HS"; case 2 : this->_MCCE2electroTypeStr = "HS photovoltaic";
_rangeLimit = 7; _rangeLimit = 7;
break; break;
case 3 : this->_MCCE2electroTypeStr = "Photovoltaque MS"; case 3 : this->_MCCE2electroTypeStr = "MS photovoltaic";
_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 mesure\n"; argout += "Not measuring\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 += "Paramtre OK\n"; argout += "Parameter 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'erreur\n"; argout += "No error\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 satur\n"; argout += "Overloaded electrometer\n";
change_state_to_alarm = false; change_state_to_alarm = false;
} }
if(errors & 0x10) if(errors & 0x10)
{ {
argout += "Electromtre bloqu (Polarity error ?)\n"; argout += "Eletrometer blocked (Polarity error ?)\n";
change_state_to_alarm = false; change_state_to_alarm = false;
} }
if(errors & 0x20) if(errors & 0x20)
argout += "HT < limite basse\n"; argout += "HT < low limit\n";
if(errors & 0x40) if(errors & 0x40)
argout += "HT > limite haute\n"; argout += "HT > high limit\n";
if(errors & 0x80) if(errors & 0x80)
argout += "Initialisation\n"; argout += "Initialization\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 )
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment