Index: src/progs/icd2/base/icd2_serial.cpp
===================================================================
--- src/progs/icd2/base/icd2_serial.cpp (révision 2930)
+++ src/progs/icd2/base/icd2_serial.cpp (révision 2932)
@@ -31,16 +31,27 @@
{
if ( !static_cast<SerialPort *>(_port)->open(Port::Serial::S19200) ) return false;
if ( !reset() ) return false;
+ log(Log::DebugLevel::Max, QString("Send: \"%1\"").arg("Z"));
if ( !_port->send("Z", 1) ) return false;
QString s;
if ( !_port->receive(4, s) ) return false;
+ log(Log::DebugLevel::Max, QString("Received: \"%1\"").arg(s));
+
if ( !reset() ) return false;
- QByteArray a = toAscii(mode);
- if ( !_port->send(a.data(), a.count()) ) return false;
- if ( !_port->receive(1, s) ) return false;
- if ( s.upper()!=mode ) {
- log(Log::LineType::Error, i18n("Failed to set port mode to '%1'.").arg(mode));
- return false;
+ for (uint i = 0; ; ++i) {
+ const QByteArray a = toAscii(mode);
+ log(Log::DebugLevel::Max, QString("Send: \"%1\"").arg(mode));
+ if ( !_port->send(a.data(), a.count()) ) return false;
+ if ( !_port->receive(1, s) ) return false;
+ log(Log::DebugLevel::Max, QString("Received: \"%1\"").arg(s));
+ if ( s.upper()==mode ) {
+ break;
+ }
+ if (i == 10) {
+ log(Log::LineType::Error, i18n("Failed to set port mode to '%1'.").arg(mode));
+ return false;
+ }
+ Port::msleep(100);
}
//log(Log::Debug, "set fast speed");
//if ( !setFastSpeed() ) return false;
@@ -49,6 +60,7 @@
bool Icd2::SerialHardware::reset()
{
+ log(Log::DebugLevel::Max, QString("Reset icd2 serial port"));
static_cast<Port::Serial *>(_port)->setPinOn(Port::Serial::DTR, false, Port::PositiveLogic); // Trigger DTR to reset icd2
Port::msleep(10);
static_cast<Port::Serial *>(_port)->setPinOn(Port::Serial::DTR, true, Port::PositiveLogic); // remove reset