Arianna autonomous DAQ firmware

Dependencies:   mbed SDFileSystemFilinfo AriSnProtocol NetServicesMin AriSnComm MODSERIAL PowerControlClkPatch DS1820OW

Revision:
2:e67f7c158087
Parent:
1:e392595b4b76
Child:
3:24c5f0f50bf1
--- a/SnCommWin.h	Fri Jul 20 19:04:02 2012 +0000
+++ b/SnCommWin.h	Tue Jul 24 02:07:23 2012 +0000
@@ -15,6 +15,7 @@
         kUndefFail,     // undefined fail type
         kCanNotConnect, // unable to connect to port
         kFailTimeout,   // timed out but message required
+        kFailNoneSent,  // none of the message sent
         kFailPartSent,  // only part of the message sent
         kAllFails,      // to be used for "if (ret > kAllFails) ==> success"
         // only successes should go below
@@ -23,22 +24,20 @@
         kOkNoMsg,       // timed out with no message, but that is ok
         kOkWithMsg      // successfully received message
     };
-    
+        
  private:
     //bool                    fWinOpen;  // whether this comm should listen
     
             ECommWinResult SendData(FILE* inf, const char* infn,
                                     const SnConfigFrame& curConf,
                                     SnEventFrame& evt,
-                                    char* const evtBuf,
-                                    char* const confBuf,
+                                    char* const genBuf,
                                     const uint32_t nevts,
                                     const uint32_t firstEvt=0);
             ECommWinResult  SendData(const char* infn,
                                      const SnConfigFrame& curConf,
                                      SnEventFrame& evt,
-                                     char* const evtBuf,
-                                     char* const confBuf,
+                                     char* const genBuf,
                                      const uint32_t nevts,
                                      const uint32_t firstEvt=0);
 
@@ -46,8 +45,7 @@
     virtual ECommWinResult  SendConfAndEvents(FILE* inf,
                                               const SnConfigFrame& curConf,
                                               SnEventFrame& evt,
-                                              char* const evtBuf,
-                                              char* const confBuf,
+                                              char* const genBuf,
                                               const uint32_t nevts,
                                               const uint32_t firstEvt=0)=0;
  public:
@@ -57,8 +55,7 @@
                                        const bool sendStatus,
                                        const SnConfigFrame& conf,
                                        const SnEventFrame& evt,
-                                       char* const evtBuf,
-                                       char* const statBuf)=0;
+                                       char* const genBuf)=0;
     
     virtual bool            Connect(const uint32_t timeout)=0;
 
@@ -68,13 +65,11 @@
     
     virtual ECommWinResult  SendStatus(const SnConfigFrame& conf,
                                        const SnEventFrame& evt,
-                                       char* const evtBuf,
-                                       char* const statBuf)=0;
+                                       char* const genBuf)=0;
             
             ECommWinResult  SendData(SnConfigFrame& conf,
                                      SnEventFrame& evt,
-                                     char* const evtBuf,
-                                     char* const confBuf,
+                                     char* const genBuf,
                                      const uint32_t timeout);
     
     virtual ECommWinResult  SendData(FILE* inf)=0;