diff --git a/config.py b/config.py index b11d7d755ac897e2c56e37fdd67f0b17fe81b87b..9e787e98fbef18ee8d3429457ea7fb9b27b8d60d 100644 --- a/config.py +++ b/config.py @@ -18,7 +18,7 @@ OHMPI_CONFIG = { } HARDWARE_CONFIG = { - 'controller': {'model' : 'raspberry_pi_3' + 'controller': {'model' : 'raspberry_pi' }, 'tx' : {'model' : 'ohmpi_card_3_15', 'mcp_board_address': 0x20, diff --git a/config_mb_2024_rev_0_0.py b/config_mb_2024_rev_0_0.py index 90b0f0a4c6d1bc859ec40fed0cd7f8988afc448a..3f6671f9d7b5c9ae8d51270712e3ffc991f59621 100644 --- a/config_mb_2024_rev_0_0.py +++ b/config_mb_2024_rev_0_0.py @@ -18,7 +18,7 @@ OHMPI_CONFIG = { } HARDWARE_CONFIG = { - 'controller': {'model' : 'raspberry_pi_3' + 'controller': {'model' : 'raspberry_pi' }, 'tx' : {'model' : 'mb_2024_rev_0_0', 'mcp_board_address': 0x20, diff --git a/config_ohmpi_card_3_15.py b/config_ohmpi_card_3_15.py index b11d7d755ac897e2c56e37fdd67f0b17fe81b87b..9e787e98fbef18ee8d3429457ea7fb9b27b8d60d 100644 --- a/config_ohmpi_card_3_15.py +++ b/config_ohmpi_card_3_15.py @@ -18,7 +18,7 @@ OHMPI_CONFIG = { } HARDWARE_CONFIG = { - 'controller': {'model' : 'raspberry_pi_3' + 'controller': {'model' : 'raspberry_pi' }, 'tx' : {'model' : 'ohmpi_card_3_15', 'mcp_board_address': 0x20, diff --git a/hardware/raspberry_pi_3.py b/hardware/raspberry_pi.py similarity index 50% rename from hardware/raspberry_pi_3.py rename to hardware/raspberry_pi.py index ac8fe5688f27566c8db235d1a66baf8a5687292e..cdf04664e3dfa0bddadf83ddbb0d025850c7289f 100644 --- a/hardware/raspberry_pi_3.py +++ b/hardware/raspberry_pi.py @@ -1,8 +1,12 @@ from OhmPi.hardware import ControllerAbstract import board # noqa import busio # noqa +from OhmPi.utils import get_platform class Controller(ControllerAbstract): def __init__(self, **kwargs): super().__init__(**kwargs) - self.bus = busio.I2C(board.SCL, board.SDA) # noqa \ No newline at end of file + self.bus = busio.I2C(board.SCL, board.SDA) # noqa + platform, on_pi = get_platform() + assert on_pi + self.board_name = platform \ No newline at end of file