Commit ec429d81 authored by Arnaud WATLET's avatar Arnaud WATLET
Browse files

Updates components for tests

Showing with 18 additions and 4 deletions
+18 -4
......@@ -88,13 +88,14 @@ class Tx(TxAbstract):
self.current_adjustable = False
# I2C connexion to MCP23008, for current injection
self.mcp_board = MCP23008(self.connection, address=kwargs['mcp_address'])
self._mcp_address = kwargs['mcp_address']
self.reset_mcp()
# ADS1115 for current measurement (AB)
self._ads_current_address = kwargs['ads_address']
self._ads_current_data_rate = kwargs['data_rate']
self._adc_gain = 2 / 3
self._ads_current = ads.ADS1115(self.connection, gain=self._adc_gain, data_rate=self._ads_current_data_rate,
address=self._ads_current_address)
self.reset_ads()
self._ads_current.mode = Mode.CONTINUOUS
self._r_shunt = kwargs['r_shunt']
self.adc_voltage_min = kwargs['adc_voltage_min']
......@@ -182,6 +183,12 @@ class Tx(TxAbstract):
# def turn_on(self):
# self.pwr.turn_on(self)
def reset_ads(self):
self._ads_current = ads.ADS1115(self.connection, gain=self._adc_gain, data_rate=self._ads_current_data_rate,
address=self._ads_current_address)
def reset_mcp(self):
self.mcp_board = MCP23008(self.connection, address=self._mcp_address)
@property
def tx_bat(self):
if np.isnan(self.pwr.battery_voltage):
......
......@@ -142,7 +142,8 @@ class Rx(Rx_mb_2023):
if not subclass_init:
self.exec_logger.event(f'{self.model}\trx_init\tbegin\t{datetime.datetime.utcnow()}')
# I2C connection to MCP23008, for voltage
self.mcp_board = MCP23008(self.connection, address=kwargs['mcp_address'])
# self.mcp_board = MCP23008(self.connection, address=kwargs['mcp_address'])
# self.reset_mcp()
# ADS1115 for voltage measurement (MN)
self._coef_p2 = 1.
# Define default DG411 gain
......
......@@ -126,6 +126,9 @@ class Mux(MuxAbstract):
self._mcp[2] = MCP23017(self._tca[2])
self._mcp[3] = MCP23017(self._tca[3])
def reset_one(self, which=0):
self._mcp[which] = MCP23017(self._tca[which])
def switch_one(self, elec=None, role=None, state=None):
MuxAbstract.switch_one(self, elec=elec, role=role, state=state)
......
......@@ -152,6 +152,9 @@ class Mux(MuxAbstract):
self._mcp[0] = MCP23017(self._tca, address=int(self._mcp_addresses[0], 16))
self._mcp[1] = MCP23017(self._tca, address=int(self._mcp_addresses[1], 16))
def reset_one(self, which=0):
self._mcp[which] = MCP23017(self._tca, address=int(self._mcp_addresses[which], 16))
def switch_one(self, elec=None, role=None, state=None):
MuxAbstract.switch_one(self, elec=elec, role=role, state=state)
def activate_relay(mcp, mcp_pin, value=True):
......
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