diff --git a/software/usbflashprog/backend/runner.cpp b/software/usbflashprog/backend/runner.cpp index 4c77e471..f582ff76 100644 --- a/software/usbflashprog/backend/runner.cpp +++ b/software/usbflashprog/backend/runner.cpp @@ -689,7 +689,8 @@ bool Runner::sendCommand_(TRunnerCommand& cmd, int retry) { } if (!cmd.responseIsOk()) { WARNING << "Response NOK." - << "Command" << cmd.opcode.descr.c_str(); + << "Command" << cmd.opcode.descr.c_str() << ". Response" + << "[ 0x" + QString(cmd.response.toHex()) << "]"; error_ = true; return false; } else { diff --git a/software/usbflashprog/i18n/ufprog_en_US.ts b/software/usbflashprog/i18n/ufprog_en_US.ts index 2588f30a..32cce927 100644 --- a/software/usbflashprog/i18n/ufprog_en_US.ts +++ b/software/usbflashprog/i18n/ufprog_en_US.ts @@ -546,6 +546,14 @@ Get Byte Get Byte + + Device is blank + Device is blank + + + Device is not blank + Device is not blank + SettingsDialog diff --git a/software/usbflashprog/i18n/ufprog_pt_BR.ts b/software/usbflashprog/i18n/ufprog_pt_BR.ts index 0361ec96..f095c991 100644 --- a/software/usbflashprog/i18n/ufprog_pt_BR.ts +++ b/software/usbflashprog/i18n/ufprog_pt_BR.ts @@ -545,6 +545,14 @@ Get Byte Ler 8 Bits + + Device is blank + Dispositivo está vazio + + + Device is not blank + Dispositivo não está vazio + SettingsDialog diff --git a/software/usbflashprog/ui/mainwindow.cpp b/software/usbflashprog/ui/mainwindow.cpp index 7ee6e189..9205b79e 100644 --- a/software/usbflashprog/ui/mainwindow.cpp +++ b/software/usbflashprog/ui/mainwindow.cpp @@ -430,7 +430,17 @@ void MainWindow::on_actionDoErase_triggered(bool checked) { if (!showActionWarningDialog_()) return; configureDeviceFromControls_(); showDialogActionProgress_(ui_->actionDoErase->text()); - device_->erase(); + if (device_->erase()) { + progress_->hide(); + QMessageBox::information( + this, progress_->windowTitle(), + tr("Device is blank").leftJustified(kDialogLabelMinLength)); + } else { + progress_->hide(); + QMessageBox::critical( + this, progress_->windowTitle(), + tr("Device is not blank").leftJustified(kDialogLabelMinLength)); + } } void MainWindow::on_actionEraseAndBlankCheck_triggered(bool checked) { @@ -441,7 +451,17 @@ void MainWindow::on_actionEraseAndBlankCheck_triggered(bool checked) { if (!showActionWarningDialog_()) return; configureDeviceFromControls_(); showDialogActionProgress_(ui_->actionEraseAndBlankCheck->text()); - device_->erase(true); + if (device_->erase(true)) { + progress_->hide(); + QMessageBox::information( + this, progress_->windowTitle(), + tr("Device is blank").leftJustified(kDialogLabelMinLength)); + } else { + progress_->hide(); + QMessageBox::critical( + this, progress_->windowTitle(), + tr("Device is not blank").leftJustified(kDialogLabelMinLength)); + } } void MainWindow::on_actionBlankCheck_triggered(bool checked) { @@ -449,7 +469,17 @@ void MainWindow::on_actionBlankCheck_triggered(bool checked) { if (!showActionWarningDialog_()) return; configureDeviceFromControls_(); showDialogActionProgress_(ui_->actionBlankCheck->text()); - device_->blankCheck(); + if (device_->blankCheck()) { + progress_->hide(); + QMessageBox::information( + this, progress_->windowTitle(), + tr("Device is blank").leftJustified(kDialogLabelMinLength)); + } else { + progress_->hide(); + QMessageBox::critical( + this, progress_->windowTitle(), + tr("Device is not blank").leftJustified(kDialogLabelMinLength)); + } } void MainWindow::on_actionGetID_triggered(bool checked) { @@ -459,6 +489,7 @@ void MainWindow::on_actionGetID_triggered(bool checked) { configureDeviceFromControls_(); showDialogActionProgress_(ui_->actionGetID->text()); if (device_->getId(deviceId)) { + progress_->hide(); QMessageBox::information( this, progress_->windowTitle(), tr("Manufacturer: 0x%1 (%2)")