Diff: main.cpp

Revision:

8:97c8bf056a17

Parent:

7:4f9e72e260d8

Child:

9:e79b746421b1

--- a/main.cpp	Mon Jan 08 13:14:52 2018 +0000
+++ b/main.cpp	Mon Jan 15 10:12:20 2018 +0000
@@ -10,12 +10,12 @@
 #define THERMOMETER DS18B20
 
 Serial serie(SERIAL_TX, SERIAL_RX);
-TSL2561 LUM(PA_10, PA_9); // Luminosité (I2C:SDA,SCL)
-DHT22 Tem_Hum_A(A2); // Température & Humidité air
-AnalogIn Humidite(A3);
-SSD1306 ecran(D3 /* cs */, A0/* reset */, A7 /* dc */, A1 /* clock */, A6 /* data */);
+TSL2561 LUM(PA_10, PA_9);
+DHT22 Tem_Hum_A(PA_11); // Température & Humidité air
+AnalogIn Humidite(PA_0);
+SSD1306 ecran(D3 /* cs */, D6/* reset */, A5 /* dc */, A4 /* clock */, D2 /* data */);
 //Serial PC(PA_2, PA_3);
-Serial sigfox(PB_6, PB_7);
+Serial sigfox(PA_2, PA_3);
 DigitalOut myled(LED1);
 
 int i, Hum_sol, Temp_sol, Lum, Temp_air, Hum_air;
@@ -28,30 +28,31 @@
     ecran.set_contrast(255);
     ecran.set_font(bold_font, 8);
     
-    //serie.printf("New Program \r\n");
+    serie.printf("New Program \r\n");
      // device( crcOn, useAddress, parasitic, mbed pin )
-    THERMOMETER device(true, true, false, A4);
+    THERMOMETER device(true, true, false, PA_8);
     
-   // while (!device.initialize());    // keep calling until it works
+    while (!device.initialize());    // keep calling until it works
     
     while (true)
     {   
         myled = !myled;
         Tem_Hum_A.sample();
         device.readTemperature(); 
-        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();
+        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();
+        //TSL2561 LUM(PB_7, PB_6); // Luminosité (I2C:SDA,SCL)
+        Lum = (int) LUM.lux();
         printf("Temperature air: %d\n\r", Tem_Hum_A.getTemperature()/10);
         printf("Hum air: %d\n\r", Tem_Hum_A.getHumidity()/10);
         serie.printf("\rLum: %f \r\n", LUM.lux());
         serie.printf("Temperature sol: %d \n\r",Temp_sol);
         serie.printf("Hum sol: %f \n\r",Humidite.read()*100);
         printf("------------------------------------------------------------\n\r");
-        sigfox.printf("AT$SF= %02x %02x %02x %02x %02x \r\n", Temp_sol, Temp_air, Lum, Hum_sol, Hum_air);
- 
+        sigfox.printf("AT$SS=%02x %02x %02x %02x %02x \r\n", Temp_sol, Temp_air, Lum, Hum_sol, Hum_air);
+        
         //OLED
         ecran.set_font(bold_font, 8);
         ecran.printf("Valeurs");
@@ -66,11 +67,14 @@
         ecran.printf("\r\n");
         ecran.printf("Temp sol = %d",Temp_sol );
         ecran.printf("\r\n");
-        ecran.printf("Hum sol = %f", Hum_sol);
+        ecran.printf("Hum sol = %f", Humidite.read()*100);
         ecran.printf("\r\n");
         ecran.update();
         ecran.clear();
         
-        wait(2);
+        
+        
+        wait(10);
     }
-}
+    return EXIT_SUCCESS;
+}
\ No newline at end of file