Changeset d7cce5

Timestamp:

01/11/12 14:53:46 (4 months ago)

Author:

Stefan Persson <stefan.persson@…>

Branches:

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

Children:

4068742b254f2b7a11aba2fee7294d136447aa9b

Parents:

8d22eff5da33b1ab94e7459832a33e1f1ab6587c

git-author:

Stefan Persson <stefan.persson@telldus.se>2012-01-11 14:53:46+01:00

git-committer:

Stefan Persson <stefan.persson@telldus.se>2012-01-11 14:53:46+01:00

Message:

Added setting for 'Not wait for confirmation from TellStick', see ticket 98, in Linux

Location:

telldus-core

Files:

• client/Client.cpp (modified) (2 diffs)
• service/ClientCommunicationHandler.cpp (modified) (1 diff)
• service/SettingsConfuse.cpp (modified) (1 diff)
• service/TellStick_libftdi.cpp (modified) (5 diffs)
• service/tellstick.conf (modified) (1 diff)

telldus-core/client/Client.cpp

@@ -297 +297 @@
                 s.connect(L"TelldusClient");
                 if (!s.isConnected()) { //Connection failed
+                        printf("Connection failed\n\r");
                         msleep(500);
                         continue; //retry
@@ -302 +303 @@
                 s.write(msg.data());
                 if (!s.isConnected()) { //Connection failed sometime during operation... (better check here, instead of 5 seconds timeout later)
+                        printf("Connection failed after write\n\r");
                         msleep(500);
                         continue; //retry
                 }
-                readData = s.read(5000);
+                readData = s.read(10000);  //TODO changed to 10000 from 5000, how much does this do...?
                 if(readData == L""){
+                        printf("Readdata nothing\n\r");
                         msleep(500);
                         continue; //TODO can we be really sure it SHOULD be anything?
+                        //TODO perhaps break here instead?
                 }
                 
                 if (!s.isConnected()) { //Connection failed sometime during operation...
+                        printf("Connection failed in the end\n\r");
                         msleep(500);
                         continue; //retry

telldus-core/service/ClientCommunicationHandler.cpp

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

telldus-core/service/SettingsConfuse.cpp

@@ -376 +376 @@
                 CFG_STR(const_cast<char *>("group"), const_cast<char *>("plugdev"), CFGF_NONE),
                 CFG_STR(const_cast<char *>("deviceNode"), const_cast<char *>("/dev/tellstick"), CFGF_NONE),
+                CFG_STR(const_cast<char *>("ignoreControllerConfirmation"), const_cast<char *>("false"), CFGF_NONE),
                 CFG_SEC(const_cast<char *>("device"), device_opts, CFGF_MULTI),
                 CFG_END()

telldus-core/service/TellStick_libftdi.cpp

@@ -20 +20 @@
 #include "Mutex.h"
 #include "Log.h"
+#include "Settings.h"
 #include "Strings.h"
 #include "common.h"
-#include "Log.h"
 
 #include <unistd.h>
@@ -34 +34 @@
 class TellStick::PrivateData {
 public:
-        bool open;
+        bool open, ignoreControllerConfirmation;
         int vid, pid, fwVersion;
         std::string serial, message;
@@ -53 +53 @@
         d->serial = td.serial;
         d->running = false;
+
+        Settings set;
+        d->ignoreControllerConfirmation = set.getSetting(L"ignoreControllerConfirmation")==L"true";
 
         ftdi_init(&d->ftHandle);
@@ -214 +217 @@
         delete[] tempMessage;
         Log::notice("Message: %s", strMessage.c_str());
-        if(strMessage == "N+" && ((pid() == 0x0C31 && firmwareVersion() < 5) || (pid() == 0x0C30 && firmwareVersion() < 6))){
+        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;
                 }
@@ -231 +236 @@
                 ret = ftdi_read_data( &d->ftHandle, &in, 1);
                 if (ret > 0) {
+                        Log::notice("Returned %c", in);
                         if (in == '\n') {
+                                Log::notice("BREAK");
                                 break;
                         }

telldus-core/service/tellstick.conf

@@ -1 +1 @@
 user = "nobody"
 group = "plugdev"
+ignoreControllerConfirmation = "false"
 device {
   id = 1