Diff: main.cpp

Revision:

1:d446f0124474

Parent:

0:5755bf39c144

Child:

2:ae058dfdebac

diff -r 5755bf39c144 -r d446f0124474 main.cpp
--- a/main.cpp	Fri May 18 14:04:05 2018 +0000
+++ b/main.cpp	Tue May 22 11:51:24 2018 +0000
@@ -1,7 +1,11 @@
 #include "mbed.h"
 #include "coffre.h"
+#include "music.h"
 
 
+#define O 0.0193
+#define F 0.0175
+
 
 
 // VARIABLE *****************
@@ -16,7 +20,9 @@
 int code[4]={2,1,0,3};
 int etat =0;
 int   N_precedent;
-int N; 
+int N;
+int juste;
+int count;
 Serial pc (USBTX,USBRX);
 
 
@@ -42,7 +48,15 @@
         switch(etat)
         {
             case 0:
-                fermer();
+                servo.pulsewidth(O);
+                if (count>=3)
+                {
+                    
+                    led2.write(1);
+                    music();
+                    wait(3);
+                    count=0;
+                }
                 
                 if ( N_precedent==-3 and N == code[0] ) 
                 {
@@ -92,8 +106,9 @@
                 {
                     etat=4;
                     pc.printf("bravo c bon msieur\n\r");
-                    ouvrir();
-                    wait(5);
+                    juste=1;
+                    servo.pulsewidth(F);
+                    wait(0.5);
                     t2.reset();
                     t2.start();
                 }
@@ -109,7 +124,7 @@
                 
             
           
-                if(t2.read()>5)
+                if(t2.read()>2)
                 {
                     etat=0;
                 }
@@ -117,16 +132,20 @@
             case 5:
                 if (t1.read()>1)
                 {
+                    count++;
+                    pc.printf(" count = %d \n\r",count);
                     pc.printf("c faux msieur\n\r");
                     etat=0;
+                    
                 }
+                
                 break;
             
             }
         switch(etat)
         {
            case 0:
-                led1.write(1);
+                //led1.write(1);
                 led2.write(0);
                 break;
                 
@@ -143,7 +162,7 @@
                 break;
             case 4:
                 led1.write(0);
-                led2.write(1);
+                //led2.write(1);
                 break;
             }