Skip to content

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

Updated test

parent b4c2ba5f
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 6 deletions
software/DistributedOscilloscope/applications/tests/test_all.py
View file @ f4c8edd6
...@@ -302,8 +302,8 @@ class OscilloscopeMethods(unittest.TestCase): ...@@ -302,8 +302,8 @@ class OscilloscopeMethods(unittest.TestCase):
self.zmq_rpc.send_RPC('set_ADC_parameter', 'internal_trigger_enable', self.zmq_rpc.send_RPC('set_ADC_parameter', 'internal_trigger_enable',
1, unique_ADC_name_1, ADC_trigger_idx) 1, unique_ADC_name_1, ADC_trigger_idx)
self.zmq_rpc.send_RPC('set_presamples', 0, self.testbench_name) self.zmq_rpc.send_RPC('set_pre_post_samples', 0, 1000,
self.zmq_rpc.send_RPC('set_postsamples', 1000, self.testbench_name) self.testbench_name)
self.zmq_rpc.send_RPC('single_acquisition', self.testbench_name) self.zmq_rpc.send_RPC('single_acquisition', self.testbench_name)
self.return_queue.get() self.return_queue.get()
...@@ -351,7 +351,7 @@ class OscilloscopeMethods(unittest.TestCase): ...@@ -351,7 +351,7 @@ class OscilloscopeMethods(unittest.TestCase):
def measure_zero_cross_distance(self): def measure_zero_cross_distance(self):
self.zmq_rpc.send_RPC('single_acquisition', self.testbench_name) self.zmq_rpc.send_RPC('single_acquisition', self.testbench_name)
try: try:
data, offsets = self.return_queue.get(timeout=1 ) data, offsets = self.return_queue.get(timeout=0.1 )
except: except:
return None return None
chan_1 = data[0] chan_1 = data[0]
...@@ -407,7 +407,7 @@ class OscilloscopeMethods(unittest.TestCase): ...@@ -407,7 +407,7 @@ class OscilloscopeMethods(unittest.TestCase):
def test_precision(self): def test_precision(self):
self.clean_queue() self.clean_queue()
number_of_acq = 200 number_of_acq = 5000
"""Some data could not arrive so actual number of acquisitions could """Some data could not arrive so actual number of acquisitions could
be smaller""" be smaller"""
self.results.write("Internal trigger on channel 3\n" self.results.write("Internal trigger on channel 3\n"
...@@ -439,7 +439,7 @@ class OscilloscopeMethods(unittest.TestCase): ...@@ -439,7 +439,7 @@ class OscilloscopeMethods(unittest.TestCase):
ADC_trigger_idx = 3 ADC_trigger_idx = 3
self.zmq_rpc.send_RPC('set_ADC_parameter', 'channel_offset', -290000, self.zmq_rpc.send_RPC('set_ADC_parameter', 'channel_offset', -5000,
unique_ADC_name_1, ADC_trigger_idx) unique_ADC_name_1, ADC_trigger_idx)
"""Used for calibration""" """Used for calibration"""
......
software/DistributedOscilloscope/applications/tests/test_conf.py
View file @ f4c8edd6
...@@ -4,7 +4,7 @@ update_data_types = {1: 'plot', ...@@ -4,7 +4,7 @@ update_data_types = {1: 'plot',
2: 'time_measurements', 2: 'time_measurements',
3: 'frequency_measurements', 3: 'frequency_measurements',
4: 'precision'} 4: 'precision'}
update_data_select = 1 update_data_select = 4
update_data_type = update_data_types[update_data_select] update_data_type = update_data_types[update_data_select]
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