Commit 50f9756f authored by Olivier Kaufmann's avatar Olivier Kaufmann
Browse files

Replaces OhmPi imports with ohmpi imports

Showing with 16 additions and 16 deletions
+16 -16
from ohmpi import OhmPi from ohmpi.ohmpi import OhmPi
import matplotlib.pyplot as plt import matplotlib.pyplot as plt
import numpy as np import numpy as np
......
import sys # import sys
sys.path.extend(['/home/su530201/PycharmProjects/ohmpi_reversaal/OhmPi']) # sys.path.extend(['/home/su530201/PycharmProjects/OhmPi'])
from OhmPi.hardware_components.dummy_tx import Tx from ohmpi.hardware_components.dummy_tx import Tx
from OhmPi.hardware_components.dummy_rx import Rx from ohmpi.hardware_components.dummy_rx import Rx
from OhmPi.logging_setup import create_stdout_logger from ohmpi.logging_setup import create_stdout_logger
exec_logger = create_stdout_logger(name='exec') exec_logger = create_stdout_logger(name='exec')
soh_logger = create_stdout_logger(name='soh') soh_logger = create_stdout_logger(name='soh')
print('\nCreating TX...') 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...') print('\nCreating RX...')
rx = Rx(exec_logger= exec_logger, soh_logger= soh_logger) rx = Rx(exec_logger=exec_logger, soh_logger=soh_logger)
import time import time
from utils import change_config from ohmpi.utils import change_config
import logging import logging
change_config('config_mb_2023_mux_2024.py', verbose=False) 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.mux_2024_rev_0_0 import Mux, MUX_CONFIG
from OhmPi.hardware_components import raspberry_pi_i2c as ctl_module from ohmpi.hardware_components import raspberry_pi_i2c as ctl_module
stand_alone_mux = False stand_alone_mux = False
part_of_hardware_system = False part_of_hardware_system = False
...@@ -26,7 +26,7 @@ if stand_alone_mux: ...@@ -26,7 +26,7 @@ if stand_alone_mux:
# mux as part of a OhmPiHardware system # mux as part of a OhmPiHardware system
if part_of_hardware_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.') print('Starting test of mux as part of a OhmPiHardware system.')
k = OhmPiHardware() k = OhmPiHardware()
k.exec_logger.setLevel(logging.DEBUG) k.exec_logger.setLevel(logging.DEBUG)
...@@ -38,7 +38,7 @@ if part_of_hardware_system: ...@@ -38,7 +38,7 @@ if part_of_hardware_system:
k.switch_mux(electrodes=[1,4,2,3], roles=['A', 'B', 'M', 'N'], state='off') k.switch_mux(electrodes=[1,4,2,3], roles=['A', 'B', 'M', 'N'], state='off')
if within_ohmpi: if within_ohmpi:
from OhmPi.ohmpi import OhmPi from ohmpi.ohmpi import OhmPi
print('Starting test of mux within OhmPi.') print('Starting test of mux within OhmPi.')
k = OhmPi() k = OhmPi()
k.switch_mux_on([1,4,2,3]) k.switch_mux_on([1,4,2,3])
......
# import sys # import sys
# sys.path.extend(['/home/su530201/PycharmProjects/ohmpi_reversaal/OhmPi']) # 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 Tx
from OhmPi.hardware_components.ohmpi_card_3_15 import Rx from ohmpi.hardware_components.ohmpi_card_3_15 import Rx
from OhmPi.logging_setup import create_stdout_logger from ohmpi.logging_setup import create_stdout_logger
import numpy as np import numpy as np
exec_logger = create_stdout_logger(name='exec') exec_logger = create_stdout_logger(name='exec')
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment