# HG changeset patch # User David Douard # Date 1238451185 -7200 # Node ID 550811b4c3c1f04b66cc1e215ca7682d23e021a4 # Parent 19e4da44795ed70d9ec52cb653c4940dba2cec48 fixes in HP8904 device description diff -r 19e4da44795e -r 550811b4c3c1 pygpibtoolkit/HP8904.py --- a/pygpibtoolkit/HP8904.py Mon Mar 30 21:32:14 2009 +0200 +++ b/pygpibtoolkit/HP8904.py Tue Mar 31 00:13:05 2009 +0200 @@ -18,7 +18,9 @@ from pygpibtoolkit.pygpib import Constants, Command from pygpibtoolkit.pygpib import Mode, ModeCommand -from pygpibtoolkit.pygpib import VoltageValue +from pygpibtoolkit.pygpib import VoltageValue, FrequencyValue +from pygpibtoolkit.pygpib import FloatUnitValue + from pygpibtoolkit.pygpib import SimpleMode from pygpibtoolkit.gpibcontroller import AbstractGPIBDevice, deviceRegister @@ -53,8 +55,8 @@ def build_set_cmd(self, value): # XXX HERE: todo: make it work with value not in self._cmds # (eg. value=="AU", cmds == ['FS1AU') - assert value in self._cmds - return value, value + assert self._prefix+value in self._cmds + return self._prefix+value, value class Filter1(_PerOutputMode):