jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Code cleanup

Browse source
This commit is contained in:
Stefan Persson 2012-01-12 14:27:15 +01:00
parent 3ce58f019f
commit e2e9ba4634
2 changed files with 0 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
telldus-core/service/TellStick_libftdi.cpp
View file

@ -216,9 +216,6 @@ int TellStick::send( const std::string &strMessage ) {
}
delete[] tempMessage;
Log::notice("Message: %s", strMessage.c_str());
Log::notice("FWVersion: %d", firmwareVersion());
Log::notice("Pid: %X", pid());
if(!c){
Log::debug("Broken pipe on send");
@ -227,27 +224,21 @@ int TellStick::send( const std::string &strMessage ) {
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;
}
if(d->ignoreControllerConfirmation){
//allow TellStick to finish its air-sending
Log::warning("Sleeping");
msleep(1000);
return TELLSTICK_SUCCESS;
}
Log::warning("Continuing");
int retrycnt = 250;
unsigned char in;
while(--retrycnt) {
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;
}
} else if(ret == 0) { // No data available
@ -258,7 +249,6 @@ int TellStick::send( const std::string &strMessage ) {
}
}
Log::warning("Error in communication, retrycount ended");
return TELLSTICK_ERROR_COMMUNICATION;
}

1
telldus-core/service/TelldusMain.cpp
View file

@ -112,7 +112,6 @@ void TelldusMain::start(void) {
while(janitor->isSignaled()) {
janitor->popSignal();
}
Log::debug("Do Janitor cleanup");
controllerManager.queryControllerStatus();
}
}