Diff: main.cpp

Revision:

2:ae058dfdebac

Parent:

1:d446f0124474

Child:

3:98f5de1dd010

Child:

4:23e955d622f9

diff -r d446f0124474 -r ae058dfdebac main.cpp
--- a/main.cpp	Tue May 22 11:51:24 2018 +0000
+++ b/main.cpp	Fri Jun 01 11:36:44 2018 +0000
@@ -4,15 +4,15 @@
 
 
 #define O 0.0193
-#define F 0.0175
+#define F 0.0179
 
 
 
 // VARIABLE *****************
 
-extern PwmOut servo;
+
 extern BusIn digicode;
-DigitalOut led1(p17);
+DigitalOut led1(p20);
 DigitalOut led2(p18);
 Timer t1;
 Timer t2;
@@ -33,12 +33,12 @@
 
 int main()
 {
-    servo.period(0.02);
+    
     while(1) 
     {
         N_precedent=N;
         t3.start();
-        if(t3.read()>0.1)
+        if(t3.read()>0.01)
         {
             N=lireval();
             t3.reset();
@@ -48,13 +48,12 @@
         switch(etat)
         {
             case 0:
-                servo.pulsewidth(O);
                 if (count>=3)
                 {
                     
                     led2.write(1);
                     music();
-                    wait(3);
+                    //wait(3);
                     count=0;
                 }
                 
@@ -70,10 +69,11 @@
                     t1.start();
                     
                 }
+                pc.printf("etat =0\n\r");
                 break;
             case 1 : 
                 
-                
+                pc.printf("etat =1\n\r");
                 if ( N_precedent==-3 and N == code[1])
                 {
                     etat=2;
@@ -88,7 +88,7 @@
                 }
                 break;
             case 2 :  
-                
+                pc.printf("etat =2\n\r");
                 if( N_precedent==-3 and N == code[2])
                 {
                     etat=3;
@@ -102,13 +102,14 @@
                 }
                 break;
             case 3 : 
+                pc.printf("etat =3\n\r");
                 if ( N_precedent==-3 and N == code[3])
                 {
                     etat=4;
                     pc.printf("bravo c bon msieur\n\r");
                     juste=1;
-                    servo.pulsewidth(F);
-                    wait(0.5);
+                    
+                    //wait(0.5);
                     t2.reset();
                     t2.start();
                 }
@@ -123,7 +124,7 @@
             case 4:
                 
             
-          
+                pc.printf("etat =4\n\r");
                 if(t2.read()>2)
                 {
                     etat=0;
@@ -138,6 +139,7 @@
                     etat=0;
                     
                 }
+                pc.printf("etat =5\n\r");
                 
                 break;
             
@@ -163,6 +165,7 @@
             case 4:
                 led1.write(0);
                 //led2.write(1);
+                servo();
                 break;
             }