Diff: SnCommWinSBD.cpp

Revision:

84:80b15993944e

Parent:

56:0bba0ef15697

Child:

116:8099b754fbb4

--- a/SnCommWinSBD.cpp	Mon Feb 23 03:04:39 2015 +0000
+++ b/SnCommWinSBD.cpp	Fri Oct 30 04:49:40 2015 +0000
@@ -6,7 +6,7 @@
     SnCommWin(new SnCommSBD(sbd)) {
     
 }
-
+/*
 SnCommWin::ECommWinResult SnCommWinSBD::OpenWindow(const uint32_t timeout,
                                                    const bool sendStatus,
                                                    const SnConfigFrame& conf,
@@ -18,11 +18,24 @@
                                                    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 powerOnTime,
+                                                   const SnTempFrame& temper, // com win temp
+                                                   char* const genBuf,
+                                                   const uint32_t timeout_clock) {
+
 #ifdef DEBUG
     printf("SnCommWinSBD::OpenWindow\r\n");
 #endif
 
-    const bool canCon = fComm->Connect(timeout);
+    const bool canCon = fComm->Connect(timeout_clock);
     
 #ifdef DEBUG
     printf("canCon=%d\r\n",(int)canCon);
@@ -32,7 +45,11 @@
                                            : SnCommWin::kCanNotConnect;
     
     if (canCon && sendStatus) {
-        ret = SendStatus(conf, evt, pow, seq, thmrate, evtrate, powerOnTime, temper, genBuf, timeout);
+        //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);
+
     }
 
 #ifdef DEBUG