Diff: main.cpp

Revision:

41:737f967d707c

Parent:

38:65ae9771f1e3

--- a/main.cpp	Fri Apr 29 20:28:05 2016 +0000
+++ b/main.cpp	Tue May 03 03:37:43 2016 +0000
@@ -472,7 +472,7 @@
     //Get time and set RTC 
     ///////////////////////////
     time_t seconds = time(NULL);
-    //strftime(timestr, 32, "%y%m%d%H%M%S", localtime(&seconds));
+    strftime(timestr, 32, "%y%m%d%H%M%S", localtime(&seconds));
     //strftime(hrstr, 32, "%H", localtime(&seconds));
     RTC_UPAS.get_time(); 
     
@@ -778,24 +778,7 @@
     
     wait(10); 
     }
-
-
-    schoolF1.getFault();
-    homeF2.getFault();
-    transitF3.getFault();
-    blankF4.getFault();
-    
-    schoolF1.drive(253); //closed = 253, open = 254
-    homeF2.drive(253); //closed = 253, open = 254
-    transitF3.drive(253); //closed = 253, open = 254
-    blankF4.drive(253); //closed = 253, open = 254
-    
-    wait(1);
-    schoolF1.stop();
-    homeF2.stop();
-    transitF3.stop();
-    blankF4.stop();
-    */
+*/
     
     schoolF1.getFault();
     homeF2.getFault();
@@ -1091,7 +1074,7 @@
 
     //---------------------------------------------------------------------------------------------//
     //Sets the flow withen +-1.5% of the desired flow rate based on mass flow
-
+/*
     while(abs(deltaMflow)>.025) {
 
         omronReading = ads.readADC_SingleEnded(0, 0xC383); // read channel 0 PGA = 2 : Full Scale Range = 2.048V
@@ -1126,6 +1109,8 @@
 
 
     }
+    
+ */   
     //pumps = 0;
     sampledVol = 0.0;
     RGB_LED.set_led(0,1,0);
@@ -1134,85 +1119,11 @@
 
     //stop.attach(&check_stop, 9);    // check if we should shut down every 9 number seconds, starting after the start.
     logg.attach(&log_data, logInerval);
-    flowCtl.attach(&flowControl, 3);
+   // flowCtl.attach(&flowControl, 3);
 
 
 
 
-/*    
-    wait(60);
-    
-    schoolF1.getFault();
-    homeF2.getFault();
-    transitF3.getFault();
-    blankF4.getFault();
-    
-    schoolF1.drive(254); //closed = 253, open = 254
-    homeF2.drive(253); //closed = 253, open = 254
-    transitF3.drive(253); //closed = 253, open = 254
-    blankF4.drive(253); //closed = 253, open = 254
-    
-    wait(1);
-    schoolF1.stop();
-    homeF2.stop();
-    transitF3.stop();
-    blankF4.stop();
-            
-
-wait(60);
-    
-    schoolF1.getFault();
-    homeF2.getFault();
-    transitF3.getFault();
-    blankF4.getFault();
-    
-    schoolF1.drive(253); //closed = 253, open = 254
-    homeF2.drive(254); //closed = 253, open = 254
-    transitF3.drive(253); //closed = 253, open = 254
-    blankF4.drive(253); //closed = 253, open = 254
-    
-    wait(1);
-    schoolF1.stop();
-    homeF2.stop();
-    transitF3.stop();
-    blankF4.stop();
-    
-    wait(60);
-    
-    schoolF1.getFault();
-    homeF2.getFault();
-    transitF3.getFault();
-    blankF4.getFault();
-    
-    schoolF1.drive(253); //closed = 253, open = 254
-    homeF2.drive(253); //closed = 253, open = 254
-    transitF3.drive(254); //closed = 253, open = 254
-    blankF4.drive(253); //closed = 253, open = 254
-    
-    wait(1);
-    schoolF1.stop();
-    homeF2.stop();
-    transitF3.stop();
-    blankF4.stop();
-    
-    wait(60);
-    
-    schoolF1.getFault();
-    homeF2.getFault();
-    transitF3.getFault();
-    blankF4.getFault();
-    
-    schoolF1.drive(253); //closed = 253, open = 254
-    homeF2.drive(253); //closed = 253, open = 254
-    transitF3.drive(253); //closed = 253, open = 254
-    blankF4.drive(254); //closed = 253, open = 254
-    
-    wait(1);
-    schoolF1.stop();
-    homeF2.stop();
-    transitF3.stop();
-    blankF4.stop();
-*/
 
     //** end of initalization **//
     //---------------------------------------------------------------------------------------------//