From d30f1a50fa382e6eda766652af5c2c928f7533fc Mon Sep 17 00:00:00 2001 From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr> Date: Thu, 10 Jun 2010 14:36:15 +0000 Subject: [PATCH] cmd switch_off called before any parameters modifications and then locked with switch_on. --- include/AbstractElectrometerClass.h | 5 ++++- include/CommunicationLink.h | 8 +++++++- include/ElectrometerProtocol.h | 6 +++++- src/AbstractElectrometerClass.cpp | 5 ++++- src/CommunicationLink.cpp | 8 +++++++- src/ElectrometerException.cpp | 6 +++++- src/Makefile.linux | 7 ++++++- 7 files changed, 38 insertions(+), 7 deletions(-) diff --git a/include/AbstractElectrometerClass.h b/include/AbstractElectrometerClass.h index f71fafb..dd148e8 100644 --- a/include/AbstractElectrometerClass.h +++ b/include/AbstractElectrometerClass.h @@ -9,9 +9,12 @@ // // $Author: xavela $ // -// $Revision: 1.19 $ +// $Revision: 1.20 $ // // $Log: not supported by cvs2svn $ +// Revision 1.19 2010/03/17 11:57:04 xavela +// VSource control added ! +// // Revision 1.18 2010/03/17 10:00:15 xavela // VSource output added for K_6517 // diff --git a/include/CommunicationLink.h b/include/CommunicationLink.h index 0cf7976..3378330 100644 --- a/include/CommunicationLink.h +++ b/include/CommunicationLink.h @@ -12,9 +12,15 @@ // // $Author: xavela $ // -// $Revision: 1.5 $ +// $Revision: 1.6 $ // // $Log: not supported by cvs2svn $ +// Revision 1.5 2008/04/15 12:51:59 xavela +// xavier : +// - SRQ management changed : +// * ReadStatusByteRegister method added +// * IsSrqLineUP added +// // Revision 1.4 2008/02/15 10:17:55 xavela // xavier : // - command abort added for SCPI Keithleys diff --git a/include/ElectrometerProtocol.h b/include/ElectrometerProtocol.h index 5240db5..ed90be3 100644 --- a/include/ElectrometerProtocol.h +++ b/include/ElectrometerProtocol.h @@ -12,9 +12,13 @@ // // $Author: xavela $ // -// $Revision: 1.12 $ +// $Revision: 1.13 $ // // $Log: not supported by cvs2svn $ +// Revision 1.12 2009/10/14 15:26:17 xavela +// KeithleyMemory leak fixed. +// Novelec part updated +// // Revision 1.11 2009/01/19 12:00:25 xavela // xavier : // - MCCE2 (Novelec part) : methods to change the active channel to communicate with. diff --git a/src/AbstractElectrometerClass.cpp b/src/AbstractElectrometerClass.cpp index f55de82..518722a 100644 --- a/src/AbstractElectrometerClass.cpp +++ b/src/AbstractElectrometerClass.cpp @@ -11,9 +11,12 @@ // // $Author: xavela $ // -// $Revision: 1.21 $ +// $Revision: 1.22 $ // // $Log: not supported by cvs2svn $ +// Revision 1.21 2010/03/17 11:57:03 xavela +// VSource control added ! +// // Revision 1.20 2010/03/17 10:00:15 xavela // VSource output added for K_6517 // diff --git a/src/CommunicationLink.cpp b/src/CommunicationLink.cpp index b6056fd..7685b01 100644 --- a/src/CommunicationLink.cpp +++ b/src/CommunicationLink.cpp @@ -12,9 +12,15 @@ // // $Author: xavela $ // -// $Revision: 1.5 $ +// $Revision: 1.6 $ // // $Log: not supported by cvs2svn $ +// Revision 1.5 2008/04/15 12:52:14 xavela +// xavier : +// - SRQ management changed : +// * ReadStatusByteRegister method added +// * IsSrqLineUP added +// // Revision 1.4 2008/02/15 10:17:57 xavela // xavier : // - command abort added for SCPI Keithleys diff --git a/src/ElectrometerException.cpp b/src/ElectrometerException.cpp index 9131a37..63d464f 100644 --- a/src/ElectrometerException.cpp +++ b/src/ElectrometerException.cpp @@ -12,9 +12,13 @@ // // $Author: xavela $ // -// $Revision: 1.2 $ +// $Revision: 1.3 $ // // $Log: not supported by cvs2svn $ +// Revision 1.2 2008/02/15 10:17:57 xavela +// xavier : +// - command abort added for SCPI Keithleys +// // Revision 1.1 2007/07/09 13:20:37 stephle // initial import // diff --git a/src/Makefile.linux b/src/Makefile.linux index cdcb730..c3f2afc 100644 --- a/src/Makefile.linux +++ b/src/Makefile.linux @@ -6,9 +6,14 @@ # # $Author: xavela $ # -# $Revision: 1.6 $ +# $Revision: 1.7 $ # # $Log: not supported by cvs2svn $ +# Revision 1.6 2009/03/18 10:25:29 xavela +# xavier : +# - Novelec part updated and tested ! +# - +no more compilation warnings +# # Revision 1.5 2008/04/16 08:40:32 xavela # xavier : # lib compiled on Linux platform -- GitLab