From 03a832c3868dc665ea482b4d365c434ffa58f5f2 Mon Sep 17 00:00:00 2001
From: ELATTAOUI <xavier.elattaoui@synchrotron-soleil.fr>
Date: Thu, 12 May 2022 08:53:48 +0200
Subject: [PATCH] No more french words in status.
---
src/N_PhotoVoltaique.cpp | 2 +-
src/Novelec_MCCE2.cpp | 46 ++++++++++++++++++++++------------------
2 files changed, 26 insertions(+), 22 deletions(-)
diff --git a/src/N_PhotoVoltaique.cpp b/src/N_PhotoVoltaique.cpp
index 2a70465..0209ac4 100644
--- a/src/N_PhotoVoltaique.cpp
+++ b/src/N_PhotoVoltaique.cpp
@@ -2,7 +2,7 @@
//
// = CONTEXT
// TANGO Project - NovelecElectrometer Support Library
-// PhotoVoltaique Types are Type 1, 2 & 3
+// PhotoVoltaic Types are Type 1, 2 & 3
//
// = FILENAME
// N_PhotoVoltaique.cpp
diff --git a/src/Novelec_MCCE2.cpp b/src/Novelec_MCCE2.cpp
index 4c6329b..9756356 100644
--- a/src/Novelec_MCCE2.cpp
+++ b/src/Novelec_MCCE2.cpp
@@ -91,13 +91,13 @@ bool Novelec_MCCE2::init_protocol (void)
case 0 : this->_MCCE2electroTypeStr = "Not connected";
success = false;
break;
- case 1 : this->_MCCE2electroTypeStr = "Photovolta�que UHS";
+ case 1 : this->_MCCE2electroTypeStr = "UHS photovoltaic";
_rangeLimit = 3;
break;
- case 2 : this->_MCCE2electroTypeStr = "Photovolta�que HS";
+ case 2 : this->_MCCE2electroTypeStr = "HS photovoltaic";
_rangeLimit = 7;
break;
- case 3 : this->_MCCE2electroTypeStr = "Photovolta�que MS";
+ case 3 : this->_MCCE2electroTypeStr = "MS photovoltaic";
_rangeLimit = 7;
break;
case 4 : this->_MCCE2electroTypeStr = "Photoconducteur HS";
@@ -258,15 +258,19 @@ std::string Novelec_MCCE2::electrometer_status (void)
short status = 0;
if( !this->_electrometerProtocol )
+ {
throw electrometer::ElectrometerException("INIT_ERROR",
"Novelec protocol initialization failed.",
"Novelec_MCCE2::electrometer_status( ).");
+ }
NovelecProtocol* nproto = dynamic_cast<NovelecProtocol*>(_electrometerProtocol);
if( !nproto )
+ {
throw electrometer::ElectrometerException("BAD_ALLOC",
"Memory allocation failed to query the electrmometer status.",
"Novelec_MCCE2::electrometer_status( ).");
+ }
/***********************************************************************
DISABLED PART TO INCREASE SERIAL PERFORMANCE
@@ -303,17 +307,17 @@ std::string Novelec_MCCE2::electrometer_status (void)
//- build novelec status
if(status & 0x10)
- argout += "En mesure\n";
+ argout += "Measuring\n";
else
- argout += "Hors mesure\n";
+ argout += "Not measuring\n";
if(status & 0x20)
- argout += "Param�tres par defaut\n";
+ argout += "Default parameters\n";
else
argout += "Ram OK\n";
if(status & 0x40)
- argout += "Param�tre invalide\n";
+ argout += "Invalid parameter\n";
else
- argout += "Param�tre OK\n";
+ argout += "Parameter OK\n";
if(status & 0x80)
{
argout += "ERREUR\n";
@@ -321,7 +325,7 @@ std::string Novelec_MCCE2::electrometer_status (void)
}
else
{
- argout += "Pas d'erreur\n";
+ argout += "No error\n";
set_electroState(ON);
}
@@ -348,35 +352,35 @@ std::string Novelec_MCCE2::electrometer_status (void)
bool change_state_to_alarm = true;
if(errors & 0x01)
- argout += "Param�tre par d�faut\n";
+ argout += "Default parameter\n";
if(errors & 0x02)
- argout += "Erreur s�rie\n";
+ argout += "Serial error\n";
if(errors & 0x04)
- argout += "Param�tre invalide\n";
+ argout += "Invalid parameter\n";
if(errors & 0x08)
{
- argout += "Electrom�tre satur�\n";
+ argout += "Overloaded electrometer\n";
change_state_to_alarm = false;
}
if(errors & 0x10)
{
- argout += "Electrom�tre bloqu� (Polarity error ?)\n";
+ argout += "Eletrometer blocked (Polarity error ?)\n";
change_state_to_alarm = false;
}
if(errors & 0x20)
- argout += "HT < limite basse\n";
+ argout += "HT < low limit\n";
if(errors & 0x40)
- argout += "HT > limite haute\n";
+ argout += "HT > high limit\n";
if(errors & 0x80)
- argout += "Initialisation\n";
+ argout += "Initialization\n";
if(errors & 0x100)
- argout += "D�faut batterie\n";
+ argout += "Battery default\n";
if(errors & 0x200)
- argout += "D�faut d'alimentation\n";
+ argout += "Power supply default\n";
if(errors & 0x400)
- argout += "Type d'�lectrom�tre inconnu\n";
+ argout += "Unknown electrometer type\n";
if(errors & 0x800)
- argout += "Electrom�tre d�connect�\n";
+ argout += "Disconnected electrometer\n";
//- set state according to specifications : if "bloqu�" or "satur�" do not change the state to ALARM !!
if ( change_state_to_alarm )
--
GitLab