* Qt devops fixed + .pro file updated

parezj · Oct 10, 2021 · 3761ead · 3761ead
1 parent 3240f18
commit 3761ead
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 14 deletions.
diff --git a/src/firmware/__changelog.txt b/src/firmware/__changelog.txt
@@ -1,7 +1,13 @@
+0.2.4 - 10.10.2021
+==================
+* fixed critical bug (daq.c:725) was LL_TIM_EnableDMAReq instead of Disable
++ F103RE full support added
+
+------------------------------------------------------------------------------------------------------------------------------
+
 0.2.3 - 27.9.2021
-=================
+==================
 + 2 channel Signal Generator (fw + sq)
-+ F303RE full support added
 + L412KB full support added
 * Qt fixed wrong font scaling on high DPI displays (SetProcessDpiAwarenessContext)
 * fixed daq_enable(EM_FALSE) - added timeout between disable timer and ADC, which was causing channels order failure
@@ -13,14 +19,15 @@
 ------------------------------------------------------------------------------------------------------------------------------
 
 0.2.2 - 11.6.2021
-=================
+==================
 + Qt FFT size can be adjusted
 + ETS (Equivalent Time Sampling - Stroboscopic) mode added to SCOPE 
 * task priorities changed (critical)
 
 ------------------------------------------------------------------------------------------------------------------------------
 
 0.2.1 - 22.5.2021 [RELEASED]
-=================
+==================
 + initial release
-! need to fix ADC2 mode
++ F103C8 full support added
++ F303RE full support added
diff --git a/src/software/EMBO/EMBO.pro b/src/software/EMBO/EMBO.pro
@@ -26,10 +26,6 @@ greaterThan(QT_MAJOR_VERSION, 4){
     TARGET_ARCH=$${QMAKE_HOST.arch}
 }
 
-CONFIG(release, debug|release): DESTDIR = $$OUT_PWD/release
-CONFIG(debug, debug|release): DESTDIR = $$OUT_PWD/debug
-
-
 include(__updater/QSimpleUpdater.pri)
 
 LINUX_LIB_DIR = ubuntu_18
@@ -46,6 +42,9 @@ win32 {
         LIBS += $$PWD/lib/win64/libfftw3-3.dll
         LIBS += $$PWD/lib/win64/libqBreakpad.a
 
+        CONFIG(release, debug|release): DESTDIR = $$PWD/build-win64/release
+        CONFIG(debug, debug|release): DESTDIR = $$PWD/build-win64/debug
+
         inst.files += $$PWD/lib/win64/libfftw3-3.dll
         inst.path += $${DESTDIR}
         INSTALLS += inst
@@ -57,6 +56,9 @@ win32 {
         LIBS += $$PWD/lib/win32/libfftw3-3.dll
         LIBS += $$PWD/lib/win32/libqBreakpad.a
 
+        CONFIG(release, debug|release): DESTDIR = $$PWD/build-win32/release
+        CONFIG(debug, debug|release): DESTDIR = $$PWD/build-win32/debug
+
         inst.files += $$PWD/lib/win32/libfftw3-3.dll
         inst.path += $${DESTDIR}
         INSTALLS += inst
@@ -71,6 +73,9 @@ linux {
     QMAKE_LIBDIR += $$PWD/lib/$$LINUX_LIB_DIR
     LIBS += $$PWD/lib/$$LINUX_LIB_DIR/libfftw3.a
     #LIBS += $$PWD/lib/$$LINUX_LIB_DIR/libqBreakpad.a
+
+    CONFIG(release, debug|release): DESTDIR = $$PWD/build/linux/release
+    CONFIG(debug, debug|release): DESTDIR = $$PWD/build/linux/debug
 }
 
 macx {
@@ -82,6 +87,9 @@ macx {
     LIBS += -framework AppKit
     LIBS += $$PWD/lib/$$MACOS_LIB_DIR/libfftw3.a
     LIBS += $$PWD/lib/$$MACOS_LIB_DIR/libqBreakpad.a
+
+    CONFIG(release, debug|release): DESTDIR = $$PWD/build/macx/release
+    CONFIG(debug, debug|release): DESTDIR = $$PWD/build/macx/debug
 }
 
 #LIBS += -lOpenGL32
@@ -98,6 +106,7 @@ QMAKE_TARGET_DESCRIPTION = EMBedded Oscilloscope
 QMAKE_TARGET_COPYRIGHT = CTU Jakub Parez
 
 QMAKE_CXXFLAGS += -Wno-deprecated -Wno-deprecated-declarations
+QMAKE_POST_LINK=$(MAKE) install
 
 # You can also make your code fail to compile if it uses deprecated APIs.
 # In order to do so, uncomment the following line.

diff --git a/src/software/README.txt b/src/software/README.txt
@@ -0,0 +1,9 @@
+1. open Qt project
+2. configure:
+    build dirs: 
+                EMBO/build-win64
+                EMBO/build-win32
+                EMBO/build-linux
+                EMBO/build-macx
+
+3. add build step: make install
diff --git a/src/software/clean64.bat b/src/software/clean64.bat
@@ -1,5 +1,5 @@
 F:
-cd F:\STM32Cube\EMBO\src\software-qt\build\win64\release
+cd F:\STM32Cube\EMBO\src\softwarea\build\win64\release
 rm *.cpp
 rm *.h
 rm *.o

diff --git a/src/software/windeploy32.bat b/src/software/windeploy32.bat
@@ -1,6 +1,6 @@
 call  D:\PROJECTS\Qt\Qt5.14.2\5.14.2\mingw73_64\bin\qtenv2.bat
 F:
-cd D:\PROJECTS\STM32Cube\EMBO\src\software-qt\build-EMBO-Desktop_Qt_5_14_2_MinGW_32_bit-Release\release
+cd D:\PROJECTS\STM32Cube\EMBO\src\software\EMBO\build-win32\release
 dir
 windeployqt EMBO.exe
 dir

diff --git a/src/software/windeploy64.bat b/src/software/windeploy64.bat
@@ -1,6 +1,6 @@
-call  D:\PROJECTS\Qt\Qt5.14.2\5.14.2\mingw73_64\bin\qtenv2.bat
-D:
-cd D:\PROJECTS\STM32Cube\EMBO\src\software-qt\build-EMBO-Desktop_Qt_5_14_2_MinGW_64_bit-Release\release
+call  F:\Programs\Qt\Qt5.14.2\5.14.2\mingw73_64\bin\qtenv2.bat
+F:
+cd F:\STM32Cube\EMBO\src\software\EMBO\build-win64\release
 dir
 windeployqt EMBO.exe
 dir