From 7663960c887460e4260ae18ae6d0e03b55ca7d5e Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Wed, 11 Oct 2023 13:50:35 +0200
Subject: [PATCH] Changes config of 1 mux
---
ohmpi/hardware_components/mux_2023_0_X.py | 4 ++--
ohmpi/hardware_components/mux_2024_0_X.py | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/ohmpi/hardware_components/mux_2023_0_X.py b/ohmpi/hardware_components/mux_2023_0_X.py
index 140ab180..e0033c1b 100644
--- a/ohmpi/hardware_components/mux_2023_0_X.py
+++ b/ohmpi/hardware_components/mux_2023_0_X.py
@@ -68,7 +68,7 @@ class Mux(MuxAbstract):
kwargs.update({'cabling': kwargs.pop('cabling', default_mux_cabling)})
super().__init__(**kwargs)
if not subclass_init:
- self.exec_logger.event(f'{self.model}{self.board_id}\tmux_init\tbegin\t{datetime.datetime.utcnow()}')
+ self.exec_logger.event(f'{self.model}: {self.board_id}\tmux_init\tbegin\t{datetime.datetime.utcnow()}')
assert isinstance(self.connection, I2C)
self.exec_logger.debug(f'configuration: {kwargs}')
self._roles = kwargs.pop('roles', None)
@@ -87,7 +87,7 @@ class Mux(MuxAbstract):
self._get_addresses()
self.exec_logger.debug(f'{self.board_id} addresses: {self.addresses}')
if not subclass_init:
- self.exec_logger.event(f'{self.model}_{self.board_id}\tmux_init\tend\t{datetime.datetime.utcnow()}')
+ self.exec_logger.event(f'{self.model}: {self.board_id}\tmux_init\tend\t{datetime.datetime.utcnow()}')
def _get_addresses(self):
""" Converts inner cabling addressing into (electrodes, role) addressing """
diff --git a/ohmpi/hardware_components/mux_2024_0_X.py b/ohmpi/hardware_components/mux_2024_0_X.py
index decd5461..db16f57b 100644
--- a/ohmpi/hardware_components/mux_2024_0_X.py
+++ b/ohmpi/hardware_components/mux_2024_0_X.py
@@ -66,7 +66,7 @@ class Mux(MuxAbstract):
subclass_init = True
super().__init__(**kwargs)
if not subclass_init:
- self.exec_logger.event(f'{self.model}{self.board_id}\tmux_init\tbegin\t{datetime.datetime.utcnow()}')
+ self.exec_logger.event(f'{self.model}: {self.board_id}\tmux_init\tbegin\t{datetime.datetime.utcnow()}')
assert isinstance(self.connection, I2C)
self.exec_logger.debug(f'configuration: {kwargs}')
self._roles = kwargs.pop('roles', None)
@@ -97,7 +97,7 @@ class Mux(MuxAbstract):
self.exec_logger.debug(f'{self.board_id} addresses: {self.addresses}')
if not subclass_init: # TODO: try to only log this event and not the one created by super()
- self.exec_logger.event(f'{self.model}_{self.board_id}\tmux_init\tend\t{datetime.datetime.utcnow()}')
+ self.exec_logger.event(f'{self.model}: {self.board_id}\tmux_init\tend\t{datetime.datetime.utcnow()}')
def _get_addresses(self):
""" Converts inner cabling addressing into (electrodes, role) addressing """
--
GitLab