From 2d1e47c92afe257fd64c4dcddc61abe0c0535567 Mon Sep 17 00:00:00 2001
From: "remi.clement" <remi.clement@inrae.fr>
Date: Thu, 28 Mar 2024 18:26:07 +0100
Subject: [PATCH] update code
---
setier_datalogger_code/Base_Wifi.ino | 36 ++++++++++++++++++-
setier_datalogger_code/Config_File.h | 2 +-
.../setier_datalogger_code.ino | 6 ++--
setier_datalogger_code/water_content.h | 10 +++---
4 files changed, 44 insertions(+), 10 deletions(-)
diff --git a/setier_datalogger_code/Base_Wifi.ino b/setier_datalogger_code/Base_Wifi.ino
index 5281e69..ff9ae17 100644
--- a/setier_datalogger_code/Base_Wifi.ino
+++ b/setier_datalogger_code/Base_Wifi.ino
@@ -187,7 +187,41 @@ void Awake_Wifi()
client.print(Capteur_Energie_A3);
client.print(" A ) <br>");
}
-
+
+////////////////////////////////////////////////////////////////////////////
+
+
+ #elif defined(TYPE_DATALOGGER_WATER_CONTENT)
+ if (Capteur_WATER_CONTENT_A0)
+ {
+ Get_VWcontent(&Wcontent_0, 0, Capteur_WATER_CONTENT_A0);;
+ client.print("Water content capteur_A0 ");
+ client.print(Wcontent_0);
+ client.print(" mV ) <br>");
+ }
+ if (Capteur_WATER_CONTENT_A1)
+ {
+ Get_VWcontent(&Wcontent_1, 1, Capteur_WATER_CONTENT_A1);
+ client.print("Courant capteur_A1 ");
+ client.print(Wcontent_1);
+ client.print(" mV ) <br>");
+ }
+ if (Capteur_WATER_CONTENT_A2)
+ {
+ Get_VWcontent(&Wcontent_2, 2, Capteur_WATER_CONTENT_A2);
+ client.print("Courant capteur_2 ");
+ client.print(Wcontent_2);
+ client.print(" mV ) <br>");
+ }
+ if (Capteur_WATER_CONTENT_A3)
+ {
+ Get_VWcontent(&Wcontent_3, 3, Capteur_WATER_CONTENT_A3);
+ client.print("Courant capteur_3 ");
+ client.print(Wcontent_3);
+ client.print(" mV ) <br>");
+ }
+
+
#elif defined(TYPE_DATALOGGER_HAUTEUR_BOUE)
client.print("Distance : ");
diff --git a/setier_datalogger_code/Config_File.h b/setier_datalogger_code/Config_File.h
index cbac94f..9bdb744 100644
--- a/setier_datalogger_code/Config_File.h
+++ b/setier_datalogger_code/Config_File.h
@@ -7,7 +7,7 @@
/********* conservez les guillemets ***************************************************************/
/********* Le reseau wifi cree portera le nom du datalogger **************************************/
-#define STATION_NAME "H_eau" // exemple le nom de ma station est TOTO_1
+#define STATION_NAME "Water_content" // exemple le nom de ma station est TOTO_1
/************* CHOISISSEZ LA FREQUENCE DE MESURE **************************************************/
/******** SUPPRIMER LES DEUX SLASH DE DEBUT DE LIGNE DE LA FREQUENCE CHOISI (//) ******************/
/******** Un seul choix possible ******************************************************************/
diff --git a/setier_datalogger_code/setier_datalogger_code.ino b/setier_datalogger_code/setier_datalogger_code.ino
index 78b9368..99ea0ba 100644
--- a/setier_datalogger_code/setier_datalogger_code.ino
+++ b/setier_datalogger_code/setier_datalogger_code.ino
@@ -343,7 +343,7 @@ void setup()
else
Serial.println(F("Il n'y a pas de capteur_A3 "));
- IEnergie_0 = IEnergie_1 = IEnergie_2 = IEnergie_3 = 999; // initialisation des variables tension des capteurs
+ Wcontent_0 = Wcontent_1 = Wcontent_2 = Wcontent_3 = 999; // initialisation des variables tension des capteurs
@@ -523,9 +523,9 @@ void loop()
if (Capteur_WATER_CONTENT_A3)
Get_VWcontent(&Wcontent_3, 3, Capteur_WATER_CONTENT_A3); // acquisition des données Energie_3 si present
if(Serial) //Affichage des données sur le moniteur serie
- Affiche_Data_VWcontent (&Vbatt,&Wcontent_0,&Wcontent_1,&Wcontent_2,&Wcontent_3);
+ Affiche_Data_Wcontent (&Vbatt,&Wcontent_0,&Wcontent_1,&Wcontent_2,&Wcontent_3);
if (SD_OK == true) //Ecriture des données sur la carte SD
- Write_Data_SD_VWcontent (&Vbatt,&Wcontent_0,&Wcontent_1,&Wcontent_2,&Wcontent_3);
+ Write_Data_SD_Wcontent (&Vbatt,&Wcontent_0,&Wcontent_1,&Wcontent_2,&Wcontent_3);
#endif
diff --git a/setier_datalogger_code/water_content.h b/setier_datalogger_code/water_content.h
index 9d9523f..c9014d7 100644
--- a/setier_datalogger_code/water_content.h
+++ b/setier_datalogger_code/water_content.h
@@ -48,9 +48,9 @@ void Get_VWcontent(float *VofWcontent, byte Wcontent_number, byte Wcontent_type)
delay(20);
}
}
-
sum=sum/20;
- *VofWcontent= (sum/3.333)*pow(2,12-1)
+ *VofWcontent= (sum*3333)/(pow(2,12)-1);
+ *VofWcontent = *VofWcontent * 1.52;
return;
@@ -137,13 +137,13 @@ void Affiche_Data_Wcontent (float *Vofbatt, float *param1,float *param2,float *p
Serial.print (F( " V "));
Serial.print(F(" water content A0 "));
Serial.print(*param1); //Print distance
- Serial.print(F(" A "));
+ Serial.print(F(" mV "));
Serial.print(F(" water content A1 "));
Serial.print(*param2);
- Serial.print(F(" A "));
+ Serial.print(F(" mV "));
Serial.print(F(" water content A2 "));
Serial.print(*param3);
- Serial.print(F(" A "));
+ Serial.print(F(" mV "));
Serial.print(F(" water content A3 "));
Serial.print(*param4);
Serial.print(F(" A "));
--
GitLab