Diff: main.cpp

Revision:

5:ae57f8977663

Parent:

4:784c4b53a3d4

Child:

6:f552ca0f5165

--- a/main.cpp	Mon Oct 02 13:20:42 2017 +0000
+++ b/main.cpp	Mon Nov 20 13:12:03 2017 +0000
@@ -2,51 +2,50 @@
 #include "DS18B20.h"
 #include "OneWireDefs.h"
 #include "TSL2561.h"
-//------------------------------------
-// Hyperterminal configuration
-// 9600 bauds, 8-bit data, no parity
-//------------------------------------
+#include "DHT22.h"
 
 
-//#define THERMOMETER DS18S20
 #define THERMOMETER DS18B20
 
 Serial serie(SERIAL_TX, SERIAL_RX);
 TSL2561 LUM(PB_7, PB_6); // Luminosité (I2C:SDA,SCL)
+DHT22 Tem_Hum_A(PA_11); // Température & Humidité air
 AnalogIn Humidite(PA_0);
 Serial PC(PA_2, PA_3);
+Serial sigfox(PA_9, PA_10);
 DigitalOut myled(LED1);
 
+int i, Hum_sol, Temp_sol, Lum, Temp_air, Hum_air;
+
 int main()
 {   
-    
-    int i = 1;
-    serie.printf("Hello World !\n");
+
+
+    serie.printf("New Program \r\n");
      // device( crcOn, useAddress, parasitic, mbed pin )
-    THERMOMETER device(true, true, false, D3);
+    THERMOMETER device(true, true, false, PB_0);
     
     while (!device.initialize());    // keep calling until it works
     
     while (true)
     {   
-        wait(1);
-        serie.printf("This program runs since %d seconds.\n", i++);
         myled = !myled;
-        printf("Lum: %f \r\n", LUM.lux());
-        printf("Hum: %f \n\r",Humidite.read());
-        // changing the resolutions only affects the DS18B20. The DS18S20 is fixed.
-        device.setResolution(nineBit);
+        Tem_Hum_A.sample();
         device.readTemperature(); 
-        wait(2);
-        device.setResolution(tenBit);
-        device.readTemperature(); 
-        wait(2);
-        device.setResolution(elevenBit);
-        device.readTemperature(); 
-        wait(2);
-        device.setResolution(twelveBit);
-        device.readTemperature(); 
-        wait(2);
+        Temp_air = (int)(Tem_Hum_A.getTemperature()/10);
+        Hum_air = (int) (Tem_Hum_A.getHumidity()/10);
+        Hum_sol = (int)(Humidite.read()) * 100;
+        Temp_sol = (int)device.readTemperature();
+        Lum = (int) LUM.lux();
+        printf("Air Temperature : %d\n\r", Tem_Hum_A.getTemperature()/10);
+        printf("Air Humidity is %d\n\r", Tem_Hum_A.getHumidity()/10);
+        serie.printf("\rLum: %f \r\n", LUM.lux());
+        serie.printf("Hum: %f \n\r",Humidite.read()*100);
+        serie.printf("Temperature du sol: %d \n\r",Temp_sol);
+        serie.printf("Lum: %d \r\n", Lum);
+        printf("---------------------------------------------\n\r");
+        sigfox.printf("AT$SS=%02x %02x %02x %02x %02x \r\n", Temp_sol, Temp_air, Lum, Hum_sol, Hum_air);
+        wait(30);
     }
     return EXIT_SUCCESS;
 }