diff --git a/doc/html/_abstract_electrometer_class_8h-source.html b/doc/html/_abstract_electrometer_class_8h-source.html index 8e4f6759809ad0c434369f845f22952a50fb02dd..d9fe1d65d056d84b9acb8e2bba18ee722e16742b 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 d482a26af1a8ea9c854362cb61d18b583ddd5010..6b35336d991bc08537a10b2d420ee0f04f585fc2 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 a5557284fe86eff241464fe723e821c42969c19d..c29c7841007ded850d5cb70b9f164583640290a0 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 869a918910edf3fe9b15155c875b8ddfa03387c2..b625e1c24ef8bad61bf97922ac2c42862596298a 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 75eba2bdd3319451223730cf638a5a4e64452529..a5172dff52fb960cfe3d5fbe6b09b5795461becc 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 5d06b51020e77b67f05f7cd118b3186aae860f6e..c81453dcb80ceb1096dbad5b0a6de0406beb8d48 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 f5eedc6df8a060f5f164904051eae0bdfba13cd0..3b86624187e5a0071f650ce6a163ad746401a9a9 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 526bb6c285df55d2585c5b192203210fe5ed1324..d03cf87c649f7dfffea1d824409a9d746f3fd21f 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 eba1eab5160e46475a4ee4c7ea0ea1da233fc96f..9131a37cf3bb0a2085587b2849447f4e8043a7f1 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 77523c695661815e61caf04bcba01aadac94ddc5..f6143c06d3ec248fb15eaa6f19f72df1ecc9458c 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