Added electrotype as string method

include/Novelec_MCCE2.h

@@ -51,6 +51,9 @@ public:
 	short get_electrometer_type() {
     return this->_MCCE2electroTypeNumber;
   }
+	std::string get_electrometer_typeStr() {
+    return this->_MCCE2electroTypeStr;
+  }
 
 	/**
 	*  \brief Electrometer Functions : mode for novelec types.
@@ -87,7 +90,7 @@ protected :
 	unsigned short _rangeLimit;				      //- define the range limit for each novelec type
   unsigned short _address;                //- a DAIP manages 2 "channels" (or address)
 	unsigned short _MCCE2electroTypeNumber;	//- the mcce2 electrometer type number (to check range value)
-
+    std::string _MCCE2electroTypeStr;       //-  "      "   "   "   "   "   as string
 	/**
 	*	\brief Checks the new range value
 	*/

pom.xml

@@ -8,7 +8,7 @@
    </parent>
    <groupId>fr.soleil.lib</groupId>
    <artifactId>Electrometers-${aol}-${library}-${mode}</artifactId>
-   <version>2.5.18-SNAPSHOT</version>
+   <version>2.5.18</version>
    <packaging>nar</packaging>
    <name>Electrometers library</name>
    <description>Electrometers library</description>

src/Novelec_MCCE2.cpp

@@ -43,7 +43,8 @@ Novelec_MCCE2::Novelec_MCCE2 (std::string& comLink_device_name, unsigned short a
 :	AbstractElectrometerClass(comLink_device_name),
 	_rangeLimit(0),
   _address(address),
-	_MCCE2electroTypeNumber(0)
+	_MCCE2electroTypeNumber(0),
+	_MCCE2electroTypeStr("Unknown type")
 {
 	std::cout << "\t\tNovelec_MCCE2::Novelec_MCCE2 <-" << std::endl;
 
@@ -240,7 +241,6 @@ void Novelec_MCCE2::mcce_off (void)
 std::string Novelec_MCCE2::electrometer_status (void)
 {
 	std::string argout("");
-	std::string typeStr(" ");
 	std::string tmp(" ");
 	short status	= 0;
 
@@ -264,21 +264,21 @@ std::string Novelec_MCCE2::electrometer_status (void)
 
 	switch(this->_MCCE2electroTypeNumber)
 	{
-	case 1 :	typeStr = "Photovoltaque UHS";
+	case 1 :	this->_MCCE2electroTypeStr = "Photovoltaque UHS";
 		break;
-	case 2 :	typeStr = "Photovoltaque HS";
+	case 2 :	this->_MCCE2electroTypeStr = "Photovoltaque HS";
 		break;
-	case 3 :	typeStr = "Photovoltaque MS";
+	case 3 :	this->_MCCE2electroTypeStr = "Photovoltaque MS";
 		break;
-	case 4 :	typeStr = "Photoconducteur HS";
+	case 4 :	this->_MCCE2electroTypeStr = "Photoconducteur HS";
 		break;
-	case 5 :	typeStr = "Photoconducteur MS";
+	case 5 :	this->_MCCE2electroTypeStr = "Photoconducteur MS";
 		break;
 	default :	set_electroState(FAULT);
 				argout = "Invalid status string returned !";
 				return argout;
 	}
-	argout += "Novelec type : " + typeStr + "\n";
+	argout += "Novelec type : " + this->_MCCE2electroTypeStr + "\n";
 
 	//- get Electrometer mode :
 	argout += "Novelec mode : " + _electrometerProtocol->get_mode() + "\n";