From 682736abb3495e2d0ba1f23c536cfebe893243bd Mon Sep 17 00:00:00 2001 From: Xavier Elattaoui <xavier.elattaoui@synchrotron-soleil.fr> Date: Fri, 15 Feb 2008 10:17:57 +0000 Subject: [PATCH] xavier : - command abort added for SCPI Keithleys --- doc/html/_abstract_electrometer_class_8h-source.html | 7 +++++-- doc/html/_communication_link_8h-source.html | 7 +++++-- doc/html/_electrometer_protocol_8h-source.html | 7 +++++-- include/AbstractElectrometerClass.h | 6 +++++- include/CommunicationLink.h | 7 ++++++- include/ElectrometerProtocol.h | 6 +++++- src/AbstractElectrometerClass.cpp | 6 +++++- src/CommunicationLink.cpp | 7 ++++++- src/ElectrometerException.cpp | 7 +++++-- src/Makefile.linux | 6 +++++- 10 files changed, 52 insertions(+), 14 deletions(-) diff --git a/doc/html/_abstract_electrometer_class_8h-source.html b/doc/html/_abstract_electrometer_class_8h-source.html index 8e4f675..d9fe1d6 100644 --- a/doc/html/_abstract_electrometer_class_8h-source.html +++ b/doc/html/_abstract_electrometer_class_8h-source.html @@ -16,11 +16,14 @@ 00007 <span class="comment">// AbstractElectrometerClass.h</span> 00008 <span class="comment">//</span> 00009 <span class="comment">//</span> -00010 <span class="comment">// $Author: stephle $</span> +00010 <span class="comment">// $Author: xavela $</span> 00011 <span class="comment">//</span> -00012 <span class="comment">// $Revision: 1.1 $</span> +00012 <span class="comment">// $Revision: 1.2 $</span> 00013 <span class="comment">//</span> 00014 <span class="comment">// $Log: not supported by cvs2svn $ +00014 <span class="comment">// Revision 1.1 2007/07/09 13:20:09 stephle +00014 <span class="comment">// initial import +00014 <span class="comment">// 00014 <span class="comment">// Revision 1.1 2006/12/01 14:56:41 elattaoui 00014 <span class="comment">// xavier : 00014 <span class="comment">// Doxygen doc added diff --git a/doc/html/_communication_link_8h-source.html b/doc/html/_communication_link_8h-source.html index d482a26..6b35336 100644 --- a/doc/html/_communication_link_8h-source.html +++ b/doc/html/_communication_link_8h-source.html @@ -19,11 +19,14 @@ 00010 <span class="comment">// X. Elattaoui</span> 00011 <span class="comment">//</span> 00012 <span class="comment">//</span> -00013 <span class="comment">// $Author: stephle $</span> +00013 <span class="comment">// $Author: xavela $</span> 00014 <span class="comment">//</span> -00015 <span class="comment">// $Revision: 1.1 $</span> +00015 <span class="comment">// $Revision: 1.2 $</span> 00016 <span class="comment">//</span> 00017 <span class="comment">// $Log: not supported by cvs2svn $ +00017 <span class="comment">// Revision 1.1 2007/07/09 13:20:09 stephle +00017 <span class="comment">// initial import +00017 <span class="comment">// 00017 <span class="comment">// Revision 1.1 2006/12/01 14:56:41 elattaoui 00017 <span class="comment">// xavier : 00017 <span class="comment">// Doxygen doc added diff --git a/doc/html/_electrometer_protocol_8h-source.html b/doc/html/_electrometer_protocol_8h-source.html index a555728..c29c784 100644 --- a/doc/html/_electrometer_protocol_8h-source.html +++ b/doc/html/_electrometer_protocol_8h-source.html @@ -19,11 +19,14 @@ 00010 <span class="comment">// X. Elattaoui</span> 00011 <span class="comment">//</span> 00012 <span class="comment">//</span> -00013 <span class="comment">// $Author: stephle $</span> +00013 <span class="comment">// $Author: xavela $</span> 00014 <span class="comment">//</span> -00015 <span class="comment">// $Revision: 1.1 $</span> +00015 <span class="comment">// $Revision: 1.2 $</span> 00016 <span class="comment">//</span> 00017 <span class="comment">// $Log: not supported by cvs2svn $ +00017 <span class="comment">// Revision 1.1 2007/07/09 13:20:10 stephle +00017 <span class="comment">// initial import +00017 <span class="comment">// 00017 <span class="comment">// Revision 1.1 2006/12/01 14:56:41 elattaoui 00017 <span class="comment">// xavier : 00017 <span class="comment">// Doxygen doc added diff --git a/include/AbstractElectrometerClass.h b/include/AbstractElectrometerClass.h index 869a918..b625e1c 100644 --- a/include/AbstractElectrometerClass.h +++ b/include/AbstractElectrometerClass.h @@ -9,9 +9,13 @@ // // $Author: xavela $ // -// $Revision: 1.8 $ +// $Revision: 1.9 $ // // $Log: not supported by cvs2svn $ +// Revision 1.8 2008/02/15 10:15:16 xavela +// xavier : +// - command abort added for SCPI Keithleys +// // Revision 1.7 2008/02/15 08:49:46 xavela // xavier : // - minor change for integration time diff --git a/include/CommunicationLink.h b/include/CommunicationLink.h index 75eba2b..a5172df 100644 --- a/include/CommunicationLink.h +++ b/include/CommunicationLink.h @@ -12,9 +12,14 @@ // // $Author: xavela $ // -// $Revision: 1.3 $ +// $Revision: 1.4 $ // // $Log: not supported by cvs2svn $ +// Revision 1.3 2008/02/13 15:51:44 xavela +// xavier : +// - Integration Mode available for DDC/SCPI devices +// - tests done with a K617 (DDC) and a K6485 (SCPI) +// // Revision 1.2 2008/02/11 16:55:04 xavela // xavier : for DDC part // - integration mode OK (tests done with K_486) diff --git a/include/ElectrometerProtocol.h b/include/ElectrometerProtocol.h index 5d06b51..c81453d 100644 --- a/include/ElectrometerProtocol.h +++ b/include/ElectrometerProtocol.h @@ -12,9 +12,13 @@ // // $Author: xavela $ // -// $Revision: 1.7 $ +// $Revision: 1.8 $ // // $Log: not supported by cvs2svn $ +// Revision 1.7 2008/02/15 10:15:16 xavela +// xavier : +// - command abort added for SCPI Keithleys +// // Revision 1.6 2008/02/15 08:49:46 xavela // xavier : // - minor change for integration time diff --git a/src/AbstractElectrometerClass.cpp b/src/AbstractElectrometerClass.cpp index f5eedc6..3b86624 100644 --- a/src/AbstractElectrometerClass.cpp +++ b/src/AbstractElectrometerClass.cpp @@ -11,9 +11,13 @@ // // $Author: xavela $ // -// $Revision: 1.9 $ +// $Revision: 1.10 $ // // $Log: not supported by cvs2svn $ +// Revision 1.9 2008/02/15 10:15:18 xavela +// xavier : +// - command abort added for SCPI Keithleys +// // Revision 1.8 2008/02/15 08:49:51 xavela // xavier : // - minor change for integration time diff --git a/src/CommunicationLink.cpp b/src/CommunicationLink.cpp index 526bb6c..d03cf87 100644 --- a/src/CommunicationLink.cpp +++ b/src/CommunicationLink.cpp @@ -12,9 +12,14 @@ // // $Author: xavela $ // -// $Revision: 1.3 $ +// $Revision: 1.4 $ // // $Log: not supported by cvs2svn $ +// Revision 1.3 2008/02/13 15:51:44 xavela +// xavier : +// - Integration Mode available for DDC/SCPI devices +// - tests done with a K617 (DDC) and a K6485 (SCPI) +// // Revision 1.2 2007/11/27 15:23:02 xavela // xavier : // - modif done on Novelec part : diff --git a/src/ElectrometerException.cpp b/src/ElectrometerException.cpp index eba1eab..9131a37 100644 --- a/src/ElectrometerException.cpp +++ b/src/ElectrometerException.cpp @@ -10,11 +10,14 @@ // ElectrometerException.cpp: interface for the communication exceptions class. // // -// $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 +// // //****************************************************************************************** diff --git a/src/Makefile.linux b/src/Makefile.linux index 77523c6..f6143c0 100644 --- a/src/Makefile.linux +++ b/src/Makefile.linux @@ -6,9 +6,13 @@ # # $Author: xavela $ # -# $Revision: 1.3 $ +# $Revision: 1.4 $ # # $Log: not supported by cvs2svn $ +# Revision 1.3 2007/11/28 10:37:20 xavela +# compile en MODE debug -> +# modifier le(s) MakeFile ! +# # Revision 1.2 2007/09/25 14:45:54 xavela # xavier : # support added for Keithley 6517 -- GitLab