From 8b4f7233d154e39ba4e20173296dbb8106d071c2 Mon Sep 17 00:00:00 2001
From: "remi.clement@inrae.fr" <arnaud.watlet@umons.ac.be>
Date: Tue, 7 Mar 2023 22:14:10 +0100
Subject: [PATCH] refactors MCPIHM to MCP_board
---
ohmpi.py | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/ohmpi.py b/ohmpi.py
index bc5d6b8f..f5a670c9 100644
--- a/ohmpi.py
+++ b/ohmpi.py
@@ -127,8 +127,8 @@ class OhmPi(object):
self.i2c = busio.I2C(board.SCL, board.SDA) # noqa
# I2C connexion to MCP23008, for current injection
- self.MCPIHM = MCP23008(self.i2c, address=0x24)
- self.pin4 = self.MCPIHM.get_pin(4) # Ohmpi_run
+ self.MCP_board = MCP23008(self.i2c, address=0x24)
+ self.pin4 = self.MCP_board.get_pin(4) # Ohmpi_run
self.pin4.direction = Direction.OUTPUT
self.pin4.value = True
@@ -142,10 +142,10 @@ class OhmPi(object):
# current injection module
if self.idps:
- self.pin2 = self.MCPIHM.get_pin(2) # dsp +
+ self.pin2 = self.MCP_board.get_pin(2) # dsp +
self.pin2.direction = Direction.OUTPUT
self.pin2.value = True
- self.pin3 = self.MCPIHM.get_pin(3) # dsp -
+ self.pin3 = self.MCP_board.get_pin(3) # dsp -
self.pin3.direction = Direction.OUTPUT
self.pin3.value = True
time.sleep(4)
@@ -164,10 +164,10 @@ class OhmPi(object):
# (last number) 0 is for mA, 3 is for A
# injection courant and measure (TODO check if it works, otherwise back in run_measurement())
- self.pin0 = self.MCPIHM.get_pin(0)
+ self.pin0 = self.MCP_board.get_pin(0)
self.pin0.direction = Direction.OUTPUT
self.pin0.value = False
- self.pin1 = self.MCPIHM.get_pin(1)
+ self.pin1 = self.MCP_board.get_pin(1)
self.pin1.direction = Direction.OUTPUT
self.pin1.value = False
@@ -314,10 +314,10 @@ class OhmPi(object):
volt = 5.
# redefined the pin of the mcp (needed when relays are connected)
- self.pin0 = self.MCPIHM.get_pin(0)
+ self.pin0 = self.MCP_board.get_pin(0)
self.pin0.direction = Direction.OUTPUT
self.pin0.value = False
- self.pin1 = self.MCPIHM.get_pin(1)
+ self.pin1 = self.MCP_board.get_pin(1)
self.pin1.direction = Direction.OUTPUT
self.pin1.value = False
@@ -809,33 +809,33 @@ class OhmPi(object):
# as it's run in another thread, it doesn't consider these
# and this can lead to short circuit!
- self.pin0 = self.MCPIHM.get_pin(0)
+ self.pin0 = self.MCP_board.get_pin(0)
self.pin0.direction = Direction.OUTPUT
self.pin0.value = False
- self.pin1 = self.MCPIHM.get_pin(1)
+ self.pin1 = self.MCP_board.get_pin(1)
self.pin1.direction = Direction.OUTPUT
self.pin1.value = False
- self.pin7 = self.MCPIHM.get_pin(7) #IHM on mesaurement
+ self.pin7 = self.MCP_board.get_pin(7) #IHM on mesaurement
self.pin7.direction = Direction.OUTPUT
self.pin7.value = False
if self.sequence is None :
if self.idps:
- self.pin2 = self.MCPIHM.get_pin(2) # dsp +
+ self.pin2 = self.MCP_board.get_pin(2) # dsp +
self.pin2.direction = Direction.OUTPUT
self.pin2.value = True
- self.pin3 = self.MCPIHM.get_pin(3) # dsp -
+ self.pin3 = self.MCP_board.get_pin(3) # dsp -
self.pin3.direction = Direction.OUTPUT
self.pin3.value = True
time.sleep(5)
- self.pin5 = self.MCPIHM.get_pin(5) #IHM on mesaurement
+ self.pin5 = self.MCP_board.get_pin(5) #IHM on mesaurement
self.pin5.direction = Direction.OUTPUT
self.pin5.value = True
- self.pin6 = self.MCPIHM.get_pin(6) #IHM on mesaurement
+ self.pin6 = self.MCP_board.get_pin(6) #IHM on mesaurement
self.pin6.direction = Direction.OUTPUT
self.pin6.value = False
- self.pin7 = self.MCPIHM.get_pin(7) #IHM on mesaurement
+ self.pin7 = self.MCP_board.get_pin(7) #IHM on mesaurement
self.pin7.direction = Direction.OUTPUT
self.pin7.value = False
if self.idps:
@@ -1235,10 +1235,10 @@ class OhmPi(object):
# call the switch_mux function to switch to the right electrodes
self.switch_mux_on(quad)
self.mcp = MCP23008(self.i2c, address=0x24)
- self.pin2 = self.MCPIHM.get_pin(2) # dsp -
+ self.pin2 = self.MCP_board.get_pin(2) # dsp -
self.pin2.direction = Direction.OUTPUT
self.pin2.value = True
- self.pin3 = self.MCPIHM.get_pin(3) # dsp -
+ self.pin3 = self.MCP_board.get_pin(3) # dsp -
self.pin3.direction = Direction.OUTPUT
self.pin3.value = True
time.sleep(4)
--
GitLab