Skip to content

Commit

Permalink
Rev.G. Improve the hexeditor
Browse files Browse the repository at this point in the history
  • Loading branch information
@robsonsmartins
robsonsmartins committed Dec 22, 2023
1 parent fc4fc95 commit d26be0c
Show file tree
Hide file tree
Showing 7 changed files with 235 additions and 92 deletions.
12 changes: 12 additions & 0 deletions software/usbflashprog/i18n/ufprog_en_US.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,5 +477,17 @@
<source>Disconnect</source>
<translation>Disconnect</translation>
</message>
<message>
<source>The amount of data in the buffer is different from the device size.</source>
<translation>The amount of data in the buffer is different from the device size.</translation>
</message>
<message>
<source>Do you want to write the truncated data anyway?</source>
<translation>Do you want to write the truncated data anyway?</translation>
</message>
<message>
<source>Size: %1 | Checksum: 0x%2 [ADD16] | 0x%3 [CRC32]</source>
<translation>Size: %1 | Checksum: 0x%2 [ADD16] | 0x%3 [CRC32]</translation>
</message>
</context>
</TS>
12 changes: 12 additions & 0 deletions software/usbflashprog/i18n/ufprog_pt_BR.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -477,5 +477,17 @@
<source>Disconnect</source>
<translation>Desconectar</translation>
</message>
<message>
<source>The amount of data in the buffer is different from the device size.</source>
<translation>A quantidade de dados no editor é diferente do tamanho do dispositivo.</translation>
</message>
<message>
<source>Do you want to write the truncated data anyway?</source>
<translation>Você quer gravar o dispositivo com os dados truncados, mesmo assim?</translation>
</message>
<message>
<source>Size: %1 | Checksum: 0x%2 [ADD16] | 0x%3 [CRC32]</source>
<translation>Tamanho: %1 | Soma: 0x%2 [ADD16] | 0x%3 [CRC32]</translation>
</message>
</context>
</TS>
230 changes: 143 additions & 87 deletions software/usbflashprog/main/mainwindow.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,52 @@ constexpr const char *kSettingProgFast = "Prog/FastProg";
/* @brief Setting: Programmer / Sector Size. */
constexpr const char *kSettingProgSectorSize = "Prog/SectorSize";

/* @brief CRC32 table for calculation. */
constexpr uint32_t kCRC32Table[] = {
0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F,
0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988,
0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2,
0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7,
0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,
0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172,
0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C,
0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59,
0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423,
0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,
0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106,
0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433,
0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D,
0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E,
0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,
0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65,
0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7,
0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0,
0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA,
0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,
0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81,
0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A,
0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84,
0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1,
0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,
0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC,
0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E,
0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B,
0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55,
0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,
0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28,
0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D,
0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F,
0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38,
0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,
0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777,
0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69,
0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2,
0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC,
0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,
0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693,
0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94,
0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D};

// ---------------------------------------------------------------------------
// General

Expand Down Expand Up @@ -104,17 +150,16 @@ MainWindow::MainWindow(QWidget *parent)
ui_->frameEditor->layout()->addWidget(hexeditor_);
ui_->frameEditor->layout()->setContentsMargins(0, 0, 20, 20);

QFrame *frame = new QFrame();
QHBoxLayout *layout = new QHBoxLayout(frame);
QWidget *contentWidget = new QWidget();
layout->addWidget(contentWidget);

ui_->actionSave->setEnabled(false);
connectSignals_();
enableDiagControls_(false);
enumTimer_.start(kUsbEnumerateInterval);

checksumLabel_ = new QLabel();
ui_->statusbar->addPermanentWidget(checksumLabel_);

loadSettings_();
updateCheckSum_();
}

MainWindow::~MainWindow() {
Expand All @@ -124,6 +169,7 @@ MainWindow::~MainWindow() {
delete device_;
}
delete hexeditor_;
delete checksumLabel_;
delete ui_;
}

Expand All @@ -143,86 +189,26 @@ void MainWindow::connectSignals_() {
// diag
connect(&refreshTimer_, &QTimer::timeout, this,
&MainWindow::onRefreshTimerTimeout);
connect(ui_->checkBoxA0, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA1, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA2, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA3, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA4, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA5, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA6, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA7, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA8, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA9, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA10, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA11, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA12, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA13, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA14, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA15, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA16, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA17, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA18, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA19, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA20, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA21, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA22, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxA23, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
connect(ui_->checkBoxD0, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD1, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD2, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD3, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD4, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD5, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD6, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD7, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD8, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD9, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD10, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD11, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD12, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD13, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD14, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
connect(ui_->checkBoxD15, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
QCheckBox *addrCheckBoxes[] = {
ui_->checkBoxA0, ui_->checkBoxA1, ui_->checkBoxA2, ui_->checkBoxA3,
ui_->checkBoxA4, ui_->checkBoxA5, ui_->checkBoxA6, ui_->checkBoxA7,
ui_->checkBoxA8, ui_->checkBoxA9, ui_->checkBoxA10, ui_->checkBoxA11,
ui_->checkBoxA12, ui_->checkBoxA13, ui_->checkBoxA14, ui_->checkBoxA15,
ui_->checkBoxA16, ui_->checkBoxA17, ui_->checkBoxA18, ui_->checkBoxA19,
ui_->checkBoxA20, ui_->checkBoxA21, ui_->checkBoxA22, ui_->checkBoxA23};
for (QCheckBox *obj : addrCheckBoxes) {
connect(obj, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxAddressToggled);
}
QCheckBox *dataCheckBoxes[] = {
ui_->checkBoxD0, ui_->checkBoxD1, ui_->checkBoxD2, ui_->checkBoxD3,
ui_->checkBoxD4, ui_->checkBoxD5, ui_->checkBoxD6, ui_->checkBoxD7,
ui_->checkBoxD8, ui_->checkBoxD9, ui_->checkBoxD10, ui_->checkBoxD11,
ui_->checkBoxD12, ui_->checkBoxD13, ui_->checkBoxD14, ui_->checkBoxD15};
for (QCheckBox *obj : dataCheckBoxes) {
connect(obj, &QCheckBox::toggled, this,
&MainWindow::onCheckBoxDataToggled);
}
}

QScreen *MainWindow::screen() const {
Expand Down Expand Up @@ -314,11 +300,15 @@ void MainWindow::onBtnSelectDeviceClicked(bool checked) {
}

void MainWindow::onSelectDeviceTriggered(bool checked) {
if (hexeditor_->isChanged()) {
if (!showDialogFileChanged_()) return;
}
QAction *action = qobject_cast<QAction *>(sender());
ui_->btnProgDevice->setText(action->text());
createDevice_();
configureProgControls_();
saveSettings_();
hexeditor_->fill(0xFF);
}

void MainWindow::onActionProgress(uint32_t current, uint32_t total, bool done,
Expand Down Expand Up @@ -352,29 +342,61 @@ void MainWindow::onActionProgress(uint32_t current, uint32_t total, bool done,

void MainWindow::on_actionRead_triggered(bool checked) {
if (!device_ || !device_->getInfo().capability.hasRead) return;
if (hexeditor_->isChanged()) {
if (!showDialogFileChanged_()) return;
}
configureDeviceFromControls_();
showDialogActionProgress_(ui_->actionRead->text());
QByteArray buffer;
if (device_->read(buffer)) {
hexeditor_->setSize(device_->getSize());
hexeditor_->putData(buffer);
}
}

void MainWindow::on_actionDoProgram_triggered(bool checked) {
if (!device_ || !device_->getInfo().capability.hasProgram) return;
QByteArray data = hexeditor_->getData();
if (data.size() != device_->getSize()) {
if (QMessageBox::question(
this, tr("USB Flash/EPROM Programmer"),
tr("The amount of data in the buffer is different from the "
"device size.")
.leftJustified(kDialogLabelMinLength) +
"\n" +
tr("Do you want to write the truncated data anyway?")
.leftJustified(kDialogLabelMinLength)) ==
QMessageBox::No) {
return;
}
}
configureDeviceFromControls_();
showDialogActionProgress_(ui_->actionDoProgram->text());
device_->program(hexeditor_->getData());
device_->program(data);
}

void MainWindow::on_actionProgramAndVerify_triggered(bool checked) {
if (!device_ || !device_->getInfo().capability.hasProgram ||
!device_->getInfo().capability.hasVerify) {
return;
}
QByteArray data = hexeditor_->getData();
if (data.size() != device_->getSize()) {
if (QMessageBox::question(
this, tr("USB Flash/EPROM Programmer"),
tr("The amount of data in the buffer is different from the "
"device size.")
.leftJustified(kDialogLabelMinLength) +
"\n" +
tr("Do you want to write the truncated data anyway?")
.leftJustified(kDialogLabelMinLength)) ==
QMessageBox::No) {
return;
}
}
configureDeviceFromControls_();
showDialogActionProgress_(ui_->actionProgramAndVerify->text());
device_->program(hexeditor_->getData(), true);
device_->program(data, true);
}

void MainWindow::on_actionVerify_triggered(bool checked) {
Expand Down Expand Up @@ -1216,14 +1238,23 @@ void MainWindow::on_actionSaveAs_triggered(bool checked) {
}

void MainWindow::on_actionFillFF_triggered(bool checked) {
if (hexeditor_->isChanged()) {
if (!showDialogFileChanged_()) return;
}
hexeditor_->fill(0xFF);
}

void MainWindow::on_actionFill00_triggered(bool checked) {
if (hexeditor_->isChanged()) {
if (!showDialogFileChanged_()) return;
}
hexeditor_->fill(0x00);
}

void MainWindow::on_actionFillRandom_triggered(bool checked) {
if (hexeditor_->isChanged()) {
if (!showDialogFileChanged_()) return;
}
hexeditor_->random();
}

Expand Down Expand Up @@ -1277,6 +1308,31 @@ void MainWindow::onDataChanged(bool status) {
title += "*";
}
setWindowTitle(title);
updateCheckSum_();
}

void MainWindow::updateCheckSum_() {
uint32_t sum16 = 0, crc32 = 0xFFFFFFFF;
QByteArray data = hexeditor_->getData();
for (const auto &d : data) {
sum16 += d;
sum16 &= 0xFFFF;
crc32 = (crc32 >> 8) ^ kCRC32Table[(crc32 ^ d) & 0xFF];
}
crc32 ^= 0xFFFFFFFF;
QString size;
if (data.size() > 1024 * 1024) {
size = QString("%1 MB").arg(ceilf(data.size() / (1024.0f * 1024.0f)));
} else if (data.size() > 1024) {
size = QString("%1 KB").arg(ceilf(data.size() / 1024.0f));
} else {
size = QString("%1 Bytes").arg(data.size());
}
checksumLabel_->setText(
tr("Size: %1 | Checksum: 0x%2 [ADD16] | 0x%3 [CRC32]")
.arg(size)
.arg(QString("%1").arg(sum16, 4, 16, QChar('0')).toUpper())
.arg(QString("%1").arg(crc32, 8, 16, QChar('0')).toUpper()));
}

void MainWindow::enableEditorControls_(bool state) {
Expand Down
4 changes: 4 additions & 0 deletions software/usbflashprog/main/mainwindow.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,6 +156,8 @@ class MainWindow : public QMainWindow {
Ui::MainWindow *ui_;
/* @brief Pointer to QHexEditor widget. */
QHexEditor *hexeditor_;
/* @brief Pointer to checksum QLabel widget. */
QLabel *checksumLabel_;
/* @brief Pointer to QProgressDialog widget (Prog). */
QProgressDialog *progress_;
/* @brief Ports Enumerator Timer (Diag). */
Expand Down Expand Up @@ -204,6 +206,8 @@ class MainWindow : public QMainWindow {
QString getOpenDialogFilter_();
/* @brief Gets file filter of the save dialog (Editor). */
QString getSaveDialogFilter_();
/* @brief Updates checksum info (Editor). */
void updateCheckSum_();
/*
* @brief Connects to board via CDC port (Diag).
* @param state True to connect, false to disconnect.
Expand Down
2 changes: 1 addition & 1 deletion software/usbflashprog/third/QHexView/qhexview.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,7 @@ void QHexView::ensureVisible()
auto vlines = this->visibleLines();

if(pos.line >= (this->verticalScrollBar()->value() + vlines))
this->verticalScrollBar()->setValue(static_cast<int>(pos.line - vlines + 1));
this->verticalScrollBar()->setValue(static_cast<int>(pos.line - vlines + 2));
else if(pos.line < this->verticalScrollBar()->value())
this->verticalScrollBar()->setValue(static_cast<int>(pos.line));
else
Expand Down
Loading

0 comments on commit d26be0c

Please sign in to comment.