HG_REPOSITORIES/LPP/INSTRUMENTATION/lppinstru Commit - r13:669810a4267c

75

AnalogOutNodeFM = c_int(1)

75

AnalogOutNodeFM = c_int(1)

76

AnalogOutNodeAM = c_int(2)

76

AnalogOutNodeAM = c_int(2)

77

78

filterDecimate = c_int(0)

79

filterAverage = c_int(1)

80

filterMinMax = c_int(2)

81

78

82

79

shapes = {'DC' : 0,

83

shapes = {'DC' : 0,

80

'Sine' : 1,

84

'Sine' : 1,

284

self.__libdwf.FDwfAnalogInFrequencyGet(self.__hdwf, byref(f))

288

self.__libdwf.FDwfAnalogInFrequencyGet(self.__hdwf, byref(f))

285

frequency=f.value

289

frequency=f.value

286

self.__libdwf.FDwfAnalogInBufferSizeSet(self.__hdwf, c_int(cnt))

290

self.__libdwf.FDwfAnalogInBufferSizeSet(self.__hdwf, c_int(cnt))

287

self.__libdwf.FDwfAnalogInChannelEnableSet(self.__hdwf, c_int(0), c_bool(ch1))

291

for ch in (0,1):

288

self.__libdwf.FDwfAnalogInChannel~~Rang~~eSet(self.__hdwf, c_int(0), c_~~dou~~ble(ch~~1range~~))

292

self.__libdwf.FDwfAnalogInChannelEnableSet(self.__hdwf, c_int(ch), c_bool(ch2))

289

self.__libdwf.FDwfAnalogInChannel~~Enabl~~eSet(self.__hdwf, c_int(1), c_~~bool~~(ch2))

293

self.__libdwf.FDwfAnalogInChannelRangeSet(self.__hdwf, c_int(ch), c_double(ch2range))

290

self.__libdwf.FDwfAnalogInChannel~~Range~~Set(self.__hdwf, c_int(1), ~~c_double~~(~~ch2range~~))

294

self.__libdwf.FDwfAnalogInChannelFilterSet(self.__hdwf,c_int(ch),filterAverage)

291

self.set_analog_in_trigger(trigger)

295

self.set_analog_in_trigger(trigger)

292

self.__libdwf.FDwfAnalogInConfigure(self.__hdwf, c_bool(False), c_bool(True))

296

self.__libdwf.FDwfAnalogInConfigure(self.__hdwf, c_bool(False), c_bool(True))

293

status = c_byte()

297

status = c_byte()

327

#############################################################

331

#############################################################

328

# AnalogOut

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

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):

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

self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(False))

341

self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(False))

332

self.__libdwf.FDwfAnalogOutNodeEnableSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_bool(True))

342

self.__libdwf.FDwfAnalogOutNodeEnableSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_bool(True))

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

             AnalogOutNodeFM       = c_int(1)
             AnalogOutNodeAM       = c_int(2)
+            filterDecimate  = c_int(0)
+            filterAverage   = c_int(1)
+            filterMinMax    = c_int(2)
             shapes = {'DC' : 0,
                     'Sine' : 1,
                     self.__libdwf.FDwfAnalogInFrequencyGet(self.__hdwf, byref(f))
                     frequency=f.value
                     self.__libdwf.FDwfAnalogInBufferSizeSet(self.__hdwf, c_int(cnt))
-                    self.__libdwf.FDwfAnalogInChannelEnableSet(self.__hdwf, c_int(0), c_bool(ch1))
+                    for ch in (0,1):
-                    self.__libdwf.FDwfAnalogInChannelRangeSet(self.__hdwf, c_int(0), c_double(ch1range))
+                        self.__libdwf.FDwfAnalogInChannelEnableSet(self.__hdwf, c_int(ch), c_bool(ch2))
-                    self.__libdwf.FDwfAnalogInChannelEnableSet(self.__hdwf, c_int(1), c_bool(ch2))
+                        self.__libdwf.FDwfAnalogInChannelRangeSet(self.__hdwf, c_int(ch), c_double(ch2range))
-                    self.__libdwf.FDwfAnalogInChannelRangeSet(self.__hdwf, c_int(1), c_double(ch2range))
+                        self.__libdwf.FDwfAnalogInChannelFilterSet(self.__hdwf,c_int(ch),filterAverage)
                     self.set_analog_in_trigger(trigger)
                     self.__libdwf.FDwfAnalogInConfigure(self.__hdwf, c_bool(False), c_bool(True))
                     status = c_byte()
             #############################################################
             #        AnalogOut
             #############################################################
+                def analog_out_enable(self,channel=0):
+                    self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(True))
+                def analog_out_disable(self,channel=0):
+                    self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(False))
                 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):
                     self.__libdwf.FDwfAnalogOutConfigure(self.__hdwf, c_int(channel), c_bool(False))
                     self.__libdwf.FDwfAnalogOutNodeEnableSet(self.__hdwf, c_int(channel), AnalogOutNodeCarrier, c_bool(True))