Changeset 06ac02

Timestamp:

01/10/12 09:55:26 (4 months ago)

Author:

Stefan Persson <stefan.persson@…>

Branches:

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

Children:

dfae48ef33f9c218e80c5ec9ec1d96a1ae5fa625

Parents:

e019f416d9aa3212aa5dc3a677eb8e2cf8ad8290

git-author:

Stefan Persson <stefan.persson@telldus.se>2012-01-10 09:55:26+01:00

git-committer:

Stefan Persson <stefan.persson@telldus.se>2012-01-10 09:55:26+01:00

Message:

Resetting USB and retrying send once if TellStick is not found, in Linux

Location:

telldus-core/service

Files:

• Controller.h (modified) (1 diff)
• ControllerManager.cpp (modified) (5 diffs)
• ControllerManager.h (modified) (1 diff)
• DeviceManager.cpp (modified) (3 diffs)
• TellStick.h (modified) (1 diff)
• TellStick_libftdi.cpp (modified) (4 diffs)

telldus-core/service/Controller.h

@@ -17 +17 @@
         virtual int firmwareVersion() = 0;
         virtual int send( const std::string &message ) = 0;
+        virtual int reset() = 0;
 
 protected:

telldus-core/service/ControllerManager.cpp

@@ -3 +3 @@
 #include "Mutex.h"
 #include "TellStick.h"
+#include "Log.h"
 
 #include <map>
@@ -91 +92 @@
 
         std::list<TellStickDescriptor>::iterator it = list.begin();
+        Log::notice("Before for-loop");
         for(; it != list.end(); ++it) {
+                Log::notice("Something in the loop");
                 //Most backend only report non-opened devices.
                 //If they don't make sure we don't open them twice
@@ -97 +100 @@
                 ControllerMap::const_iterator cit = d->controllers.begin();
                 for(; cit != d->controllers.end(); ++cit) {
+                        Log::notice("Something in second the loop");
                         TellStick *tellstick = reinterpret_cast<TellStick*>(cit->second);
                         if (!tellstick) {
+                                Log::notice("No tellstick");
                                 continue;
                         }
                         if (tellstick->isSameAsDescriptor(*it)) {
                                 found = true;
+                                Log::notice("FOUND");
                                 break;
                         }
@@ -112 +118 @@
                 int controllerId = d->lastControllerId-1;
                 TellStick *controller = new TellStick(controllerId, d->event, *it);
+                Log::notice("Is it open?");
                 if (!controller->isOpen()) {
+                        Log::notice("Yes it was");
                         delete controller;
                         continue;
@@ -120 +128 @@
         }
 }
+
+int ControllerManager::resetController(Controller *controller) {
+        TellStick *tellstick = reinterpret_cast<TellStick*>(controller);
+        if (!tellstick) {
+                return true; //not tellstick, nothing to reset at the moment, just return true
+        }
+        Log::notice("resettingController");
+        int success = controller->reset(); //ehh, här är väl controllern borttagen förresten?
+        Log::notice("Remove device");
+        deviceInsertedOrRemoved(tellstick->vid(), tellstick->pid(), tellstick->serial(), false); //remove from list and delete
+        Log::notice("Device removed");
+        return success;
+}

telldus-core/service/ControllerManager.h

@@ -15 +15 @@
 
         Controller *getBestControllerById(int id);
-
-protected:
         void loadControllers();
+        int resetController(Controller *controller);
 
 private:

telldus-core/service/DeviceManager.cpp

@@ -7 +7 @@
 #include "Message.h"
 #include "common.h"
+#include "Log.h"
 
 #include <map>
@@ -432 +433 @@
         }
         else{
+                Log::notice("Getting a controller...");
                 Controller *controller = d->controllerManager->getBestControllerById(device->getPreferredControllerId());
+                Log::notice("Doing action...");
+                if(!controller){
+                        Log::warning("No controller found, rescanning USB ports");
+                        //no controller found, scan for one, and retry once
+                        d->controllerManager->loadControllers();
+                        controller = d->controllerManager->getBestControllerById(device->getPreferredControllerId());
+                }
+
                 if(controller){
+                        Log::notice("But now, a controller!");
                         retval = device->doAction(action, data, controller);
+                        Log::notice("Retval received, %d.", retval);
+                        if(retval == TELLSTICK_ERROR_COMMUNICATION){
+                                Log::warning("Error in communication with TellStick, resetting USB");
+                                d->controllerManager->resetController(controller);
+                                Log::notice("Controller reset");
+                        }
+                        if(retval == TELLSTICK_ERROR_COMMUNICATION || retval == TELLSTICK_ERROR_NOT_FOUND){
+                                Log::warning("Rescanning USB ports");
+                                d->controllerManager->loadControllers();
+                                Log::notice("Loaded, get one");
+                                controller = d->controllerManager->getBestControllerById(device->getPreferredControllerId());
+                                if(!controller){
+                                        Log::error("No contoller (TellStick) found, even after reset. Giving up.");
+                                        return TELLSTICK_ERROR_NOT_FOUND;
+                                }
+                                Log::notice("Got a new, do action");
+                                retval = device->doAction(action, data, controller); //retry one more time
+                                Log::notice("Did action");
+                        }
                 } else {
+                        Log::error("No contoller (TellStick) found after one retry. Giving up.");
                         return TELLSTICK_ERROR_NOT_FOUND;
                 }
@@ -720 +751 @@
 
         Controller *controller = d->controllerManager->getBestControllerById(-1);
+
+        if(!controller){
+                //no controller found, scan for one, and retry once
+                d->controllerManager->loadControllers();
+                controller = d->controllerManager->getBestControllerById(-1);
+        }
+
+        int retval = TELLSTICK_ERROR_UNKNOWN;
         if(controller){
-                return controller->send(TelldusCore::wideToString(command));
-        }
-        else{
+                retval = controller->send(TelldusCore::wideToString(command));
+                if(retval == TELLSTICK_ERROR_COMMUNICATION){
+                        d->controllerManager->resetController(controller);
+                }
+                if(retval == TELLSTICK_ERROR_COMMUNICATION || retval == TELLSTICK_ERROR_NOT_FOUND){
+                        d->controllerManager->loadControllers();
+                        controller = d->controllerManager->getBestControllerById(-1);
+                        if(!controller){
+                                return TELLSTICK_ERROR_NOT_FOUND;
+                        }
+                        retval = controller->send(TelldusCore::wideToString(command));  //retry one more time
+                }
+                return retval;
+        } else {
                 return TELLSTICK_ERROR_NOT_FOUND;
         }

telldus-core/service/TellStick.h

@@ -30 +30 @@
         virtual int firmwareVersion();
         virtual int pid() const;
+        virtual int vid() const;
+        virtual std::string serial() const;
+
         bool isOpen() const;
         bool isSameAsDescriptor(const TellStickDescriptor &d) const;
+        virtual int reset();
         virtual int send( const std::string &message );
         bool stillConnected() const;

telldus-core/service/TellStick_libftdi.cpp

@@ -22 +22 @@
 #include "Strings.h"
 #include "common.h"
+#include "Log.h"
 
 #include <unistd.h>
@@ -98 +99 @@
 int TellStick::pid() const {
         return d->pid;
+}
+
+int TellStick::vid() const {
+        return d->vid;
+}
+
+std::string TellStick::serial() const {
+        return d->serial;
 }
 
@@ -136 +145 @@
 }
 
+int TellStick::reset(){
+        Log::notice("Resetting one");
+        int success = ftdi_usb_reset( &d->ftHandle );
+        Log::notice("Has reset one");
+        if(success < 0){
+                return TELLSTICK_ERROR_UNKNOWN; //-1 = FTDI reset failed, -2 = USB device unavailable
+        }
+        return success;
+}
+
 void TellStick::run() {
         int dwBytesRead = 0;
@@ -274 +293 @@
         ftdi_init(&ftdic);
 
+        Log::notice("Trying to find Duo");
         int ret = ftdi_usb_find_all(&ftdic, &devlist, vid, pid);
         if (ret > 0) {
+                Log::notice("Curdev > 0");
                 for (curdev = devlist; curdev != NULL; curdev = curdev->next) {
+                        Log::notice("Something in the loop");
                         ret = ftdi_usb_get_strings(&ftdic, curdev->dev, NULL, 0, NULL, 0, serialBuffer, 10);
+                        Log::notice("Ret: %d",ret);
+                        //blir -9 efter felen, "get serial number failed", även lsusb -v ger annat svar än innan...?
                         if (ret != 0) {
                                 continue;