From f59b6d04ea8ba90fa2b32232f3a426825e32656e Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Wed, 28 Nov 2007 10:37:30 +0000
Subject: [PATCH] compile en MODE debug -> modifier le(s) MakeFile !
---
include/AbstractElectrometerClass.h | 7 ++++++-
src/AbstractElectrometerClass.cpp | 10 ++++++++--
src/Makefile.linux | 8 ++++++--
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/include/AbstractElectrometerClass.h b/include/AbstractElectrometerClass.h
index 085db96..f6fdb2c 100644
--- a/include/AbstractElectrometerClass.h
+++ b/include/AbstractElectrometerClass.h
@@ -9,9 +9,14 @@
//
// $Author: xavela $
//
-// $Revision: 1.2 $
+// $Revision: 1.3 $
//
// $Log: not supported by cvs2svn $
+// Revision 1.2 2007/11/27 10:17:46 xavela
+// xavier :
+// - modif done on Novelec part :
+// init_MCCE2() added
+//
// Revision 1.1 2007/07/09 13:20:35 stephle
// initial import
//
diff --git a/src/AbstractElectrometerClass.cpp b/src/AbstractElectrometerClass.cpp
index 51eb6e6..fbe2302 100644
--- a/src/AbstractElectrometerClass.cpp
+++ b/src/AbstractElectrometerClass.cpp
@@ -11,9 +11,14 @@
//
// $Author: xavela $
//
-// $Revision: 1.3 $
+// $Revision: 1.4 $
//
// $Log: not supported by cvs2svn $
+// Revision 1.3 2007/11/27 15:23:02 xavela
+// xavier :
+// - modif done on Novelec part :
+// bug fix
+//
// Revision 1.2 2007/11/27 10:17:46 xavela
// xavier :
// - modif done on Novelec part :
@@ -41,7 +46,8 @@
AbstractElectrometerClass::AbstractElectrometerClass (std::string comLink_device_name)
: _device_proxy_name(comLink_device_name),
_range(0),
- _rangeStr("NOT INITIALISED")
+ _rangeStr("NOT INITIALISED"),
+ electrometerState(UNKNOWN)
{
// std::cout << "AbstractElectrometerClass::AbstractElectrometerClass <-" << std::endl;
diff --git a/src/Makefile.linux b/src/Makefile.linux
index 026801d..77523c6 100644
--- a/src/Makefile.linux
+++ b/src/Makefile.linux
@@ -6,9 +6,13 @@
#
# $Author: xavela $
#
-# $Revision: 1.2 $
+# $Revision: 1.3 $
#
# $Log: not supported by cvs2svn $
+# Revision 1.2 2007/09/25 14:45:54 xavela
+# xavier :
+# support added for Keithley 6517
+#
# Revision 1.1 2007/07/09 13:20:37 stephle
# initial import
#
@@ -40,7 +44,7 @@
# of a library with no Tango dependencies)
#
OUTPUT_TYPE = STATIC_LIB
-
+RELEASE_TYPE = DEBUG
#=============================================================================
# OUTPUT_DIR is the directory which contains the build result.
# if not set, the standard location is :
--
GitLab