From 50f9756fec768465dfbdb470d4ff4bfd6d90152b Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Tue, 16 May 2023 19:10:07 +0200
Subject: [PATCH] Replaces OhmPi imports with ohmpi imports
---
dev/test.py | 2 +-
dev/test_dummy.py | 14 +++++++-------
dev/test_mux_2024.py | 10 +++++-----
dev/test_ohmpi_card_3_15.py | 6 +++---
4 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/dev/test.py b/dev/test.py
index 86ad70da..f4946ed9 100644
--- a/dev/test.py
+++ b/dev/test.py
@@ -1,4 +1,4 @@
-from ohmpi import OhmPi
+from ohmpi.ohmpi import OhmPi
import matplotlib.pyplot as plt
import numpy as np
diff --git a/dev/test_dummy.py b/dev/test_dummy.py
index 0ba2e474..96d16d1a 100644
--- a/dev/test_dummy.py
+++ b/dev/test_dummy.py
@@ -1,13 +1,13 @@
-import sys
-sys.path.extend(['/home/su530201/PycharmProjects/ohmpi_reversaal/OhmPi'])
-from OhmPi.hardware_components.dummy_tx import Tx
-from OhmPi.hardware_components.dummy_rx import Rx
-from OhmPi.logging_setup import create_stdout_logger
+# import sys
+# sys.path.extend(['/home/su530201/PycharmProjects/OhmPi'])
+from ohmpi.hardware_components.dummy_tx import Tx
+from ohmpi.hardware_components.dummy_rx import Rx
+from ohmpi.logging_setup import create_stdout_logger
exec_logger = create_stdout_logger(name='exec')
soh_logger = create_stdout_logger(name='soh')
print('\nCreating TX...')
-tx = Tx(exec_logger= exec_logger, soh_logger= soh_logger)
+tx = Tx(exec_logger=exec_logger, soh_logger=soh_logger)
print('\nCreating RX...')
-rx = Rx(exec_logger= exec_logger, soh_logger= soh_logger)
+rx = Rx(exec_logger=exec_logger, soh_logger=soh_logger)
diff --git a/dev/test_mux_2024.py b/dev/test_mux_2024.py
index 3a056013..42006053 100644
--- a/dev/test_mux_2024.py
+++ b/dev/test_mux_2024.py
@@ -1,9 +1,9 @@
import time
-from utils import change_config
+from ohmpi.utils import change_config
import logging
change_config('config_mb_2023_mux_2024.py', verbose=False)
-from OhmPi.hardware_components.mux_2024_rev_0_0 import Mux, MUX_CONFIG
-from OhmPi.hardware_components import raspberry_pi_i2c as ctl_module
+from ohmpi.hardware_components.mux_2024_rev_0_0 import Mux, MUX_CONFIG
+from ohmpi.hardware_components import raspberry_pi_i2c as ctl_module
stand_alone_mux = False
part_of_hardware_system = False
@@ -26,7 +26,7 @@ if stand_alone_mux:
# mux as part of a OhmPiHardware system
if part_of_hardware_system:
- from OhmPi.hardware_system import OhmPiHardware
+ from ohmpi.hardware_system import OhmPiHardware
print('Starting test of mux as part of a OhmPiHardware system.')
k = OhmPiHardware()
k.exec_logger.setLevel(logging.DEBUG)
@@ -38,7 +38,7 @@ if part_of_hardware_system:
k.switch_mux(electrodes=[1,4,2,3], roles=['A', 'B', 'M', 'N'], state='off')
if within_ohmpi:
- from OhmPi.ohmpi import OhmPi
+ from ohmpi.ohmpi import OhmPi
print('Starting test of mux within OhmPi.')
k = OhmPi()
k.switch_mux_on([1,4,2,3])
diff --git a/dev/test_ohmpi_card_3_15.py b/dev/test_ohmpi_card_3_15.py
index 49f91f36..aa1310cc 100644
--- a/dev/test_ohmpi_card_3_15.py
+++ b/dev/test_ohmpi_card_3_15.py
@@ -1,8 +1,8 @@
# import sys
# sys.path.extend(['/home/su530201/PycharmProjects/ohmpi_reversaal/OhmPi'])
-from OhmPi.hardware_components.ohmpi_card_3_15 import Tx
-from OhmPi.hardware_components.ohmpi_card_3_15 import Rx
-from OhmPi.logging_setup import create_stdout_logger
+from ohmpi.hardware_components.ohmpi_card_3_15 import Tx
+from ohmpi.hardware_components.ohmpi_card_3_15 import Rx
+from ohmpi.logging_setup import create_stdout_logger
import numpy as np
exec_logger = create_stdout_logger(name='exec')
--
GitLab