From 3a5705979513600764aac4854383ee5044df819a Mon Sep 17 00:00:00 2001
From: Nicolas Forquet <nicolas.forquet@irstea.fr>
Date: Tue, 29 Oct 2019 11:25:37 +0100
Subject: [PATCH] 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.
---
ohmpy_v_1_01.py | 33 ++++++++++-----------------------
1 file changed, 10 insertions(+), 23 deletions(-)
diff --git a/ohmpy_v_1_01.py b/ohmpy_v_1_01.py
index 6e514bb9..9748cbe6 100644
--- a/ohmpy_v_1_01.py
+++ b/ohmpy_v_1_01.py
@@ -1,5 +1,5 @@
"""
-23/08/2019
+29/10/2019
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).
Version 1.01 23/08/2019 modified by Remi CLEMENT
@@ -27,12 +27,12 @@ def switch_mux(quadripole):
quadmux = numpy.loadtxt("quadmux.txt", delimiter=" ", dtype=int)
for i in range(0,4):
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.setwarnings(False)
-
+
#i2c = busio.I2C(board.SCL, board.SDA)
# Create the ADC object using the I2C bus
#ads = ADS.ADS1115(i2c)
@@ -41,8 +41,8 @@ GPIO.setwarnings(False)
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)
-for i in pinList:
- GPIO.setup(i, GPIO.OUT)
+for i in pinList:
+ GPIO.setup(i, GPIO.OUT)
GPIO.output(i, GPIO.HIGH)
"""
Measurement settings
@@ -58,23 +58,19 @@ Reading the quadripole file
N=numpy.loadtxt("ABMN4.txt", delimiter=" ",dtype=int) # load quadripole file
for g in range(0,nbr_meas): # for time-lapse monitoring
-
+
"""
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
# call switch_mux function
switch_mux(N[i,])
-
- 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(18, GPIO.HIGH); GPIO.output(23, GPIO.HIGH); GPIO.output(24, GPIO.HIGH); GPIO.output(25, GPIO.HIGH); GPIO.output(19, GPIO.HIGH)
+
+ 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(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(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
@@ -86,12 +82,3 @@ Showing results
Save result in txt file
'''
-
-
-
-
-
-
-
-
-
--
GitLab