From 2ee9fa6b19786e665dc27a65d8b8aa73413ddb75 Mon Sep 17 00:00:00 2001 From: peterlu14 Date: Fri, 14 Oct 2022 10:52:41 +0800 Subject: [PATCH] [update] project device change --- python/biopro/devlib/library.py | 2 +- python/biopro/project/project.py | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/python/biopro/devlib/library.py b/python/biopro/devlib/library.py index bb6394e..bf573f6 100644 --- a/python/biopro/devlib/library.py +++ b/python/biopro/devlib/library.py @@ -1032,7 +1032,7 @@ class CompletedDevice(Device): @property def mac_address_in_str(self) -> str: - return ':'.join('{:02x}'.format(b) for b in self._device.mac_address) + return ':'.join('{:02x}'.format(b) for b in self._device.mac_address).upper() @property def device(self) -> Device: diff --git a/python/biopro/project/project.py b/python/biopro/project/project.py index 9b370d2..6e92404 100644 --- a/python/biopro/project/project.py +++ b/python/biopro/project/project.py @@ -33,7 +33,7 @@ class Project(threading.Thread): self._name = None self._desc = None self._device = None - self._complete_device = [] + self._complete_device = {} self._status = 0 self._instruction_set = Instruction() @@ -64,8 +64,9 @@ class Project(threading.Thread): def setup_device(self, device_list): for device in device_list: - complete_device = self._device_manager.get_device(device['connectDevice']['device_address']) - self._complete_device.append(complete_device) + mac_address = device_list[device]['pair'] + complete_device = self._device_manager.get_device(mac_address) + self._complete_device[device] = complete_device @property def id(self) -> int: