リビジョン | c8975cab8bde3fca3754611b31e4eae15e52dfc8 (tree) |
---|---|
日時 | 2018-10-10 17:53:34 |
作者 | Sergey Gusarov |
コミッター | Sergey Gusarov |
SerialCommandsController:: Changed error messages on read/write failures
@@ -37,6 +37,7 @@ | ||
37 | 37 | sim::Balance Tele2::getBalanceFromUssdResponse(const QString &ussdResponse) const |
38 | 38 | { |
39 | 39 | // Example: OCTATOK 12500.58 p. Угадайте звезду – получите до 1000р: *783# (2 дн.беспл) |
40 | + // Example: Сервис временно не доступен повторите запрос позже Service is unavaible | |
40 | 41 | |
41 | 42 | const QStringList kPrefixList = QStringList() << QString("OCTATOK ") << QString("Balance: "); |
42 | 43 | QString balance; |
@@ -240,10 +240,10 @@ | ||
240 | 240 | if (kQtReadStatus < 0) |
241 | 241 | { |
242 | 242 | const QSerialPort::SerialPortError kError = serialPort.error(); |
243 | + const QString kErrorString = QString("Error detected(%1) while reading data from the port %2, message=\"%3\"") | |
244 | + .arg(kError).arg(serialPort.portName()).arg(serialPort.errorString()); | |
243 | 245 | |
244 | - CT_TRACE_WARNING_IF(kError != QSerialPort::NoError, "Error detected(%u) while reading rata from the port %s", | |
245 | - kError, QTT_LATIN_PRINTABLE(serialPort.portName()) | |
246 | - ); | |
246 | + CT_TRACE_WARNING_IF(kError != QSerialPort::NoError, "%s", QTT_LATIN_PRINTABLE(serialPort.portName())); | |
247 | 247 | |
248 | 248 | readStatus = 0; |
249 | 249 | } |
@@ -260,7 +260,16 @@ | ||
260 | 260 | |
261 | 261 | const quint64 kWritten = serialPort.write(data, size); |
262 | 262 | |
263 | - CPT_THROW_IF(kWritten != size, cpptools::exceptions::IoException, std::error_code(static_cast<int>(kWritten), std::system_category())); | |
263 | + if (kWritten != size) | |
264 | + { | |
265 | + CT_TRACE_WARNING("Written only %u bytes but wanted to write %u bytes", kWritten, size); | |
266 | + | |
267 | + const QSerialPort::SerialPortError kError = serialPort.error(); | |
268 | + const QString kErrorString = QString("Error detected(%1) while writing data from the port %2, message=\"%3\"") | |
269 | + .arg(kError).arg(serialPort.portName()).arg(serialPort.errorString()); | |
270 | + | |
271 | + CT_TRACE_WARNING_IF(kError != QSerialPort::NoError, "%s", QTT_LATIN_PRINTABLE(serialPort.portName())); | |
272 | + } | |
264 | 273 | } |
265 | 274 | |
266 | 275 | /* *INDENT-OFF* */ |