Revision 4:45d466252fb6, committed 2011-05-10

Comitter:

mxjac

Date:

Tue May 10 08:46:15 2011 +0000

Parent:

3:5271cc1a527b

Commit message:

Changed in this revision

diff -r 5271cc1a527b -r 45d466252fb6 Alex.cpp
--- a/Alex.cpp	Wed Dec 15 16:08:37 2010 +0000
+++ b/Alex.cpp	Tue May 10 08:46:15 2011 +0000
@@ -51,32 +51,33 @@
         wait(0.1);
     }
 }
-void Alex::Simulate_Talking(int length)
+/*
+//void Alex::Simulate_Talking(int length)
 {
-     for(int i=0; i<length; i++)
+     //for(int i=0; i<length; i++)
     {
-        Move_mouth(100);
-        wait(0.01);
+    //    Move_mouth(100);
+  //      wait(0.01);
     }
 }
 
-void Alex::Presence_too_far()
+//void Alex::Presence_too_far()
 {
-        pc.printf("You are too far, I can't see you !");
-        Simulate_Talking(4);
-        wait(3);
-        pc.printf("Is there somebody ?");
-        Simulate_Talking(4);
-        wait(3);
+      //  pc.printf("You are too far, I can't see you !");
+    //    Simulate_Talking(4);
+        //wait(3);
+      //  pc.printf("Is there somebody ?");
+    //    Simulate_Talking(4);
+  //      wait(3);
 }
-void Alex::displaydistance()
+//void Alex::displaydistance()
 {
-    pc.printf("Distance : %4i\r\n", S.read());
+  //  pc.printf("Distance : %4i\r\n", S.read());
 }
 
-void Alex::Presence_too_close()
+//void Alex::Presence_too_close()
 {
-        pc.printf("You are too close, please move back");
-        Simulate_Talking(4);
-        wait(3);
-}
\ No newline at end of file
+        //pc.printf("You are too close, please move back");
+        //Simulate_Talking(4);
+       // wait(3);
+}*/
\ No newline at end of file

diff -r 5271cc1a527b -r 45d466252fb6 Alex.h
--- a/Alex.h	Wed Dec 15 16:08:37 2010 +0000
+++ b/Alex.h	Tue May 10 08:46:15 2011 +0000
@@ -13,9 +13,9 @@
      void Move_mouth(int);
      void Move_leaning(int);
      void Move_rotation(int);
-     void Simulate_Talking(int);
-     void Presence_too_far();
-     void displaydistance();
+//     void Simulate_Talking(int);
+  //   void Presence_too_far();
+    // void displaydistance();
     private:
      SRF05 S;
      Servo E, M, L, R;