# HG changeset patch
# User Alexis Jeandet
# Date 2015-11-20 09:10:44
# Node ID 8aa46b8032686eadd9c82f447cb0f9f9837abb27
# Parent  8ccb7546abb53ccd58d70bb770e78c95b79a0fef

WIP

diff --git a/lppinstru/Agilent_34410A.py b/lppinstru/Agilent_34410A.py
deleted file mode 100644
--- a/lppinstru/Agilent_34410A.py
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env python
-#-*- coding: utf-8 -*-
-"""Simple python library to communicate with Agilent 34410A over USB-TMC.
-"""
-import time
-import sys
-import os
-import agilenttmc
-
-__author__ = "Alexis Jeandet"
-__copyright__ = "Copyright 2015, Laboratory of Plasma Physics"
-__credits__ = []
-__license__ = "GPLv2"
-__version__ = "1.0.0"
-__maintainer__ = "Alexis Jeandet"
-__email__ = "alexis.jeandet@member.fsf.org"
-__status__ = "Development"
-
-class Agilent3441xA(usbtmc.UsbTmc):
-    def __init__(self,ref,serial=""):
-        isnt=usbtmc.findInstrument(ref,serial)
-        if inst=="":
-            raise UserWarning("Can't find instrument "+ref)
-        self.UsbTmc.__init__(isnt)
diff --git a/lppinstru/agilent3441xA.py b/lppinstru/agilent3441xA.py
--- a/lppinstru/agilent3441xA.py
+++ b/lppinstru/agilent3441xA.py
@@ -16,7 +16,6 @@ import agilenttmc
 __email__ = "alexis.jeandet@member.fsf.org"
 __status__ = "Development"
 
-"34410A"
 
 class Agilent3441xA(agilentusbtmc.AgilentUsbTmc):
     def __init__(self,serial=""):
@@ -24,3 +23,11 @@ class Agilent3441xA(agilentusbtmc.Agilen
         if inst=="":
             raise UserWarning("Can't find instrument "+ref)
         self.UsbTmc.__init__(isnt)
+
+    def volts_dc(self):
+        self.write("CONF:VOLT:DC\n READ?")
+        volts=float(self.read(100))
+
+    def volts_ac(self):
+        self.write("CONF:VOLT:AC\n READ?")
+        volts=float(self.read(100))
diff --git a/lppinstru/agilenttmc.py b/lppinstru/agilenttmc.py
--- a/lppinstru/agilenttmc.py
+++ b/lppinstru/agilenttmc.py
@@ -22,3 +22,9 @@ class AgilentUsbTmc(usbtmc.UsbTmc):
         if inst=="":
             raise UserWarning("Can't find instrument "+ref)
         self.UsbTmc.__init__(isnt)
+
+    def abort(self):
+        self.write("ABORt")
+
+    def reset(self):
+        self.write("*RST")