Skip to content

Simplify and standardize QT project file and Windows installer #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mi-hol merged 5 commits into from
Feb 25, 2026
Merged

Simplify and standardize QT project file and Windows installer #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c7a62e9
Use identical logic for firmware deployment for all OSes
mi-hol Jan 27, 2026
2a55e8b
Update firmware hex files in Labrador.aip
mi-hol Feb 23, 2026
485b886
Include Windows firmware update files in Labrador.pro
mi-hol Feb 23, 2026
5617142
Remove duplicate labrafirm hex files from installer
mi-hol Feb 23, 2026
c1ab310
Merge branch 'master' into simplify_installer
mi-hol Feb 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions Desktop_Interface/Labrador.pro
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,10 @@ win32 {
lib_deploy.path = /

firmware.path = /firmware
firmware.files = $$files(resources/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/*)
Expand Down Expand Up @@ -164,7 +167,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/*)
Expand Down Expand Up @@ -302,7 +305,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/*)
Expand Down
8 changes: 4 additions & 4 deletions Desktop_Interface/build_win/Labrador.aip
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,8 +174,8 @@
<ROW File="libusbK.dll_1" Component_="libusbK.dll_1" FileName="libusbK.dll" Attributes="0" SourcePath="bin32\libusbK.dll" SelfReg="false"/>
<ROW File="dfuprogrammer.exe_1" Component_="dfuprogrammer.exe_1" FileName="DFU-PR~1.EXE|dfu-programmer.exe" Attributes="0" SourcePath="bin64\firmware\dfu-programmer.exe" SelfReg="false" DigSign="true"/>
<ROW File="flash.bat" Component_="flash.bat" FileName="flash.bat" Attributes="0" SourcePath="bin64\firmware\flash.bat" SelfReg="false"/>
<ROW File="labrafirm_0007_01.hex" Component_="flash.bat" FileName="LABRA~10.HEX|labrafirm_0007_01.hex" Attributes="0" SourcePath="bin64\firmware\labrafirm_0007_01.hex" SelfReg="false"/>
<ROW File="labrafirm_0007_02.hex" Component_="flash.bat" FileName="LABRA~11.HEX|labrafirm_0007_02.hex" Attributes="0" SourcePath="bin64\firmware\labrafirm_0007_02.hex" SelfReg="false"/>
<ROW File="labrafirm_0007_01.hex" Component_="flash.bat" FileName="LABRAF~8.HEX|labrafirm_0007_01.hex" Attributes="0" SourcePath="bin64\firmware\labrafirm_0007_01.hex" SelfReg="false"/>
<ROW File="labrafirm_0007_02.hex" Component_="flash.bat" FileName="LABRAF~9.HEX|labrafirm_0007_02.hex" Attributes="0" SourcePath="bin64\firmware\labrafirm_0007_02.hex" SelfReg="false"/>
<ROW File="wipe.bat" Component_="flash.bat" FileName="wipe.bat" Attributes="0" SourcePath="bin64\firmware\wipe.bat" SelfReg="false"/>
<ROW File="DC.tlw" Component_="DC.tlw" FileName="DC.tlw" Attributes="0" SourcePath="bin64\waveforms\DC.tlw" SelfReg="false"/>
<ROW File="Sawtooth.tlw" Component_="DC.tlw" FileName="Sawtooth.tlw" Attributes="0" SourcePath="bin64\waveforms\Sawtooth.tlw" SelfReg="false"/>
Expand Down Expand Up @@ -205,8 +205,8 @@
<ROW File="qt_sk.qm" Component_="qt_ar.qm" FileName="qt_sk.qm" Attributes="0" SourcePath="bin64\translations\qt_sk.qm" SelfReg="false"/>
<ROW File="qt_uk.qm" Component_="qt_ar.qm" FileName="qt_uk.qm" Attributes="0" SourcePath="bin64\translations\qt_uk.qm" SelfReg="false"/>
<ROW File="flash.bat_1" Component_="flash.bat_1" FileName="flash.bat" Attributes="0" SourcePath="bin32\firmware\flash.bat" SelfReg="false"/>
<ROW File="labrafirm_0007_01.hex_1" Component_="flash.bat_1" FileName="LABRA~10.HEX|labrafirm_0007_01.hex" Attributes="0" SourcePath="bin32\firmware\labrafirm_0007_01.hex" SelfReg="false"/>
<ROW File="labrafirm_0007_02.hex_1" Component_="flash.bat_1" FileName="LABRA~11.HEX|labrafirm_0007_02.hex" Attributes="0" SourcePath="bin32\firmware\labrafirm_0007_02.hex" SelfReg="false"/>
<ROW File="labrafirm_0007_01.hex_1" Component_="flash.bat_1" FileName="LABRAF~8.HEX|labrafirm_0007_01.hex" Attributes="0" SourcePath="bin32\firmware\labrafirm_0007_01.hex" SelfReg="false"/>
<ROW File="labrafirm_0007_02.hex_1" Component_="flash.bat_1" FileName="LABRAF~9.HEX|labrafirm_0007_02.hex" Attributes="0" SourcePath="bin32\firmware\labrafirm_0007_02.hex" SelfReg="false"/>
<ROW File="wipe.bat_1" Component_="flash.bat_1" FileName="wipe.bat" Attributes="0" SourcePath="bin32\firmware\wipe.bat" SelfReg="false"/>
<ROW File="qt_ar.qm_1" Component_="qt_ar.qm_1" FileName="qt_ar.qm" Attributes="0" SourcePath="bin32\translations\qt_ar.qm" SelfReg="false"/>
<ROW File="qt_bg.qm_1" Component_="qt_ar.qm_1" FileName="qt_bg.qm" Attributes="0" SourcePath="bin32\translations\qt_bg.qm" SelfReg="false"/>
Expand Down