From e606035a2b03f8f36034f890fd51a810f95fe104 Mon Sep 17 00:00:00 2001
From: Arnaud Watlet <arnaud.watlet@umons.ac.be>
Date: Tue, 14 Feb 2023 14:50:05 +0100
Subject: [PATCH] Fixes merge conflicts
---
config.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/config.py b/config.py
index 10e75f24..6003db18 100644
--- a/config.py
+++ b/config.py
@@ -17,12 +17,12 @@ OHMPI_CONFIG = {
'R_shunt': 2, # Shunt resistance in Ohms
'Imax': 4800 / 50 / 2, # Maximum current
'coef_p2': 2.50, # slope for current conversion for ADS.P2, measurement in V/V
- 'nb_samples': 2, # Max value 10 # was named integer before...
+ 'nb_samples': 20, # Max value 10 # was named integer before...
'version': 2, # Is this still needed?
'max_elec': 64,
'board_addresses': {'A': 0x73, 'B': 0x72, 'M': 0x71, 'N': 0x70}, # CHECK IF YOUR BOARDS HAVE THESE ADDRESSES
'settings': 'ohmpi_settings.json', # INSERT YOUR FAVORITE SETTINGS FILE HERE
- 'board_version': '22.10',
+ 'board_version': 'mb.2023.0.0',
'mux_board_version': '2023.0.0'
} # TODO: add a dictionary with INA models and associated gain values
--
GitLab