SCSGATE: Actually cycle through all devices to register (#1841)

* SCSGATE: Actually cycle through all devices to register

Modify _activate_next_device function to actually cycle through self-devices_to_register instead of simply checking whether there are any and onl registering one

* Deleted extra white lines
This commit is contained in:
icovada 2016-04-17 19:17:42 +02:00 committed by Paulus Schoutsen
parent 37a28c799f
commit b29dedaecf

View File

@ -98,12 +98,11 @@ class SCSGate:
from scsgate.tasks import GetStatusTask from scsgate.tasks import GetStatusTask
with self._devices_to_register_lock: with self._devices_to_register_lock:
if len(self._devices_to_register) == 0: while len(self._devices_to_register) != 0:
return _, device = self._devices_to_register.popitem()
_, device = self._devices_to_register.popitem() self._devices[device.scs_id] = device
self._devices[device.scs_id] = device self._device_being_registered = device.scs_id
self._device_being_registered = device.scs_id self._reactor.append_task(GetStatusTask(target=device.scs_id))
self._reactor.append_task(GetStatusTask(target=device.scs_id))
def is_device_registered(self, device_id): def is_device_registered(self, device_id):
"""Check whether a device is already registered or not.""" """Check whether a device is already registered or not."""