Diff: SnCommWinAfar.cpp

Revision:

84:80b15993944e

Parent:

56:0bba0ef15697

Child:

116:8099b754fbb4

--- a/SnCommWinAfar.cpp	Mon Feb 23 03:04:39 2015 +0000
+++ b/SnCommWinAfar.cpp	Fri Oct 30 04:49:40 2015 +0000
@@ -10,7 +10,7 @@
                                   conf.GetMbedGate())) {
 
 }
-
+/*
 SnCommWin::ECommWinResult SnCommWinAfar::OpenWindow(const uint32_t timeout,
                                                     const bool sendStatus,
                                                     const SnConfigFrame& conf,
@@ -22,11 +22,23 @@
                                                     const uint32_t powerOnTime,
                                                     const SnTempFrame& temper,
                                                     char* const genBuf) {
+*/
+SnCommWin::ECommWinResult SnCommWinAfar::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("SnCommWinAfar::OpenWindow\r\n");
 #endif
 
-    const bool canCon = fComm->Connect(timeout);
+    const bool canCon = fComm->Connect(timeout_clock);
     
     SnCommWin::ECommWinResult ret = canCon ? SnCommWin::kConnected
                                            : SnCommWin::kCanNotConnect;
@@ -35,7 +47,11 @@
 #ifdef DEBUG
     printf("calling SendStatus\r\n");
 #endif
-        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, evt, pow, seq, thmrate, evtrate, powerOnTime, temper, genBuf, timeout);
 #ifdef DEBUG
     printf("Send Status returned\r\n");
 #endif