Changeset 8d22ef

Timestamp:

01/11/12 11:38:03 (4 months ago)

Author:

Stefan Persson <stefan.persson@…>

Branches:

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

Children:

d7cce515ff9fca11b5be98bf926bcc355c949294

Parents:

0c8de249d4250159c0b215c5d806d15d28de3bae

git-author:

Stefan Persson <stefan.persson@telldus.se>2012-01-11 11:38:03+01:00

git-committer:

Stefan Persson <stefan.persson@telldus.se>2012-01-11 11:38:03+01:00

Message:

Added wait for ack on noop-command

Location:

telldus-core/service

Files:

• ControllerManager.cpp (modified) (8 diffs)
• DeviceManager.cpp (modified) (4 diffs)
• TellStick_libftdi.cpp (modified) (4 diffs)
• TelldusMain.cpp (modified) (1 diff)

telldus-core/service/ControllerManager.cpp

@@ -93 +93 @@
 
         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
@@ -101 +99 @@
                 ControllerMap::const_iterator cit = d->controllers.begin();
                 for(; cit != d->controllers.end(); ++cit) {
-                        Log::notice("Something in the second 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;
                         }
@@ -119 +114 @@
                 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;
@@ -137 +130 @@
                 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);
                         }
@@ -147 +138 @@
 
         bool reloadControllers = false;
-        std::string noop = "noop";
+        std::string noop = "N+";
         for(std::list<TellStick *>::iterator it = tellStickControllers.begin(); it != tellStickControllers.end(); ++it) {
                 int success = (*it)->send(noop);
@@ -153 +144 @@
                         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");
                 }
         }
@@ -163 +152 @@
         if(!tellStickControllers.size() || reloadControllers){
                 //no tellstick at all found, or controller was reset
-                Log::warning("TellStick query: Rescanning USB ports");
+                Log::debug("TellStick query: Rescanning USB ports");  //only log as debug, since this will happen all the time if no TellStick is connected
                 loadControllers();
         }
@@ -173 +162 @@
                 return true; //not tellstick, nothing to reset at the moment, just return true
         }
-        Log::notice("resettingController");
-        int success = controller->reset();
-        Log::notice("Remove device");
+        int success = tellstick->reset();
         deviceInsertedOrRemoved(tellstick->vid(), tellstick->pid(), tellstick->serial(), false); //remove from list and delete
-        Log::notice("Device removed");
         return success;
 }

telldus-core/service/DeviceManager.cpp

@@ -6 +6 @@
 #include "Strings.h"
 #include "Message.h"
-
-#include "common.h" //TODO remove?
-#include "Log.h" //TODO remove?
+#include "Log.h"
 
 #include <map>
@@ -434 +432 @@
         }
         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");
+                        Log::warning("Trying to execute action, but no controller found. Rescanning USB ports");
                         //no controller found, scan for one, and retry once
                         d->controllerManager->loadControllers();
@@ -445 +441 @@
 
                 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");
+                                Log::warning("Error in communication with TellStick when executing action. 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){
@@ -462 +454 @@
                                         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 {

telldus-core/service/TellStick_libftdi.cpp

@@ -146 +146 @@
 
 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
@@ -211 +209 @@
                 c = false;
         } else if(ret != strMessage.length()) {
-                fprintf(stderr, "weird send length? retval %i instead of %d\n",
-                ret, (int)strMessage.length());
+                Log::debug("Weird send length? retval %i instead of %d\n", ret, (int)strMessage.length());
         }
 
         delete[] tempMessage;
-        if(strMessage == "noop"){
+        Log::notice("Message: %s", strMessage.c_str());
+        if(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){
                         return TELLSTICK_SUCCESS;
@@ -224 +224 @@
                 }
         }
+        Log::warning("Continuing");
 
         int retrycnt = 500;
@@ -301 +302 @@
         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;

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); //Every 5 minutes TODO how often? 60*5
+        supervisor.setInterval(10); //TODO Once every minute
         supervisor.start();