Diff: SnCommWinSBD.cpp

Revision:

116:8099b754fbb4

Parent:

84:80b15993944e

--- a/SnCommWinSBD.cpp	Fri Dec 04 02:57:12 2015 +0000
+++ b/SnCommWinSBD.cpp	Tue May 03 02:01:35 2016 +0000
@@ -6,26 +6,15 @@
     SnCommWin(new SnCommSBD(sbd)) {
     
 }
-/*
-SnCommWin::ECommWinResult SnCommWinSBD::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) {
-*/
+
 SnCommWin::ECommWinResult SnCommWinSBD::OpenWindow(const bool sendStatus,
                                                    const SnConfigFrame& conf,
                                                    const SnPowerFrame& pow, // com win power
                                                    const SnEventFrame& stEvent,
                                                    const uint16_t seq,
-                                                   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,
@@ -45,10 +34,10 @@
                                            : SnCommWin::kCanNotConnect;
     
     if (canCon && sendStatus) {
-        //ret = SendStatus(conf, evt, pow, seq, thmrate, evtrate, powerOnTime, temper, genBuf, timeout);
-                ret = SendStatus(conf, pow, stEvent, seq, thmrate, evtrate,
-                                 powerOnTime, temper,
-                                 genBuf, timeout_clock);
+        ret = SendStatus(conf, pow, stEvent, seq,
+                         numThmTrigs, numSavedEvts, seqlive,
+                         powerOnTime, temper,
+                         genBuf, timeout_clock);
 
     }