From be433c00cb3c76c0dcf3c8c9f8e7c484faafacb3 Mon Sep 17 00:00:00 2001
From: Andre Dunford <andredunford@gmail.com>
Date: Tue, 29 Nov 2022 09:59:18 -0800
Subject: [PATCH] include PacketConstants.h and update FW_CHUNK_SIZE reference

---
 .../LibreVNA-GUI/Device/firmwareupdatedialog.cpp           | 7 ++++---
 Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro      | 1 +
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Software/PC_Application/LibreVNA-GUI/Device/firmwareupdatedialog.cpp b/Software/PC_Application/LibreVNA-GUI/Device/firmwareupdatedialog.cpp
index f2e5283..3b16e8c 100644
--- a/Software/PC_Application/LibreVNA-GUI/Device/firmwareupdatedialog.cpp
+++ b/Software/PC_Application/LibreVNA-GUI/Device/firmwareupdatedialog.cpp
@@ -1,6 +1,7 @@
 #include "firmwareupdatedialog.h"
 
 #include "ui_firmwareupdatedialog.h"
+#include "../../VNA_embedded/Application/Communication/PacketConstants.h"
 
 #include <QFileDialog>
 #include <QStyle>
@@ -49,7 +50,7 @@ void FirmwareUpdateDialog::on_bStart_clicked()
     }
     file->seek(0);
     addStatus("Evaluating file...");
-    if(file->size() % Protocol::FirmwareChunkSize != 0) {
+    if(file->size() % PacketConstants::FW_CHUNK_SIZE != 0) {
         abortWithError("Invalid file size");
         return;
     }
@@ -132,7 +133,7 @@ void FirmwareUpdateDialog::receivedAck()
         timer.start(1000);
         break;
     case State::TransferringData:
-        transferredBytes += Protocol::FirmwareChunkSize;
+        transferredBytes += PacketConstants::FW_CHUNK_SIZE;
         ui->progress->setValue(100 * transferredBytes / file->size());
         if(transferredBytes >= file->size()) {
             // complete file transferred
@@ -175,6 +176,6 @@ void FirmwareUpdateDialog::sendNextFirmwareChunk()
 {
     Protocol::FirmwarePacket fw;
     fw.address = transferredBytes;
-    file->read((char*) &fw.data, Protocol::FirmwareChunkSize);
+    file->read((char*) &fw.data, PacketConstants::FW_CHUNK_SIZE);
     dev->SendFirmwareChunk(fw);
 }
diff --git a/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro b/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
index 3639f44..2621729 100644
--- a/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
+++ b/Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro
@@ -1,5 +1,6 @@
 HEADERS += \
     ../../VNA_embedded/Application/Communication/Protocol.hpp \
+    ../../VNA_embedded/Application/Communication/PacketConstants.h \
     Calibration/LibreCAL/caldevice.h \
     Calibration/LibreCAL/librecaldialog.h \
     Calibration/LibreCAL/usbdevice.h \