Diff: main.cpp

Revision:

4:001603e48dc8

Parent:

3:2a8fdcc54c95

Child:

5:f137bb7eeda6

--- a/main.cpp	Mon Jun 05 12:31:15 2017 +0000
+++ b/main.cpp	Tue Jun 06 13:15:07 2017 +0000
@@ -19,15 +19,16 @@
 //DigitalOut myled3(LED3);
 //DigitalOut myled4(LED4);
 
+//DigitalIn demoLedSw(p20, PullUp);
 
-DigitalIn demoLedSw(p20, PullUp);
-//DigitalSw startSw(p20);
+//DigitalSw startSw(p19);
 DigitalSw upSw(p8);
 DigitalSw downSw(p14);
 
 int main()
 {
     int8_t p = 0;
+    int8_t point = 0;
     int32_t loPriod;
     int32_t hiPriod;
 
@@ -38,9 +39,9 @@
     int count =0;
 
     while(1) {
-    myled2 = !myled2;
+        myled2 = !myled2;
 
-#if 0
+#ifdef CHECKSIGNAL
         testSoundMain(!demoLedSw);
         testLedMain(!demoLedSw);
 #endif
@@ -58,12 +59,18 @@
                 p = 0;
             }
         }
-
 #ifdef LCD
-        if(true ==  surementData((uint8_t)p, &hiPriod, &loPriod)) {
+        point = p;
+        if(true ==  surementData(&point, &hiPriod, &loPriod)) {
             lcd.cls();
-            lcd.printf("p = %2d  hi = %d\n",p, hiPriod);
-            lcd.printf("        lo = %d",loPriod);
+            lcd.printf("p = %2d  hi = %d\n",point, hiPriod);
+            lcd.printf("surement lo = %d",loPriod);
+            wait(0.2);
+        } else {
+            p = 0;
+            lcd.cls();
+            lcd.printf("p = %2d  hi = %d\n",point, hiPriod);
+            lcd.printf("sample   lo = %d",loPriod);
             wait(0.2);
         }
 #endif // LCD