From b680542e3beb0df524e3739ac076c3a5ee48e7d3 Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Fri, 13 Jul 2012 07:42:40 +0000
Subject: [PATCH] - no more warnings (Xstring.h -> helpers/XString.h) -
communicationLink structure modified - Range : modified to use RangeUp/Down
commands
---
doc/DevelopersUsersGuide.doc | Bin 147968 -> 152576 bytes
include/CommunicationLink.h | 7 ++--
include/ElectrometerProtocol.h | 8 +++--
include/KeithleyDDCProtocol.h | 6 ++--
include/KeithleySCPIProtocol.h | 3 ++
include/NovelecProtocol.h | 3 +-
include/TangoGpibLink.h | 1 -
include/TangoSerialLink.h | 22 -------------
pom.xml | 2 +-
src/AbstractElectrometerClass.cpp | 7 ++--
src/ElectrometerProtocol.cpp | 9 +-----
src/KeithleyDDCProtocol.cpp | 10 ++++--
src/KeithleySCPIProtocol.cpp | 13 ++++++--
src/Keithley_485.cpp | 2 +-
src/Keithley_486.cpp | 2 +-
src/Keithley_487.cpp | 2 +-
src/Keithley_617.cpp | 2 +-
src/Keithley_6485.cpp | 2 +-
src/Keithley_6487.cpp | 2 +-
src/Keithley_6512.cpp | 2 +-
src/Keithley_6514.cpp | 2 +-
src/Keithley_6517.cpp | 2 +-
src/N_PhotoConducteur.cpp | 2 +-
src/N_PhotoVoltaique.cpp | 8 ++++-
src/NovelecProtocol.cpp | 10 +++---
src/Novelec_MCCE2.cpp | 2 +-
src/TangoGpibLink.cpp | 4 +--
src/TangoSerialLink.cpp | 51 ------------------------------
28 files changed, 69 insertions(+), 117 deletions(-)
diff --git a/doc/DevelopersUsersGuide.doc b/doc/DevelopersUsersGuide.doc
index c17c30216bb6333dd30de4b75704c6c5e6b32010..1c7155780351eeee362602ecdea0d1889169f2b0 100644
GIT binary patch
delta 11657
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
delta 8190
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
diff --git a/include/CommunicationLink.h b/include/CommunicationLink.h
index 84ed171..b486245 100644
--- a/include/CommunicationLink.h
+++ b/include/CommunicationLink.h
@@ -12,9 +12,12 @@
//
// $Author: xavela $
//
-// $Revision: 1.9 $
+// $Revision: 1.10 $
//
// $Log: not supported by cvs2svn $
+// Revision 1.9 2012/07/11 08:21:54 xavela
+// for test purpose only !
+//
// Revision 1.8 2012/07/09 13:15:59 xavela
// Novelec part : bug at init fixed.
//
@@ -116,7 +119,7 @@ public :
*
* \throws Tango::DevFailed
*/
- virtual std::string write_read (std::string command_to_send, long nbChar) {return "";}
+ //virtual std::string write_read (std::string , long ) {return "";}
/**
diff --git a/include/ElectrometerProtocol.h b/include/ElectrometerProtocol.h
index 663ef37..6935716 100644
--- a/include/ElectrometerProtocol.h
+++ b/include/ElectrometerProtocol.h
@@ -12,9 +12,12 @@
//
// $Author: xavela $
//
-// $Revision: 1.14 $
+// $Revision: 1.15 $
//
// $Log: not supported by cvs2svn $
+// Revision 1.14 2011/03/14 14:42:22 xavela
+// SaveRestoreConfiguration command added. (Available only for SCPI Keithley devices)
+//
// Revision 1.13 2010/06/10 14:36:15 xavela
// cmd switch_off called before any parameters modifications and then locked with switch_on.
//
@@ -85,7 +88,7 @@
#define _ELECTROMETER_PROTOCOL_H_
#include <vector>
-#include "CommunicationLink.h"
+//#include "CommunicationLink.h"
/**
* \addtogroup Standard Commands Protocol
@@ -242,7 +245,6 @@ protected :
short _range;
std::string _mode;
std::string _commDevName; //- communication device proxy name
- CommunicationLink* _communication_link;
private :
diff --git a/include/KeithleyDDCProtocol.h b/include/KeithleyDDCProtocol.h
index 34cc954..20c9414 100644
--- a/include/KeithleyDDCProtocol.h
+++ b/include/KeithleyDDCProtocol.h
@@ -16,6 +16,7 @@
#include "ElectrometerProtocol.h"
#include "ElectrometerException.h"
+#include "TangoGpibLink.h"
/**
* \addtogroup Standard Commands Protocol
@@ -105,9 +106,9 @@ public:
/**
* \brief Electrometer Mode : getters and setters.
*/
- std::string get_mode (void) { return _mode; };
+ std::string get_mode (void) { return _mode; }
std::string get_range (void);
- bool get_overloadRangeState (void) { return _is_overloaded; };//- used to know if the device range is overloaded!
+ bool get_overloadRangeState (void) { return _is_overloaded; } //- used to know if the device range is overloaded!
/**
* \brief Methods to configure the Integration mode
@@ -145,6 +146,7 @@ protected :
std::vector<double> buildDataList (std::string listToParse);
private :
+ CommunicationLink* _communication_link;
bool _is_overloaded;
};
diff --git a/include/KeithleySCPIProtocol.h b/include/KeithleySCPIProtocol.h
index 3ccc5f5..80e0b50 100644
--- a/include/KeithleySCPIProtocol.h
+++ b/include/KeithleySCPIProtocol.h
@@ -16,6 +16,7 @@
#include <vector>
#include "ElectrometerProtocol.h"
+#include "TangoGpibLink.h"
#include "ElectrometerException.h"
/**
@@ -162,7 +163,9 @@ public:
protected :
std::vector<double> buildDataList (std::string listToParse);
+
private :
+ CommunicationLink* _communication_link;
bool isDiffSuportedMode;
std::string trigCountStr;
diff --git a/include/NovelecProtocol.h b/include/NovelecProtocol.h
index 76b36d1..2ea97c5 100644
--- a/include/NovelecProtocol.h
+++ b/include/NovelecProtocol.h
@@ -120,7 +120,8 @@ private :
//- check if the MCCE2 is not in MEASURE mode to get/change any settings
void is_allowed();
- TangoSerialLink* _tgSerLk; //- to use SerialLink specific methods !
+ CommunicationLink* _communication_link;
+ //TangoSerialLink* _tgSerLk; //- to use SerialLink specific methods !
//- if true, parameters cannot be changed !
diff --git a/include/TangoGpibLink.h b/include/TangoGpibLink.h
index 56b87f5..dabfae1 100644
--- a/include/TangoGpibLink.h
+++ b/include/TangoGpibLink.h
@@ -18,7 +18,6 @@
// DEPENDENCIES
// ============================================================================
#include <tango.h>
-//#include <DeviceProxyHelper.h>
#include "CommunicationLink.h"
/**
diff --git a/include/TangoSerialLink.h b/include/TangoSerialLink.h
index 4371d23..ac9d767 100644
--- a/include/TangoSerialLink.h
+++ b/include/TangoSerialLink.h
@@ -18,7 +18,6 @@
// DEPENDENCIES
// ============================================================================
#include <tango.h>
-//#include <DeviceProxyHelper.h>
#include "CommunicationLink.h"
/**
@@ -47,15 +46,6 @@ public :
*/
~TangoSerialLink ();
- /**
- * \brief One MCCE-2 can manage two differents electrometers
- * through only one serial line !
- *
- */
- //static TangoSerialLink* get_instance(std::string& serial_device_name);
-
- //static void delete_instance(CommunicationLink*);
-
/**
* \brief Send command (data) as string to hardware.
*
@@ -77,13 +67,6 @@ public :
*/
std::string read(long nbCharToRead) throw (Tango::DevFailed);
- /**
- * \brief Performs a write read operation as string. (read in mode LINE)
- *
- * \throws Tango::DevFailed
- */
- //std::string write_read(std::string cmd) throw (Tango::DevFailed);
-
/**
* \brief Performs a write read operation as string. (read nb char)
*
@@ -93,11 +76,6 @@ public :
private :
- /**
- * \brief Tango Serial Link instance.
- */
- //static TangoSerialLink* tsl_Instance;
-
/**
* Creates a proxy on the specified Serial Device.
*/
diff --git a/pom.xml b/pom.xml
index efde46e..b83b215 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.8-SNAPSHOT</version>
+ <version>2.5.8</version>
<packaging>nar</packaging>
<name>Electrometers library</name>
<description>Electrometers library</description>
diff --git a/src/AbstractElectrometerClass.cpp b/src/AbstractElectrometerClass.cpp
index ed43de0..78abaf5 100644
--- a/src/AbstractElectrometerClass.cpp
+++ b/src/AbstractElectrometerClass.cpp
@@ -11,9 +11,12 @@
//
// $Author: xavela $
//
-// $Revision: 1.25 $
+// $Revision: 1.26 $
//
// $Log: not supported by cvs2svn $
+// Revision 1.25 2012/07/11 08:21:54 xavela
+// for test purpose only !
+//
// Revision 1.24 2012/07/03 06:15:53 xavela
// Novelec part : bug at init fixed.
//
@@ -133,7 +136,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <Xstring.h>
+#include <helpers/XString.h>
#include "AbstractElectrometerClass.h"
#include "ElectrometerException.h"
diff --git a/src/ElectrometerProtocol.cpp b/src/ElectrometerProtocol.cpp
index de748c3..07dd9ef 100644
--- a/src/ElectrometerProtocol.cpp
+++ b/src/ElectrometerProtocol.cpp
@@ -16,7 +16,6 @@
// ============================================================================
#include <iostream>
#include "ElectrometerProtocol.h"
-#include "TangoGpibLink.h"
#include "ElectrometerException.h"
// ============================================================================
@@ -25,7 +24,7 @@
ElectrometerProtocol::ElectrometerProtocol () :
_range(0),
_mode("NOT INITIALISED"),
- _communication_link(0)
+ _commDevName("")
{
//std::cout << "ElectrometerProtocol::ElectrometerProtocol <-" << std::endl;
@@ -39,12 +38,6 @@ ElectrometerProtocol::~ElectrometerProtocol (void)
{
std::cout << "ElectrometerProtocol::~ElectrometerProtocol <-" << std::endl;
- if(_communication_link)
- {
- delete _communication_link;
- _communication_link = 0;
- }
-
std::cout << "ElectrometerProtocol::~ElectrometerProtocol ->" << std::endl;
}
diff --git a/src/KeithleyDDCProtocol.cpp b/src/KeithleyDDCProtocol.cpp
index f30117b..eeab0c2 100644
--- a/src/KeithleyDDCProtocol.cpp
+++ b/src/KeithleyDDCProtocol.cpp
@@ -17,15 +17,15 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <Xstring.h>
+#include <helpers/XString.h>
#include "KeithleyDDCProtocol.h"
-#include "TangoGpibLink.h"
// ============================================================================
// KeithleyDDCProtocol::KeithleyDDCProtocol
// ============================================================================
KeithleyDDCProtocol::KeithleyDDCProtocol (std::string& gpib_device_name)
: ElectrometerProtocol(),
+ _communication_link(0),
_is_overloaded(false)
{
std::cout << "KeithleyDDCProtocol::KeithleyDDCProtocol <-" << std::endl;
@@ -41,6 +41,12 @@ KeithleyDDCProtocol::KeithleyDDCProtocol (std::string& gpib_device_name)
KeithleyDDCProtocol::~KeithleyDDCProtocol (void)
{
std::cout << "KeithleyDDCProtocol::~KeithleyDDCProtocol <-" << std::endl;
+
+ if(_communication_link)
+ {
+ delete _communication_link;
+ _communication_link = 0;
+ }
std::cout << "KeithleyDDCProtocol::~KeithleyDDCProtocol ->" << std::endl;
}
diff --git a/src/KeithleySCPIProtocol.cpp b/src/KeithleySCPIProtocol.cpp
index 5dd54f2..34e903f 100644
--- a/src/KeithleySCPIProtocol.cpp
+++ b/src/KeithleySCPIProtocol.cpp
@@ -17,18 +17,19 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <Xstring.h>
+#include <helpers/XString.h>
#ifndef WIN32
# include <unistd.h>
#endif
#include "KeithleySCPIProtocol.h"
-#include "TangoGpibLink.h"
+//#include "TangoGpibLink.h"
// ============================================================================
// KeithleySCPIProtocol::KeithleySCPIProtocol
// ============================================================================
KeithleySCPIProtocol::KeithleySCPIProtocol (std::string& gpib_device_name)
: ElectrometerProtocol(),
+ _communication_link(0),
isDiffSuportedMode(false),
trigCountStr("")
{
@@ -46,7 +47,13 @@ KeithleySCPIProtocol::~KeithleySCPIProtocol (void)
{
std::cout << "KeithleySCPIProtocol::~KeithleySCPIProtocol <-" << std::endl;
- std::cout << "KeithleySCPIProtocol::~KeithleySCPIProtocol ->" << std::endl;
+ if(_communication_link)
+ {
+ delete _communication_link;
+ _communication_link = 0;
+ }
+
+ std::cout << "KeithleySCPIProtocol::~KeithleySCPIProtocol ->" << std::endl;
}
// ============================================================================
diff --git a/src/Keithley_485.cpp b/src/Keithley_485.cpp
index cf1e4e9..ea9af93 100644
--- a/src/Keithley_485.cpp
+++ b/src/Keithley_485.cpp
@@ -18,7 +18,7 @@
#include <stdexcept>
#include <sstream>
#include <string>
-#include <Xstring.h>
+#include <helpers/XString.h>
#include "KeithleyDDCProtocol.h"
#include "Keithley_485.h"
diff --git a/src/Keithley_486.cpp b/src/Keithley_486.cpp
index ee52f30..87d03b5 100644
--- a/src/Keithley_486.cpp
+++ b/src/Keithley_486.cpp
@@ -19,7 +19,7 @@
#include <sstream>
#include <string>
#include <math.h> //- for ceil
-#include <Xstring.h>
+#include <helpers/XString.h>
#include "Keithley_486.h"
#include "KeithleyDDCProtocol.h"
diff --git a/src/Keithley_487.cpp b/src/Keithley_487.cpp
index 92b44ed..9b8900b 100644
--- a/src/Keithley_487.cpp
+++ b/src/Keithley_487.cpp
@@ -19,7 +19,7 @@
#include <sstream>
#include <string>
#include <math.h> //- for ceil
-#include <Xstring.h>
+#include <helpers/XString.h>
#include "Keithley_487.h"
#include "KeithleyDDCProtocol.h"
diff --git a/src/Keithley_617.cpp b/src/Keithley_617.cpp
index ef84324..edb99b3 100644
--- a/src/Keithley_617.cpp
+++ b/src/Keithley_617.cpp
@@ -18,7 +18,7 @@
#include <stdexcept>
#include <sstream>
#include <string>
-#include <Xstring.h>
+#include <helpers/XString.h>
#include "Keithley_617.h"
#include "KeithleyDDCProtocol.h"
diff --git a/src/Keithley_6485.cpp b/src/Keithley_6485.cpp
index 529f088..18b6651 100644
--- a/src/Keithley_6485.cpp
+++ b/src/Keithley_6485.cpp
@@ -18,7 +18,7 @@
#include <sstream>
#include <string>
#include <math.h> //- for ceil
-#include <Xstring.h>
+#include <helpers/XString.h>
#include "Keithley_6485.h"
#include "KeithleySCPIProtocol.h"
/*
diff --git a/src/Keithley_6487.cpp b/src/Keithley_6487.cpp
index 56e6aa5..1a076ae 100644
--- a/src/Keithley_6487.cpp
+++ b/src/Keithley_6487.cpp
@@ -18,7 +18,7 @@
#include <sstream>
#include <string>
#include <math.h> //- for ceil
-#include <Xstring.h>
+#include <helpers/XString.h>
#include "Keithley_6487.h"
#include "KeithleySCPIProtocol.h"
/*
diff --git a/src/Keithley_6512.cpp b/src/Keithley_6512.cpp
index 375111d..99b6f43 100644
--- a/src/Keithley_6512.cpp
+++ b/src/Keithley_6512.cpp
@@ -18,7 +18,7 @@
#include <stdexcept>
#include <sstream>
#include <string>
-#include <Xstring.h>
+#include <helpers/XString.h>
#include "Keithley_6512.h"
#include "KeithleyDDCProtocol.h"
diff --git a/src/Keithley_6514.cpp b/src/Keithley_6514.cpp
index 7ff9c69..91c4893 100644
--- a/src/Keithley_6514.cpp
+++ b/src/Keithley_6514.cpp
@@ -18,7 +18,7 @@
#include <sstream>
#include <string>
#include <math.h> //- for ceil
-#include <Xstring.h>
+#include <helpers/XString.h>
#include <tango.h> //- Tango exceptions
#include "Keithley_6514.h"
#include "KeithleySCPIProtocol.h"
diff --git a/src/Keithley_6517.cpp b/src/Keithley_6517.cpp
index 5a92b00..555a78e 100644
--- a/src/Keithley_6517.cpp
+++ b/src/Keithley_6517.cpp
@@ -18,7 +18,7 @@
#include <sstream>
#include <string>
#include <math.h> //- for ceil
-#include <Xstring.h>
+#include <helpers/XString.h>
#include "Keithley_6517.h"
#include "KeithleySCPIProtocol.h"
/*
diff --git a/src/N_PhotoConducteur.cpp b/src/N_PhotoConducteur.cpp
index f66efbd..6c278d7 100644
--- a/src/N_PhotoConducteur.cpp
+++ b/src/N_PhotoConducteur.cpp
@@ -18,7 +18,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <Xstring.h>
+#include <helpers/XString.h>
#include "N_PhotoConducteur.h"
#include "NovelecProtocol.h"
/*
diff --git a/src/N_PhotoVoltaique.cpp b/src/N_PhotoVoltaique.cpp
index ff66745..eac66a5 100644
--- a/src/N_PhotoVoltaique.cpp
+++ b/src/N_PhotoVoltaique.cpp
@@ -18,7 +18,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <Xstring.h>
+#include <helpers/XString.h>
#include "N_PhotoVoltaique.h"
#include "NovelecProtocol.h"
/*
@@ -72,6 +72,9 @@ void N_PhotoVoltaique::range_up (void)
std::stringstream cmd_to_send;
+ //- update range idx
+ this->get_ElectroMeterRange();
+
_range += 1;
if(_range > _rangeLimit)
@@ -100,6 +103,9 @@ void N_PhotoVoltaique::range_down (void)
std::stringstream cmd_to_send;
+ //- update range idx
+ this->get_ElectroMeterRange();
+
_range -= 1;
if(_range < 0)
diff --git a/src/NovelecProtocol.cpp b/src/NovelecProtocol.cpp
index 2be3272..3dfde0b 100644
--- a/src/NovelecProtocol.cpp
+++ b/src/NovelecProtocol.cpp
@@ -24,9 +24,9 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <Xstring.h>
+#include <helpers/XString.h>
#include "NovelecProtocol.h"
-#include "TangoSerialLink.h"
+//#include "TangoSerialLink.h"
//- commands numbers
static const short STATUS_CMD_NUM = 1;
@@ -63,13 +63,13 @@ NovelecProtocol::NovelecProtocol (std::string& serial_device_name, unsigned shor
: ElectrometerProtocol(),
_devAdd(devAddress),
_novType(novelecType),
- _tgSerLk(0)
+ _communication_link(0),
+ _is_measure_mode_on(false),
+ _is_explicite_resp_enabled(false)
{
_commDevName = serial_device_name;
_rangeParameterNum = _novType + 2;
_function = "Not updated";
- _is_measure_mode_on = false;
- _is_explicite_resp_enabled = false;
}
// ============================================================================
diff --git a/src/Novelec_MCCE2.cpp b/src/Novelec_MCCE2.cpp
index ce95840..031bf55 100644
--- a/src/Novelec_MCCE2.cpp
+++ b/src/Novelec_MCCE2.cpp
@@ -17,7 +17,7 @@
#include <iostream>
#include <sstream>
#include <string>
-#include <Xstring.h>
+#include <helpers/XString.h>
#include "NovelecProtocol.h"
#include "Novelec_MCCE2.h"
diff --git a/src/TangoGpibLink.cpp b/src/TangoGpibLink.cpp
index a7b7494..6763c00 100644
--- a/src/TangoGpibLink.cpp
+++ b/src/TangoGpibLink.cpp
@@ -24,7 +24,7 @@
// ============================================================================
TangoGpibLink::TangoGpibLink (std::string& gpib_device_name)
: CommunicationLink(gpib_device_name),
-_gpib_proxy (0)
+ _gpib_proxy (0)
{
std::cout << "TangoGpibLink::TangoGpibLink <-" << std::endl;
@@ -187,7 +187,7 @@ std::string TangoGpibLink::read (void) throw (Tango::DevFailed)
// ============================================================================
// TangoGpibLink::write_read
// ============================================================================
-std::string TangoGpibLink::write_read (std::string command_to_send, size_t unusedLgth) throw (Tango::DevFailed)
+std::string TangoGpibLink::write_read (std::string command_to_send, size_t /*unusedLgth*/) throw (Tango::DevFailed)
{
std::string description("");
diff --git a/src/TangoSerialLink.cpp b/src/TangoSerialLink.cpp
index 4c76d01..593b3ff 100644
--- a/src/TangoSerialLink.cpp
+++ b/src/TangoSerialLink.cpp
@@ -21,31 +21,6 @@
//- Read serial data in mode LINE (i.e SerialLine device wait until EOF is received from instrument)
static const long MODE_LINE = 2;
-//- init of the static instance
-//TangoSerialLink* TangoSerialLink::tsl_Instance = 0; //- ptr on the TangoSerialLink instance
-
-// ============================================================================
-// TangoSerialLink::get_instance
-// ============================================================================
-/*TangoSerialLink* TangoSerialLink::get_instance(std::string & serial_dev_name)
-{
- if( !tsl_Instance )
- tsl_Instance = new TangoSerialLink(serial_dev_name);
-
- return tsl_Instance;
-}
-
-// ============================================================================
-// TangoSerialLink::delete_instance
-// ============================================================================
-void TangoSerialLink::delete_instance(CommunicationLink* tsl_Instance)
-{
- if(tsl_Instance)
- {
- delete tsl_Instance ;
- tsl_Instance = 0;
- }
-}*/
// ============================================================================
// TangoSerialLink::TangoSerialLink
@@ -270,32 +245,6 @@ std::string TangoSerialLink::read (long nbCharToRead) throw (Tango::DevFailed)
return this->response ;
}
-// ============================================================================
-// TangoSerialLink::write_read
-// ============================================================================
-//std::string TangoSerialLink::write_read (std::string command_to_send) throw (Tango::DevFailed)
-//{
-// if(!_serial_proxy)
-// create_serial_proxy();
-// Tango::DeviceData dd_in;
-//
-// std::string respTmp("");
-// long flush_in_out = 2;
-// dd_in << flush_in_out;
-//
-// //- Flush buffers ( In & Out = 2 )
-// this->_serial_proxy->command_inout("DevSerFlush", dd_in);
-//
-// omni_thread::sleep(0, 200000000); //200 milliseconds
-// write(command_to_send);
-//
-// //- sleep a little bit to let the adapter(RS232/485) to switch mode
-// omni_thread::sleep(0, 100000000); //100 milliseconds
-//
-// // now read response from HW
-// return this->read();
-//}
-
// ============================================================================
// TangoSerialLink::write_read : read N char
// ============================================================================
--
GitLab