Changeset e2e9ba

Timestamp:

01/12/12 14:27:15 (4 months ago)

Author:

Stefan Persson <stefan.persson@…>

Branches:

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

Children:

01855cac968f05755723356ac8582602264fbffb

Parents:

3ce58f019fbe42e77592b30166a1f44a732eeee5

git-author:

Stefan Persson <stefan.persson@telldus.se>2012-01-12 14:27:15+01:00

git-committer:

Stefan Persson <stefan.persson@telldus.se>2012-01-12 14:27:15+01:00

Message:

Code cleanup

Location:

telldus-core/service

Files:

• TellStick_libftdi.cpp (modified) (5 diffs)
• TelldusMain.cpp (modified) (1 diff)

telldus-core/service/TellStick_libftdi.cpp

@@ -217 +217 @@
 
         delete[] tempMessage;
-        Log::notice("Message: %s", strMessage.c_str());
-        Log::notice("FWVersion: %d", firmwareVersion());
-        Log::notice("Pid: %X", pid());
 
         if(!c){
@@ -228 +225 @@
         if(strMessage.compare("N+") == 0 && ((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::warning("Too old firmware, accepting this, just return success");
                 return TELLSTICK_SUCCESS;
         }
@@ -234 +230 @@
         if(d->ignoreControllerConfirmation){
                 //allow TellStick to finish its air-sending
-                Log::warning("Sleeping");
                 msleep(1000);
                 return TELLSTICK_SUCCESS;
         }
-
-        Log::warning("Continuing");
 
         int retrycnt = 250;
@@ -246 +239 @@
                 ret = ftdi_read_data( &d->ftHandle, &in, 1);
                 if (ret > 0) {
-                        Log::warning("%c", in);
                         if (in == '\n') {
-                                Log::warning("Received an end");
                                 return TELLSTICK_SUCCESS;
                         }
@@ -259 +250 @@
         }
 
-        Log::warning("Error in communication, retrycount ended");
         return TELLSTICK_ERROR_COMMUNICATION;
 }

telldus-core/service/TelldusMain.cpp

@@ -113 +113 @@
                                 janitor->popSignal();
                         }
-                        Log::debug("Do Janitor cleanup");
                         controllerManager.queryControllerStatus();
                 }