diff --git a/ABMN.txt b/ABMN.txt index 385fab260308b252e221a527648c29800286c822..1f30b10421a8598bf8ca0794811d1ca725f33289 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 73b14fefdeb0dc6e507b62f89b1be62aec8c3e45..f485b66570597b2e7bbbb3a78f044265cb75ba04 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