Diff: main.cpp

Revision:

3:7d80fb2473cc

Parent:

2:7897e64de2f3

Child:

4:88f5dd4e476d

diff -r 7897e64de2f3 -r 7d80fb2473cc main.cpp
--- a/main.cpp	Sun Aug 05 19:04:45 2018 +0000
+++ b/main.cpp	Sun Aug 05 19:39:05 2018 +0000
@@ -29,7 +29,7 @@
 {
     if(pritisnuto==true && gotovo==true) {
         wait(2);
-        semafor1 = 0b001100;
+        /*semafor1 = 0b001100;
         semafor2 = 0b10010;         //Semafor 2 pali se crveno svijetlo za pješake
         wait(5);
         semafor1 = 0b010100;        //Semafor 1 pali se žuto svjetlo za aute
@@ -40,7 +40,7 @@
         wait(1);
         semafor1 = 0b100101;        //Semafor 1 pali se strelica za skretanje u lijevo
         semafor2 = 0b10010;
-        wait(5);
+        wait(5);*/
         semafor1 = 0b100100;        //Semafor 1 gasi se strelica za skretanje u lijevo
         semafor2 = 0b10010;
         wait(2);
@@ -73,7 +73,7 @@
     echo.rise(&startTimer);
     echo.fall(&stopTimer);
 
-    pj.attach(&pjesaci,1);
+    pj.attach(&pjesaci,0.5);
 
     while(1) {
         led5=1;
@@ -81,7 +81,18 @@
         semafor1 = 0b001100;        //Semafor 1 upaljeno zeleno za aute, a crveno za pješake
         semafor2 = 0b10001;         //Semafor 2 upaljeno crveno za aute, a zeleno za pješake
         wait (5);                  // zeleno na glavnoj cesti
-        
+        semafor1 = 0b001100;
+        semafor2 = 0b10010;         //Semafor 2 pali se crveno svijetlo za pješake
+        wait(5);
+        semafor1 = 0b010100;        //Semafor 1 pali se žuto svjetlo za aute
+        semafor2 = 0b10010;
+        wait(5);
+        semafor1 = 0b100100;        //Semafor 1 pali se crveno svjetlo za aute
+        semafor2 = 0b10010;
+        wait(1);
+        semafor1 = 0b100101;        //Semafor 1 pali se strelica za skretanje u lijevo
+        semafor2 = 0b10010;
+        wait(2);
         trigger = 1;
         wait_us(10);
         trigger = 0;
@@ -91,8 +102,13 @@
         t.reset();
         if (distance >= 10 && distance <= 20) {
             pritisnuto=true;
+            gotovo=true;
         }
-        gotovo=true;
-
+        if(pritisnuto==true){
+            gotovo=true;}
+        semafor1 = 0b100100;
+        wait(2);
+        semafor1 = 0b110100;        
+        wait(5);    
     }
 }
\ No newline at end of file