diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
index 1cb4500..a94a208 100644
--- a/.github/workflows/Build.yml
+++ b/.github/workflows/Build.yml
@@ -4,12 +4,34 @@ on:
push:
branches:
- master
- - embedded_firmware_ci
+ - compoundDevice
pull_request:
branches:
- master
jobs:
+ Tests:
+ runs-on: ubuntu-18.04
+ steps:
+ - uses: actions/checkout@v1
+
+ - name: Install dependencies
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y libusb-1.0-0-dev qt5-default qt5-qmake qtbase5-dev
+
+ - name: Build Tests
+ run: |
+ cd Software/PC_Application/LibreVNA-Test
+ qmake LibreVNA-Test.pro
+ make -j9
+ shell: bash
+
+ - name: Run Tests
+ run: |
+ cd Software/PC_Application/LibreVNA-Test
+ ./LibreVNA-Test
+
PC_Application_Ubuntu:
runs-on: ubuntu-18.04
steps:
@@ -27,7 +49,7 @@ jobs:
- name: Get app version
id: id_version
run: |
- cd Software/PC_Application
+ cd Software/PC_Application/LibreVNA-GUI
fw_major=`grep -oP '(?<=FW_MAJOR=)[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`
@@ -35,7 +57,7 @@ jobs:
- name: Build application
run: |
- cd Software/PC_Application
+ cd Software/PC_Application/LibreVNA-GUI
qmake LibreVNA-GUI.pro
make -j9
shell: bash
@@ -46,7 +68,7 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: LibreVNA-GUI-Ubuntu-${{env.LIBREVNA_VERSION}}
- path: Software/PC_Application/LibreVNA-GUI
+ path: Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI
PC_Application_Windows:
runs-on: windows-2019
@@ -65,7 +87,7 @@ jobs:
curl -o libusb.7z -L https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.7z
7z x libusb.7z -r -olibusb
Xcopy /E /I /Y libusb\include ..\Qt\5.15.1\mingw81_64\include
- Xcopy /E /I /Y libusb\MinGW64\static Software\PC_Application
+ Xcopy /E /I /Y libusb\MinGW64\static Software\PC_Application\LibreVNA-GUI
shell: cmd
- name: Get build timestamp
@@ -77,7 +99,7 @@ jobs:
id: id_version
shell: msys2 {0}
run: |
- cd Software/PC_Application
+ cd Software/PC_Application/LibreVNA-GUI
fw_major=`grep -oP '(?<=FW_MAJOR=)[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`
@@ -85,14 +107,14 @@ jobs:
- name: Build application
run: |
- cd Software/PC_Application
+ cd Software/PC_Application/LibreVNA-GUI
qmake LibreVNA-GUI.pro
make -j9
shell: cmd
- name: Deploy application
run: |
- cd Software/PC_Application/release
+ cd Software/PC_Application/LibreVNA-GUI/release
del *.o *.cpp
windeployqt.exe .
copy ..\..\..\..\Qt\5.15.1\mingw81_64\bin\libwinpthread-1.dll .
@@ -107,7 +129,7 @@ jobs:
LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
with:
name: GUI_Windows-${{env.LIBREVNA_VERSION}}
- path: Software/PC_Application/release
+ path: Software/PC_Application/LibreVNA-GUI/release
PC_Application_OSX:
runs-on: macos-10.15
@@ -129,7 +151,7 @@ jobs:
- name: Get app version
id: id_version
run: |
- cd Software/PC_Application
+ cd Software/PC_Application/LibreVNA-GUI
fw_major=`pcregrep -o '(?<=FW_MAJOR=)[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`
@@ -137,7 +159,7 @@ jobs:
- name: Build application
run: |
- cd Software/PC_Application
+ cd Software/PC_Application/LibreVNA-GUI
qmake LibreVNA-GUI.pro
make -j9
macdeployqt LibreVNA-GUI.app
@@ -150,7 +172,7 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: LibreVNA-GUI-OSX-${{env.LIBREVNA_VERSION}}
- path: Software/PC_Application/LibreVNA-GUI.zip
+ path: Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.zip
Embedded_Firmware:
runs-on: ubuntu-20.04
diff --git a/.github/workflows/Release_tag_stable.yml.bak b/.github/workflows/Release_tag_stable.yml.bak
deleted file mode 100644
index eb3ce50..0000000
--- a/.github/workflows/Release_tag_stable.yml.bak
+++ /dev/null
@@ -1,222 +0,0 @@
-name: Upload release for tag stable
-
-on:
- push:
- tags:
- - 'v[0-9]+.[0-9]+.[0-9]+'
-
-jobs:
-
- PC_Application_Ubuntu:
- runs-on: ubuntu-18.04
- outputs:
- upload_url: ${{ steps.bump_release.outputs.upload_url }}
- steps:
- - uses: actions/checkout@v1
-
- - name: Install dependencies
- run: |
- sudo apt-get update
- sudo apt-get install -y libusb-1.0-0-dev qt5-default qt5-qmake qtbase5-dev zip
-
- - name: Get app version
- id: id_version
- run: |
- cd Software/PC_Application
- fw_major=`grep -oP '(?<=FW_MAJOR=)[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`
- echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch"
-
- - name: Build application
- run: |
- cd Software/PC_Application
- qmake LibreVNA-GUI.pro
- make -j9
- zip LibreVNA-GUI.zip LibreVNA-GUI
- shell: bash
-
- - name: Bump release page
- id: bump_release
- uses: actions/create-release@v1
- env:
- LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- with:
- tag_name: ${{env.LIBREVNA_VERSION}}
- release_name: ${{env.LIBREVNA_VERSION}}
- body: |
- See [CHANGELOG](https://github.com/${{github.repository}}/blob/${{env.LIBREVNA_VERSION}}/CHANGELOG.md) for more information.
- draft: false
- prerelease: false
-
- - name: 'Upload release asset'
- uses: actions/upload-release-asset@v1
- env:
- LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- with:
- upload_url: ${{ steps.bump_release.outputs.upload_url }}
- asset_path: ./Software/PC_Application/LibreVNA-GUI.zip
- asset_name: LibreVNA-GUI-Ubuntu-${{env.LIBREVNA_VERSION}}.zip
- asset_content_type: application/tar+gzip
-
- PC_Application_Windows:
- needs: PC_Application_Ubuntu
- runs-on: windows-2019
- steps:
- - uses: actions/checkout@v1
- - uses: msys2/setup-msys2@v2
-
- - name: Install Qt
- uses: jurplel/install-qt-action@v2
- with:
- version: '5.15.1'
- arch: 'win64_mingw81'
-
- - name: Download libusb
- run: |
- curl -o libusb.7z -L https://github.com/libusb/libusb/releases/download/v1.0.23/libusb-1.0.23.7z
- 7z x libusb.7z -r -olibusb
- Xcopy /E /I /Y libusb\include ..\Qt\5.15.1\mingw81_64\include
- Xcopy /E /I /Y libusb\MinGW64\static Software\PC_Application
- shell: cmd
-
- - name: Get app version
- id: id_version
- shell: msys2 {0}
- run: |
- cd Software/PC_Application
- fw_major=`grep -oP '(?<=FW_MAJOR=)[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`
- echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch"
-
- - name: Build application
- run: |
- cd Software/PC_Application
- qmake LibreVNA-GUI.pro
- make -j9
- shell: cmd
-
- - name: Deploy application
- run: |
- cd Software/PC_Application/release
- del *.o *.cpp
- windeployqt.exe .
- copy ..\..\..\..\Qt\5.15.1\mingw81_64\bin\libwinpthread-1.dll .
- copy ..\..\..\..\Qt\5.15.1\mingw81_64\bin\libgcc_s_seh-1.dll .
- copy "..\..\..\..\Qt\5.15.1\mingw81_64\bin\libstdc++-6.dll" .
- copy ..\..\..\..\Qt\5.15.1\mingw81_64\bin\Qt5OpenGL.dll .
- shell: cmd
-
- - name: Zip app
- shell: cmd
- env:
- LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
- run: |
- 7z a LibreVNA-GUI_Windows-${{env.LIBREVNA_VERSION}}.zip ./Software/PC_Application/release
-
- - name: 'Upload release asset'
- uses: actions/upload-release-asset@v1
- env:
- LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- with:
- upload_url: ${{ needs.PC_Application_Ubuntu.outputs.upload_url }}
- asset_path: ./LibreVNA-GUI_Windows-${{env.LIBREVNA_VERSION}}.zip
- asset_name: LibreVNA-GUI_Windows-${{env.LIBREVNA_VERSION}}.zip
- asset_content_type: application/tar+gzip
-
- PC_Application_OSX:
- needs: PC_Application_Ubuntu
- runs-on: macos-10.15
- steps:
- - uses: actions/checkout@v1
-
- - name: Install dependencies
- run: |
- brew install qt@5 libusb
-
- - name: Set Environment
- run: |
- echo "/usr/local/opt/qt@5/bin" >> $GITHUB_PATH
-
- - name: Get app version
- id: id_version
- run: |
- cd Software/PC_Application
- fw_major=`pcregrep -o '(?<=FW_MAJOR=)[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`
- echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch"
-
- - name: Build application
- run: |
- cd Software/PC_Application
- qmake LibreVNA-GUI.pro
- make -j9
- macdeployqt LibreVNA-GUI.app
- zip -ry LibreVNA-GUI.zip LibreVNA-GUI.app
- shell: bash
-
- - name: 'Upload release asset'
- uses: actions/upload-release-asset@v1
- env:
- LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- with:
- upload_url: ${{ needs.PC_Application_Ubuntu.outputs.upload_url }}
- asset_path: ./Software/PC_Application/LibreVNA-GUI.zip
- asset_name: LibreVNA-GUI-OSX-${{env.LIBREVNA_VERSION}}.zip
- asset_content_type: application/tar+gzip
-
- Embedded_Firmware:
- needs: PC_Application_Ubuntu
- runs-on: ubuntu-18.04
- steps:
- - uses: actions/checkout@v1
-
- - name: Install toolchain
- run: |
- sudo apt-get install -y gcc-arm-none-eabi binutils-arm-none-eabi
-
- - name: Get app version
- id: id_version
- run: |
- cd Software/VNA_embedded
- fw_major=`grep -oP '(?<=FW_MAJOR=)[0-9]+' Makefile`
- fw_minor=`grep -oP '(?<=FW_MINOR=)[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"`
- echo "::set-output name=app_version::hw-rev-$hw_revision-v$fw_major.$fw_minor.$fw_patch"
-
- - name: Build application
- run: |
- cd Software/VNA_embedded
- make -j9
- cp build/VNA_embedded.elf ../../
- shell: bash
-
- - name: Combine with FPGA bitstream
- run: |
- python3 AssembleFirmware.py
- shell: bash
-
- - name: Zip firmware
- env:
- LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
- run: |
- zip EmbeddedFirmware-${{env.LIBREVNA_VERSION}}.zip VNA_embedded.elf combined.vnafw
- shell: bash
-
- - name: 'Upload release asset'
- uses: actions/upload-release-asset@v1
- env:
- LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- with:
- upload_url: ${{ needs.PC_Application_Ubuntu.outputs.upload_url }}
- asset_path: ./EmbeddedFirmware-${{env.LIBREVNA_VERSION}}.zip
- asset_name: EmbeddedFirmware-${{env.LIBREVNA_VERSION}}.zip
- asset_content_type: application/tar+gzip
diff --git a/Software/PC_Application/51-vna.rules b/Software/PC_Application/51-vna.rules
deleted file mode 100644
index a35c97c..0000000
--- a/Software/PC_Application/51-vna.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="564e", MODE:="0666"
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="4121", MODE:="0666"
diff --git a/Software/PC_Application/Calibration/CalStandardLineEditDialog.ui b/Software/PC_Application/Calibration/CalStandardLineEditDialog.ui
deleted file mode 100644
index 92681e7..0000000
--- a/Software/PC_Application/Calibration/CalStandardLineEditDialog.ui
+++ /dev/null
@@ -1,147 +0,0 @@
-
-
- CalStandardLineEditDialog
-
-
-
- 0
- 0
- 383
- 202
-
-
-
- Edit Line Standard
-
-
- true
-
-
- -
-
-
-
-
-
- Name:
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- Z0:
-
-
-
- -
-
-
- false
-
-
-
- -
-
-
- Delay:
-
-
-
- -
-
-
- -
-
-
- Minimum usable frequency:
-
-
-
- -
-
-
- false
-
-
-
- -
-
-
- Maximum usable frequency:
-
-
-
- -
-
-
- false
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- SIUnitEdit
- QLineEdit
- CustomWidgets/siunitedit.h
-
-
-
-
-
- buttonBox
- accepted()
- CalStandardLineEditDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- CalStandardLineEditDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
-
-
-
diff --git a/Software/PC_Application/Calibration/CalStandardLoadEditDialog.ui b/Software/PC_Application/Calibration/CalStandardLoadEditDialog.ui
deleted file mode 100644
index 6aebdf9..0000000
--- a/Software/PC_Application/Calibration/CalStandardLoadEditDialog.ui
+++ /dev/null
@@ -1,254 +0,0 @@
-
-
- CalStandardLoadEditDialog
-
-
-
- 0
- 0
- 344
- 386
-
-
-
- Edit Load Standard
-
-
- true
-
-
- -
-
-
-
-
-
- Name:
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- Coefficients
-
-
- buttonGroup
-
-
-
- -
-
-
- Measurement file
-
-
- buttonGroup
-
-
-
-
-
- -
-
-
- 0
-
-
-
-
-
-
-
-
-
-
- Resistance:
-
-
-
- -
-
-
- -
-
-
- Z0:
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- Offset delay [ps]:
-
-
-
- -
-
-
- -
-
-
- Offset loss [GΩ/s]:
-
-
-
- -
-
-
- -
-
-
- Parallel C:
-
-
-
- -
-
-
- -
-
-
- Series L:
-
-
-
- -
-
-
-
-
- -
-
-
- Load Parameter Model
-
-
-
-
-
-
- Series L first
-
-
- buttonGroup_2
-
-
-
- -
-
-
- Shunt C first
-
-
- buttonGroup_2
-
-
-
-
-
-
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- false
-
-
- Update from file
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- SIUnitEdit
- QLineEdit
- CustomWidgets/siunitedit.h
-
-
- TouchstoneImport
- QWidget
- CustomWidgets/touchstoneimport.h
- 1
-
-
-
-
-
- buttonBox
- accepted()
- CalStandardLoadEditDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- CalStandardLoadEditDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
-
-
-
-
diff --git a/Software/PC_Application/Calibration/CalStandardOpenEditDialog.ui b/Software/PC_Application/Calibration/CalStandardOpenEditDialog.ui
deleted file mode 100644
index f3fdcfb..0000000
--- a/Software/PC_Application/Calibration/CalStandardOpenEditDialog.ui
+++ /dev/null
@@ -1,230 +0,0 @@
-
-
- CalStandardOpenEditDialog
-
-
-
- 0
- 0
- 358
- 342
-
-
-
- Edit Open Standard
-
-
- true
-
-
- -
-
-
-
-
-
- Name:
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- Coefficients
-
-
- buttonGroup
-
-
-
- -
-
-
- Measurement file
-
-
- buttonGroup
-
-
-
-
-
- -
-
-
- 0
-
-
-
-
-
-
-
- Z0:
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- Offset delay [ps]:
-
-
-
- -
-
-
- -
-
-
- Offset loss [GΩ/s]:
-
-
-
- -
-
-
- -
-
-
- C0 [10<sup>-15</sup>F]:
-
-
-
- -
-
-
- -
-
-
- C1 [10<sup>-27</sup>F/Hz]:
-
-
-
- -
-
-
- -
-
-
- C2 [10<sup>-36</sup>F/Hz<sup>2</sup>]:
-
-
-
- -
-
-
- -
-
-
- <html><head/><body><p>C3 [10<span style=" vertical-align:super;">-45</span>F/Hz<span style=" vertical-align:super;">3</span>]:</p></body></html>
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- false
-
-
- Update from file
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- SIUnitEdit
- QLineEdit
- CustomWidgets/siunitedit.h
-
-
- TouchstoneImport
- QWidget
- CustomWidgets/touchstoneimport.h
- 1
-
-
-
-
-
- buttonBox
- accepted()
- CalStandardOpenEditDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- CalStandardOpenEditDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
-
-
-
diff --git a/Software/PC_Application/Calibration/CalStandardReflectEditDialog.ui b/Software/PC_Application/Calibration/CalStandardReflectEditDialog.ui
deleted file mode 100644
index 486ae8b..0000000
--- a/Software/PC_Application/Calibration/CalStandardReflectEditDialog.ui
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
- CalStandardReflectEditDialog
-
-
-
- 0
- 0
- 291
- 109
-
-
-
- Edit Reflect Standard
-
-
- true
-
-
- -
-
-
-
-
-
- Name:
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- Reflection type:
-
-
-
- -
-
-
-
-
- Open
-
-
- -
-
- Short
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
-
- buttonBox
- accepted()
- CalStandardReflectEditDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- CalStandardReflectEditDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/Software/PC_Application/Calibration/CalStandardShortEditDialog.ui b/Software/PC_Application/Calibration/CalStandardShortEditDialog.ui
deleted file mode 100644
index 594cb06..0000000
--- a/Software/PC_Application/Calibration/CalStandardShortEditDialog.ui
+++ /dev/null
@@ -1,230 +0,0 @@
-
-
- CalStandardShortEditDialog
-
-
-
- 0
- 0
- 358
- 342
-
-
-
- Edit Short Standard
-
-
- true
-
-
- -
-
-
-
-
-
- Name:
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- Coefficients
-
-
- buttonGroup
-
-
-
- -
-
-
- Measurement file
-
-
- buttonGroup
-
-
-
-
-
- -
-
-
- 0
-
-
-
-
-
-
-
- Z0:
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- Offset delay [ps]:
-
-
-
- -
-
-
- -
-
-
- Offset loss [GΩ/s]:
-
-
-
- -
-
-
- -
-
-
- <html><head/><body><p>L0 [10<span style=" vertical-align:super;">-12</span>H]:</p></body></html>
-
-
-
- -
-
-
- -
-
-
- <html><head/><body><p>L1 [10<span style=" vertical-align:super;">-24</span>H/Hz]:</p></body></html>
-
-
-
- -
-
-
- -
-
-
- <html><head/><body><p>L2 [10<span style=" vertical-align:super;">-33</span>H/Hz<span style=" vertical-align:super;">2</span>]:</p></body></html>
-
-
-
- -
-
-
- -
-
-
- <html><head/><body><p>L3 [10<span style=" vertical-align:super;">-42</span>H/Hz<span style=" vertical-align:super;">3</span>]:</p></body></html>
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- false
-
-
- Update from file
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- SIUnitEdit
- QLineEdit
- CustomWidgets/siunitedit.h
-
-
- TouchstoneImport
- QWidget
- CustomWidgets/touchstoneimport.h
- 1
-
-
-
-
-
- buttonBox
- accepted()
- CalStandardShortEditDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- CalStandardShortEditDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
-
-
-
diff --git a/Software/PC_Application/Calibration/CalStandardThroughEditDialog.ui b/Software/PC_Application/Calibration/CalStandardThroughEditDialog.ui
deleted file mode 100644
index 7dfd09c..0000000
--- a/Software/PC_Application/Calibration/CalStandardThroughEditDialog.ui
+++ /dev/null
@@ -1,190 +0,0 @@
-
-
- CalStandardThroughEditDialog
-
-
-
- 0
- 0
- 358
- 342
-
-
-
- Edit Through Standard
-
-
- true
-
-
- -
-
-
-
-
-
- Name:
-
-
-
- -
-
-
-
-
- -
-
-
-
-
-
- Coefficients
-
-
- buttonGroup
-
-
-
- -
-
-
- Measurement file
-
-
- buttonGroup
-
-
-
-
-
- -
-
-
- 0
-
-
-
-
-
-
-
- Z0:
-
-
-
- -
-
-
- false
-
-
-
- -
-
-
- Delay [ps]:
-
-
-
- -
-
-
- -
-
-
- Loss [GΩ/s]:
-
-
-
- -
-
-
-
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- false
-
-
- Update from file
-
-
-
- -
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- SIUnitEdit
- QLineEdit
- CustomWidgets/siunitedit.h
-
-
- TouchstoneImport
- QWidget
- CustomWidgets/touchstoneimport.h
- 1
-
-
-
-
-
- buttonBox
- accepted()
- CalStandardThroughEditDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- CalStandardThroughEditDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
-
-
-
diff --git a/Software/PC_Application/Calibration/Eigen/Cholesky b/Software/PC_Application/Calibration/Eigen/Cholesky
deleted file mode 100644
index a318ceb..0000000
--- a/Software/PC_Application/Calibration/Eigen/Cholesky
+++ /dev/null
@@ -1,45 +0,0 @@
-// This file is part of Eigen, a lightweight C++ template library
-// for linear algebra.
-//
-// This Source Code Form is subject to the terms of the Mozilla
-// Public License v. 2.0. If a copy of the MPL was not distributed
-// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifndef EIGEN_CHOLESKY_MODULE_H
-#define EIGEN_CHOLESKY_MODULE_H
-
-#include "Core"
-#include "Jacobi"
-
-#include "src/Core/util/DisableStupidWarnings.h"
-
-/** \defgroup Cholesky_Module Cholesky module
- *
- *
- *
- * This module provides two variants of the Cholesky decomposition for selfadjoint (hermitian) matrices.
- * Those decompositions are also accessible via the following methods:
- * - MatrixBase::llt()
- * - MatrixBase::ldlt()
- * - SelfAdjointView::llt()
- * - SelfAdjointView::ldlt()
- *
- * \code
- * #include
- * \endcode
- */
-
-#include "src/Cholesky/LLT.h"
-#include "src/Cholesky/LDLT.h"
-#ifdef EIGEN_USE_LAPACKE
-#ifdef EIGEN_USE_MKL
-#include "mkl_lapacke.h"
-#else
-#include "src/misc/lapacke.h"
-#endif
-#include "src/Cholesky/LLT_LAPACKE.h"
-#endif
-
-#include "src/Core/util/ReenableStupidWarnings.h"
-
-#endif // EIGEN_CHOLESKY_MODULE_H
diff --git a/Software/PC_Application/Calibration/Eigen/CholmodSupport b/Software/PC_Application/Calibration/Eigen/CholmodSupport
deleted file mode 100644
index bed8924..0000000
--- a/Software/PC_Application/Calibration/Eigen/CholmodSupport
+++ /dev/null
@@ -1,48 +0,0 @@
-// This file is part of Eigen, a lightweight C++ template library
-// for linear algebra.
-//
-// This Source Code Form is subject to the terms of the Mozilla
-// Public License v. 2.0. If a copy of the MPL was not distributed
-// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifndef EIGEN_CHOLMODSUPPORT_MODULE_H
-#define EIGEN_CHOLMODSUPPORT_MODULE_H
-
-#include "SparseCore"
-
-#include "src/Core/util/DisableStupidWarnings.h"
-
-extern "C" {
- #include
-}
-
-/** \ingroup Support_modules
- * \defgroup CholmodSupport_Module CholmodSupport module
- *
- * This module provides an interface to the Cholmod library which is part of the suitesparse package.
- * It provides the two following main factorization classes:
- * - class CholmodSupernodalLLT: a supernodal LLT Cholesky factorization.
- * - class CholmodDecomposiiton: a general L(D)LT Cholesky factorization with automatic or explicit runtime selection of the underlying factorization method (supernodal or simplicial).
- *
- * For the sake of completeness, this module also propose the two following classes:
- * - class CholmodSimplicialLLT
- * - class CholmodSimplicialLDLT
- * Note that these classes does not bring any particular advantage compared to the built-in
- * SimplicialLLT and SimplicialLDLT factorization classes.
- *
- * \code
- * #include
- * \endcode
- *
- * In order to use this module, the cholmod headers must be accessible from the include paths, and your binary must be linked to the cholmod library and its dependencies.
- * The dependencies depend on how cholmod has been compiled.
- * For a cmake based project, you can use our FindCholmod.cmake module to help you in this task.
- *
- */
-
-#include "src/CholmodSupport/CholmodSupport.h"
-
-#include "src/Core/util/ReenableStupidWarnings.h"
-
-#endif // EIGEN_CHOLMODSUPPORT_MODULE_H
-
diff --git a/Software/PC_Application/Calibration/Eigen/Core b/Software/PC_Application/Calibration/Eigen/Core
deleted file mode 100644
index 5921e15..0000000
--- a/Software/PC_Application/Calibration/Eigen/Core
+++ /dev/null
@@ -1,384 +0,0 @@
-// This file is part of Eigen, a lightweight C++ template library
-// for linear algebra.
-//
-// Copyright (C) 2008 Gael Guennebaud
-// Copyright (C) 2007-2011 Benoit Jacob
-//
-// This Source Code Form is subject to the terms of the Mozilla
-// Public License v. 2.0. If a copy of the MPL was not distributed
-// with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#ifndef EIGEN_CORE_H
-#define EIGEN_CORE_H
-
-// first thing Eigen does: stop the compiler from reporting useless warnings.
-#include "src/Core/util/DisableStupidWarnings.h"
-
-// then include this file where all our macros are defined. It's really important to do it first because
-// it's where we do all the compiler/OS/arch detections and define most defaults.
-#include "src/Core/util/Macros.h"
-
-// This detects SSE/AVX/NEON/etc. and configure alignment settings
-#include "src/Core/util/ConfigureVectorization.h"
-
-// We need cuda_runtime.h/hip_runtime.h to ensure that
-// the EIGEN_USING_STD macro works properly on the device side
-#if defined(EIGEN_CUDACC)
- #include
-#elif defined(EIGEN_HIPCC)
- #include
-#endif
-
-
-#ifdef EIGEN_EXCEPTIONS
- #include
-#endif
-
-// Disable the ipa-cp-clone optimization flag with MinGW 6.x or newer (enabled by default with -O3)
-// See http://eigen.tuxfamily.org/bz/show_bug.cgi?id=556 for details.
-#if EIGEN_COMP_MINGW && EIGEN_GNUC_AT_LEAST(4,6) && EIGEN_GNUC_AT_MOST(5,5)
- #pragma GCC optimize ("-fno-ipa-cp-clone")
-#endif
-
-// Prevent ICC from specializing std::complex operators that silently fail
-// on device. This allows us to use our own device-compatible specializations
-// instead.
-#if defined(EIGEN_COMP_ICC) && defined(EIGEN_GPU_COMPILE_PHASE) \
- && !defined(_OVERRIDE_COMPLEX_SPECIALIZATION_)
-#define _OVERRIDE_COMPLEX_SPECIALIZATION_ 1
-#endif
-#include
-
-// this include file manages BLAS and MKL related macros
-// and inclusion of their respective header files
-#include "src/Core/util/MKL_support.h"
-
-
-#if defined(EIGEN_HAS_CUDA_FP16) || defined(EIGEN_HAS_HIP_FP16)
- #define EIGEN_HAS_GPU_FP16
-#endif
-
-#if defined(EIGEN_HAS_CUDA_BF16) || defined(EIGEN_HAS_HIP_BF16)
- #define EIGEN_HAS_GPU_BF16
-#endif
-
-#if (defined _OPENMP) && (!defined EIGEN_DONT_PARALLELIZE)
- #define EIGEN_HAS_OPENMP
-#endif
-
-#ifdef EIGEN_HAS_OPENMP
-#include
-#endif
-
-// MSVC for windows mobile does not have the errno.h file
-#if !(EIGEN_COMP_MSVC && EIGEN_OS_WINCE) && !EIGEN_COMP_ARM
-#define EIGEN_HAS_ERRNO
-#endif
-
-#ifdef EIGEN_HAS_ERRNO
-#include
-#endif
-#include
-#include
-#include
-#include
-#include
-#include
-#ifndef EIGEN_NO_IO
- #include
-#endif
-#include
-#include
-#include
-#include // for CHAR_BIT
-// for min/max:
-#include
-
-#if EIGEN_HAS_CXX11
-#include
-#endif
-
-// for std::is_nothrow_move_assignable
-#ifdef EIGEN_INCLUDE_TYPE_TRAITS
-#include
-#endif
-
-// for outputting debug info
-#ifdef EIGEN_DEBUG_ASSIGN
-#include
-#endif
-
-// required for __cpuid, needs to be included after cmath
-#if EIGEN_COMP_MSVC && EIGEN_ARCH_i386_OR_x86_64 && !EIGEN_OS_WINCE
- #include
-#endif
-
-#if defined(EIGEN_USE_SYCL)
- #undef min
- #undef max
- #undef isnan
- #undef isinf
- #undef isfinite
- #include
- #include