Diff: main.cpp

Revision:

49:f607520ff745

Parent:

48:a0cc7ac1856f

diff -r a0cc7ac1856f -r f607520ff745 main.cpp
--- a/main.cpp	Thu Oct 22 11:41:31 2015 +0000
+++ b/main.cpp	Thu Oct 22 14:45:08 2015 +0000
@@ -1,17 +1,6 @@
 #include "mbed.h"
 
-DigitalOut ledgreen1(D0);
-DigitalOut ledgreen2(D1);
-DigitalOut ledyellow1(D2);
-DigitalOut ledyellow2(D3);
-DigitalOut ledred1(D9);
-DigitalOut ledred2(D10);
-
-
-double timestep1 = 0.03;
-const double ledon = 1;
-const double ledoff = 0;
-bool flag1, flag2, flag3, flag4;
+DigitalOut ledgreen1(D0),  ledgreen2(D3), ledyellow1(PTC12), ledyellow2(D11), ledred1(D14), ledred2(D15);
 
 
 void led12() { ledgreen1 = ledon; ledgreen2 = ledon; ledyellow1 = ledoff; ledyellow2 = ledoff; ledred1 = ledoff; ledred2 = ledoff; }
@@ -21,80 +10,71 @@
 void led56() { ledgreen1 = ledoff; ledgreen2 = ledoff; ledyellow1 = ledoff; ledyellow2 = ledoff; ledred1 = ledon; ledred2 = ledon; }
 void led61() { ledgreen1 = ledon; ledgreen2 = ledoff; ledyellow1 = ledoff; ledyellow2 = ledoff; ledred1 = ledoff; ledred2 = ledon; }
 
+void led_off() { ledgreen1 = ledoff; ledgreen2 = ledoff; ledyellow1 = ledoff; ledyellow2 = ledoff; ledred1 = ledoff; ledred2 = ledoff; }
 void led1() { ledgreen1 = ledon; ledgreen2 = ledoff; ledyellow1 = ledoff; ledyellow2 = ledoff; ledred1 = ledoff; ledred2 = ledoff; }
 void led2() { ledgreen1 = ledoff; ledgreen2 = ledon; ledyellow1 = ledoff; ledyellow2 = ledoff; ledred1 = ledoff; ledred2 = ledoff; }
 void led3() { ledgreen1 = ledoff; ledgreen2 = ledoff; ledyellow1 = ledon; ledyellow2 = ledoff; ledred1 = ledoff; ledred2 = ledoff; }
 void led4() { ledgreen1 = ledoff; ledgreen2 = ledoff; ledyellow1 = ledoff; ledyellow2 = ledon; ledred1 = ledoff; ledred2 = ledoff; }
 void led5() { ledgreen1 = ledoff; ledgreen2 = ledoff; ledyellow1 = ledoff; ledyellow2 = ledoff; ledred1 = ledon; ledred2 = ledoff; }
 void led6() { ledgreen1 = ledoff; ledgreen2 = ledoff; ledyellow1 = ledoff; ledyellow2 = ledoff; ledred1 = ledoff; ledred2 = ledon; }
-
+void led_on() { ledgreen1 = ledon; ledgreen2 = ledon; ledyellow1 = ledon; ledyellow2 = ledon; ledred1 = ledon; ledred2 = ledon; }
 
-led12(); //per 2 leds van onder naar boven en weer van onder naar boven.
-wait(timestep1);
-led23();
-wait(timestep1);
-led34();
-wait(timestep1);
-led45();
-wait(timestep1);
-led56();
-wait(timestep1);
-led61();
-wait(timestep1);
+void leds_down_up()
+{
+if(a==15)
+{led1();}
+
+if(a==30)
+{led2();} 
+
+if(a==45)
+{led3();} 
 
-led12(); // per 2 leds heen en weer
-wait(timestep2);
-led23();
-wait(timestep2);
-led34();
-wait(timestep2);
-led45();
-wait(timestep2);
-led56();
-wait(timestep2);
-led45();
-wait(timestep2);
-led34();
-wait(timestep2);
-led23();
-wait(timestep2);
-    
-wait(3);
+if(a==60)
+{led4();}
+
+if(a==90)
+{led5();}
+
+if(a==90)
+{led6(); a=0;}
+a++;
+}
+
+void led_up_down_up()
+{
+if(a==15)
+{led1();}
 
-    led1();        // per één led van onder naar boven en weer van onder naar boven
-wait(timestep1);
-led2();
-wait(timestep1);
-led3();
-wait(timestep1);
-led4();
-wait(timestep1);
-led5();
-wait(timestep1);
-led6();
-wait(timestep1);
-    
- wait (3)   ;
+if(a==30)
+{led2();} 
+
+if(a==45)
+{led3();} 
+
+if(a==60)
+{led4();}
+
+if(a==75)
+{led5();}
+
+if(a==90)
+{led6();} 
 
-led1();         // per één led heen en weer
-wait(timestep2);
-led2();
-wait(timestep2);
-led3();
-wait(timestep2);
-led4();
-wait(timestep2);
-led5();
-wait(timestep2);
-led6();
-wait(timestep2);
-led5();
-wait(timestep2);
-led4();
-wait(timestep2);
-led3();
-wait(timestep2);
-led2();
-wait(timestep2);
-    }   
-    }
\ No newline at end of file
+if(a==105)
+{led5();} 
+
+if(a==120)
+{led4();}
+
+if(a==135)
+{led3();} 
+
+if(a==150)
+{led2();} 
+
+if(a==165)
+{led1(); a=0;}
+
+a++;
+}