From d5f857046bdfe38cea29f74346ae765362f7014e Mon Sep 17 00:00:00 2001
From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr>
Date: Tue, 27 Nov 2007 15:23:02 +0000
Subject: [PATCH] xavier : - modif done on Novelec part : bug fix
---
src/AbstractElectrometerClass.cpp | 15 ++++++---
src/CommunicationLink.cpp | 15 +++++----
src/ElectrometerProtocol.cpp | 8 ++---
src/N_PhotoConducteur.cpp | 8 ++---
src/N_PhotoVoltaique.cpp | 9 ++---
src/NovelecProtocol.cpp | 55 ++-----------------------------
src/Novelec_MCCE2.cpp | 13 +++-----
src/TangoSerialLink.cpp | 8 ++---
8 files changed, 42 insertions(+), 89 deletions(-)
diff --git a/src/AbstractElectrometerClass.cpp b/src/AbstractElectrometerClass.cpp
index f78455e..51eb6e6 100644
--- a/src/AbstractElectrometerClass.cpp
+++ b/src/AbstractElectrometerClass.cpp
@@ -11,9 +11,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:37 stephle
// initial import
//
@@ -38,10 +43,10 @@ AbstractElectrometerClass::AbstractElectrometerClass (std::string comLink_device
_range(0),
_rangeStr("NOT INITIALISED")
{
- std::cout << "AbstractElectrometerClass::AbstractElectrometerClass <-" << std::endl;
+// std::cout << "AbstractElectrometerClass::AbstractElectrometerClass <-" << std::endl;
- std::cout << "AbstractElectrometerClass::AbstractElectrometerClass ->" << std::endl;
+// std::cout << "AbstractElectrometerClass::AbstractElectrometerClass ->" << std::endl;
}
// ============================================================================
@@ -49,7 +54,7 @@ AbstractElectrometerClass::AbstractElectrometerClass (std::string comLink_device
// ============================================================================
AbstractElectrometerClass::~AbstractElectrometerClass (void)
{
- std::cout << "AbstractElectrometerClass::~AbstractElectrometerClass <-" << std::endl;
+// std::cout << "AbstractElectrometerClass::~AbstractElectrometerClass <-" << std::endl;
if(_electrometerProtocol)
{
@@ -57,7 +62,7 @@ AbstractElectrometerClass::~AbstractElectrometerClass (void)
_electrometerProtocol = 0;
}
- std::cout << "AbstractElectrometerClass::~AbstractElectrometerClass ->" << std::endl;
+// std::cout << "AbstractElectrometerClass::~AbstractElectrometerClass ->" << std::endl;
}
diff --git a/src/CommunicationLink.cpp b/src/CommunicationLink.cpp
index e84998c..db2c7bf 100644
--- a/src/CommunicationLink.cpp
+++ b/src/CommunicationLink.cpp
@@ -10,11 +10,14 @@
// X. Elattaoui
//
//
-// $Author: stephle $
+// $Author: xavela $
//
-// $Revision: 1.1 $
+// $Revision: 1.2 $
//
// $Log: not supported by cvs2svn $
+// Revision 1.1 2007/07/09 13:20:37 stephle
+// initial import
+//
//
// ============================================================================
@@ -31,10 +34,10 @@
CommunicationLink::CommunicationLink ( std::string& communication_link_name)
: _communication_Device_name(communication_link_name)
{
- std::cout << "CommunicationLink::CommunicationLink <-" << std::endl;
+ //std::cout << "CommunicationLink::CommunicationLink <-" << std::endl;
- std::cout << "CommunicationLink::CommunicationLink ->" << std::endl;
+ //std::cout << "CommunicationLink::CommunicationLink ->" << std::endl;
}
// ============================================================================
@@ -42,9 +45,9 @@ CommunicationLink::CommunicationLink ( std::string& communication_link_name)
// ============================================================================
CommunicationLink::~CommunicationLink (void)
{
- std::cout << "CommunicationLink::~CommunicationLink <-" << std::endl;
+ //std::cout << "CommunicationLink::~CommunicationLink <-" << std::endl;
- std::cout << "CommunicationLink::~CommunicationLink ->" << std::endl;
+ //std::cout << "CommunicationLink::~CommunicationLink ->" << std::endl;
}
diff --git a/src/ElectrometerProtocol.cpp b/src/ElectrometerProtocol.cpp
index ab4431e..290e4db 100644
--- a/src/ElectrometerProtocol.cpp
+++ b/src/ElectrometerProtocol.cpp
@@ -27,9 +27,9 @@ ElectrometerProtocol::ElectrometerProtocol () :
_mode("NOT INITIALISED"),
_communication_link(0)
{
- std::cout << "ElectrometerProtocol::ElectrometerProtocol <-" << std::endl;
+ //std::cout << "ElectrometerProtocol::ElectrometerProtocol <-" << std::endl;
- std::cout << "ElectrometerProtocol::ElectrometerProtocol ->" << std::endl;
+ //std::cout << "ElectrometerProtocol::ElectrometerProtocol ->" << std::endl;
}
// ============================================================================
@@ -37,7 +37,7 @@ ElectrometerProtocol::ElectrometerProtocol () :
// ============================================================================
ElectrometerProtocol::~ElectrometerProtocol (void)
{
- std::cout << "ElectrometerProtocol::~ElectrometerProtocol <-" << std::endl;
+ //std::cout << "ElectrometerProtocol::~ElectrometerProtocol <-" << std::endl;
if(_communication_link)
{
@@ -45,7 +45,7 @@ ElectrometerProtocol::~ElectrometerProtocol (void)
_communication_link = 0;
}
- std::cout << "ElectrometerProtocol::~ElectrometerProtocol ->" << std::endl;
+ //std::cout << "ElectrometerProtocol::~ElectrometerProtocol ->" << std::endl;
}
// ============================================================================
diff --git a/src/N_PhotoConducteur.cpp b/src/N_PhotoConducteur.cpp
index a7c7779..bb4203d 100644
--- a/src/N_PhotoConducteur.cpp
+++ b/src/N_PhotoConducteur.cpp
@@ -34,11 +34,11 @@ static const std::string NType_5_rangeValue[] = {"1000 KOhms","300 KOhms","100 K
N_PhotoConducteur::N_PhotoConducteur (std::string& comLink_device_name, short address, short novTypeNumber)
: Novelec_MCCE2(comLink_device_name, address, novTypeNumber)
{
- std::cout << "N_PhotoConducteur::N_PhotoConducteur <-" << std::endl;
+ //std::cout << "N_PhotoConducteur::N_PhotoConducteur <-" << std::endl;
_rangeLimit = 3;
- std::cout << "N_PhotoConducteur::N_PhotoConducteur ->" << std::endl;
+ //std::cout << "N_PhotoConducteur::N_PhotoConducteur ->" << std::endl;
}
// ============================================================================
@@ -46,9 +46,9 @@ N_PhotoConducteur::N_PhotoConducteur (std::string& comLink_device_name, short ad
// ============================================================================
N_PhotoConducteur::~N_PhotoConducteur (void)
{
- std::cout << "N_PhotoConducteur::~N_PhotoConducteur <-" << std::endl;
+ //std::cout << "N_PhotoConducteur::~N_PhotoConducteur <-" << std::endl;
- std::cout << "N_PhotoConducteur::~N_PhotoConducteur ->" << std::endl;
+ //std::cout << "N_PhotoConducteur::~N_PhotoConducteur ->" << std::endl;
}
// ============================================================================
diff --git a/src/N_PhotoVoltaique.cpp b/src/N_PhotoVoltaique.cpp
index 2d36994..457a6d7 100644
--- a/src/N_PhotoVoltaique.cpp
+++ b/src/N_PhotoVoltaique.cpp
@@ -35,7 +35,7 @@ static const std::string NType3_rangeValue[] = {"1e-8 A","3e-8 A","1e-7 A","3e-7
N_PhotoVoltaique::N_PhotoVoltaique (std::string comLink_device_name, short address, short novTypeNumber)
: Novelec_MCCE2(comLink_device_name, address, novTypeNumber)
{
- std::cout << "N_PhotoVoltaique::N_PhotoVoltaique <-" << std::endl;
+ //std::cout << "N_PhotoVoltaique::N_PhotoVoltaique <-" << std::endl;
//- init range limit
switch(novTypeNumber)
@@ -47,7 +47,7 @@ N_PhotoVoltaique::N_PhotoVoltaique (std::string comLink_device_name, short addre
break;
}
- std::cout << "N_PhotoVoltaique::N_PhotoVoltaique ->" << std::endl;
+ //std::cout << "N_PhotoVoltaique::N_PhotoVoltaique ->" << std::endl;
}
// ============================================================================
@@ -55,9 +55,9 @@ N_PhotoVoltaique::N_PhotoVoltaique (std::string comLink_device_name, short addre
// ============================================================================
N_PhotoVoltaique::~N_PhotoVoltaique (void)
{
- std::cout << "N_PhotoVoltaique::~N_PhotoVoltaique <-" << std::endl;
+ //std::cout << "N_PhotoVoltaique::~N_PhotoVoltaique <-" << std::endl;
- std::cout << "N_PhotoVoltaique::~N_PhotoVoltaique ->" << std::endl;
+ //std::cout << "N_PhotoVoltaique::~N_PhotoVoltaique ->" << std::endl;
}
// ============================================================================
@@ -117,6 +117,7 @@ std::string N_PhotoVoltaique::get_ElectroMeterFrequency (void)
throw electrometer::ElectrometerException("BAD_CAST",
"Unable to query the electrmometer frequency.",
"N_PhotoVoltaique::get_ElectroMeterFrequency( ).");
+
return _nproto->get_frequency();
}
diff --git a/src/NovelecProtocol.cpp b/src/NovelecProtocol.cpp
index 162eab5..b7f9d71 100644
--- a/src/NovelecProtocol.cpp
+++ b/src/NovelecProtocol.cpp
@@ -55,29 +55,10 @@ NovelecProtocol::NovelecProtocol (std::string& serial_device_name, short devAddr
_novType(novelecType),
_is_measure_mode_on(false)
{
-//std::stringstream explicite_resp;
-//std::string tmp("no data");
-
- std::cout << "NovelecProtocol::NovelecProtocol <-" << std::endl;
_communication_link = new TangoSerialLink (serial_device_name);
_rangeParameterNum = _novType + 2;
- //- CMD to enable PROG cmds
-//-XE this->switch_MCCE2_OFF(); //- this command is now called in the MCCE2 device !
-/*
- //- Clear error registers
- this->clear_registers();
-
- //- send cmd to have an explicite response :
- explicite_resp << _devAdd << " PROG " << RESPONSE_LGTH_CMD_NUM << " 1" << END_OF_LINE << std::endl;
- tmp = _communication_link->write_read(explicite_resp.str());
- //- check only the command response
- check_command(tmp);
- //- if no error
- _is_explicite_resp_enabled = true;
-*/
- std::cout << "NovelecProtocol::NovelecProtocol ->" << std::endl;
}
// ============================================================================
@@ -109,9 +90,9 @@ std::string tmp("no data");
// ============================================================================
NovelecProtocol::~NovelecProtocol (void)
{
- std::cout << "NovelecProtocol::~NovelecProtocol <-" << std::endl;
+// std::cout << "NovelecProtocol::~NovelecProtocol <-" << std::endl;
- std::cout << "NovelecProtocol::~NovelecProtocol ->" << std::endl;
+// std::cout << "NovelecProtocol::~NovelecProtocol ->" << std::endl;
}
// ============================================================================
@@ -157,8 +138,6 @@ std::stringstream cmd_to_send;
std::string argout("no data");
std::string tmp("no data");
-//std::cout << "\n\n***INFO : NovelecProtocol::get_mode () ->" << std::endl;
-
//- send command to Novelec device
cmd_to_send << _devAdd << " READ " << MODE_CMD_NUM << END_OF_LINE << std::endl;
tmp = _communication_link->write_read(cmd_to_send.str());
@@ -174,8 +153,6 @@ std::string tmp("no data");
else
_function = argout;
-//std::cout << "***INFO : NovelecProtocol::get_mode () <- $" << _function << "$\n\n" << std::endl;
-
return _function;
}
@@ -189,8 +166,6 @@ std::string tmp("no data");
std::string value("no data");
short cmd_num = 13; //- default value for DEBUG !!!
-//std::cout << "\n\n***INFO : NovelecProtocol::get_value () ->" << std::endl;
-
//- first get mode
get_mode();
if( (_function.find("OFFSET") != std::string::npos) || (_function.find("V1") != std::string::npos) )
@@ -204,12 +179,9 @@ short cmd_num = 13; //- default value for DEBUG !!!
std::cout << "\t\t***WARN : Current mode : \"" << get_mode() << "\" has no value available." << std::endl;
cmd_to_send << _devAdd << " READ " << cmd_num << END_OF_LINE << std::endl;
- tmp = _communication_link->write_read(cmd_to_send.str());
//- check only the command response
value = check_and_extract_data(tmp, cmd_num);
-//std::cout << "***INFO : NovelecProtocol::get_value () <- $" << value << "$\n\n" << std::endl;
-
return value;
}
@@ -302,8 +274,6 @@ std::stringstream cmd_to_send;
std::string argout("no data");
std::string tmp("no data");
-//std::cout << "\n\n***INFO : NovelecProtocol::get_range () ->" << std::endl;
-
//- send command to Novelec device
cmd_to_send << _devAdd << " READ " << RANGE_CMD_NUM << END_OF_LINE << std::endl;
tmp = _communication_link->write_read(cmd_to_send.str());
@@ -318,8 +288,6 @@ std::string tmp("no data");
argout = range_str[_novType-1][idx];
}
-//std::cout << "***INFO : NovelecProtocol::get_range () =$" << argout << "$" << std::endl;
-
return argout;
}
@@ -348,8 +316,6 @@ std::stringstream cmd_to_send;
std::string argout("no data");
std::string tmp("no data");
-//std::cout << "\n\n***INFO : NovelecProtocol::get_polarity () ->" << std::endl;
-
//- send command to Novelec device
cmd_to_send << _devAdd << " READ " << POLARITY_CMD_NUM << END_OF_LINE << std::endl;
tmp = _communication_link->write_read(cmd_to_send.str());
@@ -366,7 +332,6 @@ std::string tmp("no data");
argout = "positive";
}
-//std::cout << "***INFO : NovelecProtocol::get_polarity () -> $" << argout << "$" << std::endl;
return argout;
}
@@ -394,8 +359,6 @@ std::stringstream cmd_to_send;
std::string argout("no data");
std::string tmp("no data");
-//std::cout << "\n\n***INFO : NovelecProtocol::get_frequency () ->" << std::endl;
-
//- send command to Novelec device
cmd_to_send << _devAdd << " READ " << FREQUENCY_CMD_NUM << END_OF_LINE << std::endl;
tmp = _communication_link->write_read(cmd_to_send.str());
@@ -409,8 +372,6 @@ std::string tmp("no data");
argout = frequency_str[idx];
}
-
-//std::cout << "***INFO : NovelecProtocol::get_frequency () -> $" << argout << "$" << std::endl;
return argout;
}
@@ -438,8 +399,6 @@ std::stringstream cmd_to_send;
std::string argout("no data");
std::string tmp("no data");
-//std::cout << "\n\n***INFO : NovelecProtocol::get_gain () ->" << std::endl;
-
//- send command to Novelec device
cmd_to_send << _devAdd << " READ " << GAIN_CMD_NUM << END_OF_LINE << std::endl;
tmp = _communication_link->write_read(cmd_to_send.str());
@@ -456,7 +415,6 @@ std::string tmp("no data");
//- erase wildcard char : response received is as this "*10xx"
argout = argout.erase(argout.find('*'),1);
-//std::cout << "***INFO : NovelecProtocol::get_gain () -> $" << argout << "$" << std::endl;
return argout;
}
@@ -485,8 +443,6 @@ std::stringstream cmd_to_send;
std::string argout("no data");
std::string tmp("no data");
-//std::cout << "\n\n***INFO : NovelecProtocol::get_errors () ->" << std::endl;
-
//- send command to Novelec device
cmd_to_send << _devAdd << " READ " << ERRORS_CMD_NUM << END_OF_LINE << std::endl;
tmp = _communication_link->write_read(cmd_to_send.str());
@@ -505,8 +461,6 @@ std::stringstream cmd_to_send;
std::string argout("no data");
std::string tmp("no data");
-//std::cout << "\n\n***INFO : NovelecProtocol::get_electrotype () -> " << std::endl;
-
//- send command to Novelec device
cmd_to_send << _devAdd << " READ " << ELECTROTYPE_CMD_NUM << END_OF_LINE << std::endl;
tmp = _communication_link->write_read(cmd_to_send.str());
@@ -517,7 +471,6 @@ std::string tmp("no data");
if( _is_explicite_resp_enabled == true )
argout = argout.substr(argout.find(".")+1);
-//std::cout << "***INFO : NovelecProtocol::get_electrotype () -> $" << argout << "$" << std::endl;
return argout;
}
@@ -699,9 +652,5 @@ std::string cmd_sentStr;
"NovelecProtocol::check_and_extract_data( ).");
- //- DEBUG
-//std::cout << "NovelecProtocol::check_and_extract_data ANSWER =*" << data << "*" << std::endl;
-
-
return data;
}
diff --git a/src/Novelec_MCCE2.cpp b/src/Novelec_MCCE2.cpp
index c390630..17d661b 100644
--- a/src/Novelec_MCCE2.cpp
+++ b/src/Novelec_MCCE2.cpp
@@ -29,12 +29,12 @@ Novelec_MCCE2::Novelec_MCCE2 (std::string& comLink_device_name, short address, s
: AbstractElectrometerClass(comLink_device_name),
_rangeLimit(0)
{
- std::cout << "Novelec_MCCE2::Novelec_MCCE2 <-" << std::endl;
+ //std::cout << "Novelec_MCCE2::Novelec_MCCE2 <-" << std::endl;
//- build the Novelec Electrometer obj
_electrometerProtocol = new NovelecProtocol(_device_proxy_name, address, novTypeNumber);
- std::cout << "Novelec_MCCE2::Novelec_MCCE2 ->" << std::endl;
+ //std::cout << "Novelec_MCCE2::Novelec_MCCE2 ->" << std::endl;
}
// ============================================================================
@@ -42,9 +42,9 @@ Novelec_MCCE2::Novelec_MCCE2 (std::string& comLink_device_name, short address, s
// ============================================================================
Novelec_MCCE2::~Novelec_MCCE2 (void)
{
- std::cout << "Novelec_MCCE2::~Novelec_MCCE2 <-" << std::endl;
+ //std::cout << "Novelec_MCCE2::~Novelec_MCCE2 <-" << std::endl;
- std::cout << "Novelec_MCCE2::~Novelec_MCCE2 ->" << std::endl;
+ //std::cout << "Novelec_MCCE2::~Novelec_MCCE2 ->" << std::endl;
}
// ============================================================================
@@ -142,7 +142,6 @@ std::string Novelec_MCCE2::electrometer_status (void)
{
tmp = _nproto->get_electrotype();
_type = XString<short>::convertFromString(tmp);
-//std::cout << "\t Novelec_MCCE2::Novelec_MCCE2 -> TYPE : *" << _type << "*" << std::endl;
}
catch(...)
{
@@ -175,14 +174,12 @@ std::string Novelec_MCCE2::electrometer_status (void)
//- get Electrometer mode :
argout += "Novelec mode : " + _electrometerProtocol->get_mode() + "\n";
-//std::cout << "\t Novelec_MCCE2::Novelec_MCCE2 -> MODE : *" << _electrometerProtocol->get_mode() << "*" << std::endl;
try
{
//- read novelec status from HW
tmp = _electrometerProtocol->get_raw_status();
_status = XString<short>::convertFromString(tmp);
-//std::cout << "\t Novelec_MCCE2::Novelec_MCCE2 -> STATUS : *" << _status << "*" << std::endl;
}
catch(...)
{
@@ -227,7 +224,6 @@ std::string Novelec_MCCE2::electrometer_status (void)
//- read novelec error(s) from HW
tmp = _nproto->get_errors();
_errors = XString<short>::convertFromString(tmp);
-//std::cout << "\t Novelec_MCCE2::Novelec_MCCE2 -> ERROR : *" << _errors << "*" << std::endl;
}
catch(...)
{
@@ -267,7 +263,6 @@ std::string Novelec_MCCE2::electrometer_status (void)
set_electroState(ALARM);
}
-//std::cout << "\t Novelec_MCCE2::Novelec_MCCE2 -> electro_status() : *" << argout << "*" << std::endl;
return argout;
}
diff --git a/src/TangoSerialLink.cpp b/src/TangoSerialLink.cpp
index 0756539..e87c01b 100644
--- a/src/TangoSerialLink.cpp
+++ b/src/TangoSerialLink.cpp
@@ -30,11 +30,11 @@ TangoSerialLink::TangoSerialLink (std::string& serial_device_name)
_serial_proxy (0),
_is_serial_proxy_created (false)
{
- std::cout << "TangoSerialLink::TangoSerialLink <-" << std::endl;
+// //std::cout << "TangoSerialLink::TangoSerialLink <-" << std::endl;
response.erase();
- std::cout << "TangoSerialLink::TangoSerialLink ->" << std::endl;
+// //std::cout << "TangoSerialLink::TangoSerialLink ->" << std::endl;
}
// ============================================================================
@@ -42,7 +42,7 @@ TangoSerialLink::TangoSerialLink (std::string& serial_device_name)
// ============================================================================
TangoSerialLink::~TangoSerialLink (void)
{
- std::cout << "TangoSerialLink::~TangoSerialLink <-" << std::endl;
+ //std::cout << "TangoSerialLink::~TangoSerialLink <-" << std::endl;
if(_is_serial_proxy_created)
{
@@ -51,7 +51,7 @@ TangoSerialLink::~TangoSerialLink (void)
_is_serial_proxy_created = false;
}
- std::cout << "TangoSerialLink::~TangoSerialLink ->" << std::endl;
+ //std::cout << "TangoSerialLink::~TangoSerialLink ->" << std::endl;
}
--
GitLab