From 9a6689e4770e12953feb0f0be97105514fc416e0 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Thu, 1 Jun 2023 11:25:13 +0200
Subject: [PATCH] Uses HARDWARECONFIG in ohmpi.py
---
ohmpi/ohmpi.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ohmpi/ohmpi.py b/ohmpi/ohmpi.py
index e025e6ff..ead54bc0 100644
--- a/ohmpi/ohmpi.py
+++ b/ohmpi/ohmpi.py
@@ -23,7 +23,7 @@ from termcolor import colored
from logging import DEBUG
from ohmpi.utils import get_platform
from ohmpi.logging_setup import setup_loggers
-from ohmpi.config import MQTT_CONTROL_CONFIG, OHMPI_CONFIG, EXEC_LOGGING_CONFIG
+from ohmpi.config import MQTT_CONTROL_CONFIG, OHMPI_CONFIG, EXEC_LOGGING_CONFIG, HARDWARE_CONFIG
import ohmpi.deprecated as deprecated
from ohmpi.hardware_system import OhmPiHardware
@@ -77,8 +77,9 @@ class OhmPi(object):
print(msg)
# read in hardware parameters (config.py)
- self._hw = OhmPiHardware(**{'exec_logger': self.exec_logger, 'data_logger': self.data_logger,
+ HARDWARE_CONFIG.update({'exec_logger': self.exec_logger, 'data_logger': self.data_logger,
'soh_logger': self.soh_logger})
+ self._hw = OhmPiHardware(**HARDWARE_CONFIG)
self.exec_logger.info('Hardware configured...')
# default acquisition settings
self.settings = {
--
GitLab