diff --git a/include/Novelec_MCCE2.h b/include/Novelec_MCCE2.h index 24edddd6377f3eff47b3d86b0e8365dfb8bc5ffe..906efeb9e4b536def9e5e488e36894974781b92b 100644 --- a/include/Novelec_MCCE2.h +++ b/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 */ diff --git a/pom.xml b/pom.xml index 019c1e273badc8dc4cc9886fff29a2e84742f9a5..fa932b029b63d16c3e04cc232051f4e12e100ca2 100644 --- a/pom.xml +++ b/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> diff --git a/src/Novelec_MCCE2.cpp b/src/Novelec_MCCE2.cpp index 1ba93fae72778b41810539efe8ed830f06ee8721..11a4f376fa34198aa21f58eb265a6e4d32b90073 100644 --- a/src/Novelec_MCCE2.cpp +++ b/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 = "Photovolta�que UHS"; + case 1 : this->_MCCE2electroTypeStr = "Photovolta�que UHS"; break; - case 2 : typeStr = "Photovolta�que HS"; + case 2 : this->_MCCE2electroTypeStr = "Photovolta�que HS"; break; - case 3 : typeStr = "Photovolta�que MS"; + case 3 : this->_MCCE2electroTypeStr = "Photovolta�que 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";