Renames hardware and measure

doc/mux_2024_rev_0_0.py

 from OhmPi.config import HARDWARE_CONFIG
 import os
-from OhmPi.hardware import MuxAbstract
+from OhmPi.hardware_components import MuxAbstract
 MUX_CONFIG = HARDWARE_CONFIG['mux']
 
 class Mux(MuxAbstract):

hardware/__init__.py

-from .abstract_hardware import TxAbstract, RxAbstract, MuxAbstract, ControllerAbstract
\ No newline at end of file

hardware_components/__init__.py

+from .abstract_hardware_components import TxAbstract, RxAbstract, MuxAbstract, ControllerAbstract
\ No newline at end of file

hardware/dummy_controller.py → hardware_components/dummy_controller.py

 from OhmPi.config import HARDWARE_CONFIG
 import os
-from OhmPi.hardware import ControllerAbstract
+from OhmPi.hardware_components import ControllerAbstract
 CONTROLLER_CONFIG = HARDWARE_CONFIG['controller']
 
 

hardware/dummy_mux.py → hardware_components/dummy_mux.py

 from OhmPi.config import HARDWARE_CONFIG
 import os
-from OhmPi.hardware import MuxAbstract
+from OhmPi.hardware_components import MuxAbstract
 MUX_CONFIG = HARDWARE_CONFIG['mux']
 
 class Mux(MuxAbstract):

hardware/dummy_rx.py → hardware_components/dummy_rx.py

 from OhmPi.config import HARDWARE_CONFIG
 import numpy as np
 import os
-from OhmPi.hardware import RxAbstract
+from OhmPi.hardware_components import RxAbstract
 RX_CONFIG = HARDWARE_CONFIG['rx']
 
 # hardware characteristics and limitations

hardware/dummy_tx.py → hardware_components/dummy_tx.py

@@ -2,7 +2,7 @@ from OhmPi.config import HARDWARE_CONFIG
 import time
 import os
 import numpy as np
-from OhmPi.hardware import TxAbstract
+from OhmPi.hardware_components import TxAbstract
 
 TX_CONFIG = HARDWARE_CONFIG['tx']
 

hardware/mb_2024_rev_0_0.py → hardware_components/mb_2024_rev_0_0.py

@@ -8,7 +8,7 @@ import minimalmodbus  # noqa
 import time
 import numpy as np
 import os
-from OhmPi.hardware import TxAbstract, RxAbstract
+from OhmPi.hardware_components import TxAbstract, RxAbstract
 controller_module = importlib.import_module(f'OhmPi.hardware.{HARDWARE_CONFIG["hardware"]["controller"]["model"]}')
 
 TX_CONFIG = HARDWARE_CONFIG['tx']

hardware/ohmpi_card_3_15.py → hardware_components/ohmpi_card_3_15.py

@@ -8,7 +8,7 @@ import minimalmodbus  # noqa
 import time
 import numpy as np
 import os
-from OhmPi.hardware import TxAbstract, RxAbstract
+from OhmPi.hardware_components import TxAbstract, RxAbstract
 controller_name = HARDWARE_CONFIG['controller'].pop('board_name', 'raspberry_pi')
 controller_module = importlib.import_module(f'OhmPi.hardware.{controller_name}')
 

hardware/raspberry_pi.py → hardware_components/raspberry_pi.py

-from OhmPi.hardware import ControllerAbstract
+from OhmPi.hardware_components import ControllerAbstract
 import board  # noqa
 import busio  # noqa
 import os

ohmpi.py

@@ -24,7 +24,7 @@ import threading
 from OhmPi.logging_setup import setup_loggers
 from OhmPi.config import MQTT_CONTROL_CONFIG, OHMPI_CONFIG, EXEC_LOGGING_CONFIG
 from logging import DEBUG
-from measure import OhmPiHardware
+from hardware_system import OhmPiHardware
 
 # finish import (done only when class is instantiated as some libs are only available on arm64 platform)
 try:

test_dummy.py

 import sys
 sys.path.extend(['/home/su530201/PycharmProjects/ohmpi_reversaal/OhmPi'])
-from OhmPi.hardware.dummy_tx import Tx
-from OhmPi.hardware.dummy_rx import Rx
+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')

test_measure_with_ohmpi_card_3_15.py

@@ -3,7 +3,7 @@ import logging
 import matplotlib.pyplot as plt
 from utils import change_config
 change_config('config_ohmpi_card_3_15.py', verbose=False)
-from OhmPi.measure import OhmPiHardware
+from OhmPi.hardware_system import OhmPiHardware
 
 k = OhmPiHardware()
 k.exec_logger.setLevel(logging.INFO)

test_ohmpi_card_3_15.py

 # import sys
 # sys.path.extend(['/home/su530201/PycharmProjects/ohmpi_reversaal/OhmPi'])
-from OhmPi.hardware.ohmpi_card_3_15 import Tx
-from OhmPi.hardware.ohmpi_card_3_15 import Rx
+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