@@ -308,7 +308,7 class Discovery(object): | |||||
308 | ############################################################# |
|
308 | ############################################################# | |
309 | # AnalogOut |
|
309 | # AnalogOut | |
310 | ############################################################# |
|
310 | ############################################################# | |
311 | def analog_out_gen(self,frequency=1000, shape='Sine', channel=0, amplitude=1.0, offset=0.0,phase=0.0): |
|
311 | def analog_out_gen(self,frequency=1000, shape='Sine', channel=0, amplitude=1.0, offset=0.0,phase=0.0, syncOnTrigger=False, triggerFrq=1.0): | |
312 | self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(False)) |
|
312 | self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(False)) | |
313 | self.__libdwf.FDwfAnalogOutNodeEnableSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_bool(True)) |
|
313 | self.__libdwf.FDwfAnalogOutNodeEnableSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_bool(True)) | |
314 | self.__libdwf.FDwfAnalogOutNodeFunctionSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_int(shapes.get(shape))) |
|
314 | self.__libdwf.FDwfAnalogOutNodeFunctionSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_int(shapes.get(shape))) | |
@@ -317,6 +317,14 class Discovery(object): | |||||
317 | self.__libdwf.FDwfAnalogOutNodeAmplitudeSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_double(self.__limits.genAmplitude(amplitude))) |
|
317 | self.__libdwf.FDwfAnalogOutNodeAmplitudeSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_double(self.__limits.genAmplitude(amplitude))) | |
318 | self.__libdwf.FDwfAnalogOutNodeOffsetSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_double(self.__limits.genOffset(offset))) |
|
318 | self.__libdwf.FDwfAnalogOutNodeOffsetSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_double(self.__limits.genOffset(offset))) | |
319 | self.__libdwf.FDwfAnalogOutNodePhaseSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_double(phase)) |
|
319 | self.__libdwf.FDwfAnalogOutNodePhaseSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_double(phase)) | |
|
320 | if syncOnTrigger: | |||
|
321 | self.analog_out_set_trigger(channel) | |||
|
322 | self.__libdwf.FDwfAnalogOutRepeatSet(self.__hdwf, c_int(channel),c_int(0)) | |||
|
323 | if frequency >= triggerFrq: | |||
|
324 | runDuration = triggerFrq | |||
|
325 | else: | |||
|
326 | runDuration = triggerFrq/frequency | |||
|
327 | self.__libdwf.FDwfAnalogOutRunSet(self.__hdwf, c_int(channel),c_double(runDuration)) | |||
320 | self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(True)) |
|
328 | self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(True)) | |
321 |
|
329 | |||
322 | def analog_out_gen_arbit(self,samplesBuffer ,repeatingFrequency=100, channel=0, amplitude=1.0, offset=0.0): |
|
330 | def analog_out_gen_arbit(self,samplesBuffer ,repeatingFrequency=100, channel=0, amplitude=1.0, offset=0.0): | |
@@ -333,14 +341,15 class Discovery(object): | |||||
333 | self.__libdwf.FDwfAnalogOutNodeDataSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, buf, c_int(cnt)) |
|
341 | self.__libdwf.FDwfAnalogOutNodeDataSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, buf, c_int(cnt)) | |
334 | self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(True)) |
|
342 | self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(True)) | |
335 |
|
343 | |||
|
344 | def analog_out_set_trigger(self, channel=0, trigSrc=trigsrcExternal1, trigRepeat=True): | |||
|
345 | self.__libdwf.FDwfAnalogOutTriggerSourceSet(self.__hdwf, c_int(channel), trigSrc) | |||
|
346 | self.__libdwf.FDwfAnalogOutRepeatTriggerSet(self.__hdwf, c_int(channel), c_bool(trigRepeat)) | |||
336 |
|
347 | |||
337 | def __del__(self): |
|
348 | def __del__(self): | |
338 | if self.__opened: |
|
349 | if self.__opened: | |
339 | self.__libdwf.FDwfDeviceClose(self.__hdwf) |
|
350 | self.__libdwf.FDwfDeviceClose(self.__hdwf) | |
340 |
|
351 | |||
341 |
|
352 | |||
342 |
|
||||
343 |
|
||||
344 | if __name__ == '__main__': |
|
353 | if __name__ == '__main__': | |
345 | print("open first dev") |
|
354 | print("open first dev") | |
346 | test = Discovery() |
|
355 | test = Discovery() |
General Comments 0
You need to be logged in to leave comments.
Login now