From c7a62e9c5cad9cbc87bd4fc9b38868e16103e2d2 Mon Sep 17 00:00:00 2001
From: mi-hol <22799428+mi-hol@users.noreply.github.com>
Date: Wed, 28 Jan 2026 00:45:33 +0100
Subject: [PATCH 1/4] Use identical logic for firmware deployment for all OSes
simplify logic to avoid bugs caused by inconsistencies/differences
---
Desktop_Interface/Labrador.pro | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Desktop_Interface/Labrador.pro b/Desktop_Interface/Labrador.pro
index fc6d1b480..77edf6496 100644
--- a/Desktop_Interface/Labrador.pro
+++ b/Desktop_Interface/Labrador.pro
@@ -105,7 +105,7 @@ win32 {
lib_deploy.path = /
firmware.path = /firmware
- firmware.files = $$files(resources/firmware/*)
+ firmware.files = $$files(resources/firmware/labrafirm*)
waveforms.path = /waveforms
waveforms.files = $$files(resources/waveforms/*)
@@ -164,7 +164,7 @@ unix:!android:!macx {
lib_deploy.files += build_linux/libdfuprog/lib/$${QT_ARCH}/libdfuprog-0.9.so
firmware.path = $$PREFIX/share/EspoTek/Labrador/firmware
- firmware.files += $$files(resources/firmware/labrafirm*)
+ firmware.files = $$files(resources/firmware/labrafirm*)
waveforms.path = $$PREFIX/share/EspoTek/Labrador/waveforms
waveforms.files += $$files(resources/waveforms/*)
@@ -300,7 +300,7 @@ android {
ANDROID_PERMISSIONS += android.permission.READ_EXTERNAL_STORAGE
firmware.path = /assets/firmware
- firmware.files = resources/firmware/labrafirm_0007_02.hex
+ firmware.files = $$files(resources/firmware/labrafirm*)
waveforms.path = /assets/waveforms
waveforms.files = $$files(resources/waveforms/*)
From 2a55e8b705b4604a2be7c5eae3a542595a3ebf7b Mon Sep 17 00:00:00 2001
From: mi-hol <22799428+mi-hol@users.noreply.github.com>
Date: Mon, 23 Feb 2026 14:13:21 +0100
Subject: [PATCH 2/4] Update firmware hex files in Labrador.aip
Removed obsolete firmware hex files and added new ones for labrafirm.
---
Desktop_Interface/build_win/Labrador.aip | 22 ++++------------------
1 file changed, 4 insertions(+), 18 deletions(-)
diff --git a/Desktop_Interface/build_win/Labrador.aip b/Desktop_Interface/build_win/Labrador.aip
index 65bddc92d..3cc7a05f2 100644
--- a/Desktop_Interface/build_win/Labrador.aip
+++ b/Desktop_Interface/build_win/Labrador.aip
@@ -174,15 +174,8 @@
|
|
|
- |
- |
- |
- |
- |
- |
- |
- |
- |
+ |
+ |
|
|
|
@@ -212,15 +205,8 @@
|
|
|
- |
- |
- |
- |
- |
- |
- |
- |
- |
+ |
+ |
|
|
|
From 485b8860d998036aaeb2da6e508bd3608ae1a01c Mon Sep 17 00:00:00 2001
From: mi-hol <22799428+mi-hol@users.noreply.github.com>
Date: Mon, 23 Feb 2026 14:19:15 +0100
Subject: [PATCH 3/4] Include Windows firmware update files in Labrador.pro
Add Windows-specific firmware update files to the project.
---
Desktop_Interface/Labrador.pro | 3 +++
1 file changed, 3 insertions(+)
diff --git a/Desktop_Interface/Labrador.pro b/Desktop_Interface/Labrador.pro
index 77edf6496..d95083a35 100644
--- a/Desktop_Interface/Labrador.pro
+++ b/Desktop_Interface/Labrador.pro
@@ -106,6 +106,9 @@ win32 {
firmware.path = /firmware
firmware.files = $$files(resources/firmware/labrafirm*)
+ # Windows special for firmware update
+ firmware.files += $$files(resources/firmware/*.bat)
+ firmware.files += $$files(resources/firmware/*.exe)
waveforms.path = /waveforms
waveforms.files = $$files(resources/waveforms/*)
From 5617142f53b2e83491d8fcaacc716308ba6b8eb0 Mon Sep 17 00:00:00 2001
From: mi-hol <22799428+mi-hol@users.noreply.github.com>
Date: Mon, 23 Feb 2026 14:42:49 +0100
Subject: [PATCH 4/4] Remove duplicate labrafirm hex files from installer
---
Desktop_Interface/build_win/Labrador.aip | 4 ----
1 file changed, 4 deletions(-)
diff --git a/Desktop_Interface/build_win/Labrador.aip b/Desktop_Interface/build_win/Labrador.aip
index 3cc7a05f2..292acbaa0 100644
--- a/Desktop_Interface/build_win/Labrador.aip
+++ b/Desktop_Interface/build_win/Labrador.aip
@@ -241,10 +241,6 @@
|
|
|
- |
- |
- |
- |
|
|
|