Skip to content
GitLab
Commit 950683dc authored by Clement Remi's avatar Clement Remi
Browse files

Merge branch 'master' of https://gitlab.irstea.fr/reversaal/OhmPi

parents 405e6ae5 4f948e6b
master 144-create-testing-framework-for-tests-automation EGU23 MB.2024.ter_restored MUX_board_v2024 Refactor_mb_2023 battery_charger board_v4 code_refactor dev/dummy mqtt update_V2023 v2024_rc v2025_alpha v2024.0.35 v2024.0.34 v2024.0.33 v2024.0.32 v2024.0.31 v2024.0.30 v2024.0.29 v2024.0.28 v2024.0.27 v2024.0.26 v2024.0.25 v2024.0.24 v2024.0.23 v2024.0.22 v2024.0.21 v2024.0.20 v2024.0.19 v2024.0.18 v2024.0.17 v2024.0.16 v2024.0.15 v2024.0.14 v2024.0.13 v2024.0.12 v2024.0.11 v2024.0.10 v2024.0.9 v2024.0.8 v2024.0.7 v2024.0.0 v2023.0.1 v2023.0.0 archives/mqtt
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
+2 -2
Ohmpi.py
+ 2
− 2
View file @ 950683dc
...@@ -30,7 +30,7 @@ from gpiozero import CPUTemperature ...@@ -30,7 +30,7 @@ from gpiozero import CPUTemperature
current_time = datetime.now() current_time = datetime.now()
print(current_time.strftime("%Y-%m-%d %H:%M:%S")) print(current_time.strftime("%Y-%m-%d %H:%M:%S"))
""" """
hardware parameters Hardware parameters
""" """
R_shunt = 0.2# reference resistance value in ohm R_shunt = 0.2# reference resistance value in ohm
coef_p2 = 2.50# slope for current conversion for ADS.P2, measurement in V/V coef_p2 = 2.50# slope for current conversion for ADS.P2, measurement in V/V
...@@ -41,7 +41,7 @@ integer=10 ...@@ -41,7 +41,7 @@ integer=10
meas=numpy.zeros((3,integer)) meas=numpy.zeros((3,integer))
""" """
import parameters Import parameters
""" """
with open('ohmpi_param.json') as json_file: with open('ohmpi_param.json') as json_file:
......
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