Skip to content

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

adc, server: stopped using remotely function stop_acquisition, instead using… 

adc, server: stopped using remotely function stop_acquisition, instead using run_acquisition with parameter
parent e5c7e713
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
software/DistributedOscilloscope/nodes/adc_lib_node/devices_access.py
View file @ cd105d8e
......@@ -193,8 +193,10 @@ class DevicesAccess():
self.run = run
if run:
self.configure_acquisition(channels)
else:
self.__stop_acquisition()
def stop_acquisition(self):
def __stop_acquisition(self):
self.__ADC.acq_stop(0)
try:
self.selector.unregister(self)
......
software/DistributedOscilloscope/server/ADC.py
View file @ cd105d8e
......@@ -230,8 +230,5 @@ class ADC:
def run_acquisition(self, run):
self.send_RPC('run_acquisition', run, self.__used_channels)
def stop_acquisition(self):
self.send_RPC('stop_acquisition')
def set_server_address(self, server_addr):
self.send_RPC('set_server_address', server_addr)
software/DistributedOscilloscope/server/user_app.py
View file @ cd105d8e
......@@ -161,7 +161,7 @@ class UserApplication():
def stop_acquisition_ADCs_used(self):
for ADC in self.__ADCs_used:
ADC.stop_acquisition()
ADC.run_acquisition(False)
for channel_idx, channel in self.__channels.items():
channel.timestamp_pre_post_data = []
......
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