Diff: main.cpp

Revision:

3:d2c57ab99c8e

Parent:

2:7e718a1be318

Child:

4:06944df56a2d

--- a/main.cpp	Fri Jan 27 22:47:35 2017 +0000
+++ b/main.cpp	Mon Feb 06 08:25:12 2017 +0000
@@ -21,6 +21,8 @@
 int H, T, s;
 float Boussole;
 int Head;
+char buff[55];    
+int RFIDA;
 
 int DHT_Start_Temper()
 {
@@ -75,34 +77,28 @@
 
 
 
-
-int RFID_Start(int t0,int t1,int t2,int t3,int t4)
+void RFID_Start()
 {
      int i;
      int tag[15];     
-     char buff[55];
+     //char buff[55];
 
      for(i=0;i<5;i++)
              tag[i]=rfid.getc();
 
      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");
+    serial.printf("\r\n Bracelet Orientation\r\n****************\r\n");
     
     char *p1lat, *p2lat, *p3lat;
     int intp1lat, intp2lat, intp3lat;
@@ -117,25 +113,44 @@
         /*x=Accelerometre_Start_x();
         y=Accelerometre_Start_y();
         z=Accelerometre_Start_z();*/
-        getGPSstring(1);
-        RFID_Start(t0,t1,t2,t3,t4);
+        //pc.printf("\rgga:%s",gga2);
+        parseGGA();
+        getGPSstring();        
+
+        
+        RFID_Start();
+        RFIDA=atoi(buff);
+        //serial.printf("\r\n%d\r\n",RFIDA);  
+        RFIDA=RFIDA/10000000;
+        //serial.printf("\r\n%d\r\n",RFIDA);        
         //---printf actoboard
-        serial.printf("\r\n Test Actooard\r\n****************\r\n");
-        serial.printf("%s\r\n",lati);
-        serial.printf("%s\r\n",longi);
+        serial.printf("\r\n Actooard \r\n********************************************************************\r\n");
+        serial.printf("latitude : %s\r\n",lati);
+        serial.printf("Longitutde : %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);
+    //    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);
+    //concatcénation lati
+        int latitude_complet_int;
+        char latitude_complet[6];
+        strcat(latitude_complet,p1lat);
+        strcat(latitude_complet,p2lat);
+        strcat(latitude_complet,p3lat);
+        latitude_complet_int=atoi(latitude_complet);
+        //serial.printf("\r\n int:%d \r\n",latitude_complet_int);        
+        
+        
         
     //traitement longitude
         p1long = strtok(longi,"'");
@@ -145,11 +160,20 @@
         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("\r%s\r\n",p1long);
+      //  serial.printf("\r%s\r\n",p2long);
+      //  serial.printf("\r%s\r\n",p3long);
+      
+     //concatcénation longitude
+        int longitude_complet_int;
+        char longitude_complet[6];
+        strcat(longitude_complet,p1long);
+        strcat(longitude_complet,p2long);
+        strcat(longitude_complet,p3long);
+        longitude_complet_int=atoi(longitude_complet);
+       // serial.printf("\r\n int:%d \r\n",longitude_complet_int);    
         
-        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%x%x%x%x0%x%x%x%x%x\r\n",T,H,intp1lat,intp2lat,intp3lat,intp1long,intp2long,intp3long,RFIDA,Head);//Head
         //serial.printf("AT$SS=%x\r\n",Head);