Revision 18:5c26a8f38248, committed 2018-10-23

Comitter:

jpbaillargeon

Date:

Tue Oct 23 14:40:36 2018 +0000

Parent:

17:53d4674cb37f

Child:

19:ae8e7c9292d6

Commit message:

99% fonctionnel

Changed in this revision

--- a/main.cpp	Tue Oct 23 14:24:42 2018 +0000
+++ b/main.cpp	Tue Oct 23 14:40:36 2018 +0000
@@ -184,6 +184,9 @@
     bool end[8];
     int longInt;
     bool bin2[8];
+    int temps =0;
+    int tMax;
+    int tMin;
     while(1){
         osEvent evt = mail_box.get();
         if (evt.status == osEventMail) {
@@ -205,32 +208,34 @@
             
             else if(etat==1) {
                 if(f->front==1){
-                    if((t-prev_time)<=35 && (t-prev_time)>=20){
+                    //if((t-prev_time)<=35 && (t-prev_time)>=20){
                         printf("%d Time : %d , compteur: %d\r\n", f->front, t, compteur);
                         preambule[compteur] = f->front;
                         prev_time = t; 
                         compteur++;
                         etat = 2;
                         printf("-----ETAT 2-----\r\n");
-                    }
+                    /*}
                     else{
                         etat=0;
                         printf("------FAIL------\r\n");    
-                    }
+                    }*/
                 }
             }
             
             else if(etat==2) {
-                if((t-prev_time)<=35 && (t-prev_time)>=20){
+                //if((t-prev_time)<=35 && (t-prev_time)>=20){
                     printf("%d Time : %d , compteur: %d\r\n", f->front, t, compteur);
                     preambule[compteur] = f->front;
+                    temps += t-prev_time;
                     prev_time = t; 
                     compteur++;
-                }
+                //}
             }
             
             else if(etat ==3) {
-                if((t-prev_time)<=35 && (t-prev_time)>=20){
+                //if((t-prev_time)<=35 && (t-prev_time)>=20){
+                if((t-prev_time)==temps){
                         printf("%d Time : %d , compteur: %d\r\n", f->front, t, compteur);
                         start[compteur-8] = f->front;
                         prev_time = t; 
@@ -239,7 +244,8 @@
             }
             
             else if(etat ==4) {
-                if((t-prev_time)<=35 && (t-prev_time)>=20){
+                //if((t-prev_time)<=35 && (t-prev_time)>=20){
+                if((t-prev_time)==temps){
                         printf("%d Time : %d , compteur: %d\r\n", f->front, t, compteur);
                         flag[compteur-16] = f->front;
                         prev_time = t; 
@@ -248,7 +254,8 @@
             }
             
             else if(etat ==5) {
-                if((t-prev_time)<=35 && (t-prev_time)>=20){
+                //if((t-prev_time)<=35 && (t-prev_time)>=20){
+                if((t-prev_time)==temps){
                         printf("%d Time : %d , compteur: %d\r\n", f->front, t, compteur);
                         longueur[compteur-24] = f->front;
                         prev_time = t; 
@@ -256,7 +263,8 @@
                 }
             }
             else if(etat ==6) {
-                if((t-prev_time)<=35 && (t-prev_time)>=20){
+                //if((t-prev_time)<=35 && (t-prev_time)>=20){
+                if((t-prev_time)==temps){
                         printf("%d Time : %d , compteur: %d\r\n", f->front, t, compteur);
                         message[compteur-32]= f->front;
                         prev_time = t; 
@@ -264,7 +272,8 @@
                 }
             } 
             else if(etat ==7) {
-                if((t-prev_time)<=35 && (t-prev_time)>=20){
+                //if((t-prev_time)<=35 && (t-prev_time)>=20){
+                if((t-prev_time)==temps){
                         printf("%d Time : %d , compteur: %d\r\n", f->front, t, compteur);
                         checksum[compteur-32-longInt]= f->front;
                         prev_time = t; 
@@ -272,7 +281,8 @@
                 }
             } 
             else if(etat ==8) {
-                if((t-prev_time)<=35 && (t-prev_time)>=20){
+                //if((t-prev_time)<=35 && (t-prev_time)>=20){
+                if((t-prev_time)==temps){
                         printf("%d Time : %d , compteur: %d\r\n", f->front, t, compteur);
                         end[compteur-40-longInt]= f->front;
                         prev_time = t; 
@@ -295,7 +305,10 @@
             printf("\r\n");
             if(etat != 0)
             {
-                printf("-----ETAT 3-----\r\n");
+                temps /=6;
+                tMin = 0.90*temps;
+                tMax = 1.10*temps;
+                printf("-----ETAT 3 %d-----\r\n", temps);
             }
         }
         else if((compteur ==16) && (etat == 3)) {