Skip to content
Snippets Groups Projects
Commit 1b3db24c authored by Jean Coquet's avatar Jean Coquet
Browse files

bug correction (crash when trying to Init the device and GPIB client does not respond)

some code cleaning
State and Status enhanced
parent 2334abd9
No related branches found
No related tags found
No related merge requests found
......@@ -8,7 +8,7 @@
</parent>
<groupId>fr.soleil.device</groupId>
<artifactId>GpibPrologix-${aol}-${mode}</artifactId>
<version>1.1.6-SNAPSHOT</version>
<version>1.1.6</version>
<packaging>nar</packaging>
<name>GpibPrologix</name>
<description>GpibPrologix device</description>
......
This diff is collapsed.
......@@ -8,8 +8,8 @@
//
// $Author: jean_coquet $
//
// $Revision: 1.5 $
// $Date: 2011-10-20 14:32:24 $
// $Revision: 1.6 $
// $Date: 2012-03-22 15:16:09 $
//
// SVN only:
// $HeadURL: $
......@@ -17,6 +17,9 @@
// CVS only:
// $Source: /users/chaize/newsvn/cvsroot/Communication/GpibPrologix/src/GpibPrologix.h,v $
// $Log: not supported by cvs2svn $
// Revision 1.5 2011/10/20 14:32:24 jean_coquet
// added list (limited to 50 newest) of commands which failed and drived to disconnect TCP/IP to understand the reason why so much disconnections with Power Supply AMI420
//
// Revision 1.4 2011/10/03 08:17:05 jean_coquet
// error counter added in Status
//
......@@ -80,7 +83,7 @@
/**
* @author $Author: jean_coquet $
* @version $Revision: 1.5 $
* @version $Revision: 1.6 $
*/
// Add your own constant definitions here.
......@@ -364,7 +367,6 @@ protected :
bool init_device_done;
bool properties_missing;
bool is_auto_response;
std::string read_cmd;
std::string status_str;
......@@ -373,7 +375,6 @@ protected :
//- use to display the 1st Eth com error (try to find com error origin...)
std::string com_last_error;
bool has_last_error;
Tango::DevState com_state;
......@@ -382,6 +383,7 @@ protected :
//- for counting com errors
size_t com_error_counter;
size_t consecutive_com_error_counter;
bool last_com_was_error;
std::string start_date;
std::deque <std::string> failed_cmds;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment