From 90e950003c2e1cf7a6b37592e1df9a575e8d7e57 Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Wed, 3 Oct 2012 14:57:25 +0000
Subject: [PATCH] - Returns to mode MEASURE at Init.
---
pom.xml | 2 +-
src/NovelecProtocol.cpp | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/pom.xml b/pom.xml
index baae7ac..88a6689 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.9</version>
+ <version>2.5.10</version>
<packaging>nar</packaging>
<name>Electrometers library</name>
<description>Electrometers library</description>
diff --git a/src/NovelecProtocol.cpp b/src/NovelecProtocol.cpp
index 3dfde0b..fb85fa7 100644
--- a/src/NovelecProtocol.cpp
+++ b/src/NovelecProtocol.cpp
@@ -133,6 +133,8 @@ std::cout << "NovelecProtocol::init_MCCE2_for_communication -> write_read" << st
check_command(tmp);
std::cout << "NovelecProtocol::init_MCCE2_for_communication -> check_command" << std::endl;
+ //- lock parameters modification
+ this->switch_MCCE2_ON();
//- if no error
_is_explicite_resp_enabled = true;
}
@@ -247,8 +249,6 @@ std::string tmp("no data");
//- allow parameters modification
this->switch_MCCE2_OFF();
- //- check if the MCCE2 is not in MEASURE mode to get/change any settings
- //this->is_allowed();
//- send cmd to have a explicite response :
cmd_to_send << _devAdd << " PROG 1 " << cmdNumber << END_OF_LINE /* << std::endl */;
@@ -258,7 +258,7 @@ std::string tmp("no data");
check_command(tmp);
//- lock parameters modification
- this->switch_MCCE2_OFF();
+ this->switch_MCCE2_ON();
}
// ============================================================================
--
GitLab