From e4a99c57b47b7242e49a37527c3487a88dce2b12 Mon Sep 17 00:00:00 2001 From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr> Date: Mon, 9 May 2016 15:15:32 +0000 Subject: [PATCH] Release preparation --- pom.xml | 2 +- src/Novelec_MCCE2.cpp | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pom.xml b/pom.xml index 8a8f07b..e29a4e2 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.21-SNAPSHOT</version> + <version>2.5.21</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 fe9ef40..6ce103b 100644 --- a/src/Novelec_MCCE2.cpp +++ b/src/Novelec_MCCE2.cpp @@ -88,6 +88,9 @@ bool Novelec_MCCE2::init_protocol (void) switch(_MCCE2electroTypeNumber) { + case 0 : this->_MCCE2electroTypeStr = "Not connected"; + success = false; + break; case 1 : this->_MCCE2electroTypeStr = "Photovolta�que UHS"; _rangeLimit = 3; break; @@ -105,9 +108,6 @@ bool Novelec_MCCE2::init_protocol (void) break; default : set_electroState(FAULT); success = false; - Tango::Except::throw_exception ("COMMUNICATION_ERROR", - "Invalid electrometerType returned!", - "Novelec_MCCE2::init_protocol"); } } catch(Tango::DevFailed& df) -- GitLab