caiyu/LibreVNA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

include PacketConstants.h and update FW_CHUNK_SIZE reference

Browse Source
This commit is contained in:
Andre Dunford 2022-11-29 09:59:18 -08:00
parent 5bf824220e
commit be433c00cb
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Software/PC_Application/LibreVNA-GUI/Device/firmwareupdatedialog.cpp
View File

@ -1,6 +1,7 @@
#include "firmwareupdatedialog.h" #include "firmwareupdatedialog.h"
#include "ui_firmwareupdatedialog.h" #include "ui_firmwareupdatedialog.h"
#include "../../VNA_embedded/Application/Communication/PacketConstants.h"
#include <QFileDialog> #include <QFileDialog>
#include <QStyle> #include <QStyle>
@ -49,7 +50,7 @@ void FirmwareUpdateDialog::on_bStart_clicked()
} }
file->seek(0); file->seek(0);
addStatus("Evaluating file..."); addStatus("Evaluating file...");
if(file->size() % Protocol::FirmwareChunkSize != 0) { if(file->size() % PacketConstants::FW_CHUNK_SIZE != 0) {
abortWithError("Invalid file size"); abortWithError("Invalid file size");
return; return;
} }
@ -132,7 +133,7 @@ void FirmwareUpdateDialog::receivedAck()
timer.start(1000); timer.start(1000);
break; break;
case State::TransferringData: case State::TransferringData:
transferredBytes += Protocol::FirmwareChunkSize; transferredBytes += PacketConstants::FW_CHUNK_SIZE;
ui->progress->setValue(100 * transferredBytes / file->size()); ui->progress->setValue(100 * transferredBytes / file->size());
if(transferredBytes >= file->size()) { if(transferredBytes >= file->size()) {
// complete file transferred // complete file transferred
@ -175,6 +176,6 @@ void FirmwareUpdateDialog::sendNextFirmwareChunk()
{ {
Protocol::FirmwarePacket fw; Protocol::FirmwarePacket fw;
fw.address = transferredBytes; fw.address = transferredBytes;
file->read((char*) &fw.data, Protocol::FirmwareChunkSize); file->read((char*) &fw.data, PacketConstants::FW_CHUNK_SIZE);
dev->SendFirmwareChunk(fw); dev->SendFirmwareChunk(fw);
} }

1
Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
View File

@ -1,5 +1,6 @@
HEADERS += \ HEADERS += \
../../VNA_embedded/Application/Communication/Protocol.hpp \ ../../VNA_embedded/Application/Communication/Protocol.hpp \
../../VNA_embedded/Application/Communication/PacketConstants.h \
Calibration/LibreCAL/caldevice.h \ Calibration/LibreCAL/caldevice.h \
Calibration/LibreCAL/librecaldialog.h \ Calibration/LibreCAL/librecaldialog.h \
Calibration/LibreCAL/usbdevice.h \ Calibration/LibreCAL/usbdevice.h \