diff --git a/hardware_components/abstract_hardware_components.py b/hardware_components/abstract_hardware_components.py index f328593e7ab8ea7cd65c2b38d91090e85e6b2291..7ed2d85376324776b765b4d494215dbc0116c5d1 100644 --- a/hardware_components/abstract_hardware_components.py +++ b/hardware_components/abstract_hardware_components.py @@ -47,7 +47,7 @@ class MuxAbstract(ABC): self.addresses = kwargs.pop('addresses', None) @abstractmethod - def _get_addresses(self, addresses_file): + def _get_addresses(self): pass @abstractmethod diff --git a/hardware_components/mux_2024_rev_0_0.py b/hardware_components/mux_2024_rev_0_0.py index 65ba36926176ccf65dba0977fc8929c14943c16f..22d39a986a1481fa73a0d5dade1987ee6b8c6e43 100644 --- a/hardware_components/mux_2024_rev_0_0.py +++ b/hardware_components/mux_2024_rev_0_0.py @@ -112,10 +112,6 @@ class Mux(MuxAbstract): kwargs.update({'board_name': os.path.basename(__file__).rstrip('.py')}) super().__init__(**kwargs) self.exec_logger.debug(f'configuration: {MUX_CONFIG}') - if self.addresses is None or 'addresses' in MUX_CONFIG.keys(): - self._get_addresses(MUX_CONFIG['addresses']) - self.exec_logger.debug(f'Using {MUX_CONFIG["addresses"]} for {self.board_name}...') - self.exec_logger.debug(f'addresses: {self.addresses}') self._tca_address = kwargs.pop('tca_address', None) self._tca_channel = kwargs.pop('tca_channel', 0) self._roles = kwargs.pop(('roles', {'X': 'A', 'Y': 'B', 'XX': 'M', 'YY': 'N'})) @@ -129,8 +125,11 @@ class Mux(MuxAbstract): self._mcp = [0, 0] self._mcp[0] = kwargs.pop('mcp_0', 34) # TODO add assert on valid addresses.. self._mcp[1] = kwargs.pop('mcp_1', 35) + if self.addresses is None: + self._get_addresses() + self.exec_logger.debug(f'addresses: {self.addresses}') - def _get_addresses(self, addresses_file): + def _get_addresses(self): d = inner_cabling[self._mode] for k, v in self.addresses.items(): d[(k[0], self._roles[k[1]])] = v.update({'MCP': self._mcp[v['MCP']]})