Diff: main.cpp

Revision:

30:aa6324845a84

Parent:

29:fd74725294d5

Child:

33:03d0e7f5ef0a

--- a/main.cpp	Sun Apr 24 23:37:50 2016 +0000
+++ b/main.cpp	Mon Apr 25 15:56:38 2016 +0000
@@ -670,7 +670,7 @@
     transitF3.getFault();
     blankF4.getFault();
     
-    schoolF1.drive(254); //closed = 253, open = 254
+    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
@@ -680,8 +680,8 @@
     homeF2.stop();
     transitF3.stop();
     blankF4.stop();
-
-
+    
+      
 
     gpsEN = 1;
     wait(1);
@@ -809,7 +809,7 @@
     //E2PROM.read(0x00001, serialsubjectLabelOriginal,2);
     //uint8_t newserialBytes[2] = {0,};
     
-    if(subjectLabelOriginal[2] == 95){ 
+    if(subjectLabelOriginal[2] == 126){ 
             E2PROM.write(0x00034,subjectLabelOriginal,2); 
             serial_num = (uint16_t)(((subjectLabelOriginal[0]-48)*10 + subjectLabelOriginal[1]-48));
     }
@@ -962,6 +962,25 @@
     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);
+
+wait(30);
+
+    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);