Diff: main.cpp

Revision:

8:b4756746d196

Parent:

7:4894e844911e

diff -r 4894e844911e -r b4756746d196 main.cpp
--- a/main.cpp	Sun Nov 22 18:18:30 2020 +0000
+++ b/main.cpp	Tue Dec 08 16:21:05 2020 +0000
@@ -3,14 +3,18 @@
 #include "DS1820.h"
 #include "HX711.h"
 
-#define   DHT1_DATA_PIN  D4
-#define   DHT2_DATA_PIN  D5
+#define   DHT1_DATA_PIN  D6
+#define   DHT2_DATA_PIN  D9
 
 
-DS1820      ds1820_1(D3);  // substitute D8 with the actual pin name connected to the DS1820 sensor
-DS1820      ds1820_2(D6);
+DS1820      ds1820_1(D2);  // substitute D8 with the actual pin name connected to the DS1820 sensor
+DS1820      ds1820_2(D3);
+DS1820      ds1820_3(D4);
+DS1820      ds1820_4(D5);
 float       temp1 = 0;
 float       temp2 = 0;
+float       temp3 = 0;
+float       temp4 = 0;
 int         result = 0;
 
 DHT sensor1(DHT1_DATA_PIN, DHT22);                    //DHT(PinName pin, eType DHTtype)
@@ -24,8 +28,8 @@
 {
     int error1 = 0;
     int error2 = 0;
-    float h_int = 0.0f, c_int = 0.0f,c_moyenne_int = 0.0f,h_ext = 0.0f,c_ext =0.0f;
-    float valeur = 0.3f,balance=0.2f;
+    float h_int = 0.0f, c_int = 0.0f,h_ext = 0.0f,c_ext =0.0f;
+    float balance=0.2f;
     pc.baud(9600);
     device.baud(9600);
     
@@ -42,20 +46,34 @@
     else{
         pc.printf("DS1820 sensor found!\r\n");
     }
-    
-    float valeurTare = loadcell.getValue();
+    if (!ds1820_3.begin()){
+        pc.printf("No DS1820 sensor found!\r\n");
+    }
+    else{
+        pc.printf("DS1820 sensor found!\r\n");
+    }
+    if (!ds1820_4.begin()){
+        pc.printf("No DS1820 sensor found!\r\n");
+    }
+    else{
+        pc.printf("DS1820 sensor found!\r\n");
+    }
     
     while(1) {
-        float valeur = loadcell.getValue();
-        float balance = ((double)valeur - (double)valeurTare)/21500;
+        float balance = ((loadcell.getValue() - 8469461)/21600.9)-0.5;
         pc.printf("Weight = %.2f\r\n", balance);
         
         ds1820_1.startConversion();   // start temperature conversion from analog to digital
         ds1820_2.startConversion();   // start temperature conversion from analog to digital
+        ds1820_3.startConversion();   // start temperature conversion from analog to digital
+        ds1820_4.startConversion();   // start temperature conversion from analog to digital
+
         ThisThread::sleep_for(1000);// let DS1820 complete the temperature conversion
         
         result = ds1820_1.read(temp1); // read temperature from DS1820 and perform cyclic redundancy check (CRC)
         result = ds1820_2.read(temp2);
+        result = ds1820_3.read(temp3);
+        result = ds1820_4.read(temp4);
         
         error1 = sensor1.readData();                  //read error value
         error2 = sensor2.readData();                  //read error value
@@ -66,18 +84,17 @@
         c_ext   = sensor2.ReadTemperature(CELCIUS);
         h_ext   = sensor2.ReadHumidity();
         
-        c_moyenne_int =(c_int + temp1 + temp2)/3;
         
-        pc.printf("temperature_int = %4.2f\r\n", c_moyenne_int);  // on affiche les valeurs sur teraTerm pour debug
-        pc.printf("Humidite_int = %4.2f\r\n", h_int);
-        pc.printf("temperature_ext = %4.2f\r\n", c_ext);  // on affiche les valeurs sur teraTerm pour debug
-        pc.printf("Humidite_ext = %4.2f\r\n", h_ext);
+        /*pc.printf("DHT1_temp = %4.2f\r\n", c_int);  // on affiche les valeurs sur teraTerm pour debug
+        pc.printf("DHT1_h = %4.2f\r\n", h_int);
+        pc.printf("DHT2_temp = %4.2f\r\n", c_ext);  // on affiche les valeurs sur teraTerm pour debug
+        pc.printf("DHT2_h = %4.2f\r\n", h_ext);
         pc.printf("ds1 = %4.2f\r\n", temp1);  // on affiche les valeurs sur teraTerm pour debug
         pc.printf("ds2 = %4.2f\r\n", temp2);
-        
-        
-        
-        device.printf("AT$SF=%02X%02X%02X%02X%02X\r\n", (char) c_moyenne_int,(char) h_int, (char) c_ext, (char) h_ext,(char) balance);  // on envoie les données sur l'antenne
-        wait(10.0f);
+        pc.printf("ds3 = %4.2f\r\n", temp3);  // on affiche les valeurs sur teraTerm pour debug
+        pc.printf("ds4 = %4.2f\r\n", temp4);
+        */
+        device.printf("AT$SF=%02X%02X%02X%02X%02X\r\n",(char) c_ext,(char) h_ext, (char) c_int, (char) h_int,(char) temp1,(char) temp2,(char) temp3,(char) temp4,(char) balance);
+        wait(2.0f);
     }
 }