jankae/LibreVNA
1
0
Fork 0
mirror of https://github.com/jankae/LibreVNA.git synced 2025-12-06 07:12:10 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

workflow update + minor bugs/warnings fixes

Browse source
This commit is contained in:
Jan Käberich 2024-11-03 13:36:54 +01:00
parent 69b2fac95f
commit 67a186be4f
5 changed files with 23 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
.github/workflows/Build.yml vendored
View file

@ -12,7 +12,7 @@ jobs:
PC_Application_Ubuntu: PC_Application_Ubuntu:
runs-on: ubuntu-22.04 runs-on: ubuntu-22.04
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
run: | run: |
@ -44,7 +44,7 @@ jobs:
- name: Upload artifact - name: Upload artifact
env: env:
LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}" LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: LibreVNA-GUI-Ubuntu-${{env.LIBREVNA_VERSION}} name: LibreVNA-GUI-Ubuntu-${{env.LIBREVNA_VERSION}}
path: Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI path: Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI
@ -52,7 +52,7 @@ jobs:
PC_Application_RPi5: PC_Application_RPi5:
runs-on: RPi-HIL runs-on: RPi-HIL
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
run: | run: |
@ -82,7 +82,7 @@ jobs:
- name: Upload artifact - name: Upload artifact
env: env:
LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}" LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: LibreVNA-GUI-RPi5-${{env.LIBREVNA_VERSION}} name: LibreVNA-GUI-RPi5-${{env.LIBREVNA_VERSION}}
path: Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI path: Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI
@ -90,7 +90,7 @@ jobs:
PC_Application_Windows: PC_Application_Windows:
runs-on: windows-2019 runs-on: windows-2019
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v4
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
- name: Install Qt - name: Install Qt
@ -141,7 +141,7 @@ jobs:
shell: cmd shell: cmd
- name: Upload - name: Upload
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
env: env:
LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}" LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
with: with:
@ -149,13 +149,13 @@ jobs:
path: Software/PC_Application/LibreVNA-GUI/release path: Software/PC_Application/LibreVNA-GUI/release
PC_Application_OSX: PC_Application_OSX:
runs-on: macos-12 runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
run: | run: |
brew install qt@6 libusb pcre brew install qt@6 pcre
- name: Set Environment - name: Set Environment
run: | run: |
@ -189,7 +189,7 @@ jobs:
- name: Upload artifact - name: Upload artifact
env: env:
LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}" LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
with: with:
name: LibreVNA-GUI-OSX-${{env.LIBREVNA_VERSION}} name: LibreVNA-GUI-OSX-${{env.LIBREVNA_VERSION}}
path: Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.zip path: Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.zip
@ -197,7 +197,7 @@ jobs:
Embedded_Firmware: Embedded_Firmware:
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v4
- name: Install toolchain - name: Install toolchain
run: | run: |
@ -230,7 +230,7 @@ jobs:
shell: bash shell: bash
- name: Upload - name: Upload
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v4
env: env:
LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}" LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
with: with:

14
.github/workflows/Release_tag_stable.yml vendored
View file

@ -12,7 +12,7 @@ jobs:
outputs: outputs:
upload_url: ${{ steps.bump_release.outputs.upload_url }} upload_url: ${{ steps.bump_release.outputs.upload_url }}
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
run: | run: |
@ -67,7 +67,7 @@ jobs:
needs: PC_Application_Ubuntu needs: PC_Application_Ubuntu
runs-on: RPi-HIL runs-on: RPi-HIL
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
run: | run: |
@ -106,7 +106,7 @@ jobs:
needs: PC_Application_Ubuntu needs: PC_Application_Ubuntu
runs-on: windows-2019 runs-on: windows-2019
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v4
- uses: msys2/setup-msys2@v2 - uses: msys2/setup-msys2@v2
- name: Install Qt - name: Install Qt
@ -171,13 +171,13 @@ jobs:
PC_Application_OSX: PC_Application_OSX:
needs: PC_Application_Ubuntu needs: PC_Application_Ubuntu
runs-on: macos-12 runs-on: macos-latest
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v4
- name: Install dependencies - name: Install dependencies
run: | run: |
brew install qt@6 libusb pcre brew install qt@6 pcre
- name: Set Environment - name: Set Environment
run: | run: |
@ -219,7 +219,7 @@ jobs:
needs: PC_Application_Ubuntu needs: PC_Application_Ubuntu
runs-on: ubuntu-20.04 runs-on: ubuntu-20.04
steps: steps:
- uses: actions/checkout@v1 - uses: actions/checkout@v4
- name: Install toolchain - name: Install toolchain
run: | run: |

2
Software/PC_Application/LibreVNA-GUI/Calibration/LibreCAL/caldevice.cpp
View file

@ -243,7 +243,7 @@ void CalDevice::loadCoefficientSetsThreadSlow(QStringList names, QList<int> port
totalPoints += usb->Query(":COEFF:NUM? "+name+" P"+QString::number(i)+"_SHORT").toInt(); totalPoints += usb->Query(":COEFF:NUM? "+name+" P"+QString::number(i)+"_SHORT").toInt();
totalPoints += usb->Query(":COEFF:NUM? "+name+" P"+QString::number(i)+"_LOAD").toInt(); totalPoints += usb->Query(":COEFF:NUM? "+name+" P"+QString::number(i)+"_LOAD").toInt();
for(int jdx=idx+1;jdx<numPorts;jdx++) { for(int jdx=idx+1;jdx<numPorts;jdx++) {
int j = ports[j]; int j = ports[jdx];
totalPoints += usb->Query(":COEFF:NUM? "+name+" P"+QString::number(i)+QString::number(j)+"_THROUGH").toInt(); totalPoints += usb->Query(":COEFF:NUM? "+name+" P"+QString::number(i)+QString::number(j)+"_THROUGH").toInt();
} }
} }

2
Software/PC_Application/LibreVNA-GUI/Device/LibreVNA/Compound/compounddeviceeditdialog.cpp
View file

@ -126,7 +126,7 @@ void CompoundDeviceEditDialog::checkIfOkay()
// Check port mapping // Check port mapping
// Looking for duplicate and missing ports // Looking for duplicate and missing ports
bool highestPortFound = false; bool highestPortFound = false;
unsigned int highestPort; unsigned int highestPort = 0;
for(unsigned int port=0;port<2*ldev.deviceSerials.size();port++) { for(unsigned int port=0;port<2*ldev.deviceSerials.size();port++) {
int num = 0; int num = 0;
for(unsigned int i=0;i<deviceFrames.size();i++) { for(unsigned int i=0;i<deviceFrames.size();i++) {

4
Software/PC_Application/LibreVNA-GUI/VNA/vna.cpp
View file

@ -646,7 +646,7 @@ VNA::VNA(AppWindow *window, QString name)
Calibration::InterpolationType VNA::getCalInterpolation() Calibration::InterpolationType VNA::getCalInterpolation()
{ {
double f_min, f_max; double f_min = 0, f_max = 0;
switch(settings.sweepType) { switch(settings.sweepType) {
case SweepType::Last: case SweepType::Last:
// should never get here, use frequency values just in case // should never get here, use frequency values just in case
@ -976,7 +976,7 @@ void VNA::NewDatapoint(DeviceDriver::VNAMeasurement m)
window->addStreamingData(m_avg, AppWindow::VNADataType::Calibrated); window->addStreamingData(m_avg, AppWindow::VNADataType::Calibrated);
} }
TraceMath::DataType type; TraceMath::DataType type = TraceMath::DataType::Frequency;
if(settings.zerospan) { if(settings.zerospan) {
type = TraceMath::DataType::TimeZeroSpan; type = TraceMath::DataType::TimeZeroSpan;