Refactor Calkit::fromFile without the need for move semantics

This allows to create images independent from screen resolution
Replaced copy-pasted screenshot code with the single implementation

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+github: [jankae]
+

.github/ISSUE_TEMPLATE/bugreport.yaml

@@ -48,10 +48,11 @@ body:
   validations:
             required: true
 
-- type: checkboxes
+- type: markdown
   attributes:
-    label: Confirming that you haven´t forgot to include configuration files (if applicable)
+    value: |
-    options: 
+      Please attach the following files if applicable:
-      - label: Setup file
+      - Setup file
-      - label: Calibration file
+        - File->Save Setup
-      - label: Touchstone file of measurements
+        - If available, make sure that "include datapoints" under "Window->Preferences->Debug->Trace saving" is enabled
+      - Calibration file

.github/workflows/Build.yml

@@ -4,38 +4,39 @@ on:
   push:
     branches:
       - master
-      - embedded_firmware_ci
   pull_request:
     branches:
       - master
 
 jobs:
   PC_Application_Ubuntu:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
           sudo apt-get update
-          sudo apt-get install -y libusb-1.0-0-dev qt5-default qt5-qmake qtbase5-dev
+          sudo apt-get install -y libusb-1.0-0-dev qt6-tools-dev qt6-base-dev libqt6svg6-dev libgl-dev
+          qtchooser -install qt6 $(which qmake6)
 
       - name: Get build timestamp
         id: id_date
-        run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M-%S)"
+        run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT
 
       - 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` 
-          echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}"
+          echo "app_version=v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT
 
       - name: Build application
         run: |
-          cd Software/PC_Application
+          cd Software/PC_Application/LibreVNA-GUI
+          export QT_SELECT=qt6
           qmake LibreVNA-GUI.pro
           make -j9
         shell: bash
@@ -43,101 +44,138 @@ jobs:
       - name: Upload artifact
         env: 
           LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
           name: LibreVNA-GUI-Ubuntu-${{env.LIBREVNA_VERSION}}
-          path: Software/PC_Application/LibreVNA-GUI
+          path: Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI
+          
+  PC_Application_RPi5:
+    runs-on: RPi-HIL
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libusb-1.0-0-dev qt6-tools-dev qt6-base-dev libqt6svg6-dev
+
+      - name: Get build timestamp
+        id: id_date
+        run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT
+
+      - name: Get app version
+        id: id_version
+        run: |
+          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` 
+          echo "app_version=v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT
+
+      - name: Build application
+        run: |
+          cd Software/PC_Application/LibreVNA-GUI
+          qmake6 LibreVNA-GUI.pro
+          make -j9
+        shell: bash
+
+      - name: Upload artifact
+        env: 
+          LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
+        uses: actions/upload-artifact@v4
+        with:
+          name: LibreVNA-GUI-RPi5-${{env.LIBREVNA_VERSION}}
+          path: Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI          
           
   PC_Application_Windows:
-    runs-on: windows-2019
+    runs-on: windows-2022
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - uses: msys2/setup-msys2@v2
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v4
         with:
-          version: '5.15.1'
+          version: '6.2.4'
-          arch: 'win64_mingw81'
+          arch: 'win64_mingw'
       
       - name: Download libusb
         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
-          Xcopy /E /I /Y libusb\include ..\Qt\5.15.1\mingw81_64\include
+          Xcopy /E /I /Y libusb\include %QT_ROOT_DIR%\include
-          Xcopy /E /I /Y libusb\MinGW64\static Software\PC_Application
+          Xcopy /E /I /Y libusb\MinGW64\static\libusb-1.0.a Software\PC_Application\LibreVNA-GUI
         shell: cmd
 
       - name: Get build timestamp
         shell: msys2 {0}
         id: id_date
-        run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M-%S)"
+        run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT
 
       - name: Get app version
         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` 
-          echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}"
+          echo "app_version=v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT
 
       - 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 .
+          copy %QT_ROOT_DIR%\bin\libwinpthread-1.dll .
-          copy ..\..\..\..\Qt\5.15.1\mingw81_64\bin\libgcc_s_seh-1.dll .
+          copy %QT_ROOT_DIR%\bin\libgcc_s_seh-1.dll .
-          copy "..\..\..\..\Qt\5.15.1\mingw81_64\bin\libstdc++-6.dll" .
+          copy %QT_ROOT_DIR%\bin\Qt6OpenGL.dll .
-          copy ..\..\..\..\Qt\5.15.1\mingw81_64\bin\Qt5OpenGL.dll .
         shell: cmd
         
       - name: Upload
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         env: 
           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
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
-          brew install qt@5 libusb
+          brew install qt@6 pcre
           
       - name: Set Environment
         run: |
-          echo "/usr/local/opt/qt@5/bin" >> $GITHUB_PATH
+          echo "/usr/local/opt/qt@6/bin" >> $GITHUB_PATH
           
       - name: Get build timestamp
         id: id_date
-        run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M-%S)"
+        run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT
 
       - 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` 
-          echo "::set-output name=app_version::v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}"
+          echo "app_version=v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT
 
       - name: Build application
         run: |
-          cd Software/PC_Application
+          cd Software/PC_Application/LibreVNA-GUI
           qmake LibreVNA-GUI.pro
           make -j9
           macdeployqt LibreVNA-GUI.app
@@ -147,15 +185,58 @@ jobs:
       - name: Upload artifact
         env: 
           LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         with:
-          name: LibreVNA-GUI-OSX-${{env.LIBREVNA_VERSION}}
+          name: LibreVNA-GUI-OSX-latest-${{env.LIBREVNA_VERSION}}
-          path: Software/PC_Application/LibreVNA-GUI.zip
+          path: Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.zip
+    
+  PC_Application_OSX_13:
+    runs-on: macos-13
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          brew install qt@6 pcre
+          
+      - name: Set Environment
+        run: |
+          echo "/usr/local/opt/qt@6/bin" >> $GITHUB_PATH
+          
+      - name: Get build timestamp
+        id: id_date
+        run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT
+
+      - name: Get app version
+        id: id_version
+        run: |
+          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` 
+          echo "app_version=v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT
+
+      - name: Build application
+        run: |
+          cd Software/PC_Application/LibreVNA-GUI
+          qmake LibreVNA-GUI.pro
+          make -j9
+          macdeployqt LibreVNA-GUI.app
+          zip -ry LibreVNA-GUI.zip LibreVNA-GUI.app
+        shell: bash
+
+      - name: Upload artifact
+        env: 
+          LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
+        uses: actions/upload-artifact@v4
+        with:
+          name: LibreVNA-GUI-OSX-13.7-${{env.LIBREVNA_VERSION}}
+          path: Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.zip
   
   Embedded_Firmware:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Install toolchain
         run: |
@@ -163,7 +244,7 @@ jobs:
         
       - name: Get build timestamp
         id: id_date
-        run: echo "::set-output name=timestamp::$(date +%Y-%m-%d-%H-%M-%S)"
+        run: echo "timestamp=$(date +%Y-%m-%d-%H-%M-%S)" >> $GITHUB_OUTPUT
 
       - name: Get app version
         id: id_version
@@ -173,7 +254,7 @@ jobs:
           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-${{steps.id_date.outputs.timestamp}}"
+          echo "app_version=hw-rev-$hw_revision-v$fw_major.$fw_minor.$fw_patch-${{steps.id_date.outputs.timestamp}}" >> $GITHUB_OUTPUT
 
       - name: Build application
         run: |
@@ -188,7 +269,7 @@ jobs:
         shell: bash
 
       - name: Upload
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v4
         env: 
           LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
         with:

.github/workflows/HIL_Tests.yml

@@ -0,0 +1,60 @@
+name: HIL_Tests
+
+on:
+  push:
+    branches:
+      - master
+      - HIL_actions
+
+jobs:
+  Get_Repository:
+    runs-on: RPi-HIL
+    steps:
+      - uses: actions/checkout@v1
+          
+  PC_Application_RPi5:
+    runs-on: RPi-HIL
+    needs: Get_Repository
+    steps:
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libusb-1.0-0-dev qt6-tools-dev qt6-base-dev qt6-svg-dev
+
+      - name: Build application
+        run: |
+          cd Software/PC_Application/LibreVNA-GUI
+          qmake6 LibreVNA-GUI.pro
+          make -j9
+        shell: bash
+          
+  Embedded_Firmware:
+    runs-on: RPi-HIL
+    needs: Get_Repository
+    steps:
+      - name: Install toolchain
+        run: |
+          sudo apt-get install -y gcc-arm-none-eabi binutils-arm-none-eabi
+        
+      - 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
+        
+  HIL:
+    runs-on: RPi-HIL
+    needs: [PC_Application_RPi5, Embedded_Firmware]
+    steps:
+      - name: Run HIL tests
+        run: |      
+          cd Software/Integrationtests
+          export DISPLAY=:0
+          python3 Integrationtest.py
+

.github/workflows/Release_tag_stable.yml

@@ -8,29 +8,31 @@ on:
 jobs:
 
   PC_Application_Ubuntu:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     outputs:
       upload_url: ${{ steps.bump_release.outputs.upload_url }} 
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - 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
+          sudo apt-get install -y libusb-1.0-0-dev qt6-tools-dev qt6-base-dev libqt6svg6-dev libgl-dev zip
+          qtchooser -install qt6 $(which qmake6)
 
       - 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` 
-          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
         run: |
-          cd Software/PC_Application
+          cd Software/PC_Application/LibreVNA-GUI
+          export QT_SELECT=qt6
           qmake LibreVNA-GUI.pro
           make -j9
           zip LibreVNA-GUI.zip LibreVNA-GUI
@@ -57,57 +59,95 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ steps.bump_release.outputs.upload_url }}
-          asset_path: ./Software/PC_Application/LibreVNA-GUI.zip
+          asset_path: ./Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.zip
           asset_name: LibreVNA-GUI-Ubuntu-${{env.LIBREVNA_VERSION}}.zip
           asset_content_type: application/tar+gzip
           
+  PC_Application_RPi5:
+    needs: PC_Application_Ubuntu
+    runs-on: RPi-HIL
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libusb-1.0-0-dev qt6-tools-dev qt6-base-dev qt6-svg-dev
+
+      - name: Get app version
+        id: id_version
+        run: |
+          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` 
+          echo "app_version=v$fw_major.$fw_minor.$fw_patch" >> $GITHUB_OUTPUT
+
+      - name: Build application
+        run: |
+          cd Software/PC_Application/LibreVNA-GUI
+          qmake6 LibreVNA-GUI.pro
+          make -j9
+          zip LibreVNA-GUI.zip LibreVNA-GUI
+        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/LibreVNA-GUI.zip
+          asset_name: LibreVNA-GUI-RPi5-${{env.LIBREVNA_VERSION}}.zip
+          asset_content_type: application/tar+gzip
+          
   PC_Application_Windows:
     needs: PC_Application_Ubuntu
-    runs-on: windows-latest
+    runs-on: windows-2022
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - uses: msys2/setup-msys2@v2
 
       - name: Install Qt
-        uses: jurplel/install-qt-action@v2
+        uses: jurplel/install-qt-action@v4
         with:
-          version: '5.15.1'
+          version: '6.2.4'
-          arch: 'win64_mingw81'
+          arch: 'win64_mingw'
       
       - name: Download libusb
         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
-          Xcopy /E /I /Y libusb\include ..\Qt\5.15.1\mingw81_64\include
+          Xcopy /E /I /Y libusb\include %QT_ROOT_DIR%\include
-          Xcopy /E /I /Y libusb\MinGW64\static Software\PC_Application
+          Xcopy /E /I /Y libusb\MinGW64\static\libusb-1.0.a Software\PC_Application\LibreVNA-GUI
         shell: cmd
 
       - name: Get app version
         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` 
-          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
         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 .
+          copy %QT_ROOT_DIR%\bin\libwinpthread-1.dll .
-          copy ..\..\..\..\Qt\5.15.1\mingw81_64\bin\libgcc_s_seh-1.dll .
+          copy %QT_ROOT_DIR%\bin\libgcc_s_seh-1.dll .
-          copy "..\..\..\..\Qt\5.15.1\mingw81_64\bin\libstdc++-6.dll" .
+          copy %QT_ROOT_DIR%\bin\Qt6OpenGL.dll .
-          copy ..\..\..\..\Qt\5.15.1\mingw81_64\bin\Qt5OpenGL.dll .
         shell: cmd
 
       - name: Zip app
@@ -115,7 +155,7 @@ jobs:
         env: 
           LIBREVNA_VERSION: "${{steps.id_version.outputs.app_version}}"
         run: |
-          7z a LibreVNA-GUI_Windows-${{env.LIBREVNA_VERSION}}.zip ./Software/PC_Application/release
+          7z a LibreVNA-GUI_Windows-${{env.LIBREVNA_VERSION}}.zip ./Software/PC_Application/LibreVNA-GUI/release
 
       - name: 'Upload release asset'
         uses: actions/upload-release-asset@v1
@@ -130,30 +170,30 @@ jobs:
           
   PC_Application_OSX:
     needs: PC_Application_Ubuntu
-    runs-on: macos-10.15
+    runs-on: macos-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Install dependencies
         run: |
-          brew install qt@5 libusb
+          brew install qt@6 pcre
           
       - name: Set Environment
         run: |
-          echo "/usr/local/opt/qt@5/bin" >> $GITHUB_PATH
+          echo "/usr/local/opt/qt@6/bin" >> $GITHUB_PATH
           
       - 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` 
-          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
         run: |
-          cd Software/PC_Application
+          cd Software/PC_Application/LibreVNA-GUI
           qmake LibreVNA-GUI.pro
           make -j9
           macdeployqt LibreVNA-GUI.app
@@ -167,15 +207,58 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
           upload_url: ${{ needs.PC_Application_Ubuntu.outputs.upload_url }}
-          asset_path: ./Software/PC_Application/LibreVNA-GUI.zip
+          asset_path: ./Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.zip
-          asset_name: LibreVNA-GUI-OSX-${{env.LIBREVNA_VERSION}}.zip
+          asset_name: LibreVNA-GUI-OSX-latest-${{env.LIBREVNA_VERSION}}.zip
+          asset_content_type: application/tar+gzip
+
+  PC_Application_OSX_13:
+    needs: PC_Application_Ubuntu
+    runs-on: macos-13
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: |
+          brew install qt@6 pcre
+          
+      - name: Set Environment
+        run: |
+          echo "/usr/local/opt/qt@6/bin" >> $GITHUB_PATH
+          
+      - name: Get app version
+        id: id_version
+        run: |
+          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` 
+          echo "app_version=v$fw_major.$fw_minor.$fw_patch" >> $GITHUB_OUTPUT
+
+      - name: Build application
+        run: |
+          cd Software/PC_Application/LibreVNA-GUI
+          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/LibreVNA-GUI.zip
+          asset_name: LibreVNA-GUI-OSX-13.7-${{env.LIBREVNA_VERSION}}.zip
           asset_content_type: application/tar+gzip
           
   Embedded_Firmware:
     needs: PC_Application_Ubuntu
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
 
       - name: Install toolchain
         run: |
@@ -189,7 +272,7 @@ jobs:
           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"
+          echo "app_version=hw-rev-$hw_revision-v$fw_major.$fw_minor.$fw_patch" >> $GITHUB_OUTPUT
 
       - name: Build application
         run: |

.github/workflows/Test.yml

@@ -0,0 +1,35 @@
+name: Unit_Tests
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  Tests:
+    runs-on: ubuntu-22.04
+    steps:
+      - uses: actions/checkout@v1
+
+      - name: Install dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y libusb-1.0-0-dev qt6-tools-dev qt6-base-dev libqt6svg6-dev libgl-dev
+          qtchooser -install qt6 $(which qmake6)
+
+      - name: Build Tests
+        run: |
+          cd Software/PC_Application/LibreVNA-Test
+          export QT_SELECT=qt6
+          qmake LibreVNA-Test.pro
+          make -j9
+        shell: bash
+        
+      - name: Run Tests
+        run: |
+          cd Software/PC_Application/LibreVNA-Test
+          ./LibreVNA-Test -platform offscreen
+

CHANGELOG.md

@@ -1,5 +1,155 @@
 # Changelog
 
+## v1.6.4
+
+Critical bugfix for the embedded firmware:
+
+- Fix SPI flash timing, see #315
+
+Minor improvement for the GUI:
+
+- Option to add titles to graphs
+- Show trace names even when only enabled on secondary Y axis
+- Add x axis variable to the available variables for formulas in "from math" traces
+
+
+
+## v1.6.3
+
+Bugfixes and quality of life improvements
+
+- Windows and macOS: add icon to GUI application
+- From math traces:
+  - Validate formula immediately and show error messages
+  - Bugfix: do not reset variable names when opening trace edit dialog again
+  - Fix crash when combining with de-embedding
+- Calibration:
+  - Interpolate points using mag/phase instead of real/imag (minor improvements in accuracy)
+  - Update widget when changing span
+  - Fix race condition when aborting measurement
+  - Reset LibreCAL port settings when aborting measurement
+- Manual improvement: typos and wording
+- Increase USB buffer timeout during sweep (should prevent disconnect when CPU is very busy)
+- Include actual serial of connected device in SCPI \*IDN? response
+- Allow group delay plot for reflection traces
+- Configurable default Y axis limits per Y axis type
+- Fix streaming server output for zero span sweeps
+- Synchronization improvements for compound device
+- Allow name changes for existing modes
+
+## v1.6.2
+
+Mostly bugfixes with only minor new features
+
+- New features:
+  - New SCPI commands:
+    - Temperatures readout
+    - Complete control over manual control via SCPI
+  - Padding option for TDR/DFT to increase resolution
+  - Support for dwell time (adjustable delay before each point in the sweep)
+- Bugfixes:
+  - Fix crash when deleting traces with TDR/DFT math
+  - Spectrum analyzer: Improve tracking generator frequency accuracy
+  - Fix swapped LO and Source unlock LEDs
+  - Reduce amount of mode switches when starting and loading setups (faster loading time)
+  - Use correct units on spectrum analyzer graphs (dBm instead of dB)
+  - Fix Touchstone export file ending
+  - Update eye diagram when changing settings while the trace data does not change
+  - Keep eye diagram trace visible when other trace is deleted
+  - Resolve math references when duplicating "from math" traces
+  - Update LibreCAL API, detect LibreCALs with bad factory coefficients
+  - Fix impedance renormalization (general formulas for parameter conversions)
+  - Fix rare and random phase reversals of S parameter measurements
+
+## v1.6.1
+
+Mostly bugfixes with only minor new features
+
+- New features:
+  - New SCPI commands:
+    - switch between linear/log sweeps in VNA mode
+    - delete traces
+  - Option to align axis ticks for left and right Y-axes
+  - Import/export options in file menu
+  - User-selectable handling of NaN values for limit checking
+  - drop files on trace list to import them
+
+- Bugfixes:
+  - center TDR output values at zero (fixes impedance calculations in cases where there is a reflection from before the calibration plane)
+  - fix calibration calculation when non-required S parameters are not available
+  - improve LibreCAL coefficient extraction
+  - use native OS dialogs for opening/saving files
+  - future Qt version fix: prevent crash after taking calibration measurement
+  - SCPI command handling improved
+  - fix menus after loading setup files in certain scenarios
+
+## v1.6.0
+
+This update contains API breaking changes to the SCPI server. This was necessary because the previous implementation did not follow the standard completely. If you were talking to the SCPI server directly yourself, you will need to make the required changes. If you are using the provided libreVNA.py class, you just need to update that file.
+
+- New featues:
+  - New SCPI command: read/write preferences
+  - New API: option to stream live trace data
+
+- Bugfixes and improvements:
+  - Keep de-embedding active when changing settings
+  - Improvements to trace averaging
+  - adjust SCPI API to conform better with the standard:
+    - new required commands RST, CLS, ESE, ESR, OPC and WAI
+    - no responses to commands, errors are reported through status registers instead
+  - TDR updates happen during a sweep not just afterwards (with configurable update rate)
+  - Additional sanity checks when loading calibration files
+
+## v1.5.1
+
+Mostly bugfixes with only minor new features
+
+- New features:
+  - Z0 of through standard now adjustable
+  - Option to automatically adjust the span to the active calibration
+- Bugfixes:
+  - Make De-embedding menu visible on MacOS
+  - Detection of handling of LibreCAL in the automatic calibration dialog
+  - Allow updates of devices with older firmwares (a matching older GUI version had to be used previously)
+  - Fix port excitation when not all S-parameters are measured
+  - Do not use DFT in spectrum analyzer when in zero span mode
+  - Readback of certain GUI values on Windows now correct (was stuck on 0 before)
+  - Prevent crash when disconnecting the device while a dialog was open
+  - Prevent occasional crash at the end of calibration measurements
+  - Fix spikes in sweep when a frequency calibration is set
+  - Improve sample timing between ADC and FPGA (resulted in very noisy traces on some devices)
+
+## v1.5.0
+
+- New features:
+  - Further abstraction from the LibreVNA hardware. The GUI now supports VNAs with up to 8 ports
+  - Capsulation of communication to the hardware inside of the DeviceDriver class. This simplifies the integration of drivers for other equipment
+    - Experimental drivers for Siglent SSA3000X and SNA5000A series devices as examples
+  - Allow cascading of muliple LibreVNAs, see Preferences->Device Drivers->LibreVNA/Compound. 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
+  - New graph type: Eye Diagram
+  - Restrict markers to a certain frequency range
+  - Switched to a dedicated USB VID/PID thanks to pid.codes
+  - Switched to Qt6
+  - Easier 
+
+- 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 file format changed (old calibration can be imported)
+  - 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
+  - no more disappearing device log
+
+## v1.4.1
+- Bugfix: Configure voltage regulator for correct voltage at startup
+
 ## v1.4.0
 
 - New features:

Documentation/DeveloperInfo/BuildAndFlash.md

@@ -12,17 +12,17 @@ Creating all the different parts from the source code requires quite a few tools
 ## Building the PC application:
 * Install the required tools (Qt and libusb-1.0):
   ```
-  sudo apt-get install qt5-default qt5-qmake qtbase5-dev libusb-1.0-0-dev 
+  sudo apt-get install libusb-1.0-0-dev qt6-tools-dev qt6-base-dev
   ```
 * Build the application:
   * either:
   ```
-  cd Software/PC_Application
+  cd Software/PC_Application/LibreVNA-GUI
-  qmake
+  qmake6
   make
   ```
   * or:
-    * Open Software/PC_Application/Application.pro with Qt Creator
+    * Open Software/PC_Application/LibreVNA-GUI/LibreVNA-GUI.pro with Qt Creator
     * Build the application with Qt Creator
 
 ## Building the MCU firmware:

Documentation/DeveloperInfo/DownloadActionBuilds.md

@@ -0,0 +1,27 @@
+# Download automatically build binaries
+
+The Github actions are set up in such a way that binary files are created for each commit on the master branch. Feel free to try them out if you want the latest features but be prepared to find some unfinished things in them as well.
+
+## Finding the binaries
+
+1. Switch to the `Actions` tab in the repository:
+
+   ![Binaries1](Screenshots/Binaries1.png)
+   
+2. Each commit will trigger two workflow runs, one for the binaries and one for some automated tests. Pick a commit and chose the workflow run with the higher build number:
+
+   ![Binaries2](Screenshots/Binaries2.png)
+   
+4. The next window should look like this:
+
+   ![Binaries3](Screenshots/Binaries3.png)
+   
+   If it looks like this instead, you have picked the test workflow run (which does not contain any binaries):
+   
+   ![Binaries4](Screenshots/Binaries4.png)
+   
+5. Scroll down to find the binaries:
+
+   ![Binaries5](Screenshots/Binaries5.png)
+   
+6. Click on an artifact to download it. If that doesn't seem to work, check that you are logged in on Github (required for the download)

Documentation/DeveloperInfo/FPGA_protocol.tex

@@ -13,6 +13,7 @@
 {geometry}
 \usepackage{tikz}
 \usepackage{siunitx} 
+\usepackage{minibox}
 \DeclareSIUnit{\belmilliwatt}{Bm}
 \DeclareSIUnit{\dBm}{\deci\belmilliwatt}
 
@@ -65,12 +66,17 @@ MOSI & in & MOSI for SPI communication/MOSI for PLL communication\\
 MISO & out & MISO for SPI communication/MUX for PLL communication\\
 NSS & in & Chip Select for SPI communication/LE for PLL communication\\
 INTR & out & Active high interrupt indicator\\
-RESET & in & FPGA reset\\
+RESET\footnotemark & in & FPGA reset\\
 AUX1 & in & Selector for direct communication with Source PLL\\
 AUX2 & in & Selector for direct communication with LO PLL\\
 AUX3 & in & Active low sweep enable. Has to be high when changing settings\\
+Trigger In\footnotemark & in & Trigger input for synchronization across devices\\
+Trigger Out\footnotemark & Out & Trigger output for synchronization across devices\\
 \end{tabular}
 \end{center}
+\footnotetext[1]{Reset is named "MCU\_FPGA\_UNUSED1" in the schematic as this is a later software addition}
+\footnotetext[2]{Trigger In is named "MCU\_FPGA\_UNUSED2" in the schematic as this is a later software addition}
+\footnotetext[3]{Trigger Out is named "MCU\_FPGA\_UNUSED3" in the schematic as this is a later software addition}
 Depending on the voltage on AUX1/AUX2 the SPI port controls either the FPGA or one of the MAX2871 PLLs:
 \begin{center}
 \begin{tabular}{ c|c|c }
@@ -343,9 +349,9 @@ The register contains the number of points per sweep negative one, e.g. set to 1
 \rwbits{9}{2}{Window[1:0]}
 \rwbits{11}{1}{SCEN}
 \rwbits{12}{1}{LCEN}
-\robits{13}{2}{reserved}
+\robits{13}{1}{reserved}
 %\rwbits{13}{1}{EXP2}
-%\rwbits{14}{1}{EXP1}
+\rwbits{14}{1}{SYM}
 \rwbits{15}{1}{PSEN}
 \end{tikzpicture}
 \end{center}
@@ -373,7 +379,7 @@ Setting & Window type\\
 \item \textbf{SCEN:}{Source chip enable}
 \item \textbf{LCEN:}{LO chip enable}
 %\item \textbf{EXP1:}{Excite Port1 during sweep}
-%\item \textbf{EXP2:}{Excite Port2 during sweep}
+\item \textbf{SYM:}{Sync master, see also section~\ref{synchronization}. If multiple devices are combined, exactly one must have this bit set.}
 \item \textbf{PSEN:}{Port switch enable}
 \end{itemize}
 
@@ -415,7 +421,7 @@ Each point in the sweep is done in stages. Each stage consists of (optionally) r
 \begin{tikzpicture}
 \bitrect{16}{16-\bit}
 \rwbits{0}{3}{Stages}
-\rwbits{3}{1}{IH}
+\rwbits{3}{1}{SYNC}
 \robits{4}{6}{reserved}
 \rwbits{10}{3}{Port 1 stage}
 \rwbits{13}{3}{Port 2 stage}
@@ -423,7 +429,7 @@ Each point in the sweep is done in stages. Each stage consists of (optionally) r
 \end{center}
 \begin{itemize}
 \item \textbf{Stages} Number of stages per point - 1. Normally the number of stages is equal to the number of ports but it can also be less (e.g. if only S11 is measured).
-\item \textbf{IH:} Individual halt: Sets the behavior of the "halt sweep" bit (see section~\ref{sweepconfig}). If 1, the sampling is halted before each stage. If 0, the sampling is only halted before the point and all stages are executed without additional halts inbetween.
+\item \textbf{SYNC:} Enables synchronization mode (see section~\ref{synchronization}).
 \item \textbf{Port 1 stage} Number of stage during which the source signal is routed to port 1. Must not have the same value as Port 2 stage.
 \item \textbf{Port 2 stage} Number of stage during which the source signal is routed to port 2. Must not have the same value as Port 1 stage.
 \end{itemize}
@@ -529,6 +535,26 @@ $$ f_{firstBin} =  \frac{SR_{ADC} * DFT\_FIRST\_BIN}{2^{16}}$$
 $$ \Delta f =  \frac{SR_{ADC} * DFT\_FREQ\_SPACING}{2^{24}}$$
 \end{itemize}
 
+\subsection{SETTLING\_TIME: 0x14}
+\begin{center}
+\begin{tikzpicture}
+\bitrect{16}{16-\bit}
+\rwbits{0}{16}{SETTLING\_TIME[15:0]}
+\end{tikzpicture}
+\end{center}
+\begin{itemize}
+\item \textbf{SETTLING\_TIME[19:0]:} This value determines the time delay between applying the stimulus signal and the beginning of the ADC sampling.
+$$ t_{delay} =  \frac{1}{\SI{102.4}{\mega\hertz}} SETTLING\_TIME $$
+\end{itemize}
+\subsection{SETTLING\_TIME: 0x15}
+\begin{center}
+\begin{tikzpicture}
+\bitrect{16}{16-\bit}
+\robits{0}{12}{reserved}
+\rwbits{12}{4}{SETTLING\_TIME[19:16]}
+\end{tikzpicture}
+\end{center}
+
 \section{SweepConfig}
 \label{sweepconfig}
 The SweepConfig contains data for the source and LO1 PLL as well as the attenuator and source filter. Each point in the sweep, needs a valid SweepConfig before the sweep is started.
@@ -537,7 +563,9 @@ The SweepConfig contains data for the source and LO1 PLL as well as the attenuat
 \begin{tikzpicture}
 \bitrect{16}{96-\bit}
 \rwbits{0}{1}{HS}
-\rwbits{1}{2}{SettlingTime}
+%\rwbits{1}{2}{SettlingTime}
+\rwbits{1}{1}{\tiny LO N[6]}
+\rwbits{2}{1}{\minibox{\tiny Source\\N[6]}}
 \rwbits{3}{3}{Samples}
 \rwbits{6}{2}{SourceFilter}
 \rwbits{8}{8}{LO M[11:4]}
@@ -575,17 +603,17 @@ The SweepConfig contains data for the source and LO1 PLL as well as the attenuat
 \end{center}
 \begin{itemize}
 \item \textbf{HS: Halt sweep.} If set, settling and sampling of this sweep point will be postponed until the sweep resume command is issued.
-\item \textbf{SettlingTime:} Amount of time between locking of PLLs and beginning of ADC sampling
+%\item \textbf{SettlingTime:} Amount of time between locking of PLLs and beginning of ADC sampling
-\begin{center}
+%\begin{center}
-\begin{tabular}{ c|c }
+%\begin{tabular}{ c|c }
-Setting & Time\\
+%Setting & Time\\
- \hline
+ %\hline
-00 & \SI{20}{\micro\second}\\
+%00 & \SI{20}{\micro\second}\\
-01 & \SI{60}{\micro\second}\\
+%01 & \SI{60}{\micro\second}\\
-10 & \SI{180}{\micro\second}\\
+%10 & \SI{180}{\micro\second}\\
-11 & \SI{540}{\micro\second}\\
+%11 & \SI{540}{\micro\second}\\
-\end{tabular}
+%\end{tabular}
-\end{center}
+%\end{center}
 \item \textbf{Samples:} Number of ADC samples to take
 \begin{center}
 \begin{tabular}{ c|c|c }
@@ -715,4 +743,37 @@ Each point in the sweep generates a sampling results for each stage (see section
 \end{tikzpicture}
 \end{center}
 
+\section{Synchronization}
+\label{synchronization}
+The FPGA supports synchronization of the sweep across multiple devices. This feature can be enabled by setting the SYNC bit in the sweep setup register (see section~\ref{reg:sweepsetup}). When enabled, the following conditions must be met:
+\begin{itemize}
+\item All participating devices must be connected in a loop via the trigger input and output pins. The order of the devices is not important.
+\item All devices must use the same sweep settings with the exception of the "Port 1 stage" and "Port 2 stage" settings in the sweep setup register.
+\item The port stages must be configured in such a way, that for each stage exactly one port is active in one device.
+\end{itemize}
+
+The synchronization works by delaying sampling until the stimulus signal is present, even when generated by another device. For each sampling stage, performs the following steps:
+\begin{itemize}
+\item When the device is the synchronization master (SYM bit set):
+\begin{itemize}
+\item Set up source and 1.LO PLLs
+\item If applicable: wait for the "resume sweep" command
+\item Set the trigger output to high
+\item Wait for high level on trigger input
+\item Sample ADCs
+\item Set the trigger output to low
+\item Wait for low level on trigger input
+\end{itemize}
+\item When the device is the synchronization slave (SYM bit not set):
+\begin{itemize}
+\item Set 1.LO PLL
+\item If applicable: wait for the "resume sweep" command
+\item Wait for high level on trigger input
+\item Set trigger output to high
+\item Sample ADCs
+\item Wait for low level on trigger input
+\item Set the trigger output to low
+\end{itemize}
+\end{itemize}
+
 \end{document}

Documentation/UserManual/SCPI_Examples/capture_live_data.py

@@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+
+import time
+from libreVNA import libreVNA
+
+# Create the control instance
+vna = libreVNA('localhost', 19542)
+
+# Quick connection check (should print "LibreVNA-GUI")
+print(vna.query("*IDN?"))
+
+# Make sure we are connecting to a device (just to be sure, with default settings the LibreVNA-GUI auto-connects)
+vna.cmd(":DEV:CONN")
+dev = vna.query(":DEV:CONN?")
+if dev == "Not connected":
+    print("Not connected to any device, aborting")
+    exit(-1)
+else:
+    print("Connected to "+dev)
+
+# Capture live data as it is coming in. Stop acquisition for now
+vna.cmd(":VNA:ACQ:STOP")
+
+# switch to VNA mode, set up the sweep parameters
+print("Setting up the sweep...")
+vna.cmd(":DEV:MODE VNA")
+vna.cmd(":VNA:SWEEP FREQUENCY")
+vna.cmd(":VNA:STIM:LVL -10")
+vna.cmd(":VNA:ACQ:IFBW 100")
+vna.cmd(":VNA:ACQ:AVG 1")
+vna.cmd(":VNA:ACQ:POINTS 501")
+vna.cmd(":VNA:FREQuency:START 10000000")
+vna.cmd(":VNA:FREQuency:STOP 6000000000")
+
+sweepComplete = False
+
+
+def callback(data):
+    global sweepComplete
+    print(data)
+    if data["pointNum"] == 500:
+        # this was the last point
+        vna.remove_live_callback(19000, callback)
+        sweepComplete = True
+
+
+# Set up the connection for the live data
+vna.add_live_callback(19000, callback)
+print("Starting the sweep...")
+vna.cmd(":VNA:ACQ:RUN")
+
+while not sweepComplete:
+    time.sleep(0.1)
+
+print("Sweep complete")
+
+

Documentation/UserManual/SCPI_Examples/deembedding_test.py

@@ -0,0 +1,50 @@
+#!/usr/bin/env python3
+
+import time
+from libreVNA import libreVNA
+
+# Create the control instance
+vna = libreVNA('localhost', 19542)
+
+# Quick connection check (should print "LibreVNA-GUI")
+print(vna.query("*IDN?"))
+
+vna.cmd(":VNA:DEEMB:CLEAR")
+vna.cmd(":VNA:DEEMB:NEW PORT_EXTENSION")
+vna.cmd(":VNA:DEEMB:NEW 2XTHRU")
+vna.cmd(":VNA:DEEMB:NEW MATCHING_NETWORK")
+vna.cmd(":VNA:DEEMB:NEW IMPEDANCE_RENORMALIZATION")
+
+print("Number of total deembedding options:")
+num_options = int(vna.query(":VNA:DEEMB:NUM?"))
+print(num_options)
+
+for i in range(1, num_options+1):
+	option_name = vna.query(":VNA:DEEMB:TYPE? "+str(i))
+	print("Option "+str(i)+": "+option_name)
+	
+# edit port extension
+vna.cmd(":VNA:DEEMB:1:PORT 2")
+vna.cmd(":VNA:DEEMB:1:DELAY 0.00002")
+vna.cmd(":VNA:DEEMB:1:DCLOSS 1")
+vna.cmd(":VNA:DEEMB:1:LOSS 3")
+vna.cmd(":VNA:DEEMB:1:FREQUENCY 5000000000")
+
+vna.cmd(":VNA:DEEMB:3:PORT 3")
+vna.cmd(":VNA:DEEMB:3:CLEAR")
+vna.cmd(":VNA:DEEMB:3:ADD FALSE")
+vna.cmd(":VNA:DEEMB:3:NEW ParallelC")
+vna.cmd(":VNA:DEEMB:3:NEW SeriesR")
+vna.cmd(":VNA:DEEMB:3:NEW ParallelL")
+vna.cmd(":VNA:DEEMB:3:NEW SeriesL")
+vna.cmd(":VNA:DEEMB:3:NEW touchstone_shunt")
+
+vna.cmd(":VNA:DEEMB:3:1:VALUE 0.0001")
+vna.cmd(":VNA:DEEMB:3:2:VALUE 0.00002")
+vna.cmd(":VNA:DEEMB:3:3:VALUE 0.000003")
+vna.cmd(":VNA:DEEMB:3:4:VALUE 0.000004")
+
+vna.cmd(":VNA:DEEMB:3:5:FILE TEST.S2P")
+
+vna.cmd(":VNA:DEEMB:4:IMPedance 75")
+

Documentation/UserManual/SCPI_Examples/libreVNA.py

@@ -1,10 +1,16 @@
+import re
 import socket
 from asyncio import IncompleteReadError  # only import the exception class
+import time
+import threading
+import json
 
 class SocketStreamReader:
-    def __init__(self, sock: socket.socket):
+    def __init__(self, sock: socket.socket, default_timeout=1):
         self._sock = sock
+        self._sock.setblocking(0)
         self._recv_buffer = bytearray()
+        self.default_timeout = default_timeout
 
     def read(self, num_bytes: int = -1) -> bytes:
         raise NotImplementedError
@@ -19,12 +25,14 @@ class SocketStreamReader:
             pos += n
         return bytes(buf)
 
-    def readline(self) -> bytes:
+    def readline(self, timeout=None) -> bytes:
-        return self.readuntil(b"\n")
+        return self.readuntil(b"\n", timeout=timeout)
 
-    def readuntil(self, separator: bytes = b"\n") -> bytes:
+    def readuntil(self, separator: bytes = b"\n", timeout=None) -> bytes:
         if len(separator) != 1:
             raise ValueError("Only separators of length 1 are supported.")
+        if timeout is None:
+            timeout = self.default_timeout
 
         chunk = bytearray(4096)
         start = 0
@@ -32,10 +40,13 @@ class SocketStreamReader:
         bytes_read = self._recv_into(memoryview(buf))
         assert bytes_read == len(buf)
 
+        time_limit = time.time() + timeout
         while True:
             idx = buf.find(separator, start)
             if idx != -1:
                 break
+            elif time.time() > time_limit:
+                raise Exception("Timed out waiting for response from GUI")
 
             start = len(self._recv_buffer)
             bytes_read = self._recv_into(memoryview(chunk))
@@ -53,36 +64,121 @@ class SocketStreamReader:
         self._recv_buffer = self._recv_buffer[bytes_read:]
         if bytes_read == len(view):
             return bytes_read
-        bytes_read += self._sock.recv_into(view[bytes_read:])
+        try:
+            bytes_read += self._sock.recv_into(view[bytes_read:], 0)
+        except:
+            pass
         return bytes_read
 
 class libreVNA:
-    def __init__(self, host='localhost', port=19542):
+    def __init__(self, host='localhost', port=19542,
+                 check_cmds=True, timeout=1):
         self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+        self.host = host
         try:
             self.sock.connect((host, port))
         except:
             raise Exception("Unable to connect to LibreVNA-GUI. Make sure it is running and the TCP server is enabled.")
-        self.reader = SocketStreamReader(self.sock)
+        self.reader = SocketStreamReader(self.sock,
+                                         default_timeout=timeout)
+        self.default_check_cmds = check_cmds
+        self.live_threads = {}
+        self.live_callbacks = {}
 
     def __del__(self):
         self.sock.close()
 
-    def __read_response(self):
+    def __read_response(self, timeout=None):
-        return self.reader.readline().decode().rstrip()
+        return self.reader.readline(timeout=timeout).decode().rstrip()
 
-    def cmd(self, cmd):
+    def cmd(self, cmd, check=None, timeout=None):
         self.sock.sendall(cmd.encode())
         self.sock.send(b"\n")
-        self.__read_response()
+        if check or (check is None and self.default_check_cmds):
+            status = self.get_status(timeout=timeout)
+            if status & 0x20:
+                raise Exception("Command Error")
+            if status & 0x10:
+                raise Exception("Execution Error")
+            if status & 0x08:
+                raise Exception("Device Error")
+            if status & 0x04:
+                raise Exception("Query Error")
+            return status
+        else:
+            return None
 
-    def query(self, query):
+    def query(self, query, timeout=None):
         self.sock.sendall(query.encode())
         self.sock.send(b"\n")
-        return self.__read_response()
+        return self.__read_response(timeout=timeout)
+
+    def get_status(self, timeout=None):
+        resp = self.query("*ESR?", timeout=timeout)
+        if not re.match(r'^\d+$', resp):
+            raise Exception("Expected numeric response from *ESR? but got "
+                            f"'{resp}'")
+        status = int(resp)
+        if status < 0 or status > 255:
+            raise Exception(f"*ESR? returned invalid value {status}.")
+        return status
+        
+    def add_live_callback(self, port, callback):
+        # check if we already have a thread handling this connection
+        if not port in self.live_threads:
+            # needs to create the connection and thread first
+            sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
+            try:
+                sock.connect((self.host, port))
+            except:
+                raise Exception("Unable to connect to streaming server at port {}. Make sure it is enabled.".format(port))
+
+            self.live_callbacks[port] = [callback]
+            self.live_threads[port] = threading.Thread(target=self.__live_thread, args=(sock, port))
+            self.live_threads[port].start()
+        else:
+            # thread already existed, simply add to list
+            self.live_callbacks[port].append(callback)
+
+    def remove_live_callback(self, port, callback):
+        if port in self.live_callbacks:
+            # remove all matching callbacks from the list
+            self.live_callbacks[port] = [cb for cb in self.live_callbacks[port] if cb != callback]
+            # if the list is now empty, the thread will exit
+            if len(self.live_callbacks) == 0:
+                self.live_threads[port].join()
+                del self.live_threads[port]
+
+    def __live_thread(self, sock, port):
+        reader = SocketStreamReader(sock, default_timeout=0.1)
+        while len(self.live_callbacks[port]) > 0:
+            try:
+                line = reader.readline().decode().rstrip()
+                # determine whether this is data from the VNA or spectrum analyzer
+                data = json.loads(line)
+                if "Z0" in data:
+                    # This is VNA data which has the imag/real parts of the S-parameters split into two float values.
+                    # This was necessary because json does not support complex number. But python does -> convert back
+                    # to complex
+                    measurements = {}
+                    for meas in data["measurements"].keys():
+                        if meas.endswith("_imag"):
+                            # ignore
+                            continue
+                        name = meas.removesuffix("_real")
+                        real = data["measurements"][meas]
+                        imag = data["measurements"][name+"_imag"]
+                        measurements[name] = complex(real, imag)
+                    data["measurements"] = measurements
+                for cb in self.live_callbacks[port]:
+                    cb(data)
+            except:
+                # ignore timeouts
+                pass
+    
     
     @staticmethod
-    def parse_trace_data(data):
+    def parse_VNA_trace_data(data):
         ret = []
         # Remove brackets (order of data implicitly known)
         data = data.replace(']','').replace('[','')
@@ -97,3 +193,18 @@ class libreVNA:
             ret.append((freq, complex(real, imag)))
         return ret
     
+    @staticmethod
+    def parse_SA_trace_data(data):
+        ret = []
+        # Remove brackets (order of data implicitly known)
+        data = data.replace(']','').replace('[','')
+        values = data.split(',')
+        if int(len(values) / 2) * 2 != len(values):
+            # number of values must be a multiple of two (frequency, dBm)
+            raise Exception("Invalid input data: expected tuples of two values each")
+        for i in range(0, len(values), 2):
+            freq = float(values[i])
+            dBm = float(values[i+1])
+            ret.append((freq, dBm))
+        return ret
+

Documentation/UserManual/SCPI_Examples/retrieve_trace_data.py

@@ -42,7 +42,7 @@ data = vna.query(":VNA:TRACE:DATA? S11")
 
 # Returned data is just a string containing all the measurement points.
 # Parsing the data returns a list containing frequency/complex tuples
-S11 = vna.parse_trace_data(data)
+S11 = vna.parse_VNA_trace_data(data)
 
 for x in S11:
     print(x)