Diff: main.cpp

Revision:

1:80eb2d3e5974

Parent:

0:fbbd6271c1ac

Child:

2:ce41adf02350

--- a/main.cpp	Wed Feb 12 00:21:39 2014 +0000
+++ b/main.cpp	Wed Feb 18 05:21:23 2015 +0000
@@ -5,35 +5,41 @@
 
 //TextLCD lcd(p15, p16, p17, p18, p19, p20); // rs, e, d4-d7
 TextLCD lcd(p24, p26, p27, p28, p29, p30); // rs, e, d4-d7
-
+AnalogIn    in1(p15);
+AnalogIn    in2(p16);
+AnalogIn    in3(p17);
+AnalogOut   out(p18);
 
 DigitalOut DO[4]={LED1, LED2, LED3, LED4};
-int     nCnt;
+//int     nCnt;
 
-void led_blink()
+void led_blink(int cnt)
 {
     for(int n=0; n<4; n++){
-        if(n == nCnt)   DO[n] = 1;
+        if(n == cnt)    DO[n] = 1;
         else            DO[n] = 0;
     }
 }
 
 int main() {
+    int     nCnt;
     double  cnt;
-    nCnt = 0;
+    
+    nCnt  = 0;
     cnt = 0.1;
     while(1){
-        lcd.printf("Hello World!_%d\n", nCnt);
-        //lcd.printf("...\n");
-        led_blink();
-        wait(cnt);
-        //lcd.printf("xxxxxxxxxxxx\n");
+        led_blink(nCnt);
+        nCnt++;
+        if(nCnt > 3)
+           nCnt = 0;
+           
+        wait(0.1);
+        sin(1);
+        cnt+=0.1;
+        if(cnt>=1.0)
+          cnt = 0.1;
+        out.write((float)cnt);
         lcd.printf("...\n");
-        //led_blink();
-        wait(cnt);
-        //cnt+=0.1;
-        if(cnt>=1.0)  cnt = 0.1;
-        nCnt++;
-        if(nCnt > 3)   nCnt = 0;
+        lcd.printf("%.2f,.%.2f,%.2f\n", in1.read(), in2.read(), in3.read());
     }
 }