Changeset 673daf

Timestamp:

01/10/12 16:00:14 (4 months ago)

Author:

Stefan Persson <stefan.persson@…>

Branches:

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

Children:

0c8de249d4250159c0b215c5d806d15d28de3bae

Parents:

dfae48ef33f9c218e80c5ec9ec1d96a1ae5fa625

git-author:

Stefan Persson <stefan.persson@telldus.se>2012-01-10 16:00:14+01:00

git-committer:

Stefan Persson <stefan.persson@telldus.se>2012-01-10 16:00:14+01:00

Message:

Sending noop to TellStick every 5 minutes, attempting to reconnect if TellStick is missing. In Linux.

Location:

telldus-core

Files:

• common/Socket_unix.cpp (modified) (1 diff)
• service/ControllerManager.cpp (modified) (4 diffs)
• service/ControllerManager.h (modified) (1 diff)
• service/TellStick_libftdi.cpp (modified) (1 diff)
• service/TelldusMain.cpp (modified) (2 diffs)

telldus-core/common/Socket_unix.cpp

@@ -115 +115 @@
         TelldusCore::MutexLocker locker(&d->mutex);
         d->connected = false;
+        //TODO somehow signal the socket here?
 }
 

telldus-core/service/ControllerManager.cpp

@@ -4 +4 @@
 #include "TellStick.h"
 #include "Log.h"
+#include "../client/telldus-core.h"
 
 #include <map>
@@ -100 +101 @@
                 ControllerMap::const_iterator cit = d->controllers.begin();
                 for(; cit != d->controllers.end(); ++cit) {
-                        Log::notice("Something in second the loop");
+                        Log::notice("Something in the second loop");
                         TellStick *tellstick = reinterpret_cast<TellStick*>(cit->second);
                         if (!tellstick) {
@@ -129 +130 @@
 }
 
+void ControllerManager::queryControllerStatus(){
+
+        std::list<TellStick *> tellStickControllers;
+
+        {
+                TelldusCore::MutexLocker locker(&d->mutex);
+                for(ControllerMap::iterator it = d->controllers.begin(); it != d->controllers.end(); ++it) {
+                        Log::notice("found a controller");
+                        TellStick *tellstick = reinterpret_cast<TellStick*>(it->second);
+                        if (tellstick) {
+                                Log::notice("found a tellstick");
+                                tellStickControllers.push_back(tellstick);
+                        }
+                }
+        }
+
+        bool reloadControllers = false;
+        std::string noop = "noop";
+        for(std::list<TellStick *>::iterator it = tellStickControllers.begin(); it != tellStickControllers.end(); ++it) {
+                int success = (*it)->send(noop);
+                if(success == TELLSTICK_ERROR_COMMUNICATION){
+                        Log::warning("TellStick query: Error in communication with TellStick, resetting USB");
+                        resetController(*it);
+                        Log::notice("has reset");
+                }
+                if(success == TELLSTICK_ERROR_COMMUNICATION || success == TELLSTICK_ERROR_NOT_FOUND){
+                        reloadControllers = true;
+                        Log::notice("Set reload");
+                }
+        }
+
+        if(!tellStickControllers.size() || reloadControllers){
+                //no tellstick at all found, or controller was reset
+                Log::warning("TellStick query: Rescanning USB ports");
+                loadControllers();
+        }
+}
+
 int ControllerManager::resetController(Controller *controller) {
         TellStick *tellstick = reinterpret_cast<TellStick*>(controller);
@@ -135 +174 @@
         }
         Log::notice("resettingController");
-        int success = controller->reset(); //ehh, här är väl controllern borttagen förresten?
+        int success = controller->reset();
         Log::notice("Remove device");
         deviceInsertedOrRemoved(tellstick->vid(), tellstick->pid(), tellstick->serial(), false); //remove from list and delete

telldus-core/service/ControllerManager.h

@@ -16 +16 @@
         Controller *getBestControllerById(int id);
         void loadControllers();
+        void queryControllerStatus();
         int resetController(Controller *controller);
 

telldus-core/service/TellStick_libftdi.cpp

@@ -216 +216 @@
 
         delete[] tempMessage;
+        if(strMessage == "noop"){
+                if(c){
+                        return TELLSTICK_SUCCESS;
+                }
+                else{
+                        return TELLSTICK_ERROR_COMMUNICATION;
+                }
+        }
 
         int retrycnt = 500;

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(60*5); //Every 5 minutes
+        supervisor.setInterval(10); //Every 5 minutes TODO how often? 60*5
         supervisor.start();
 
@@ -114 +114 @@
                         }
                         Log::debug("Do Janitor cleanup");
+                        controllerManager.queryControllerStatus();
                 }
         }