diff --git a/hardware/abstract_hardware.py b/hardware/abstract_hardware.py index 1c45b6caf4e80b97c443f6aa9d929cacf15573e2..b4c7e43b92b9a9fce7269d55cb27fca7b899b753 100644 --- a/hardware/abstract_hardware.py +++ b/hardware/abstract_hardware.py @@ -6,10 +6,18 @@ class ControllerAbstract(ABC): def __init__(self, **kwargs): self.board_name = kwargs.pop('board_name', 'unknown Controller hardware') self.bus = None + self.exec_logger = kwargs.pop('exec_logger', None) + if self.exec_logger is None: + self.exec_logger = create_stdout_logger('exec_ctl') + self.exec_logger.debug(f'{self.board_name} Controller initialization') class MuxAbstract(ABC): def __init__(self, **kwargs): self.board_name = kwargs.pop('board_name', 'unknown MUX hardware') + self.exec_logger = kwargs.pop('exec_logger', None) + if self.exec_logger is None: + self.exec_logger = create_stdout_logger('exec_mux') + self.exec_logger.debug(f'{self.board_name} MUX initialization') class TxAbstract(ABC): def __init__(self, **kwargs): diff --git a/logging_setup.py b/logging_setup.py index 80c05231668d96c1079f4659758c6da5638f9378..1702ccb229b9d132105f0c9ddae950e6539c3bd7 100644 --- a/logging_setup.py +++ b/logging_setup.py @@ -10,7 +10,7 @@ from termcolor import colored def create_stdout_logger(name): logger = logging.getLogger(f'{name}_logger') - log_format = f'%(asctime)-15s | {name[:4]:4s} | %(levelname)s: %(message)s' + log_format = f'%(asctime)-15s | {name[:8]:8s} | %(levelname)s: %(message)s' formatter = logging.Formatter(log_format) formatter.converter = gmtime formatter.datefmt = '%Y-%m-%d %H:%M:%S UTC' diff --git a/measure.py b/measure.py index 2f52185c517244adf343a53ab40046da78d61d48..2ad805f874ae14d0cfdd9a9df3f9f906d499f59b 100644 --- a/measure.py +++ b/measure.py @@ -48,9 +48,6 @@ class OhmPiHardware: self.mux = kwargs.pop('mux', mux_module.Mux(exec_logger=self.exec_logger, data_logger=self.data_logger, soh_logger=self.soh_logger)) - self.exec_logger.debug(f'TX: {self.tx.board_name}, RX: {self.rx.board_name}, MUX: {self.mux.board_name}, ' - f'Controller: {self.controller.board_name}') - def _inject(self, duration): self.tx_sync.set()