Diff: SnCommWinUsb.cpp

Revision:

84:80b15993944e

Parent:

56:0bba0ef15697

Child:

116:8099b754fbb4

--- a/SnCommWinUsb.cpp	Mon Feb 23 03:04:39 2015 +0000
+++ b/SnCommWinUsb.cpp	Fri Oct 30 04:49:40 2015 +0000
@@ -10,7 +10,7 @@
     SnCommWin(new SnCommUsb(cpu)) {
 
 }
-
+/*
 SnCommWin::ECommWinResult SnCommWinUsb::OpenWindow(const uint32_t timeout,
                                                    const bool sendStatus,
                                                    const SnConfigFrame& conf,
@@ -22,18 +22,34 @@
                                                    const uint32_t powerOnTime,
                                                    const SnTempFrame& temper,
                                                    char* const genBuf) {
+*/
+SnCommWin::ECommWinResult SnCommWinUsb::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("SnCommWinUsb::OpenWindow\r\n");
 #endif
 
     SnCommWin::ECommWinResult ret = 
-        fComm->Connect(timeout) ? SnCommWin::kConnected : SnCommWin::kCanNotConnect;
+        fComm->Connect(timeout_clock) ? SnCommWin::kConnected : SnCommWin::kCanNotConnect;
     
     if (sendStatus) {
 #ifdef DEBUG
         printf("SnCommWinUsb 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);
     }
     
     return ret;