From 99c272f58e27d4b0f9e54be54b2c8c96c723fbe4 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Sat, 15 Apr 2023 12:17:58 +0200
Subject: [PATCH] Fixes ohmpi_card_3_15 imports
---
hardware/mb_2024_rev_0_0.py | 8 ++++----
hardware/ohmpi_card_3_15.py | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/hardware/mb_2024_rev_0_0.py b/hardware/mb_2024_rev_0_0.py
index fbb92bba..f0d10652 100644
--- a/hardware/mb_2024_rev_0_0.py
+++ b/hardware/mb_2024_rev_0_0.py
@@ -1,5 +1,5 @@
import importlib
-from OhmPi.config import OHMPI_CONFIG
+from OhmPi.config import HARDWARE_CONFIG
import adafruit_ads1x15.ads1115 as ads # noqa
from adafruit_ads1x15.analog_in import AnalogIn # noqa
from adafruit_mcp230xx.mcp23008 import MCP23008 # noqa
@@ -9,10 +9,10 @@ import time
import numpy as np
import os
from OhmPi.hardware import TxAbstract, RxAbstract
-controller_module = importlib.import_module(f'OhmPi.hardware.{OHMPI_CONFIG["hardware"]["controller"]["model"]}')
+controller_module = importlib.import_module(f'OhmPi.hardware.{HARDWARE_CONFIG["hardware"]["controller"]["model"]}')
-TX_CONFIG = OHMPI_CONFIG['rx']
-RX_CONFIG = OHMPI_CONFIG['tx']
+TX_CONFIG = HARDWARE_CONFIG['tx']
+RX_CONFIG = HARDWARE_CONFIG['rx']
# hardware characteristics and limitations
# *** RX ***
diff --git a/hardware/ohmpi_card_3_15.py b/hardware/ohmpi_card_3_15.py
index 24aa42a4..184c27d4 100644
--- a/hardware/ohmpi_card_3_15.py
+++ b/hardware/ohmpi_card_3_15.py
@@ -11,8 +11,8 @@ import os
from OhmPi.hardware import TxAbstract, RxAbstract
controller_module = importlib.import_module(f'OhmPi.hardware.raspberry_pi_3')
-TX_CONFIG = HARDWARE_CONFIG['rx']
-RX_CONFIG = HARDWARE_CONFIG['tx']
+TX_CONFIG = HARDWARE_CONFIG['tx']
+RX_CONFIG = HARDWARE_CONFIG['rx']
# hardware characteristics and limitations
# *** RX ***
--
GitLab