Skip to content

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

adc, server: no need to retrieve the conf at the startup of the ADC application

parent 78dd20d4
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 6 deletions
software/fec/adc_client.py
View file @ ac817747
...@@ -23,7 +23,6 @@ def main(): ...@@ -23,7 +23,6 @@ def main():
port = int(args.port[0]) port = int(args.port[0])
pci_addr = int(args.pci_addr[0]) pci_addr = int(args.pci_addr[0])
number_of_channels = 4 # TODO
addr = os.popen("ifconfig| grep inet").read().split()[1] addr = os.popen("ifconfig| grep inet").read().split()[1]
ADC_idx = addr + '_' + str(port) ADC_idx = addr + '_' + str(port)
unique_ADC_name = 'ADC' + '_' + ADC_idx + '._http._tcp.local.' unique_ADC_name = 'ADC' + '_' + ADC_idx + '._http._tcp.local.'
...@@ -31,7 +30,6 @@ def main(): ...@@ -31,7 +30,6 @@ def main():
pci_addr = pci_addr pci_addr = pci_addr
trtl = 'trtl-000' + str(pci_addr) trtl = 'trtl-000' + str(pci_addr)
devices_access = DevicesAccess(pci_addr, trtl, unique_ADC_name) devices_access = DevicesAccess(pci_addr, trtl, unique_ADC_name)
conf = devices_access.get_current_adc_conf()
if args.ip_server: if args.ip_server:
ip_server = {'addr': args.ip_server[0]} ip_server = {'addr': args.ip_server[0]}
else: else:
...@@ -44,14 +42,13 @@ def main(): ...@@ -44,14 +42,13 @@ def main():
if(args.ip_server is None): if(args.ip_server is None):
zeroconf_info = zeroconf.ServiceInfo("_http._tcp.local.", zeroconf_info = zeroconf.ServiceInfo("_http._tcp.local.",
unique_ADC_name, zeroconf.socket.inet_aton(addr), unique_ADC_name, zeroconf.socket.inet_aton(addr),
8000, properties={'addr': addr, 8000, properties={'addr': addr, 'port': str(port)})
'port': str(port), 'n_chan': str(number_of_channels)})
zeroconf_service = zeroconf.Zeroconf() zeroconf_service = zeroconf.Zeroconf()
zeroconf_service.register_service(zeroconf_info) zeroconf_service.register_service(zeroconf_info)
else: else:
serv_expose.set_server_address(ip_server['addr']) serv_expose.set_server_address(ip_server['addr'])
data = {'function_name': 'register_ADC', data = {'function_name': 'register_ADC',
'args': [unique_ADC_name, addr, port, conf]} 'args': [unique_ADC_name, addr, port]}
serv_expose.server_publisher.send_message(data) serv_expose.server_publisher.send_message(data)
......
software/server/expose.py
View file @ ac817747
...@@ -80,7 +80,7 @@ class Expose(): ...@@ -80,7 +80,7 @@ class Expose():
ADC.update_data(timestamp, pre_post, data) ADC.update_data(timestamp, pre_post, data)
return True return True
def register_ADC(self, unique_ADC_name, addr, port, conf): def register_ADC(self, unique_ADC_name, addr, port):
self.__connection_manager.register_ADC(unique_ADC_name, str(addr), self.__connection_manager.register_ADC(unique_ADC_name, str(addr),
port) port)
......
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