From 64597f5f3c26e125f53cecd064a9c1b5fbdb976e Mon Sep 17 00:00:00 2001
From: "remi.clement" <remi.clement@inrae.fr>
Date: Mon, 12 Dec 2022 16:07:05 +0100
Subject: [PATCH] update mux board fritzing file fritzing and gerber
---
config.py | 2 +-
ohmpi.py | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/config.py b/config.py
index ad391ca9..ac092d52 100644
--- a/config.py
+++ b/config.py
@@ -22,7 +22,7 @@ OHMPI_CONFIG = {
'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'
+ 'measurement board_version': 'mb.2023.0.0'
} # TODO: add a dictionary with INA models and associated gain values
# SET THE LOGGING LEVELS, MQTT BROKERS AND MQTT OPTIONS ACCORDING TO YOUR NEEDS
diff --git a/ohmpi.py b/ohmpi.py
index cf050889..62448468 100644
--- a/ohmpi.py
+++ b/ohmpi.py
@@ -632,7 +632,7 @@ class OhmPi(object):
self.version = OHMPI_CONFIG['version'] # hardware version
self.max_elec = OHMPI_CONFIG['max_elec'] # maximum number of electrodes
self.board_addresses = OHMPI_CONFIG['board_addresses']
- self.board_version = OHMPI_CONFIG['board_version']
+ self.board_version = OHMPI_CONFIG['measurement board_version']
self.exec_logger.debug(f'OHMPI_CONFIG = {str(OHMPI_CONFIG)}')
def read_quad(self, **kwargs):
@@ -774,7 +774,7 @@ class OhmPi(object):
address=self.ads_current_address, mode=0)
self.ads_voltage = ads.ADS1115(self.i2c, gain=gain_voltage, data_rate=860,
address=self.ads_voltage_address, mode=0)
- elif self.board_version == '22.10':
+ elif self.board_version == 'mb.2023.0.0':
gain_current = 2 / 3
gain_voltage = 2 / 3
self.ads_current = ads.ADS1115(self.i2c, gain=gain_current, data_rate=860,
@@ -824,7 +824,7 @@ class OhmPi(object):
meas[k, 1] = AnalogIn(self.ads_voltage, ads.P0).voltage * 1000
else:
meas[k, 1] = -AnalogIn(self.ads_voltage, ads.P2).voltage * 1000
- elif self.board_version == '22.10':
+ elif self.board_version == 'mb.2023.0.0':
meas[k, 1] = -AnalogIn(self.ads_voltage, ads.P0, ads.P1).voltage * self.coef_p2 * 1000
# else:
# self.exec_logger.debug('Unknown board')
@@ -854,7 +854,7 @@ class OhmPi(object):
measpp[k, 1] = AnalogIn(self.ads_voltage, ads.P0).voltage * 1000.
else:
measpp[k, 1] = AnalogIn(self.ads_voltage, ads.P2).voltage * 1000. * -1
- elif self.board_version == '22.10':
+ elif self.board_version == 'mb.2023.0.0':
measpp[k, 1] = -AnalogIn(self.ads_voltage, ads.P0, ads.P1).voltage * self.coef_p2 * 1000.
else:
self.exec_logger.debug('unknown board')
@@ -938,7 +938,7 @@ class OhmPi(object):
"Nb samples [-]": self.nb_samples,
"fulldata": fulldata,
}
- elif self.board_version == '22.10':
+ elif self.board_version == 'mb.2023.0.0':
d = {
"time": datetime.now().isoformat(),
"A": quad[0],
--
GitLab