From b1393643e3f94427dff547dea938c1b1ac4a85b8 Mon Sep 17 00:00:00 2001
From: su530201 <olivier.kaufmann@umons.ac.be>
Date: Sat, 15 Apr 2023 12:49:27 +0200
Subject: [PATCH] Attempts to fix missing ads_current_address
---
hardware/ohmpi_card_3_15.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/hardware/ohmpi_card_3_15.py b/hardware/ohmpi_card_3_15.py
index 9529d7df..852189b3 100644
--- a/hardware/ohmpi_card_3_15.py
+++ b/hardware/ohmpi_card_3_15.py
@@ -19,7 +19,6 @@ RX_CONFIG = HARDWARE_CONFIG['rx']
# ADC for voltage
voltage_adc_voltage_min = 10. # mV
voltage_adc_voltage_max = 4500. # mV
-
RX_CONFIG['voltage_min'] = np.min([voltage_adc_voltage_min, RX_CONFIG.pop('voltage_min', np.inf)]) # mV
RX_CONFIG['voltage_max'] = np.min([voltage_adc_voltage_max, RX_CONFIG.pop('voltage_max', np.inf)]) # mV
@@ -75,7 +74,6 @@ class Tx(TxAbstract):
self.mcp_board = MCP23008(self.controller.bus, address=TX_CONFIG['mcp_board_address'])
# ADS1115 for current measurement (AB)
- self.adc_gain = 2/3
self._ads_current_address = 0x48
self._ads_current = ads.ADS1115(self.controller.bus, gain=self.adc_gain, data_rate=860,
address=self._ads_current_address)
@@ -87,6 +85,8 @@ class Tx(TxAbstract):
self.pin1.direction = Direction.OUTPUT
self.polarity = 0
+ self.adc_gain = 2 / 3
+
# DPH 5005 Digital Power Supply
self.turn_on()
time.sleep(TX_CONFIG['dps_switch_on_warm_up'])
--
GitLab