##// END OF EJS Templates
Fixed regression, disco/analog read didn't enable and set range as expected
jeandet -
r14:7b43cd98469d default draft
parent child
Show More
@@ -288,9 +288,11 class Discovery(object):
288 self.__libdwf.FDwfAnalogInFrequencyGet(self.__hdwf, byref(f))
288 self.__libdwf.FDwfAnalogInFrequencyGet(self.__hdwf, byref(f))
289 frequency=f.value
289 frequency=f.value
290 self.__libdwf.FDwfAnalogInBufferSizeSet(self.__hdwf, c_int(cnt))
290 self.__libdwf.FDwfAnalogInBufferSizeSet(self.__hdwf, c_int(cnt))
291 range,enabled = [ch1range,ch2range],[ch1,ch2]
292
291 for ch in (0,1):
293 for ch in (0,1):
292 self.__libdwf.FDwfAnalogInChannelEnableSet(self.__hdwf, c_int(ch), c_bool(ch2))
294 self.__libdwf.FDwfAnalogInChannelEnableSet(self.__hdwf, c_int(ch), c_bool(enabled[ch]))
293 self.__libdwf.FDwfAnalogInChannelRangeSet(self.__hdwf, c_int(ch), c_double(ch2range))
295 self.__libdwf.FDwfAnalogInChannelRangeSet(self.__hdwf, c_int(ch), c_double(range[ch]))
294 self.__libdwf.FDwfAnalogInChannelFilterSet(self.__hdwf,c_int(ch),filterAverage)
296 self.__libdwf.FDwfAnalogInChannelFilterSet(self.__hdwf,c_int(ch),filterAverage)
295 self.set_analog_in_trigger(trigger)
297 self.set_analog_in_trigger(trigger)
296 self.__libdwf.FDwfAnalogInConfigure(self.__hdwf, c_bool(False), c_bool(True))
298 self.__libdwf.FDwfAnalogInConfigure(self.__hdwf, c_bool(False), c_bool(True))
General Comments 0
You need to be logged in to leave comments. Login now