Diff: SnCommWin.h

Revision:

116:8099b754fbb4

Parent:

98:ce72ef143b9b

Child:

122:c1b5023eac69

--- a/SnCommWin.h	Fri Dec 04 02:57:12 2015 +0000
+++ b/SnCommWin.h	Tue May 03 02:01:35 2016 +0000
@@ -130,7 +130,9 @@
                                               uint32_t& prvTime,
                                               uint32_t& setTime);
     virtual bool            Connect(const uint32_t timeout);
-    virtual bool            CloseConn(const uint32_t timeout);
+    virtual bool            CloseConn(const uint32_t timeout,
+                                      char* const genBuf=0,
+                                      const bool sendCloseSignal=false);
     virtual bool            PowerDown(const uint32_t timeout);
     
     // optional overloads
@@ -144,25 +146,16 @@
                                       const SnPowerFrame& pow, // com win power
                                       const SnEventFrame& stEvent,
                                       const uint16_t seq,
-                                      const float thmrate,
-                                      const float evtrate,
+//                                      const float thmrate,
+//                                      const float evtrate,
+                                      const uint32_t numThmTrigs,
+                                      const uint32_t numSavedEvts, 
+                                      const float    seqlive,
                                       const uint32_t powerOnTime,
                                       const SnTempFrame& temper, // com win temp
                                       char* const genBuf,
                                       const uint32_t timeout_clock)=0;
-/*
-    virtual ECommWinResult  OpenWindow(const uint32_t timeout,
-                                       const bool sendStatus,
-                                       const SnConfigFrame& conf,
-                                       const SnEventFrame& evt,
-                                       const SnPowerFrame& pow,
-                                       const uint16_t seq,
-                                       const float thmrate,
-                                       const float evtrate,
-                                       const uint32_t powerOnTime,
-                                       const SnTempFrame& temper,
-                                       char* const genBuf)=0;
-*/    
+
     virtual bool            GetDeleteAllConfirmCode(const SnConfigFrame& conf,
                                                     const uint32_t length,
                                                     const uint32_t timeout,
@@ -201,24 +194,15 @@
                                const SnPowerFrame& pow, // com win power
                                const SnEventFrame& stEvent,
                                const uint16_t seq,
-                               const float thmrate,
-                               const float evtrate,
+//                               const float thmrate,
+//                               const float evtrate,
+                               const uint32_t numThmTrigs,
+                               const uint32_t numSavedEvts, 
+                               const float    seqlive,
                                const uint32_t powerOnTime,
                                const SnTempFrame& temper, // com win temp
                                char* const genBuf,
                                const uint32_t timeout_clock);
-    /*
-    ECommWinResult  SendStatus(const SnConfigFrame& conf,
-                               const SnEventFrame& evt,
-                               const SnPowerFrame& pow,
-                               const uint16_t seq,
-                               const float thmrate,
-                               const float evtrate,
-                               const uint32_t powerOnTime,
-                               const SnTempFrame& temper,
-                               char* const genBuf,
-                               const uint32_t timeout_clock);
-    */
 
     virtual ECommWinResult SendStatusData(const SnConfigFrame& conf,
                                           const SnConfigFrame& stConf,