From af69141d860c9e3fbd06d48da07648a6b6d890ae Mon Sep 17 00:00:00 2001
From: Nicolas Forquet <nicolas.forquet@irstea.fr>
Date: Mon, 6 Jan 2020 10:07:52 +0100
Subject: [PATCH] comment and text fixing in ohmpy and modification of the
 interrogation array to have something actually working for demonstration

---
 ABMN.txt | 27 ++++++++++-----------------
 ohmpy.py |  8 +++-----
 2 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/ABMN.txt b/ABMN.txt
index 385fab26..1f30b104 100644
--- a/ABMN.txt
+++ b/ABMN.txt
@@ -1,17 +1,10 @@
-1 1 1 1
-2 2 2 2
-3 3 3 3
-4 4 4 4
-5 5 5 5
-6 6 6 6
-7 7 7 7
-8 8 8 8
-9 9 9 9
-10 10 10 10
-11 11 11 11
-12 12 12 12
-13 13 13 13
-14 14 14 14
-15 15 15 15
-16 16 16 16
-17 17 17 17
\ No newline at end of file
+1 4 2 3
+2 5 3 4
+3 6 4 5
+4 7 5 6
+5 8 6 7
+6 9 7 8
+7 10 8 9
+8 11 9 10
+9 12 10 11
+10 13 11 12
\ No newline at end of file
diff --git a/ohmpy.py b/ohmpy.py
index 73b14fef..f485b665 100644
--- a/ohmpy.py
+++ b/ohmpy.py
@@ -1,12 +1,10 @@
 """
-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,Vivien DUBOIS, Nicolas FORQUET (IRSTEA) and Yannick FARGIER (IFSTTAR).
+January 6, 2020
+ohmpi.py is a program to control a low-cost and open source resistivity meter OhmPi that has been developed by Rémi CLEMENT,Vivien DUBOIS, Nicolas FORQUET (INRAE), and Yannick FARGIER (IFSTTAR).
 """
 print('OHMPI start' )
 print('Import library')
 
-#!/usr/bin/python
 import RPi.GPIO as GPIO
 import time
 from datetime import datetime
@@ -43,7 +41,7 @@ coef_p0 = 2.02 # slope for current conversion for ADS.P0, measurement in V/V
 coef_p1 = 2.02 # slope for current conversion for ADS.P1, measurement in V/V
 coef_p2 = 1 # slope for current conversion for ADS.P2, measurement in V/V
 coef_p3 = 1 # slope for current conversion for ADS.P3, measurement in V/V
-export_path = "/home/pi/Desktop/ohmpy-develop/measurement.csv"
+export_path = "~/measurement.csv"
 
 """
 functions
-- 
GitLab