Skip to content

D
distributed oscilloscope
Commit 55d50776 authored by Milosz Malczak's avatar Milosz Malczak
Browse files
Options

server, adc: when setting WRTD master, enable the trigger

parent eb5b3b96
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 5 deletions
software/fec/devices_access.py
View file @ 55d50776
......@@ -57,11 +57,16 @@ class DevicesAccess():
postsamples = acq_conf['postsamples']
return {'presamples': presamples, 'postsamples': postsamples}
def set_WRTD_master(self, WRTD_master):
def set_WRTD_master(self, WRTD_master, trigger_type=None,
ADC_trigger_idx=None):
for count in range(4):
self.__ADC.set_internal_trigger_enable(0, count)
self.__ADC.set_external_trigger_enable(0, 0)
if WRTD_master:
trig_enable_name = "set_{}_trigger_enable".format(trigger_type)
trig_enable = getattr(self.__ADC, trig_enable_name)
trig_enable(1, count)
self.__WRTD_master = WRTD_master
if(WRTD_master):
self.__ADC.set_presamples(self.__required_presamples)
......
software/server/ADC.py
View file @ 55d50776
......@@ -123,8 +123,10 @@ class ADC:
def get_acq_conf(self):
return self.__acq_conf
def set_is_WRTD_master(self, WRTD_master):
self.send_RPC('set_WRTD_master', WRTD_master)
def set_is_WRTD_master(self, WRTD_master, trigger_type=None,
ADC_trigger_idx=None):
self.send_RPC('set_WRTD_master', WRTD_master, trigger_type,
ADC_trigger_idx)
self.update_conf()
def get_is_WRTD_master(self):
......
software/server/GUI.py
View file @ 55d50776
......@@ -77,7 +77,7 @@ class GUI():
trigger = ADC.get_internal_trigger(ADC_trigger_idx)
else:
trigger = ADC.get_external_trigger(ADC_trigger_idx)
ADC.set_is_WRTD_master(True)
ADC.set_is_WRTD_master(True, type, ADC_trigger_idx)
self.__trigger = trigger
self.__update_ADCs_used()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment