Skip to content
Snippets Groups Projects
Commit 305ad8a0 authored by Xavier ELATTAOUI's avatar Xavier ELATTAOUI
Browse files

compilation error fixed

parent 2d89895c
No related branches found
No related tags found
No related merge requests found
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
</parent> </parent>
<groupId>fr.soleil.lib</groupId> <groupId>fr.soleil.lib</groupId>
<artifactId>Electrometers-${aol}-${library}-${mode}</artifactId> <artifactId>Electrometers-${aol}-${library}-${mode}</artifactId>
<version>2.5.4</version> <version>2.5.5</version>
<packaging>nar</packaging> <packaging>nar</packaging>
<name>Electrometers library</name> <name>Electrometers library</name>
<description>Electrometers library</description> <description>Electrometers library</description>
......
...@@ -939,7 +939,7 @@ void KeithleySCPIProtocol::set_averagecount (std::string nbAverageCount) ...@@ -939,7 +939,7 @@ void KeithleySCPIProtocol::set_averagecount (std::string nbAverageCount)
// ============================================================================ // ============================================================================
// KeithleySCPIProtocol::set_averagecount // KeithleySCPIProtocol::set_averagecount
// ============================================================================ // ============================================================================
void KeithleySCPIProtocol::set_averagecount_K6517 (std::string cmd_to_send) void KeithleySCPIProtocol::set_averagecount_K6517 (std::string nbAverageCount)
{ {
if( !this->_communication_link ) if( !this->_communication_link )
{ {
...@@ -956,7 +956,7 @@ void KeithleySCPIProtocol::set_averagecount_K6517 (std::string cmd_to_send) ...@@ -956,7 +956,7 @@ void KeithleySCPIProtocol::set_averagecount_K6517 (std::string cmd_to_send)
tmpMode.erase( tmpMode.find("\n") ); tmpMode.erase( tmpMode.find("\n") );
//- send command //- send command
std::string cmd_to_send = tmpMode + ":AVER:COUN " + cmd_to_send ; std::string cmd_to_send = tmpMode + ":AVER:COUN " + nbAverageCount ;
_communication_link->write(cmd_to_send); _communication_link->write(cmd_to_send);
} }
......
...@@ -117,7 +117,7 @@ void TangoSerialLink::create_serial_proxy (void) throw (Tango::DevFailed) ...@@ -117,7 +117,7 @@ void TangoSerialLink::create_serial_proxy (void) throw (Tango::DevFailed)
this->_serial_proxy = 0; this->_serial_proxy = 0;
} }
_is_serial_proxy_created = false; _is_serial_proxy_created = false;
description = "Unable to write command : " + command_to_send + "\nmemory allocation failed."; description = "Unable to create proxy on : " + _communication_Device_name + "\nmemory allocation failed.";
Tango::Except::throw_exception ( Tango::Except::throw_exception (
(const char*)"ALLOCATION_ERROR", (const char*)"ALLOCATION_ERROR",
description.c_str(), description.c_str(),
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment