Changeset b84e8b

Timestamp:

01/12/12 11:39:04 (4 months ago)

Author:

Stefan Persson <stefan.persson@…>

Branches:

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

Children:

c527223bc420b18a6de5b3037befd935a288597f

Parents:

69059b935b81ae1ab0b06c99638a1b837619e05c

git-author:

Stefan Persson <stefan.persson@telldus.se>2012-01-12 11:39:04+01:00

git-committer:

Stefan Persson <stefan.persson@telldus.se>2012-01-12 11:39:04+01:00

Message:

Added TELLSTICK_ERROR_BROKEN_PIPE to distinguate between when communication with TellStick fails due to timeout or actual error.

Location:

telldus-core

Files:

• client/Client.cpp (modified) (1 diff)
• client/telldus-core.cpp (modified) (3 diffs)
• client/telldus-core.h (modified) (1 diff)
• service/ClientCommunicationHandler.cpp (modified) (1 diff)
• service/ControllerManager.cpp (modified) (1 diff)
• service/DeviceManager.cpp (modified) (2 diffs)
• service/TellStick_libftdi.cpp (modified) (3 diffs)
• service/TelldusMain.cpp (modified) (1 diff)

telldus-core/client/Client.cpp

@@ -307 +307 @@
                         continue; //retry
                 }
-                readData = s.read(10000);  //TODO changed to 10000 from 5000, how much does this do...?
+                readData = s.read(8000);  //TODO changed to 10000 from 5000, how much does this do...?
                 if(readData == L""){
                         printf("Readdata nothing\n\r");

telldus-core/client/telldus-core.cpp

@@ -57 +57 @@
  * @def TELLSTICK_SUCCESS
  * Error code. Returned when the command succeeded.
+ *
+ * @def TELLSTICK_ERROR_BROKEN_PIPE
+ * Error code. Pipe broken during communication.
  *
  * @def TELLSTICK_ERROR_NOT_FOUND
@@ -488 +491 @@
  * @sa TELLSTICK_ERROR_UNKNOWN_RESPONSE
  * @sa TELLSTICK_ERROR_SYNTAX
+ * @sa TELLSTICK_ERROR_BROKEN_PIPE
  * @sa TELLSTICK_ERROR_UNKNOWN
  */
 char * WINAPI tdGetErrorString(int intErrorNo) {
-        const int numResponses = 9;
+        const int numResponses = 10;
         const char *responses[numResponses] = {
                 "Success",
@@ -501 +505 @@
                 "Could not connect to the Telldus Service",
                 "Received an unknown response",
-                "Syntax error"
+                "Syntax error",
+                "Broken pipe"
         };
         std::string strReturn;

telldus-core/client/telldus-core.h

@@ -117 +117 @@
 #define TELLSTICK_ERROR_UNKNOWN_RESPONSE -7
 #define TELLSTICK_ERROR_SYNTAX -8
+#define TELLSTICK_ERROR_BROKEN_PIPE -9
 #define TELLSTICK_ERROR_UNKNOWN -99
 

telldus-core/service/ClientCommunicationHandler.cpp

@@ -2 +2 @@
 #include "Message.h"
 #include "Strings.h"
-#include "Log.h" //Debug
 
 #include <stdlib.h>

telldus-core/service/ControllerManager.cpp

@@ -141 +141 @@
         for(std::list<TellStick *>::iterator it = tellStickControllers.begin(); it != tellStickControllers.end(); ++it) {
                 int success = (*it)->send(noop);
-                if(success == TELLSTICK_ERROR_COMMUNICATION){
+                if(success == TELLSTICK_ERROR_BROKEN_PIPE){
                         Log::warning("TellStick query: Error in communication with TellStick, resetting USB");
                         resetController(*it);
                 }
-                if(success == TELLSTICK_ERROR_COMMUNICATION || success == TELLSTICK_ERROR_NOT_FOUND){
+                if(success == TELLSTICK_ERROR_BROKEN_PIPE || success == TELLSTICK_ERROR_NOT_FOUND){
                         reloadControllers = true;
                 }

telldus-core/service/DeviceManager.cpp

@@ -442 +442 @@
                 if(controller){
                         retval = device->doAction(action, data, controller);
-                        if(retval == TELLSTICK_ERROR_COMMUNICATION){
+                        if(retval == TELLSTICK_ERROR_BROKEN_PIPE){
                                 Log::warning("Error in communication with TellStick when executing action. Resetting USB");
                                 d->controllerManager->resetController(controller);
                         }
-                        if(retval == TELLSTICK_ERROR_COMMUNICATION || retval == TELLSTICK_ERROR_NOT_FOUND){
+                        if(retval == TELLSTICK_ERROR_BROKEN_PIPE || retval == TELLSTICK_ERROR_NOT_FOUND){
                                 Log::warning("Rescanning USB ports");
                                 d->controllerManager->loadControllers();
@@ -752 +752 @@
         if(controller){
                 retval = controller->send(TelldusCore::wideToString(command));
-                if(retval == TELLSTICK_ERROR_COMMUNICATION){
+                if(retval == TELLSTICK_ERROR_BROKEN_PIPE){
                         d->controllerManager->resetController(controller);
                 }
-                if(retval == TELLSTICK_ERROR_COMMUNICATION || retval == TELLSTICK_ERROR_NOT_FOUND){
+                if(retval == TELLSTICK_ERROR_BROKEN_PIPE || retval == TELLSTICK_ERROR_NOT_FOUND){
                         d->controllerManager->loadControllers();
                         controller = d->controllerManager->getBestControllerById(-1);

telldus-core/service/TellStick_libftdi.cpp

@@ -218 +218 @@
         delete[] tempMessage;
         Log::notice("Message: %s", strMessage.c_str());
+        Log::notice("FWVersion: %d", firmwareVersion());
+        Log::notice("Pid: %X", pid());
+
+        if(!c){
+                Log::debug("Broken pipe on send");
+                return TELLSTICK_ERROR_BROKEN_PIPE;
+        }
+
         if(d->ignoreControllerConfirmation || (strMessage == "N+" && ((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");
-                if(c){
-                        Log::notice("Success");
-                        return TELLSTICK_SUCCESS;
-                }
-                else{
-                        Log::notice("Fail");
-                        return TELLSTICK_ERROR_COMMUNICATION;
-                }
+                Log::notice("Too old firmware, accepting this, just return success");
+                return TELLSTICK_SUCCESS;
         }
         Log::warning("Continuing");
@@ -234 +235 @@
         int retrycnt = 250;
         unsigned char in;
-        while(c && --retrycnt) {
+        while(--retrycnt) {
                 ret = ftdi_read_data( &d->ftHandle, &in, 1);
                 if (ret > 0) {
-                        Log::notice("Returned %c", in);
+                        Log::warning("%c", in);
                         if (in == '\n') {
-                                Log::notice("BREAK");
+                                Log::warning("Received an end");
                                 break;
                         }
@@ -245 +246 @@
                         usleep(100);
                 } else { //Error
-                        c = false;
-                }
-        }
+                        Log::debug("Broken pipe on read");
+                        return TELLSTICK_ERROR_BROKEN_PIPE;
+                }
+        }
+        Log::warning("Retry ready");
         if (!retrycnt) {
-                c = false;
-        }
-        if (!c) {
+                Log::warning("Error in communication, retrycount ended");
                 return TELLSTICK_ERROR_COMMUNICATION;
         }
+        Log::warning("Success");
         return TELLSTICK_SUCCESS;
 }

telldus-core/service/TelldusMain.cpp

@@ -44 +44 @@
         EventRef janitor = d->eventHandler.addEvent(); //Used for regular cleanups
         Timer supervisor(janitor); //Tells the janitor to go back to work
-        supervisor.setInterval(10); //TODO Once every minute
+        supervisor.setInterval(60); //Once every minute
         supervisor.start();