From 1e3e161ede19060fba6b9391741172d734ed6dab Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Sat, 15 Apr 2023 12:10:16 +0200
Subject: [PATCH] Fixes ohmpi_card_3_15 imports
---
hardware/mb_2024_rev_0_0.py | 2 +-
hardware/ohmpi_card_3_15.py | 10 +++++-----
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 2a042e31..c4bd0e86 100644
--- a/hardware/mb_2024_rev_0_0.py
+++ b/hardware/mb_2024_rev_0_0.py
@@ -18,7 +18,7 @@ RX_CONFIG = OHMPI_CONFIG['tx']
# *** RX ***
# ADC for voltage
voltage_adc_voltage_min = 10. # mV
-voltage_adc_voltage_max = 4500.
+voltage_adc_voltage_max = 4500. # mV
RX_CONFIG['voltage_min'] = np.min([voltage_adc_voltage_min, RX_CONFIG.pop('voltage_min', np.inf)]) # mV
RX_CONFIG['voltage_max'] = np.min([voltage_adc_voltage_max, RX_CONFIG.pop('voltage_max', np.inf)]) # mV
diff --git a/hardware/ohmpi_card_3_15.py b/hardware/ohmpi_card_3_15.py
index 80925012..5d96def2 100644
--- a/hardware/ohmpi_card_3_15.py
+++ b/hardware/ohmpi_card_3_15.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,16 +9,16 @@ import time
import numpy as np
import os
from OhmPi.hardware import TxAbstract, RxAbstract
-controller_module = importlib.import_module(f'OhmPi.{OHMPI_CONFIG["hardware"]["controller"]["model"]}')
+controller_module = importlib.import_module(f'OhmPi.{HARDWARE_CONFIG["controller"]["model"]}')
-TX_CONFIG = OHMPI_CONFIG['rx']
-RX_CONFIG = OHMPI_CONFIG['tx']
+TX_CONFIG = HARDWARE_CONFIG['rx']
+RX_CONFIG = HARDWARE_CONFIG['tx']
# hardware characteristics and limitations
# *** RX ***
# ADC for voltage
voltage_adc_voltage_min = 10. # mV
-voltage_adc_voltage_max = 4500.
+voltage_adc_voltage_max = 4500. # mV
RX_CONFIG['voltage_min'] = np.min([voltage_adc_voltage_min, RX_CONFIG.pop('voltage_min', np.inf)]) # mV
RX_CONFIG['voltage_max'] = np.min([voltage_adc_voltage_max, RX_CONFIG.pop('voltage_max', np.inf)]) # mV
--
GitLab