##// END OF EJS Templates
analog disco: Enabled filtering on acq and added analog out enable/disable functions
jeandet -
r13:669810a4267c default draft
parent child
Show More
@@ -75,6 +75,10 AnalogOutNodeCarrier = c_int(0)
75 75 AnalogOutNodeFM = c_int(1)
76 76 AnalogOutNodeAM = c_int(2)
77 77
78 filterDecimate = c_int(0)
79 filterAverage = c_int(1)
80 filterMinMax = c_int(2)
81
78 82
79 83 shapes = {'DC' : 0,
80 84 'Sine' : 1,
@@ -284,10 +288,10 class Discovery(object):
284 288 self.__libdwf.FDwfAnalogInFrequencyGet(self.__hdwf, byref(f))
285 289 frequency=f.value
286 290 self.__libdwf.FDwfAnalogInBufferSizeSet(self.__hdwf, c_int(cnt))
287 self.__libdwf.FDwfAnalogInChannelEnableSet(self.__hdwf, c_int(0), c_bool(ch1))
288 self.__libdwf.FDwfAnalogInChannelRangeSet(self.__hdwf, c_int(0), c_double(ch1range))
289 self.__libdwf.FDwfAnalogInChannelEnableSet(self.__hdwf, c_int(1), c_bool(ch2))
290 self.__libdwf.FDwfAnalogInChannelRangeSet(self.__hdwf, c_int(1), c_double(ch2range))
291 for ch in (0,1):
292 self.__libdwf.FDwfAnalogInChannelEnableSet(self.__hdwf, c_int(ch), c_bool(ch2))
293 self.__libdwf.FDwfAnalogInChannelRangeSet(self.__hdwf, c_int(ch), c_double(ch2range))
294 self.__libdwf.FDwfAnalogInChannelFilterSet(self.__hdwf,c_int(ch),filterAverage)
291 295 self.set_analog_in_trigger(trigger)
292 296 self.__libdwf.FDwfAnalogInConfigure(self.__hdwf, c_bool(False), c_bool(True))
293 297 status = c_byte()
@@ -327,6 +331,12 class Discovery(object):
327 331 #############################################################
328 332 # AnalogOut
329 333 #############################################################
334 def analog_out_enable(self,channel=0):
335 self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(True))
336
337 def analog_out_disable(self,channel=0):
338 self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(False))
339
330 340 def analog_out_gen(self,frequency=1000, symmetry=50.0, shape='Sine', channel=0, amplitude=1.0, offset=0.0,phase=0.0, syncOnTrigger=False, triggerFrq=1.0, wait=0.0, runDuration=None):
331 341 self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(False))
332 342 self.__libdwf.FDwfAnalogOutNodeEnableSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_bool(True))
General Comments 0
You need to be logged in to leave comments. Login now