Diff: main.cpp

Revision:

3:6af60ea9a240

Parent:

2:17db0f2dea0b

Child:

4:54e0220b3d83

--- a/main.cpp	Tue Oct 01 15:02:26 2019 +0000
+++ b/main.cpp	Tue Oct 15 12:27:43 2019 +0000
@@ -3,12 +3,13 @@
 #include"DHT.h"
 #include "TCS34725.h"
 #include "Sigfox.h"
+#include "WakeUp.h"
 #include <math.h>
 
 #define GROVE_MOIST_MIN     0
 #define GROVE_MOIST_MAX     0.55
-#define LOG_RANGE           5
-#define RAW_RANGE           1024
+#define LOG_RANGE           5.0f
+#define RAW_RANGE           1024.0f
 
 
 float Temp_Sol;
@@ -27,18 +28,19 @@
 AnalogIn humigrove(A1);
 AnalogIn lumiere(A5);
 DigitalOut ledTest(LED1);
+DigitalOut mos(D9);
 
 void ReadTempHumiAir(){
   int err=1;
   while(err!=0){
     err=dht22.readData();
-    ledTest = 1;
+    //ledTest = 1;
     wait(1);
    }
   if(err==0){
      Temp_Air= dht22.ReadTemperature(CELCIUS);
      Humi_Air=dht22.ReadHumidity();
-     ledTest = 0;
+     //ledTest = 0;
      }
 
  }
@@ -67,16 +69,27 @@
 }
 
 void ReadLumi(){
-    int raw=lumiere.read();
+    float raw=lumiere.read();
     float loglux=raw*LOG_RANGE/RAW_RANGE;
-    Lumiere=pow(10,loglux);
+    Lumiere=(float)(pow(10.0f,loglux)*255.0f)/10000.0f;
+    //Lumiere=loglux;
 }
 
 int main(){
     //Serial at(D1,D0);
     Sigfox sigfox(D1,D0);
+    /*ledTest = 1;
+    wait(20);
+    ledTest = 0;
+    wait(5);*/
+    WakeUp::calibrate();
+    //wait(30);
     
     while(1){
+        WakeUp::set(120);
+        mos = 0;
+        sigfox.wake();
+        wait(2);
         ReadTempHumiAir();
         ReadTempSol();
         ReadRGBC();
@@ -87,8 +100,10 @@
         printf("R:%d, G:%d, B:%d\n\r", r, g, b);  
         sigfox.send((s16)(Temp_Air*10),(u16)(Humi_Air*10),(s16)(Temp_Sol*10),(u16)(Humi_Sol*10),
             (u8)Lumiere,(u8)r,(u8)g,(u8)b);
-        wait(120);
-        /*printf("R:%d, G:%d, B:%d, temp: %f, hum: %f\r", r, g, b, Temp_Air, Humi_Air);
-        wait(0.5);*/
+        wait(10);
+        mos = 1;
+        //wait(10);
+        sigfox.sleep();
+        deepsleep();
     }
 }