Diff: main.cpp

Revision:

3:0432064270e1

Parent:

2:458dfec0820c

Child:

4:62ae68bcaee8

--- a/main.cpp	Sat Jan 07 14:48:11 2017 +0000
+++ b/main.cpp	Sat Jan 07 15:04:42 2017 +0000
@@ -4,50 +4,40 @@
 double getWaitTime();
 
 DigitalOut led1(LED1);
-DigitalOut greenLed(D8);
-DigitalOut redLed(D10);
-DigitalIn button(D9);
+//DigitalOut greenLed(D8);
+//DigitalOut redLed(D10);
+//DigitalIn button(D9);
 
 Serial pc(USBTX, USBRX);
 
-double ledWait = 0.2; // sec
 Timer timer;
-uint32_t prevMillis;
-uint32_t currentMillis;
-
+uint32_t prevMs;
+uint32_t currentMs;
+uint32_t lastToggleMs = 0;
+uint32_t toggleTimeMs = 500;
 
 int main()
 {
-    timer.start();
-    currentMillis = prevMillis = timer.read_ms();
+//    button.mode(PullUp);
     
-    greenLed = 0;
-    redLed = 0;
+    timer.start();
+    currentMs = prevMs = timer.read_ms();
+    
     pc.baud(115200);
     pc.printf("Hello world\r\n");
     
-    while(1)
+    led1 = 0;
+    
+    for(;;)
     {
-        currentMillis = timer.read_ms();
-        pc.printf("%ld ms\r\n", currentMillis - prevMillis);
-        prevMillis = currentMillis;
+        currentMs = timer.read_ms();
+//        pc.printf("%ld ms\r\n", currentMs - prevMs);
+        prevMs = currentMs;
         
-        led1 = 1; // LED is ON
-        greenLed = 0;
-        redLed = 1;
-        
-        wait(getWaitTime());
-        
-        led1 = 0; // LED is OFF
-        greenLed = 1;
-        redLed = 0;
-        
-        wait(getWaitTime());
+        if (currentMs - lastToggleMs >= toggleTimeMs)
+        {
+            led1 = !led1;
+            lastToggleMs = currentMs;
+        }
     }
 }
-
-
-double getWaitTime()
-{
-    return (button == 0) ? 0.2 : 1.0;
-}