Diff: runTime/runTime.cpp

Revision:

39:ddf38df9699e

Parent:

38:8efacce315ae

--- a/runTime/runTime.cpp	Sat Feb 07 08:54:51 2015 +0000
+++ b/runTime/runTime.cpp	Wed Feb 11 23:09:57 2015 +0000
@@ -44,16 +44,16 @@
     op->internalTemp        = internalTmp.read();
 
     // Telemetry trackers
-    op->xbee1.msgIn         = xbeeRelay.counterX1in;
-    op->xbee1.msgOut        = xbeeRelay.counterX1out;
-    op->xbee1.msgIn         = xbeeRelay.counterX2in;
-    op->xbee2.msgOut        = xbeeRelay.counterX2out;
-    if (counter++ % 10 == 0) {                               // Do every 1 second
-        op->xbee1.rateOut   = xbeeRelay.bytesX1out / 1000.0;   // Measure data rate in KB/s
-        op->xbee2.rateOut   = xbeeRelay.bytesX2out / 1000.0;   
-        xbeeRelay.bytesX1out = 0;                            // Clear every second
-        xbeeRelay.bytesX2out = 0;
-    }
+ //   op->xbee1.msgIn         = xbeeRelay.counterX1in;
+ //   op->xbee1.msgOut        = xbeeRelay.counterX1out;
+ //   op->xbee1.msgIn         = xbeeRelay.counterX2in;
+ //   op->xbee2.msgOut        = xbeeRelay.counterX2out;
+//    if (counter++ % 10 == 0) {                               // Do every 1 second
+//        op->xbee1.rateOut   = xbeeRelay.bytesX1out / 1000.0;   // Measure data rate in KB/s
+//        op->xbee2.rateOut   = xbeeRelay.bytesX2out / 1000.0;   
+//        xbeeRelay.bytesX1out = 0;                            // Clear every second
+ //       xbeeRelay.bytesX2out = 0;
+ //   }
     
     // CATCH ERRORS
     if (op->glvBat.error)                                   op->faultCode |= GLVBAT_FAULT;
@@ -63,7 +63,7 @@
     if (op->latch.imd & HARD_FAULT)                         op->faultCode |= IMD_LATCH;
     if (op->imd.error)                                      op->faultCode |= IMD_FAULT;
     
-    if (FreezeFrame::getError())                            op->faultCode |= FREEZE_FRAME;
+    if (FreezeFrame::getError())                          ;//  op->faultCode |= FREEZE_FRAME;
     else                                                    op->faultCode &= ~FREEZE_FRAME;
     
     // UPDATE MODE