Arianna autonomous DAQ firmware

Dependencies:   mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW

Revision:
22:f957c4f840ad
Parent:
21:ce51bb0ba4a5
Child:
40:1324da35afd4
--- a/SnEventFrame.h	Wed Oct 10 05:54:12 2012 +0000
+++ b/SnEventFrame.h	Tue Oct 16 04:47:44 2012 +0000
@@ -57,16 +57,21 @@
           uint16_t& GetData(const uint8_t ch, const uint8_t sm)
         { return fData[(ch*kNsamps)+sm]; }
     
+    uint32_t GetMbedTime() const { return fMbedTime; }
+    
     uint32_t GetEvtNum() const { return fEvtNum; }
     
-    void ClearEvent() {
+    void ClearEvent(const bool fully=true) {
 #ifdef EVDEBUG
         printf("CLEARING EVENT!\r\n");
 #endif
-        fMbedTime = fEvtNum = fTrgNum = 0;
-        fTrgBits = 0;
+        fMbedTime = 0;
         memset(fData, 0, kTotSamps*sizeof(int16_t));
         fCRC = 0;
+        if (fully) {
+            fEvtNum = fTrgNum = 0;
+            fTrgBits = 0;
+        }
     }
     
     void SetTrgBit(const ESnTrgTypes t) { fTrgBits |= kTrgBW[t]; }