Commit 3a570597 authored by Forquet Nicolas's avatar Forquet Nicolas
Browse files

modification de la fonction switch_mux(): lors de l'activation des port, il...

modification de la fonction switch_mux(): lors de l'activation des port, il faut forcer le type des variables pour qu'elles ne soient pas du type array.
Showing with 10 additions and 23 deletions
+10 -23
""" """
23/08/2019 29/10/2019
OHMPY_code is a program to control the low-cost and open source resistivity meter OHMPY_code is a program to control the low-cost and open source resistivity meter
OHMPY, it has been developed by Rémi CLEMENT, Nicolas FORQUET (IRSTEA) and Yannick FARGIER (IFSTTAR). OHMPY, it has been developed by Rémi CLEMENT, Nicolas FORQUET (IRSTEA) and Yannick FARGIER (IFSTTAR).
Version 1.01 23/08/2019 modified by Remi CLEMENT Version 1.01 23/08/2019 modified by Remi CLEMENT
...@@ -27,12 +27,12 @@ def switch_mux(quadripole): ...@@ -27,12 +27,12 @@ def switch_mux(quadripole):
quadmux = numpy.loadtxt("quadmux.txt", delimiter=" ", dtype=int) quadmux = numpy.loadtxt("quadmux.txt", delimiter=" ", dtype=int)
for i in range(0,4): for i in range(0,4):
for j in range(0,5) : for j in range(0,5) :
GPIO.output(quadmux[i,j], path2elec[quadripole[i],j]) GPIO.output(int(quadmux[i,j]), bool(path2elec[quadripole[i],j]))
GPIO.setmode(GPIO.BCM) GPIO.setmode(GPIO.BCM)
GPIO.setwarnings(False) GPIO.setwarnings(False)
#i2c = busio.I2C(board.SCL, board.SDA) #i2c = busio.I2C(board.SCL, board.SDA)
# Create the ADC object using the I2C bus # Create the ADC object using the I2C bus
#ads = ADS.ADS1115(i2c) #ads = ADS.ADS1115(i2c)
...@@ -41,8 +41,8 @@ GPIO.setwarnings(False) ...@@ -41,8 +41,8 @@ GPIO.setwarnings(False)
Initialization of multiplexer channels Initialization of multiplexer channels
""" """
pinList = [12,16,20,21,26,18,23,24,25,19,6,13,4,17,27,22,10,9,11,5] # List of GPIOs enabled for relay cards (electrodes) pinList = [12,16,20,21,26,18,23,24,25,19,6,13,4,17,27,22,10,9,11,5] # List of GPIOs enabled for relay cards (electrodes)
for i in pinList: for i in pinList:
GPIO.setup(i, GPIO.OUT) GPIO.setup(i, GPIO.OUT)
GPIO.output(i, GPIO.HIGH) GPIO.output(i, GPIO.HIGH)
""" """
Measurement settings Measurement settings
...@@ -58,23 +58,19 @@ Reading the quadripole file ...@@ -58,23 +58,19 @@ Reading the quadripole file
N=numpy.loadtxt("ABMN4.txt", delimiter=" ",dtype=int) # load quadripole file N=numpy.loadtxt("ABMN4.txt", delimiter=" ",dtype=int) # load quadripole file
for g in range(0,nbr_meas): # for time-lapse monitoring for g in range(0,nbr_meas): # for time-lapse monitoring
""" """
Selection electrode activées pour chaque quadripole Selection electrode activées pour chaque quadripole
""" """
for i in range(0,N.shape[0]): # boucle sur les quadripôles, qui tient compte du nombre de quadripole dans le fichier ABMN for i in range(0,N.shape[0]): # boucle sur les quadripôles, qui tient compte du nombre de quadripole dans le fichier ABMN
# call switch_mux function # call switch_mux function
switch_mux(N[i,]) switch_mux(N[i,])
time.sleep(injection_time); time.sleep(injection_time);
GPIO.output(12, GPIO.HIGH); GPIO.output(16, GPIO.HIGH); GPIO.output(20, GPIO.HIGH); GPIO.output(21, GPIO.HIGH); GPIO.output(26, GPIO.HIGH) GPIO.output(12, GPIO.HIGH); GPIO.output(16, GPIO.HIGH); GPIO.output(20, GPIO.HIGH); GPIO.output(21, GPIO.HIGH); GPIO.output(26, GPIO.HIGH)
GPIO.output(18, GPIO.HIGH); GPIO.output(23, GPIO.HIGH); GPIO.output(24, GPIO.HIGH); GPIO.output(25, GPIO.HIGH); GPIO.output(19, GPIO.HIGH) GPIO.output(18, GPIO.HIGH); GPIO.output(23, GPIO.HIGH); GPIO.output(24, GPIO.HIGH); GPIO.output(25, GPIO.HIGH); GPIO.output(19, GPIO.HIGH)
GPIO.output(6, GPIO.HIGH); GPIO.output(13, GPIO.HIGH); GPIO.output(4, GPIO.HIGH); GPIO.output(17, GPIO.HIGH); GPIO.output(27, GPIO.HIGH) GPIO.output(6, GPIO.HIGH); GPIO.output(13, GPIO.HIGH); GPIO.output(4, GPIO.HIGH); GPIO.output(17, GPIO.HIGH); GPIO.output(27, GPIO.HIGH)
GPIO.output(22, GPIO.HIGH); GPIO.output(10, GPIO.HIGH); GPIO.output(9, GPIO.HIGH); GPIO.output(11, GPIO.HIGH); GPIO.output(5, GPIO.HIGH) GPIO.output(22, GPIO.HIGH); GPIO.output(10, GPIO.HIGH); GPIO.output(9, GPIO.HIGH); GPIO.output(11, GPIO.HIGH); GPIO.output(5, GPIO.HIGH)
'''
Showing results
'''
time.sleep(sequence_delay);#waiting next measurement time.sleep(sequence_delay);#waiting next measurement
...@@ -86,12 +82,3 @@ Showing results ...@@ -86,12 +82,3 @@ Showing results
Save result in txt file Save result in txt file
''' '''
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