Revision 1:0cd75656b137, committed 2014-03-10

Comitter:

tim008

Date:

Mon Mar 10 18:15:29 2014 +0000

Parent:

0:99863e846ec0

Commit message:

LV2 - PAI - Grupa4 - Tim008

Changed in this revision

diff -r 99863e846ec0 -r 0cd75656b137 main.cpp
--- a/main.cpp	Mon Mar 10 17:45:40 2014 +0000
+++ b/main.cpp	Mon Mar 10 18:15:29 2014 +0000
@@ -1,32 +1,53 @@
 #include "mbed.h"
 
-DigitalIn taster(dp1); 
+DigitalIn taster1(dp1); 
+DigitalIn taster2(dp2);
 DigitalOut enable(dp14);
 BusOut myled(dp23, dp24, dp25, dp26, dp27, dp5, dp6, dp28);
 
 int main() {
     
+    bool t1_pritisnut = false;
+    bool t2_pritisnut = false;
+    
     int i = 0;
     enable = 0;
     myled = 0;
+    int brojac;
     
     while(1) {
         
-        if(taster == 0)
+        if(taster1 == 0) t1_pritisnut = false;
+        if(taster2 == 0) t2_pritisnut = false;
+        
+        if(taster1 == 1 && taster2 == 1) {}
+        else if(taster1 == 1 && t1_pritisnut == false)
         {
+            for(brojac = 0;; brojac++)
+            if(taster1 == 0) break;
+            
+            if(brojac > 1000)
+            {
             if(i == 255) i = 0;
             myled = i;
-            wait(1);
             i++;
+            t1_pritisnut = true;
+            }
             
         }
-        else
+        else if(taster2 == 1 && t2_pritisnut == false)
         {
+            for(brojac = 0;; brojac++)
+            if(taster2 == 0) break;
+            
+            if(brojac > 1000)
+            {
             if(i == 0) i =  255;
             myled = i;
-            wait(1);
             i--;
-
+            t2_pritisnut = true;
+            }
         }
+        
     }
 }