Changeset 3ce58f

Timestamp:

01/12/12 14:21:03 (4 months ago)

Author:

Stefan Persson <stefan.persson@…>

Branches:

('master', 'deebf2045e7119c339412580f37a1e653f7d5715')('controller-upgrade', '00f95d22e12d96ef089e0902ef62ae8ce841dc6f')

Children:

e2e9ba4634204ee09c0868b9088fd15e82ee2139

Parents:

c527223bc420b18a6de5b3037befd935a288597f

git-author:

Stefan Persson <stefan.persson@telldus.se>2012-01-12 14:21:03+01:00

git-committer:

Stefan Persson <stefan.persson@telldus.se>2012-01-12 14:21:03+01:00

Message:

Added sleep time to allow TellStick to finish air sending when ignoring answer from TellStick

File:

• telldus-core/service/TellStick_libftdi.cpp (modified) (3 diffs)

telldus-core/service/TellStick_libftdi.cpp

@@ -226 +226 @@
         }
 
-        if(d->ignoreControllerConfirmation || (strMessage == "N+" && ((pid() == 0x0C31 && firmwareVersion() < 5) || (pid() == 0x0C30 && firmwareVersion() < 6)))){
+        if(strMessage.compare("N+") == 0 && ((pid() == 0x0C31 && firmwareVersion() < 5) || (pid() == 0x0C30 && firmwareVersion() < 6))){
                 //these firmware versions doesn't implement ack to noop, just check that the noop can be sent correctly
-                Log::notice("Too old firmware, accepting this, just return success");
+                Log::warning("Too old firmware, accepting this, just return success");
                 return TELLSTICK_SUCCESS;
         }
+
+        if(d->ignoreControllerConfirmation){
+                //allow TellStick to finish its air-sending
+                Log::warning("Sleeping");
+                msleep(1000);
+                return TELLSTICK_SUCCESS;
+        }
+
         Log::warning("Continuing");
 
@@ -241 +249 @@
                         if (in == '\n') {
                                 Log::warning("Received an end");
-                                break;
+                                return TELLSTICK_SUCCESS;
                         }
                 } else if(ret == 0) { // No data available
@@ -250 +258 @@
                 }
         }
-        Log::warning("Retry ready");
-        if (!retrycnt) {
-                Log::warning("Error in communication, retrycount ended");
-                return TELLSTICK_ERROR_COMMUNICATION;
-        }
-        Log::warning("Success");
-        return TELLSTICK_SUCCESS;
+
+        Log::warning("Error in communication, retrycount ended");
+        return TELLSTICK_ERROR_COMMUNICATION;
 }