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

moved to -alpha.2, updated release workflow

Browse Source
This commit is contained in:
Jan Käberich 2022-11-20 21:08:57 +01:00
parent 0c17288ece
commit 73426459ef
3 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.github/workflows/Release_tag_stable.yml vendored
View File

@ -8,7 +8,7 @@ on:
jobs: jobs:
PC_Application_Ubuntu: PC_Application_Ubuntu:
runs-on: ubuntu-18.04 runs-on: ubuntu-20.04
outputs: outputs:
upload_url: ${{ steps.bump_release.outputs.upload_url }} upload_url: ${{ steps.bump_release.outputs.upload_url }}
steps: steps:
@ -26,14 +26,13 @@ jobs:
fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro` fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro`
fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' LibreVNA-GUI.pro` fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' LibreVNA-GUI.pro`
fw_patch=`grep -oP '(?<=FW_PATCH=)[0-9]+' LibreVNA-GUI.pro` fw_patch=`grep -oP '(?<=FW_PATCH=)[0-9]+' LibreVNA-GUI.pro`
echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch" echo "app_version=v$fw_major.$fw_minor.$fw_patch" >> $GITHUB_OUTPUT
- name: Build application - name: Build application
run: | run: |
cd Software/PC_Application/LibreVNA-GUI cd Software/PC_Application/LibreVNA-GUI
qmake LibreVNA-GUI.pro qmake LibreVNA-GUI.pro
make -j9 make -j9
zip LibreVNA-GUI.zip LibreVNA-GUI
shell: bash shell: bash
- name: Bump release page - name: Bump release page
@ -71,26 +70,26 @@ jobs:
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v2 uses: jurplel/install-qt-action@v2
with: with:
version: '5.15.1' version: '5.15.2'
arch: 'win64_mingw81' arch: 'win64_mingw81'
- name: Download libusb - name: Download libusb
run: | run: |
curl -o libusb.7z -L https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.7z curl -o libusb.7z -L https://github.com/libusb/libusb/releases/download/v1.0.25/libusb-1.0.25.7z
7z x libusb.7z -r -olibusb 7z x libusb.7z -r -olibusb
Xcopy /E /I /Y libusb\include ..\Qt\5.15.1\mingw81_64\include Xcopy /E /I /Y libusb\include ..\Qt\5.15.2\mingw81_64\include
Xcopy /E /I /Y libusb\MinGW64\static Software\PC_Application\LibreVNA-GUI Xcopy /E /I /Y libusb\MinGW64\static\libusb-1.0.a Software\PC_Application\LibreVNA-GUI
shell: cmd shell: cmd
- name: Get app version - name: Get app version
id: id_version id: id_version
shell: msys2 {0} shell: msys2 {0}
run: | run: |
cd Software/PC_Application cd Software/PC_Application/LibreVNA-GUI
fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro` fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro`
fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' LibreVNA-GUI.pro` fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' LibreVNA-GUI.pro`
fw_patch=`grep -oP '(?<=FW_PATCH=)[0-9]+' LibreVNA-GUI.pro` fw_patch=`grep -oP '(?<=FW_PATCH=)[0-9]+' LibreVNA-GUI.pro`
echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch" echo "app_version=v$fw_major.$fw_minor.$fw_patch" >> $GITHUB_OUTPUT
- name: Build application - name: Build application
run: | run: |
@ -104,10 +103,10 @@ jobs:
cd Software/PC_Application/LibreVNA-GUI/release cd Software/PC_Application/LibreVNA-GUI/release
del *.o *.cpp del *.o *.cpp
windeployqt.exe . windeployqt.exe .
copy ..\..\..\..\..\Qt\5.15.1\mingw81_64\bin\libwinpthread-1.dll . copy ..\..\..\..\..\Qt\5.15.2\mingw81_64\bin\libwinpthread-1.dll .
copy ..\..\..\..\..\Qt\5.15.1\mingw81_64\bin\libgcc_s_seh-1.dll . copy ..\..\..\..\..\Qt\5.15.2\mingw81_64\bin\libgcc_s_seh-1.dll .
copy "..\..\..\..\..\Qt\5.15.1\mingw81_64\bin\libstdc++-6.dll" . copy "..\..\..\..\..\Qt\5.15.2\mingw81_64\bin\libstdc++-6.dll" .
copy ..\..\..\..\..\Qt\5.15.1\mingw81_64\bin\Qt5OpenGL.dll . copy ..\..\..\..\..\Qt\5.15.2\mingw81_64\bin\Qt5OpenGL.dll .
shell: cmd shell: cmd
- name: Zip app - name: Zip app
@ -130,7 +129,7 @@ jobs:
PC_Application_OSX: PC_Application_OSX:
needs: PC_Application_Ubuntu needs: PC_Application_Ubuntu
runs-on: macos-10.15 runs-on: macos-11
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v1
@ -149,7 +148,7 @@ jobs:
fw_major=`pcregrep -o '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro` fw_major=`pcregrep -o '(?<=FW_MAJOR=)[0-9]+' LibreVNA-GUI.pro`
fw_minor=`pcregrep -o '(?<=FW_MINOR=)[0-9]+' LibreVNA-GUI.pro` fw_minor=`pcregrep -o '(?<=FW_MINOR=)[0-9]+' LibreVNA-GUI.pro`
fw_patch=`pcregrep -o '(?<=FW_PATCH=)[0-9]+' LibreVNA-GUI.pro` fw_patch=`pcregrep -o '(?<=FW_PATCH=)[0-9]+' LibreVNA-GUI.pro`
echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch" echo "app_version=v$fw_major.$fw_minor.$fw_patch" >> $GITHUB_OUTPUT
- name: Build application - name: Build application
run: | run: |
@ -189,7 +188,7 @@ jobs:
fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' Makefile` fw_minor=`grep -oP '(?<=FW_MINOR=)[0-9]+' Makefile`
fw_patch=`grep -oP '(?<=FW_PATCH=)[0-9]+' Makefile` fw_patch=`grep -oP '(?<=FW_PATCH=)[0-9]+' Makefile`
hw_revision=`grep "DHW_REVISION=" Makefile | sed "s/-DHW_REVISION=\"'//" | sed "sr'\" [\]rr"` hw_revision=`grep "DHW_REVISION=" Makefile | sed "s/-DHW_REVISION=\"'//" | sed "sr'\" [\]rr"`
echo "::set-output name=app_version::hw-rev-$hw_revision-v$fw_major.$fw_minor.$fw_patch" echo "app_version=hw-rev-$hw_revision-v$fw_major.$fw_minor.$fw_patch" >> $GITHUB_OUTPUT
- name: Build application - name: Build application
run: | run: |

14
CHANGELOG.md
View File

@ -1,18 +1,28 @@
# Changelog # Changelog
## v1.5.0 ## v1.5.0
**v1.5.0 is in a pre-release state for now:** The following changes are implemented but not sufficiently tested for productive use. The v1.5.0-alpha.1 release allows testing of these features, proceed at your own risk. **v1.5.0 is in a pre-release state for now:** The following changes are implemented but not sufficiently tested for productive use. The v1.5.0-alpha.2 release allows testing of these features, proceed at your own risk.
- New features: - New features:
- Further abstraction from the LibreVNA hardware. The GUI now supports VNAs with up to 8 ports - Further abstraction from the LibreVNA hardware. The GUI now supports VNAs with up to 8 ports
- Allow cascading of muliple LibreVNAs, see Preferences->Compound Devices. You need to configure a compound device first (consisting of up to 4 LibreVNAs). Afterwards, you are able to use them as one larger, virtual VNA with more ports (or more physical separation between the ports). Measurements within one physical LibreVNA will contain phase information, measurements between different LibreVNAs have their phase set to zero - Allow cascading of muliple LibreVNAs, see Preferences->Compound Devices. You need to configure a compound device first (consisting of up to 4 LibreVNAs). Afterwards, you are able to use them as one larger, virtual VNA with more ports (or more physical separation between the ports). Measurements within one physical LibreVNA will contain phase information, measurements between different LibreVNAs have their phase set to zero
- Support for calibrating with sliding loads - Support for calibrating with sliding loads
- New graph type: Eye Diagram
- Restrict markers to a certain frequency range
- API-breaking changes: Unfortunately, some major rework was required to make the GUI compatible to devices with more than two ports. In some areas, the file storage format and the SCPI API had to change. Almost all changes are within the calibration system. - API-breaking changes: Unfortunately, some major rework was required to make the GUI compatible to devices with more than two ports. In some areas, the file storage format and the SCPI API had to change. Almost all changes are within the calibration system.
- Calibration kit file format changed (old calibration kits can be imported) - Calibration kit file format changed (old calibration kits can be imported)
- Calibration file format changed (old calibration can **not** be imported) - Calibration file format changed (old calibration can be imported)
- Calibration API changed significantly, see Programming Guide - Calibration API changed significantly, see Programming Guide
- Lots of bugfixes, for example:
- Fix X-label clipping on graphs
- Prevent activation of a calibration without defined calibration standards
- Fix isolation measurements for calibration
- Valgrind issues fixed (mostly variable initializations)
- made USB communication more robust
- PLL locking issue fixed
## v1.4.0 ## v1.4.0
- New features: - New features:

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

@ -363,5 +363,5 @@ QMAKE_CXXFLAGS += -Wno-deprecated -Wno-deprecated-declarations -Wno-deprecated-c
CONFIG += c++17 CONFIG += c++17
REVISION = $$system(git rev-parse HEAD) REVISION = $$system(git rev-parse HEAD)
DEFINES += GITHASH=\\"\"$$REVISION\\"\" DEFINES += GITHASH=\\"\"$$REVISION\\"\"
DEFINES += FW_MAJOR=1 FW_MINOR=5 FW_PATCH=0 FW_SUFFIX=\\"\"-alpha.1\\"\" DEFINES += FW_MAJOR=1 FW_MINOR=5 FW_PATCH=0 FW_SUFFIX=\\"\"-alpha.2\\"\"
DEFINES -= _UNICODE UNICODE DEFINES -= _UNICODE UNICODE