Diff: main.cpp

Revision:

2:c696dfd53eeb

Parent:

1:dc21a6fce3af

diff -r dc21a6fce3af -r c696dfd53eeb main.cpp
--- a/main.cpp	Mon Jan 08 18:46:57 2018 +0000
+++ b/main.cpp	Tue Jan 09 11:26:15 2018 +0000
@@ -8,10 +8,12 @@
 Ticker display;
 Ticker second_pass;
 InterruptIn button(USER_BUTTON);
-
+DigitalOut led(PB_11), led2(PB_10);
 //NVIC_SetPriority(display, 0);     
 //NVIC_SetPriority(second_pass, 1);
 //NVIC_SetPriority(button, 1);
+
+
 void second_tick()
 {
     ss++;
@@ -23,31 +25,35 @@
         lcd.locate(10,0);
         lcd.printf("l:%1.2f", lvl);
         lcd.locate(0,0);
-        lcd.printf("p:%3.1f", pressuref);
+        lcd.printf("p:%5.1f", pressuref);
         lcd.locate(10,1);
         lcd.printf("t:%2.1f", tempf);
-        display_time();
+        display_time(); 
     }
-    
     else if (dislcd == 0)
     {
         display_dates();
         display_time();
     }
+   
+       //VIC_SystemReset();
 }
 
 void lcddisp()
 { 
     if (gather_data == 1)
     {
+        led2 = 1;
         display_time();
         getdata();
         store();
-        
+        led2 = 0;
     }
     if (gather_data ==0)
     {
-        
+        led = 1;
+        wait(0.2);
+        led = 0;
     }
 }
 
@@ -63,29 +69,28 @@
 int main()
 {
     lcd.cls();
+    
     //display_date_time();
 //    while (pointer != 14)
 //    {
 //        select_date();
 //    }
     bmp.initialize();
-    pc.printf("putty ready\n\r");
+    pc.printf("\n\rputty ready\n\r");
     display.attach(&lcddisp, T);
     second_pass.attach(&second_tick, 1.0);
     button.rise(&check_display);
-    
-    
     while(1)
     {
-            check_display();
-            putty_write();
-            check_display();
-            if (interrupt == 1)
-            {
-                T = t;
-                display.attach(&lcddisp, T);
-                interrupt = 0;
-            }
+        check_display();
+        putty_write();
+        check_display();
+        if (interrupt == 1)
+        {
+            T = t;
+            display.attach(&lcddisp, T);
+            interrupt = 0;
+        }
     }
 }