Diff: main.cpp

Revision:

2:7e718a1be318

Parent:

1:352fcb35e812

Child:

3:d2c57ab99c8e

--- a/main.cpp	Fri Jan 20 22:51:30 2017 +0000
+++ b/main.cpp	Fri Jan 27 22:47:35 2017 +0000
@@ -18,43 +18,68 @@
 
 float x=0,y=0,z=0; // variables for x,y,z axes
 
+int H, T, s;
+float Boussole;
+int Head;
 
-void DHT_Start()
+int DHT_Start_Temper()
 {
-    int s,T,H;
-    s = sensor.readData();
-    T=sensor.readTemperature();
-    H=sensor.readHumidity();
+    s = sensor.readData(); 
+    T=sensor.readTemperature();/*
         if (s != DHT11::OK) {
             serial.printf("Error!\r\n");
         }
         else {
-            serial.printf("AT$SS=%x%x\r\n", T,H);
-        }
+           serial.printf("AT$SS=%x%x\r\n", T,H);
+        }*/
+        return T;
+}
+
+int DHT_Start_Humid()
+{
+    s = sensor.readData(); 
+    H=sensor.readHumidity();
+    return H;
 }
 
 
-void Boussole_Start()
+int Boussole_Start()
 {
     bouss.init();
-    double test=5;
-    test= bouss.getHeadingXYDeg(); 
-    serial.printf("\r\n-----Boussole-----\r\n%2f\r\n-----Boussole-----\r\n",test);
+    Boussole= bouss.getHeadingXYDeg(); 
+    Head=((int)Boussole)/2;
+    serial.printf("\r\n-----Boussole-----\r\n%2f\r\n-----Boussole-----\r\n",Boussole);
+   return Head;
+}
+
+int Accelerometre_Start_x()
+{
+    x = inputx;
+    serial.printf("\r\n-----Accelerometre-----\r\nX:%f,Y: %f,Z: %f \r\n-----Accelerometre-----\r\n",x,y,z);
+    return x;
 }
 
-void Accelerometre_Start()
+int Accelerometre_Start_y()
 {
-    x = inputx;
     y = inputy;
+    serial.printf("\r\n-----Accelerometre-----\r\nX:%f,Y: %f,Z: %f \r\n-----Accelerometre-----\r\n",x,y,z);
+    return y;
+}
+
+int Accelerometre_Start_z()
+{
     z = inputz;
     serial.printf("\r\n-----Accelerometre-----\r\nX:%f,Y: %f,Z: %f \r\n-----Accelerometre-----\r\n",x,y,z);
+    return z;
 }
 
 
-void RFID_Start()
+
+
+int RFID_Start(int t0,int t1,int t2,int t3,int t4)
 {
      int i;
-     int tag[15];
+     int tag[15];     
      char buff[55];
 
      for(i=0;i<5;i++)
@@ -62,25 +87,72 @@
 
      sprintf(buff,"%d%d%d%d%d",tag[0],tag[1],tag[2],tag[3],tag[4]);
      serial.printf("\r\n-----Tag RFID-----\r\n%s \r\n-----Tag RFID-----\r\n",buff);
+     t0=tag[0];
+     t1=tag[1];
+     t2=tag[2];
+     t3=tag[3];
+     t4=tag[4];
 }
 //---------------
 
 int main()
 {
     //serial config
+    int t0,t1,t2,t3,t4;
     serial.baud(9600);
     serial.format(8,SerialBase::None,1);
     
     serial.printf("\r\n Test program\r\n****************\r\n");
-    //char tmp[30];//="AT$SS=00 12 FF 42 \r\n";//$SS 
+    
+    char *p1lat, *p2lat, *p3lat;
+    int intp1lat, intp2lat, intp3lat;
+    char *p1long, *p2long, *p3long;
+    int intp1long, intp2long, intp3long;
 
 
     while(1){
-        DHT_Start();
-        Boussole_Start();
-        Accelerometre_Start();
+        T=DHT_Start_Temper();
+        H=DHT_Start_Humid();
+        Head=Boussole_Start();
+        /*x=Accelerometre_Start_x();
+        y=Accelerometre_Start_y();
+        z=Accelerometre_Start_z();*/
         getGPSstring(1);
-        RFID_Start();
+        RFID_Start(t0,t1,t2,t3,t4);
+        //---printf actoboard
+        serial.printf("\r\n Test Actooard\r\n****************\r\n");
+        serial.printf("%s\r\n",lati);
+        serial.printf("%s\r\n",longi);
+        
+        
+    //traitement Latitude
+        p1lat = strtok(lati,"'");
+        p2lat= strtok(NULL, "'");//the second
+        p3lat= strtok(NULL, ".");//the third
+        serial.printf("\r%s\r\n",p1lat);
+        serial.printf("\r%s\r\n",p2lat);
+        serial.printf("\r%s\r\n",p3lat);       //serial.printf("%s\r\n",longi);
+    //conversion latitude
+        intp1lat=atoi(p1lat);
+        intp2lat=atoi(p2lat);
+        intp3lat=atoi(p3lat);
+        
+    //traitement longitude
+        p1long = strtok(longi,"'");
+        p2long= strtok(NULL, "'");//the second
+        p3long= strtok(NULL, ".");//the third
+        intp1long=atoi(p1long);
+        intp2long=atoi(p2long);
+        intp3long=atoi(p3long);
+        
+        serial.printf("\r%s\r\n",p1long);
+        serial.printf("\r%s\r\n",p2long);
+        serial.printf("\r%s\r\n",p3long);
+        
+        serial.printf("AT$SS=%x%x%x%x%x0%x%x%x\r\n",T,H,intp1lat,intp2lat,intp3lat,intp1long,intp2long,intp3long);//Head
+        //serial.printf("AT$SS=%x\r\n",Head);
+
+            
     wait(5);
     }
 }