Changeset c52722

Timestamp:

01/12/12 14:17:24 (4 months ago)

Author:

Stefan Persson <stefan.persson@…>

Branches:

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

Children:

3ce58f019fbe42e77592b30166a1f44a732eeee5

Parents:

b84e8b3806d9db62cfda5035e274ef6fe0b9f817

git-author:

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

git-committer:

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

Message:

Made use of TELLSTICK_ERROR_BROKEN_PIPE in windows too

File:

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

telldus-core/service/TellStick_ftd2xx.cpp

@@ -11 +11 @@
 //
 #include "TellStick.h"
+#include "common.h"
 #include "Mutex.h"
 #include "Settings.h"
@@ -211 +212 @@
                 return TELLSTICK_ERROR_NOT_FOUND;
         }
-        bool c = true;
-
+        
         //This lock does two things
         // 1 Prevents two calls from different threads to this function
@@ -231 +231 @@
         free(tempMessage);
         
-        if(d->ignoreControllerConfirmation || (strMessage == "N+" && ((pid() == 0x0C31 && firmwareVersion() < 5) || (pid() == 0x0C30 && firmwareVersion() < 6)))){
+        if(ftStatus != FT_OK){
+                Log::debug("Broken pipe on send");
+                return TELLSTICK_ERROR_BROKEN_PIPE;
+        }
+
+        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
-                if(c){
-                        return TELLSTICK_SUCCESS;
-                }
-                else{
-                        return TELLSTICK_ERROR_COMMUNICATION;
-                }
-        }
-
-        while(c) {
+                return TELLSTICK_SUCCESS;
+        }
+        if(d->ignoreControllerConfirmation){
+                //wait for TellStick to finish its air-sending
+                msleep(1000);
+                return TELLSTICK_SUCCESS;
+        }
+
+        while(1) {
                 ftStatus = FT_Read(d->ftHandle,&in,1,&bytesRead);
                 if (ftStatus == FT_OK) {
                         if (bytesRead == 1) {
                                 if (in == '\n') {
-                                        break;
+                                        return TELLSTICK_SUCCESS;
+                                } else {
+                                        continue;
                                 }
                         } else { //Timeout
-                                c = false;
+                                return TELLSTICK_ERROR_COMMUNICATION;
                         }
                 } else { //Error
-                        c = false;
-                }
-        }
-
-        if (!c) {
-                return TELLSTICK_ERROR_COMMUNICATION;
-        }
-        return TELLSTICK_SUCCESS;
+                        Log::debug("Broken pipe on read");
+                        return TELLSTICK_ERROR_BROKEN_PIPE;
+                }
+        }
 }