From a122236205a545f94f69181f8ca4664d1b3ed783 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Sat, 15 Apr 2023 20:14:28 +0200
Subject: [PATCH] Attemps to use the sampling_rate in _vab_pulse
---
config.py | 2 +-
config_mb_2024_rev_0_0.py | 2 +-
config_ohmpi_card_3_15.py | 2 +-
hardware/{raspberry_pi_3.py => raspberry_pi.py} | 6 +++++-
4 files changed, 8 insertions(+), 4 deletions(-)
rename hardware/{raspberry_pi_3.py => raspberry_pi.py} (50%)
diff --git a/config.py b/config.py
index b11d7d75..9e787e98 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 90b0f0a4..3f6671f9 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 b11d7d75..9e787e98 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 ac8fe568..cdf04664 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
--
GitLab